From 576b78d739cea27479167ca376d404651546ad13 Mon Sep 17 00:00:00 2001
From: Jake Fink <jfink@bitwarden.com>
Date: Tue, 11 Jun 2024 16:20:06 -0400
Subject: [PATCH] Change error message (#4175)

---
 .../src/Sso/Controllers/AccountController.cs              | 3 ++-
 src/Core/Resources/SharedResources.en.resx                | 8 ++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/bitwarden_license/src/Sso/Controllers/AccountController.cs b/bitwarden_license/src/Sso/Controllers/AccountController.cs
index ddf2553a8e..c80ae92a7a 100644
--- a/bitwarden_license/src/Sso/Controllers/AccountController.cs
+++ b/bitwarden_license/src/Sso/Controllers/AccountController.cs
@@ -483,7 +483,8 @@ public class AccountController : Controller
             if (orgUser.Status == OrganizationUserStatusType.Invited)
             {
                 // Org User is invited - they must manually accept the invite via email and authenticate with MP
-                throw new Exception(_i18nService.T("UserAlreadyInvited", email, organization.DisplayName()));
+                // This allows us to enroll them in MP reset if required
+                throw new Exception(_i18nService.T("AcceptInviteBeforeUsingSSO", organization.DisplayName()));
             }
 
             // Accepted or Confirmed - create SSO link and return;
diff --git a/src/Core/Resources/SharedResources.en.resx b/src/Core/Resources/SharedResources.en.resx
index eacc29d68b..3ef0b54efe 100644
--- a/src/Core/Resources/SharedResources.en.resx
+++ b/src/Core/Resources/SharedResources.en.resx
@@ -529,8 +529,8 @@
   <data name="NoSeatsAvailable" xml:space="preserve">
     <value>No seats available for organization, '{0}'</value>
   </data>
-  <data name="UserAlreadyInvited" xml:space="preserve">
-    <value>User, '{0}', has already been invited to this organization, '{1}'. Accept the invite in order to log in with SSO.</value>
+  <data name="AcceptInviteBeforeUsingSSO" xml:space="preserve">
+    <value>To accept your invite to {0}, you must first log in using your master password. Once your invite has been accepted, you will be able to log in using SSO.</value>
   </data>
   <data name="UserAlreadyExistsInviteProcess" xml:space="preserve">
     <value>You were removed from the organization managing single sign-on for your account. Contact the organization administrator for help regaining access to your account.</value>
@@ -540,7 +540,7 @@
   </data>
   <data name="RedirectGet" xml:space="preserve">
     <value>Redirect GET</value>
-    <comment>An OIDC Connect Redirect Behavior, Redirect; Emits a 302 response 
+    <comment>An OIDC Connect Redirect Behavior, Redirect; Emits a 302 response
     to redirect the user agent to the OpenID Connect provider using a GET request.</comment>
   </data>
   <data name="FormPost" xml:space="preserve">
@@ -685,4 +685,4 @@
   <data name="InvalidSsoRedirectToken" xml:space="preserve">
     <value>Single sign on redirect token is invalid or expired.</value>
   </data>
-</root>
\ No newline at end of file
+</root>