diff --git a/packages/webapp/lang/de.json b/packages/webapp/lang/de.json index 57fd10cc..0e1999b1 100644 --- a/packages/webapp/lang/de.json +++ b/packages/webapp/lang/de.json @@ -539,5 +539,8 @@ }, "registration.callback.waiting.description": { "defaultMessage": "Bitte warten Sie, während wir Ihre Identität überprüfen" + }, + "registation.callback.error.message": { + "defaultMessage": "Beim Überprüfen Ihrer Identität bei Google ist ein Fehler aufgetreten. Sie können es auf der Anmeldeseite erneut versuchen" } } \ No newline at end of file diff --git a/packages/webapp/lang/en.json b/packages/webapp/lang/en.json index 58117f88..fac2234a 100644 --- a/packages/webapp/lang/en.json +++ b/packages/webapp/lang/en.json @@ -535,6 +535,9 @@ }, "registration.callback.waiting.description": { "defaultMessage": "Please wait while we validate your identity" + }, + "registation.callback.error.message": { + "defaultMessage": "An error occurred validating your identity with Google, you can try again from the login page" } } \ No newline at end of file diff --git a/packages/webapp/lang/es.json b/packages/webapp/lang/es.json index bba34beb..da6780c3 100644 --- a/packages/webapp/lang/es.json +++ b/packages/webapp/lang/es.json @@ -515,5 +515,8 @@ }, "registration.callback.waiting.description": { "defaultMessage": "Por favor espera mientras validamos tu identidad" + }, + "registation.callback.error.message": { + "defaultMessage": "Ocurrió un error al validar tu identidad con Google, puedes volver a intentarlo desde la página de inicio de sesión" } } \ No newline at end of file diff --git a/packages/webapp/lang/fr.json b/packages/webapp/lang/fr.json index a8653429..e8a751ff 100644 --- a/packages/webapp/lang/fr.json +++ b/packages/webapp/lang/fr.json @@ -542,5 +542,8 @@ }, "registration.callback.waiting.description": { "defaultMessage": "Veuillez patienter pendant que nous validons votre identité" + }, + "registation.callback.error.message": { + "defaultMessage": "Une erreur s'est produite lors de la validation de votre identité auprès de Google, vous pouvez réessayer depuis la page de connexion" } } \ No newline at end of file diff --git a/packages/webapp/lang/ru.json b/packages/webapp/lang/ru.json index 8c4f38b2..ac66cf35 100644 --- a/packages/webapp/lang/ru.json +++ b/packages/webapp/lang/ru.json @@ -509,5 +509,8 @@ }, "registration.callback.waiting.description": { "defaultMessage": "Подождите, пока мы подтвердим вашу личность" + }, + "registation.callback.error.message": { + "defaultMessage": "Произошла ошибка при подтверждении вашей личности в Google. Повторите попытку со страницы входа." } } \ No newline at end of file diff --git a/packages/webapp/lang/zh.json b/packages/webapp/lang/zh.json index e2c14b0a..3df1e8df 100644 --- a/packages/webapp/lang/zh.json +++ b/packages/webapp/lang/zh.json @@ -536,5 +536,8 @@ }, "registration.callback.waiting.description": { "defaultMessage": "我们正在验证您的身份,请稍候" + }, + "registation.callback.error.message": { + "defaultMessage": "使用 Google 验证您的身份时出错,您可以从登录页面重试" } } \ No newline at end of file diff --git a/packages/webapp/src/compiled-lang/de.json b/packages/webapp/src/compiled-lang/de.json index dd7c667b..94a9cea4 100644 --- a/packages/webapp/src/compiled-lang/de.json +++ b/packages/webapp/src/compiled-lang/de.json @@ -915,6 +915,12 @@ "value": "Veröffentlichen" } ], + "registation.callback.error.message": [ + { + "type": 0, + "value": "Beim Überprüfen Ihrer Identität bei Google ist ein Fehler aufgetreten. Sie können es auf der Anmeldeseite erneut versuchen" + } + ], "registation.success-title": [ { "type": 0, diff --git a/packages/webapp/src/compiled-lang/en.json b/packages/webapp/src/compiled-lang/en.json index ac7c962e..1cc27489 100644 --- a/packages/webapp/src/compiled-lang/en.json +++ b/packages/webapp/src/compiled-lang/en.json @@ -907,6 +907,12 @@ "value": "Publish" } ], + "registation.callback.error.message": [ + { + "type": 0, + "value": "An error occurred validating your identity with Google, you can try again from the login page" + } + ], "registation.success-title": [ { "type": 0, diff --git a/packages/webapp/src/compiled-lang/es.json b/packages/webapp/src/compiled-lang/es.json index 659490bf..d13d199c 100644 --- a/packages/webapp/src/compiled-lang/es.json +++ b/packages/webapp/src/compiled-lang/es.json @@ -861,6 +861,12 @@ "value": "Publicar" } ], + "registation.callback.error.message": [ + { + "type": 0, + "value": "Ocurrió un error al validar tu identidad con Google, puedes volver a intentarlo desde la página de inicio de sesión" + } + ], "registation.success-title": [ { "type": 0, diff --git a/packages/webapp/src/compiled-lang/fr.json b/packages/webapp/src/compiled-lang/fr.json index 745cb0e1..3d70c280 100644 --- a/packages/webapp/src/compiled-lang/fr.json +++ b/packages/webapp/src/compiled-lang/fr.json @@ -907,6 +907,12 @@ "value": "Publier" } ], + "registation.callback.error.message": [ + { + "type": 0, + "value": "Une erreur s'est produite lors de la validation de votre identité auprès de Google, vous pouvez réessayer depuis la page de connexion" + } + ], "registation.success-title": [ { "type": 0, diff --git a/packages/webapp/src/compiled-lang/ru.json b/packages/webapp/src/compiled-lang/ru.json index 9cc00579..c978a347 100644 --- a/packages/webapp/src/compiled-lang/ru.json +++ b/packages/webapp/src/compiled-lang/ru.json @@ -855,6 +855,12 @@ "value": "Опубликовать" } ], + "registation.callback.error.message": [ + { + "type": 0, + "value": "Произошла ошибка при подтверждении вашей личности в Google. Повторите попытку со страницы входа." + } + ], "registation.success-title": [ { "type": 0, diff --git a/packages/webapp/src/compiled-lang/zh.json b/packages/webapp/src/compiled-lang/zh.json index 78ee3f55..25ff7c4c 100644 --- a/packages/webapp/src/compiled-lang/zh.json +++ b/packages/webapp/src/compiled-lang/zh.json @@ -903,6 +903,12 @@ "value": "发布" } ], + "registation.callback.error.message": [ + { + "type": 0, + "value": "使用 Google 验证您的身份时出错,您可以从登录页面重试" + } + ], "registation.success-title": [ { "type": 0, diff --git a/packages/webapp/src/components/registration-callback/index.tsx b/packages/webapp/src/components/registration-callback/index.tsx index 59dee32e..3947b4fd 100644 --- a/packages/webapp/src/components/registration-callback/index.tsx +++ b/packages/webapp/src/components/registration-callback/index.tsx @@ -13,6 +13,7 @@ import { activeInstance } from '../../redux/clientSlice'; import { useNavigate } from 'react-router-dom'; import { css } from '@emotion/react'; import { CircularProgress } from '@mui/material'; +import GlobalError from '../form/global-error'; const RegistrationCallbackPage = (): React.ReactElement => { const intl = useIntl(); @@ -21,6 +22,7 @@ const RegistrationCallbackPage = (): React.ReactElement => { const [email, setEmail] = useState(undefined); const [syncCode, setSyncCode] = useState(undefined); const [googleSync, setGoogleSync] = useState(undefined); + const [callbackError, setCallbackError] = useState(false); const navigate = useNavigate(); useEffect(() => { @@ -50,14 +52,10 @@ const RegistrationCallbackPage = (): React.ReactElement => { }) .catch((error) => { console.log('ERROR', error); + setCallbackError(true); }); }, []); - const buttonsStyle = css({ - marginLeft: '10px', - marginRight: '10px', - }); - const confirmAccountSynching = () => { client .confirmAccountSync(email, syncCode) @@ -69,8 +67,13 @@ const RegistrationCallbackPage = (): React.ReactElement => { }); }; + const buttonsStyle = css({ + marginLeft: '10px', + marginRight: '10px', + }); + // if service reports that user doesnt sync accounts yet, we need to show the options - const needConfirmLinking = email && !googleSync; + const needConfirmLinking = !callbackError && email && !googleSync; const titleKey = needConfirmLinking ? 'registration.callback.confirm.title' : 'registration.callback.waiting.title'; @@ -93,7 +96,32 @@ const RegistrationCallbackPage = (): React.ReactElement => { - {!needConfirmLinking && } + {callbackError && ( + <> + + + + )} + + {!needConfirmLinking && !callbackError && } {needConfirmLinking && ( <>