From 407032114e4c7cd3a03c6ec775466fe280d4601a Mon Sep 17 00:00:00 2001
From: Vincent Salucci <26154748+vincentsalucci@users.noreply.github.com>
Date: Tue, 10 Nov 2020 09:53:57 -0600
Subject: [PATCH] [Exemption] Updated policy messages (#692)

* Updated mesages // added callout for require sso

* removed unused string

* updated strings - futureproofing
---
 .../organizations/manage/policy-edit.component.html   | 11 ++++++++---
 src/locales/en/messages.json                          |  7 +++++--
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/app/organizations/manage/policy-edit.component.html b/src/app/organizations/manage/policy-edit.component.html
index d5bf41585c..220029a1c1 100644
--- a/src/app/organizations/manage/policy-edit.component.html
+++ b/src/app/organizations/manage/policy-edit.component.html
@@ -21,9 +21,14 @@
                     icon="fa-warning">
                     {{'singleOrgPolicyWarning' | i18n}}
                 </app-callout>
-                <app-callout type="tip" title="{{'prerequisite' | i18n}}" *ngIf="type === policyType.RequireSso">
-                    {{'requireSsoPolicyReq' | i18n}}
-                </app-callout>
+                <ng-container *ngIf="type === policyType.RequireSso">
+                    <app-callout type="tip" title="{{'prerequisite' | i18n}}">
+                        {{'requireSsoPolicyReq' | i18n}}
+                    </app-callout>
+                    <app-callout type="warning">
+                        {{'requireSsoExemption' | i18n}}
+                    </app-callout>
+                </ng-container>
                 <div class="form-group">
                     <div class="form-check">
                         <input class="form-check-input" type="checkbox" id="enabled" [(ngModel)]="enabled"
diff --git a/src/locales/en/messages.json b/src/locales/en/messages.json
index 4a9ceef357..6027a877f8 100644
--- a/src/locales/en/messages.json
+++ b/src/locales/en/messages.json
@@ -2991,7 +2991,7 @@
     "message": "Require users to set up two-step login on their personal accounts."
   },
   "twoStepLoginPolicyWarning": {
-    "message": "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."
+    "message": "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."
   },
   "twoStepLoginPolicyUserWarning": {
     "message": "You are a member of an organization that requires two-step login to be enabled on your user account. If you disable all two-step login providers you will be automatically removed from these organizations."
@@ -3225,7 +3225,7 @@
     "message": "Your current organization has a policy that does not allow you to join more than one organization. Please contact your organization admins or sign up from a different Bitwarden account."
   },
   "singleOrgPolicyWarning": {
-    "message": "Organization members who are already a member of another organization will be removed from your organization."
+    "message": "Organization members who are not Owners or Administrators and are already a member of another organization will be removed from your organization."
   },
   "requireSso": {
     "message": "Single Sign-On Authentication"
@@ -3242,6 +3242,9 @@
   "requireSsoPolicyReqError": {
     "message": "Single Organization policy not enabled."
   },
+  "requireSsoExemption": {
+    "message": "Organization Owners and Administrators are exempt from this policy's enforcement."
+  },
   "sendTypeFile": {
     "message": "File"
   },