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

Fixed resource and err msg for user provisioning (#939)

Browse Source
This commit is contained in:
Chad Scharf 2020-09-16 15:02:18 -04:00 committed by GitHub
parent cf4fddfa21
commit a75077d703
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -449,7 +449,7 @@ namespace Bit.Sso.Controllers
if (existingUser != null) if (existingUser != null)
{ {
// TODO: send an email inviting this user to link SSO to their account? // TODO: send an email inviting this user to link SSO to their account?
throw new Exception(_i18nService.T("NoDomainHintProvided")); throw new Exception(_i18nService.T("UserAlreadyExistsUseLinkViaSso"));
} }
// Create user record // Create user record

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

@ -523,7 +523,7 @@
<data name="UserAlreadyInvited" xml:space="preserve"> <data name="UserAlreadyInvited" xml:space="preserve">
<value>User, '{0}', has already been invited to this organization, '{1}'</value> <value>User, '{0}', has already been invited to this organization, '{1}'</value>
</data> </data>
<data name="NoDomainHintProvided" xml:space="preserve"> <data name="UserAlreadyExistsUseLinkViaSso" xml:space="preserve">
<value>User already exists, please link account to SSO after logging in</value> <value>User already exists, please link account to SSO after logging in</value>
</data> </data>
</root> </root>