nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-04-05 05:00:19 -05:00
Code

Change error message (#4175)

Browse Source
This commit is contained in:
Jake Fink 2024-06-11 16:20:06 -04:00 committed by GitHub
parent fc1c488a78
commit 576b78d739
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bitwarden_license/src/Sso/Controllers/AccountController.cs
View File

@ -483,7 +483,8 @@ public class AccountController : Controller
if (orgUser.Status == OrganizationUserStatusType.Invited) if (orgUser.Status == OrganizationUserStatusType.Invited)
{ {
// Org User is invited - they must manually accept the invite via email and authenticate with MP // 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; // Accepted or Confirmed - create SSO link and return;

8
src/Core/Resources/SharedResources.en.resx
View File

@ -529,8 +529,8 @@
<data name="NoSeatsAvailable" xml:space="preserve"> <data name="NoSeatsAvailable" xml:space="preserve">
<value>No seats available for organization, '{0}'</value> <value>No seats available for organization, '{0}'</value>
</data> </data>
<data name="UserAlreadyInvited" xml:space="preserve"> <data name="AcceptInviteBeforeUsingSSO" 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> <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>
<data name="UserAlreadyExistsInviteProcess" xml:space="preserve"> <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> <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>
<data name="RedirectGet" xml:space="preserve"> <data name="RedirectGet" xml:space="preserve">
<value>Redirect GET</value> <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> to redirect the user agent to the OpenID Connect provider using a GET request.</comment>
</data> </data>
<data name="FormPost" xml:space="preserve"> <data name="FormPost" xml:space="preserve">
@ -685,4 +685,4 @@
<data name="InvalidSsoRedirectToken" xml:space="preserve"> <data name="InvalidSsoRedirectToken" xml:space="preserve">
<value>Single sign on redirect token is invalid or expired.</value> <value>Single sign on redirect token is invalid or expired.</value>
</data> </data>
</root> </root>