diff options
| -rw-r--r-- | exports/exports.go | 6 | ||||
| -rw-r--r-- | internal/types/error.go | 6 | ||||
| -rw-r--r-- | state.go | 2 |
3 files changed, 9 insertions, 5 deletions
diff --git a/exports/exports.go b/exports/exports.go index daf84bb..b4eb909 100644 --- a/exports/exports.go +++ b/exports/exports.go @@ -114,7 +114,11 @@ func ErrorToString(error error) string { return "" } - return eduvpn.GetErrorJSONString(error) + errorString, jsonErr := eduvpn.GetErrorJSONString(error) + if jsonErr != nil { + return "" + } + return errorString } //export CancelOAuth diff --git a/internal/types/error.go b/internal/types/error.go index ad6a7e0..8612de3 100644 --- a/internal/types/error.go +++ b/internal/types/error.go @@ -88,7 +88,7 @@ type WrappedErrorMessageJSON struct { Traceback string `json:"traceback"` } -func GetErrorJSONString(err error) string { +func GetErrorJSONString(err error) (string, error) { var wrappedErr *WrappedErrorMessage var level ErrorLevel @@ -110,7 +110,7 @@ func GetErrorJSONString(err error) string { ) if jsonErr != nil { - panic(jsonErr) + return "", jsonErr } - return string(json) + return string(json), nil } @@ -714,6 +714,6 @@ func GetErrorTraceback(err error) string { return types.GetErrorTraceback(err) } -func GetErrorJSONString(err error) string { +func GetErrorJSONString(err error) (string, error) { return types.GetErrorJSONString(err) } |