Upstream/bitwarden-server
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2024-11-21 12:05:42 +01:00
Code Issues Projects Releases Wiki Activity

Streamline error message for removed user account with CME (#1741)

Browse Source
This commit is contained in:
Oscar Hinton 2021-12-02 18:38:27 +00:00 committed by GitHub
parent a70564cea8
commit 71229c2366
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -447,6 +447,12 @@ namespace Bit.Sso.Controllers
// All Existing User flows handled below
if (existingUser != null)
{
if (existingUser.UsesKeyConnector && orgUser == null ||
orgUser.Status == OrganizationUserStatusType.Invited)
{
throw new Exception(_i18nService.T("UserAlreadyExistsKeyConnector"));
}
if (orgUser == null)
{
// Org User is not created - no invite has been sent

8
bitwarden_license/src/Sso/Views/Shared/Error.cshtml
View File

@ -7,11 +7,15 @@
<h1 class="text-danger">@i18nService.T("Error")@(string.IsNullOrWhiteSpace(Model?.Message) ? null : $": {Model.Message}")</h1>
@if (!string.IsNullOrWhiteSpace(Model?.RedirectUri))
{
<p class="text-danger">@Html.Raw(i18nService.T("SsoErrorWithRedirect", Model?.RedirectUri)) @Model?.Description</p>
<p class="text-danger">@Html.Raw(i18nService.T("SsoErrorWithRedirect", Model?.RedirectUri))</p>
}
else
{
<p class="text-danger">@i18nService.T("SsoError") @Model?.Description</p>
<p class="text-danger">@i18nService.T("SsoError")</p>
}
@if (!string.IsNullOrWhiteSpace(Model?.Description))
{
<p class="text-danger">@Model?.Description</p>
}
@if (!string.IsNullOrWhiteSpace(Model?.RequestId))
{

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

@ -434,10 +434,10 @@
<value>Error</value>
</data>
<data name="SsoError" xml:space="preserve">
<value>There was an unexpected error during single sign-on. Please close this page and try again.</value>
<value>There was an unexpected error during single sign-on.</value>
</data>
<data name="SsoErrorWithRedirect" xml:space="preserve">
<value>There was an unexpected error during single sign-on. Please go back to &lt;a href="{0}"&gt;{0}&lt;/a&gt; or close this page and try again.</value>
<value>There was an unexpected error during single sign-on. Please go back to &lt;a href="{0}"&gt;{0}&lt;/a&gt;.</value>
</data>
<data name="RequestId" xml:space="preserve">
<value>Request ID</value>
@ -533,7 +533,10 @@
<value>User, '{0}', has already been invited to this organization, '{1}'. Accept the invite in order to log in with SSO.</value>
</data>
<data name="UserAlreadyExistsInviteProcess" xml:space="preserve">
<value>In order to join this organization, contact an admin to send you an invite and follow the instructions within to accept.</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>
</data>
<data name="UserAlreadyExistsKeyConnector" xml:space="preserve">
<value>You were removed from the organization managing single sign-on for your account. Create a new account to continue using Bitwarden.</value>
</data>
<data name="RedirectGet" xml:space="preserve">
<value>Redirect GET</value>