From d7754441d3bf14fae0fe7f852d4d0d207baa665b Mon Sep 17 00:00:00 2001
From: Vincent Salucci <26154748+vincentsalucci@users.noreply.github.com>
Date: Tue, 7 Sep 2021 12:06:43 -0500
Subject: [PATCH] [SSO/Auto Enroll] Set Password banner (#2050)

* [SSO/Auto Enroll] Set Password banner

* Fix merge conflict

* Add missing string/style

* Update jslib
---
 jslib                                          | 2 +-
 src/_locales/en/messages.json                  | 9 +++++++++
 src/popup/accounts/set-password.component.html | 4 ++++
 src/popup/scss/misc.scss                       | 5 +++++
 4 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/jslib b/jslib
index 30419a625fb..ef743ea8ca3 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit 30419a625fbdeefee1b0d0c24ee1d26064b17ba2
+Subproject commit ef743ea8ca3d4c3b05077ba72d391ab89347848f
diff --git a/src/_locales/en/messages.json b/src/_locales/en/messages.json
index 7dfa6376107..d5cfc737c0c 100644
--- a/src/_locales/en/messages.json
+++ b/src/_locales/en/messages.json
@@ -1765,7 +1765,16 @@
   "updateMasterPasswordWarning": {
     "message": "Your Master Password was recently changed by an administrator in your organization. In order to access the vault, you must update it now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
+  "resetPasswordPolicyAutoEnroll": {
+    "message": "Automatic Enrollment"
+  },
+  "resetPasswordAutoEnrollInviteWarning": {
+    "message": "This organization has an enterprise policy that will automatically enroll you in password reset. Enrollment will allow organization administrators to change your master password."
+  },
   "selectFolder": {
     "message": "Select folder..."
+  },
+  "ssoCompleteRegistration": {
+    "message": "In order to complete logging in with SSO, please set a master password to access and protect your vault."
   }
 }
diff --git a/src/popup/accounts/set-password.component.html b/src/popup/accounts/set-password.component.html
index d0bbc45a64d..e2f527e7a16 100644
--- a/src/popup/accounts/set-password.component.html
+++ b/src/popup/accounts/set-password.component.html
@@ -20,6 +20,10 @@
         <div *ngIf="!syncLoading">
             <div class="box">
                 <app-callout type="tip">{{'ssoCompleteRegistration' | i18n}}</app-callout>
+                <app-callout type="warning" title="{{'resetPasswordPolicyAutoEnroll' | i18n}}"
+                    *ngIf="resetPassswordAutoEnroll">
+                    {{'resetPasswordAutoEnrollInviteWarning' | i18n}}
+                </app-callout>
                 <app-callout type="info" [enforcedPolicyOptions]="enforcedPolicyOptions" *ngIf="enforcedPolicyOptions">
                 </app-callout>
             </div>
diff --git a/src/popup/scss/misc.scss b/src/popup/scss/misc.scss
index 8917a50b234..6782ea0e4bd 100644
--- a/src/popup/scss/misc.scss
+++ b/src/popup/scss/misc.scss
@@ -339,6 +339,11 @@ app-vault-icon {
             }
         }
     }
+
+    .enforced-policy-options ul {
+        padding-left: 30px;
+        margin: 0;
+    }
 }
 
 input[type="password"]::-ms-reveal {