diff --git a/packages/client/src/components/GlobalEvents/CreateEvent.js b/packages/client/src/components/GlobalEvents/CreateEvent.js index 2680651c06..3cabc2d972 100644 --- a/packages/client/src/components/GlobalEvents/CreateEvent.js +++ b/packages/client/src/components/GlobalEvents/CreateEvent.js @@ -139,8 +139,19 @@ const CreateEvent = ({ }) .then(() => editCompleteAction(item, type)) .catch((err) => { - if (err.indexOf("password") == -1) { - toastr.error(err, t("Common:Warning")); + let errorMessage = ""; + if (typeof err === "object") { + errorMessage = + err?.response?.data?.error?.message || + err?.statusText || + err?.message || + ""; + } else { + errorMessage = err; + } + + if (errorMessage.indexOf("password") == -1) { + toastr.error(errorMessage, t("Common:Warning")); return; } diff --git a/packages/client/src/components/dialogs/ConvertPasswordDialog/index.js b/packages/client/src/components/dialogs/ConvertPasswordDialog/index.js index 63e4ee5fcd..6ed837a129 100644 --- a/packages/client/src/components/dialogs/ConvertPasswordDialog/index.js +++ b/packages/client/src/components/dialogs/ConvertPasswordDialog/index.js @@ -92,8 +92,19 @@ const ConvertPasswordDialogComponent = (props) => { onClose(); }) .catch((err) => { - if (err.indexOf("password") == -1) { - toastr.error(err, t("Common:Warning")); + let errorMessage = ""; + if (typeof err === "object") { + errorMessage = + err?.response?.data?.error?.message || + err?.statusText || + err?.message || + ""; + } else { + errorMessage = err; + } + + if (errorMessage.indexOf("password") == -1) { + toastr.error(errorMessage, t("Common:Warning")); return; } @@ -118,8 +129,18 @@ const ConvertPasswordDialogComponent = (props) => { editCompleteAction(fileInfo); }) .catch((err) => { - if (err.indexOf("password") == -1) { - toastr.error(err, t("Common:Warning")); + let errorMessage = ""; + if (typeof err === "object") { + errorMessage = + err?.response?.data?.error?.message || + err?.statusText || + err?.message || + ""; + } else { + errorMessage = err; + } + if (errorMessage.indexOf("password") == -1) { + toastr.error(errorMessage, t("Common:Warning")); return; } diff --git a/packages/client/src/pages/Confirm/sub-components/activateEmail.js b/packages/client/src/pages/Confirm/sub-components/activateEmail.js index eaa6ef0636..67ed962a6d 100644 --- a/packages/client/src/pages/Confirm/sub-components/activateEmail.js +++ b/packages/client/src/pages/Confirm/sub-components/activateEmail.js @@ -26,10 +26,24 @@ class ActivateEmail extends React.PureComponent { ) ); }) - .catch((e) => { + .catch((error) => { // console.log('activate email error', e); + let errorMessage = ""; + if (typeof error === "object") { + errorMessage = + error?.response?.data?.error?.message || + error?.statusText || + error?.message || + ""; + } else { + errorMessage = error; + } + tryRedirectTo( - combineUrl(AppServerConfig.proxyURL, `/login/error?message=${e}`) + combineUrl( + AppServerConfig.proxyURL, + `/login/error?message=${errorMessage}` + ) ); }) ); diff --git a/packages/client/src/pages/Confirm/sub-components/changeEmail.js b/packages/client/src/pages/Confirm/sub-components/changeEmail.js index 8345bd9408..668402a1d1 100644 --- a/packages/client/src/pages/Confirm/sub-components/changeEmail.js +++ b/packages/client/src/pages/Confirm/sub-components/changeEmail.js @@ -23,9 +23,22 @@ class ChangeEmail extends React.PureComponent { ) ); }) - .catch((e) => { + .catch((error) => { + let errorMessage = ""; + if (typeof error === "object") { + errorMessage = + error?.response?.data?.error?.message || + error?.statusText || + error?.message || + ""; + } else { + errorMessage = error; + } + console.log("change client email error", e); - tryRedirectTo(combineUrl(AppServerConfig.proxyURL, `/error=${e}`)); + tryRedirectTo( + combineUrl(AppServerConfig.proxyURL, `/error=${errorMessage}`) + ); }); } } diff --git a/packages/client/src/pages/Confirm/sub-components/changePassword.js b/packages/client/src/pages/Confirm/sub-components/changePassword.js index f54e1ee95e..0e42bd900a 100644 --- a/packages/client/src/pages/Confirm/sub-components/changePassword.js +++ b/packages/client/src/pages/Confirm/sub-components/changePassword.js @@ -67,7 +67,18 @@ const ChangePasswordForm = (props) => { tryRedirectTo(defaultPage); }) .catch((error) => { - toastr.error(t(`${error}`)); + let errorMessage = ""; + if (typeof error === "object") { + errorMessage = + error?.response?.data?.error?.message || + error?.statusText || + error?.message || + ""; + } else { + errorMessage = error; + } + + toastr.error(t(`${errorMessage}`)); setIsLoading(false); }); }; diff --git a/packages/client/src/pages/Confirm/sub-components/createUser.js b/packages/client/src/pages/Confirm/sub-components/createUser.js index b32ba361fa..a43656215d 100644 --- a/packages/client/src/pages/Confirm/sub-components/createUser.js +++ b/packages/client/src/pages/Confirm/sub-components/createUser.js @@ -339,8 +339,19 @@ const Confirm = (props) => { createConfirmUser(personalData, loginData, headerKey) .then(() => window.location.replace(defaultPage)) .catch((error) => { - console.error("confirm error", error); - setEmailErrorText(error); + let errorMessage = ""; + if (typeof error === "object") { + errorMessage = + error?.response?.data?.error?.message || + error?.statusText || + error?.message || + ""; + } else { + errorMessage = error; + } + + console.error("confirm error", errorMessage); + setEmailErrorText(errorMessage); setEmailValid(false); setIsLoading(false); }); diff --git a/packages/client/src/pages/Confirm/sub-components/tfaActivation.js b/packages/client/src/pages/Confirm/sub-components/tfaActivation.js index 034854a261..bec8d8a625 100644 --- a/packages/client/src/pages/Confirm/sub-components/tfaActivation.js +++ b/packages/client/src/pages/Confirm/sub-components/tfaActivation.js @@ -120,8 +120,18 @@ const TfaActivationForm = withLoader((props) => { const url = await loginWithCodeAndCookie(code, linkData.confirmHeader); history.push("/"); } - } catch (e) { - setError(e); + } catch (err) { + let errorMessage = ""; + if (typeof err === "object") { + errorMessage = + err?.response?.data?.error?.message || + err?.statusText || + err?.message || + ""; + } else { + errorMessage = err; + } + setError(errorMessage); toastr.error(e); } setIsLoading(false); diff --git a/packages/client/src/pages/Confirm/withLoader.js b/packages/client/src/pages/Confirm/withLoader.js index de1d15db62..7d5bf962ec 100644 --- a/packages/client/src/pages/Confirm/withLoader.js +++ b/packages/client/src/pages/Confirm/withLoader.js @@ -34,11 +34,22 @@ export default function withLoader(WrappedComponent) { axios .all([getSettings(), getPortalPasswordSettings(confirmHeader)]) .catch((error) => { - console.error(error); + let errorMessage = ""; + if (typeof error === "object") { + errorMessage = + error?.response?.data?.error?.message || + error?.statusText || + error?.message || + ""; + } else { + errorMessage = error; + } + + console.error(errorMessage); history.push( combineUrl( AppServerConfig.proxyURL, - `/login/error?message=${error}` + `/login/error?message=${errorMessage}` ) ); }); @@ -48,11 +59,21 @@ export default function withLoader(WrappedComponent) { useEffect(() => { if (type === "LinkInvite") { axios.all([getAuthProviders(), getCapabilities()]).catch((error) => { - console.error(error); + let errorMessage = ""; + if (typeof error === "object") { + errorMessage = + error?.response?.data?.error?.message || + error?.statusText || + error?.message || + ""; + } else { + errorMessage = error; + } + console.error(errorMessage); history.push( combineUrl( AppServerConfig.proxyURL, - `/login/error?message=${error}` + `/login/error?message=${errorMessage}` ) ); }); diff --git a/packages/client/src/pages/PortalSettings/categories/common/Customization/portal-renaming.js b/packages/client/src/pages/PortalSettings/categories/common/Customization/portal-renaming.js index 20d7f23e75..7e2ad63e5d 100644 --- a/packages/client/src/pages/PortalSettings/categories/common/Customization/portal-renaming.js +++ b/packages/client/src/pages/PortalSettings/categories/common/Customization/portal-renaming.js @@ -114,8 +114,19 @@ const PortalRenaming = (props) => { setPortalRename(portalName) .then(() => toastr.success(t("SuccessfullySavePortalNameMessage"))) .catch((error) => { - setErrorValue(error); - saveToSessionStorage("errorValue", error); + let errorMessage = ""; + if (typeof error === "object") { + errorMessage = + error?.response?.data?.error?.message || + error?.statusText || + error?.message || + ""; + } else { + errorMessage = error; + } + + setErrorValue(errorMessage); + saveToSessionStorage("errorValue", errorMessage); }) .finally(() => setIsLoadingPortalNameSave(false)); diff --git a/packages/client/src/pages/PreparationPortal/index.js b/packages/client/src/pages/PreparationPortal/index.js index 622bb16314..0e296aed49 100644 --- a/packages/client/src/pages/PreparationPortal/index.js +++ b/packages/client/src/pages/PreparationPortal/index.js @@ -50,11 +50,22 @@ class PreparationPortal extends React.Component { } } }) - .catch((err) => + .catch((err) => { + let errorMessage = ""; + if (typeof err === "object") { + errorMessage = + err?.response?.data?.error?.message || + err?.statusText || + err?.message || + ""; + } else { + errorMessage = err; + } + this.setState({ - errorMessage: err, - }) - ); + errorMessage: errorMessage, + }); + }); } componentWillUnmount() { clearInterval(this.timerId); diff --git a/packages/client/src/pages/Wizard/index.js b/packages/client/src/pages/Wizard/index.js index 0fc2014610..0f918050fb 100644 --- a/packages/client/src/pages/Wizard/index.js +++ b/packages/client/src/pages/Wizard/index.js @@ -138,10 +138,20 @@ class Body extends Component { }); setIsWizardLoaded(true); }) - .catch((e) => { - console.error(e); + .catch((error) => { + let errorMessage = ""; + if (typeof err === "object") { + errorMessage = + error?.response?.data?.error?.message || + error?.statusText || + error?.message || + ""; + } else { + errorMessage = error; + } + console.error(errorMessage); this.setState({ - errorInitWizard: e, + errorInitWizard: errorMessage, }); }); } @@ -246,13 +256,24 @@ class Body extends Component { .then(() => history.push(combineUrl(AppServerConfig.proxyURL, "/login")) ) - .catch((e) => + .catch((error) => { + let errorMessage = ""; + if (typeof err === "object") { + errorMessage = + error?.response?.data?.error?.message || + error?.statusText || + error?.message || + ""; + } else { + errorMessage = error; + } + this.setState({ errorLoading: true, sending: false, - errorMessage: e, - }) - ); + errorMessage: errorMessage, + }); + }); } else { this.setState({ visibleModal: true }); } @@ -382,13 +403,23 @@ class Body extends Component { let fd = new FormData(); fd.append("files", file); - setLicense(wizardToken, fd).catch((e) => + setLicense(wizardToken, fd).catch((error) => { + let errorMessage = ""; + if (typeof err === "object") { + errorMessage = + error?.response?.data?.error?.message || + error?.statusText || + error?.message || + ""; + } else { + errorMessage = error; + } this.setState({ errorLoading: true, - errorMessage: e, + errorMessage: errorMessage, hasErrorLicense: true, - }) - ); + }); + }); }; render() { diff --git a/packages/client/src/store/UploadDataStore.js b/packages/client/src/store/UploadDataStore.js index fa1ce7af00..65a700d8a0 100644 --- a/packages/client/src/store/UploadDataStore.js +++ b/packages/client/src/store/UploadDataStore.js @@ -900,7 +900,7 @@ class UploadDataStore { path ); }) - .catch((err) => { + .catch((error) => { if (this.files[indexOfFile] === undefined) { this.primaryProgressDataStore.setPrimaryProgressBarData({ icon: "upload", @@ -910,8 +910,18 @@ class UploadDataStore { }); return Promise.resolve(); } + let errorMessage = ""; + if (typeof error === "object") { + errorMessage = + error?.response?.data?.error?.message || + error?.statusText || + error?.message || + ""; + } else { + errorMessage = error; + } - this.files[indexOfFile].error = err; + this.files[indexOfFile].error = errorMessage; //dispatch(setUploadData(uploadData)); diff --git a/packages/editor/src/client/components/Editor.js b/packages/editor/src/client/components/Editor.js index 36c4d54545..66a566f7e1 100644 --- a/packages/editor/src/client/components/Editor.js +++ b/packages/editor/src/client/components/Editor.js @@ -279,9 +279,20 @@ function Editor({ ), history: getDocumentHistory(updateVersions, historyLength), }); - } catch (e) { + } catch (error) { + let errorMessage = ""; + if (typeof error === "object") { + errorMessage = + error?.response?.data?.error?.message || + error?.statusText || + error?.message || + ""; + } else { + errorMessage = error; + } + docEditor.refreshHistory({ - error: `${e}`, //TODO: maybe need to display something else. + error: `${errorMessage}`, //TODO: maybe need to display something else. }); } }; @@ -330,9 +341,19 @@ function Editor({ currentVersion: getCurrentDocumentVersion(fileHistory, historyLength), history: getDocumentHistory(fileHistory, historyLength), }); - } catch (e) { + } catch (error) { + let errorMessage = ""; + if (typeof error === "object") { + errorMessage = + error?.response?.data?.error?.message || + error?.statusText || + error?.message || + ""; + } else { + errorMessage = error; + } docEditor.refreshHistory({ - error: `${e}`, //TODO: maybe need to display something else. + error: `${errorMessage}`, //TODO: maybe need to display something else. }); } }; @@ -361,9 +382,20 @@ function Editor({ url: versionDifference.url, version, }); - } catch (e) { + } catch (error) { + let errorMessage = ""; + if (typeof error === "object") { + errorMessage = + error?.response?.data?.error?.message || + error?.statusText || + error?.message || + ""; + } else { + errorMessage = error; + } + docEditor.setHistoryData({ - error: `${e}`, //TODO: maybe need to display something else. + error: `${errorMessage}`, //TODO: maybe need to display something else. version, }); } diff --git a/packages/login/src/client/components/sub-components/LoginForm.tsx b/packages/login/src/client/components/sub-components/LoginForm.tsx index 665f176323..5d0f384b43 100644 --- a/packages/login/src/client/components/sub-components/LoginForm.tsx +++ b/packages/login/src/client/components/sub-components/LoginForm.tsx @@ -164,9 +164,20 @@ const LoginForm: React.FC = ({ else window.location.replace("/"); //TODO: save { user, hash } for tfa }) .catch((error) => { + let errorMessage = ""; + if (typeof error === "object") { + errorMessage = + error?.response?.data?.error?.message || + error?.statusText || + error?.message || + ""; + } else { + errorMessage = error; + } + setIsEmailErrorShow(true); - setErrorText(error); - setPasswordValid(!error); + setErrorText(errorMessage); + setPasswordValid(!errorMessage); setIsLoading(false); focusInput(); });