From 7533f910bf7f373d65f6463ae6a49f47e29621f7 Mon Sep 17 00:00:00 2001
From: Jessica Lawshe <5312836+lawshe@users.noreply.github.com>
Date: Wed, 26 Feb 2025 09:19:02 -0600
Subject: [PATCH] Merge pull request #23351 from overleaf/jel-v1-down-sso-login

[web] Catch v1 errors on SSO log in to not block group SSO

GitOrigin-RevId: b99498dfd4a0de2099b8da1ac73dda28280cd430
---
 services/web/app/src/Features/Errors/Errors.js | 7 +++++++
 services/web/locales/en.json                   | 1 +
 2 files changed, 8 insertions(+)

diff --git a/services/web/app/src/Features/Errors/Errors.js b/services/web/app/src/Features/Errors/Errors.js
index 1d835b0ac9..8a21b6042a 100644
--- a/services/web/app/src/Features/Errors/Errors.js
+++ b/services/web/app/src/Features/Errors/Errors.js
@@ -71,6 +71,12 @@ class NotInV2Error extends BackwardCompatibleError {}
 
 class SLInV2Error extends BackwardCompatibleError {}
 
+class SAMLCommonsUnavailable extends OError {
+  get i18nKey() {
+    return 'saml_commons_unavailable'
+  }
+}
+
 class SAMLIdentityExistsError extends OError {
   get i18nKey() {
     return 'institution_account_tried_to_add_already_registered'
@@ -316,6 +322,7 @@ module.exports = {
   OutputFileFetchFailedError,
   SAMLAssertionAudienceMismatch,
   SAMLAuthenticationRequiredError,
+  SAMLCommonsUnavailable,
   SAMLIdentityExistsError,
   SAMLAlreadyLinkedError,
   SAMLEmailNotAffiliatedError,
diff --git a/services/web/locales/en.json b/services/web/locales/en.json
index 9f4a77b4c1..7fc5038563 100644
--- a/services/web/locales/en.json
+++ b/services/web/locales/en.json
@@ -1843,6 +1843,7 @@
   "saml": "SAML",
   "saml_auth_error": "Sorry, your identity provider responded with an error.  Please contact your administrator for more information.",
   "saml_authentication_required_error": "Other login methods have been disabled by your group administrator. Please use your group SSO login.",
+  "saml_commons_unavailable": "Institution SSO is currently unavailable. For more details, please see <0>__linkText__</0>.",
   "saml_create_admin_instructions": "Choose an email address for the first __appName__ admin account. This should correspond to an account in the SAML system. You will then be asked to log in with this account.",
   "saml_email_not_recognized_error": "This email address isn’t set up for SSO. Please check it and try again or contact your administrator.",
   "saml_identity_exists_error": "Sorry, the identity returned by your identity provider is already linked with a different Overleaf account.  Please contact your administrator for more information.",