Upstream/bitwarden-server
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-01-21 21:41:21 +01:00
Code Issues Projects Releases Wiki Activity

[Exemption] Updated policy messages (#984)

Browse Source 
* Updated messages // added exemption message // added callout

* updated strings - futureproofing
This commit is contained in:
Vincent Salucci 2020-11-10 09:53:44 -06:00 committed by GitHub
parent 26fb6fc3b7
commit d9cd7551fe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bitwarden_license/src/Portal/Views/Policies/Edit.cshtml
View File

@ -42,6 +42,13 @@
</h3>
@i18nService.T("RequireSsoPolicyReq")
</div>
<div class="callout callout-warning" role="alert">
<h3 class="callout-heading">
<i class="fa fa-warning" *ngIf="icon" aria-hidden="true"></i>
@i18nService.T("Warning")
</h3>
@i18nService.T("RequireSsoExemption")
</div>
}
<div asp-validation-summary="ModelOnly" class="alert alert-danger"></div>

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

@ -149,7 +149,7 @@
<value>Edit Policy - {0}</value>
</data>
<data name="EditPolicyTwoStepLoginWarning" xml:space="preserve">
<value>Organization members who do not have two-step login enabled for their personal account will be removed from the organization and will receive an email notifying them about the change.</value>
<value>Organization members who are not Owners or Administrators and do not have two-step login enabled for their personal account will be removed from the organization and will receive an email notifying them about the change.</value>
</data>
<data name="Save" xml:space="preserve">
<value>Save</value>
@ -546,7 +546,7 @@
<value>Restrict users from being able to join any other organizations.</value>
</data>
<data name="SingleOrganizationPolicyWarning" xml:space="preserve">
<value>Organization members who are already a part of another organization will be removed from this organization and will receive an email notifying them about the change.</value>
<value>Organization members who are not Owners or Administrators and are already a part of another organization will be removed from this organization and will receive an email notifying them about the change.</value>
</data>
<data name="RequireSso" xml:space="preserve">
<value>Single Sign-On Authentication</value>
@ -563,4 +563,7 @@
<data name="RequireSsoPolicyReqError" xml:space="preserve">
<value>Single Organization policy not enabled.</value>
</data>
<data name="RequireSsoExemption" xml:space="preserve">
<value>Organization Owners and Administrators are exempt from this policy's enforcement.</value>
</data>
</root>

3
src/Core/Services/Implementations/PolicyService.cs
View File

@ -78,7 +78,8 @@ namespace Bit.Core.Services
policy.OrganizationId);
var removableOrgUsers = orgUsers.Where(ou =>
ou.Status != Enums.OrganizationUserStatusType.Invited &&
ou.Type != Enums.OrganizationUserType.Owner && ou.UserId != savingUserId);
ou.Type != Enums.OrganizationUserType.Owner && ou.Type != Enums.OrganizationUserType.Admin &&
ou.UserId != savingUserId);
switch (currentPolicy.Type)
{
case Enums.PolicyType.TwoFactorAuthentication: