Răsfoiți Sursa

Merge pull request #27445 from overleaf/slg-improve-domain-matcher-error

Improve domain matcher error message

GitOrigin-RevId: 8f07a8e27854637cb931f852e6c59d4960caa33b
Simon Gardner 1 an în urmă
părinte
comite
e129856dfe

+ 8 - 0
services/web/app/src/Features/User/UserEmailsController.js

@@ -273,6 +273,14 @@ const _checkConfirmationCode =
         })
         })
       }
       }
 
 
+      if (error.name === 'InvalidInstitutionalEmailError') {
+        return res.status(422).json({
+          message: {
+            key: 'email_does_not_belong_to_university',
+          },
+        })
+      }
+
       logger.err({ error }, 'failed to check confirmation code')
       logger.err({ error }, 'failed to check confirmation code')
 
 
       return res.status(500).json({
       return res.status(500).json({

+ 1 - 0
services/web/frontend/extracted-translations.json

@@ -522,6 +522,7 @@
   "email_attribute": "",
   "email_attribute": "",
   "email_confirmed_onboarding": "",
   "email_confirmed_onboarding": "",
   "email_confirmed_onboarding_message": "",
   "email_confirmed_onboarding_message": "",
+  "email_does_not_belong_to_university": "",
   "email_limit_reached": "",
   "email_limit_reached": "",
   "email_link_expired": "",
   "email_link_expired": "",
   "email_must_be_linked_to_institution": "",
   "email_must_be_linked_to_institution": "",

+ 3 - 0
services/web/frontend/js/features/settings/components/emails/confirm-email-form.tsx

@@ -307,6 +307,9 @@ function ErrorMessage({ error }: { error: string }) {
     case 'email_already_registered':
     case 'email_already_registered':
       return <span>{t('email_already_registered')}</span>
       return <span>{t('email_already_registered')}</span>
 
 
+    case 'email_does_not_belong_to_university':
+      return <span>{t('email_does_not_belong_to_university')}</span>
+
     case 'too_many_confirm_code_resend_attempts':
     case 'too_many_confirm_code_resend_attempts':
       return <span>{t('too_many_confirm_code_resend_attempts')}</span>
       return <span>{t('too_many_confirm_code_resend_attempts')}</span>