From dea4c6858fa53e5103bb93526a56fb204bdae557 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rui=20Tom=C3=A9?=
 <108268980+r-tome@users.noreply.github.com>
Date: Thu, 1 Jun 2023 08:57:30 +0100
Subject: [PATCH] [AC-1077] Update "Master Password Reset" policy copy (#5463)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* [AC-1077] Renamed "Master password reset" policy to "Account recovery administration"

* [AC-1077] Updated copy in TDE SSO option in configuration page to “Account Recovery Administration policy”

* [AC-1077] Updated “Reset password” action and modal to “Recover account”

* [AC-1077] Changed event message for user updating temporary password issued through account recovery

* [AC-1077] Renamed 'password reset' enrollment to 'account recovery'

* [AC-1077] Updated key names for messages that were modified for Account Recovery policy copy
---
 .../components/reset-password.component.html  |  2 +-
 .../members/people.component.html             |  6 +--
 .../policies/reset-password.component.ts      |  4 +-
 ...nroll-master-password-reset.component.html |  2 +-
 apps/web/src/app/core/event.service.ts        | 10 ++--
 .../organization-options.component.html       |  4 +-
 apps/web/src/locales/en/messages.json         | 48 +++++++++++--------
 .../src/app/auth/sso/sso.component.html       |  6 +--
 8 files changed, 44 insertions(+), 38 deletions(-)

diff --git a/apps/web/src/app/admin-console/organizations/members/components/reset-password.component.html b/apps/web/src/app/admin-console/organizations/members/components/reset-password.component.html
index 60827963b4..4116f56de7 100644
--- a/apps/web/src/app/admin-console/organizations/members/components/reset-password.component.html
+++ b/apps/web/src/app/admin-console/organizations/members/components/reset-password.component.html
@@ -3,7 +3,7 @@
     <form class="modal-content" #form (ngSubmit)="submit()" [appApiAction]="formPromise">
       <div class="modal-header">
         <h1 class="modal-title" id="resetPasswordTitle">
-          {{ "resetPassword" | i18n }}
+          {{ "recoverAccount" | i18n }}
           <small class="text-muted" *ngIf="name">{{ name }}</small>
         </h1>
         <button
diff --git a/apps/web/src/app/admin-console/organizations/members/people.component.html b/apps/web/src/app/admin-console/organizations/members/people.component.html
index de675853a0..8154340bb8 100644
--- a/apps/web/src/app/admin-console/organizations/members/people.component.html
+++ b/apps/web/src/app/admin-console/organizations/members/people.component.html
@@ -214,10 +214,10 @@
               <ng-container *ngIf="showEnrolledStatus($any(u))">
                 <i
                   class="bwi bwi-key"
-                  title="{{ 'enrolledPasswordReset' | i18n }}"
+                  title="{{ 'enrolledAccountRecovery' | i18n }}"
                   aria-hidden="true"
                 ></i>
-                <span class="tw-sr-only">{{ "enrolledPasswordReset" | i18n }}</span>
+                <span class="tw-sr-only">{{ "enrolledAccountRecovery" | i18n }}</span>
               </ng-container>
             </td>
             <td bitCell>
@@ -283,7 +283,7 @@
                   (click)="resetPassword(u)"
                   *ngIf="allowResetPassword(u)"
                 >
-                  <i aria-hidden="true" class="bwi bwi-key"></i> {{ "resetPassword" | i18n }}
+                  <i aria-hidden="true" class="bwi bwi-key"></i> {{ "recoverAccount" | i18n }}
                 </button>
                 <button
                   type="button"
diff --git a/apps/web/src/app/admin-console/organizations/policies/reset-password.component.ts b/apps/web/src/app/admin-console/organizations/policies/reset-password.component.ts
index 44a6bb463d..4c3c346dc7 100644
--- a/apps/web/src/app/admin-console/organizations/policies/reset-password.component.ts
+++ b/apps/web/src/app/admin-console/organizations/policies/reset-password.component.ts
@@ -8,8 +8,8 @@ import { Organization } from "@bitwarden/common/admin-console/models/domain/orga
 import { BasePolicy, BasePolicyComponent } from "./base-policy.component";
 
 export class ResetPasswordPolicy extends BasePolicy {
-  name = "resetPasswordPolicy";
-  description = "resetPasswordPolicyDescription";
+  name = "accountRecoveryPolicy";
+  description = "accountRecoveryPolicyDescription";
   type = PolicyType.ResetPassword;
   component = ResetPasswordPolicyComponent;
 
diff --git a/apps/web/src/app/admin-console/organizations/users/enroll-master-password-reset.component.html b/apps/web/src/app/admin-console/organizations/users/enroll-master-password-reset.component.html
index 4d24e66764..f8d07581f4 100644
--- a/apps/web/src/app/admin-console/organizations/users/enroll-master-password-reset.component.html
+++ b/apps/web/src/app/admin-console/organizations/users/enroll-master-password-reset.component.html
@@ -14,7 +14,7 @@
     >
       <div class="modal-header">
         <h1 class="modal-title" id="enrollMasterPasswordResetTitle">
-          {{ "enrollPasswordReset" | i18n }}
+          {{ "enrollAccountRecovery" | i18n }}
         </h1>
         <button
           type="button"
diff --git a/apps/web/src/app/core/event.service.ts b/apps/web/src/app/core/event.service.ts
index f5259dc144..0e4b74e13e 100644
--- a/apps/web/src/app/core/event.service.ts
+++ b/apps/web/src/app/core/event.service.ts
@@ -75,7 +75,7 @@ export class EventService {
         msg = humanReadableMsg = this.i18nService.t("exportedVault");
         break;
       case EventType.User_UpdatedTempPassword:
-        msg = humanReadableMsg = this.i18nService.t("updatedMasterPassword");
+        msg = humanReadableMsg = this.i18nService.t("updatedTempPassword");
         break;
       case EventType.User_MigratedKeyToKeyConnector:
         msg = humanReadableMsg = this.i18nService.t("migratedKeyConnector");
@@ -259,16 +259,16 @@ export class EventService {
         );
         break;
       case EventType.OrganizationUser_ResetPassword_Enroll:
-        msg = this.i18nService.t("eventEnrollPasswordReset", this.formatOrgUserId(ev));
+        msg = this.i18nService.t("eventEnrollAccountRecovery", this.formatOrgUserId(ev));
         humanReadableMsg = this.i18nService.t(
-          "eventEnrollPasswordReset",
+          "eventEnrollAccountRecovery",
           this.getShortId(ev.organizationUserId)
         );
         break;
       case EventType.OrganizationUser_ResetPassword_Withdraw:
-        msg = this.i18nService.t("eventWithdrawPasswordReset", this.formatOrgUserId(ev));
+        msg = this.i18nService.t("eventWithdrawAccountRecovery", this.formatOrgUserId(ev));
         humanReadableMsg = this.i18nService.t(
-          "eventWithdrawPasswordReset",
+          "eventWithdrawAccountRecovery",
           this.getShortId(ev.organizationUserId)
         );
         break;
diff --git a/apps/web/src/app/vault/individual-vault/vault-filter/components/organization-options.component.html b/apps/web/src/app/vault/individual-vault/vault-filter/components/organization-options.component.html
index fd3ec61520..15f3f80b3f 100644
--- a/apps/web/src/app/vault/individual-vault/vault-filter/components/organization-options.component.html
+++ b/apps/web/src/app/vault/individual-vault/vault-filter/components/organization-options.component.html
@@ -18,7 +18,7 @@
     (click)="toggleResetPasswordEnrollment(organization)"
   >
     <i class="bwi bwi-fw bwi-key" aria-hidden="true"></i>
-    {{ "enrollPasswordReset" | i18n }}
+    {{ "enrollAccountRecovery" | i18n }}
   </button>
   <button
     type="button"
@@ -27,7 +27,7 @@
     (click)="toggleResetPasswordEnrollment(organization)"
   >
     <i class="bwi bwi-fw bwi-undo" aria-hidden="true"></i>
-    {{ "withdrawPasswordReset" | i18n }}
+    {{ "withdrawAccountRecovery" | i18n }}
   </button>
   <ng-container *ngIf="organization.useSso && organization.identifier">
     <button
diff --git a/apps/web/src/locales/en/messages.json b/apps/web/src/locales/en/messages.json
index a4f47d6034..c03ee2fc9f 100644
--- a/apps/web/src/locales/en/messages.json
+++ b/apps/web/src/locales/en/messages.json
@@ -4493,14 +4493,14 @@
   "hintEqualsPassword": {
     "message": "Your password hint cannot be the same as your password."
   },
-  "enrollPasswordReset": {
-    "message": "Enroll in password reset"
+  "enrollAccountRecovery": {
+    "message": "Enroll in account recovery"
   },
-  "enrolledPasswordReset": {
-    "message": "Enrolled in password reset"
+  "enrolledAccountRecovery": {
+    "message": "Enrolled in account recovery"
   },
-  "withdrawPasswordReset": {
-    "message": "Withdraw from password reset"
+  "withdrawAccountRecovery": {
+    "message": "Withdraw from account recovery"
   },
   "enrollPasswordResetSuccess": {
     "message": "Enrollment success!"
@@ -4508,8 +4508,8 @@
   "withdrawPasswordResetSuccess": {
     "message": "Withdrawal success!"
   },
-  "eventEnrollPasswordReset": {
-    "message": "User $ID$ enrolled in password reset.",
+  "eventEnrollAccountRecovery": {
+    "message": "User $ID$ enrolled in account recovery.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -4517,8 +4517,8 @@
       }
     }
   },
-  "eventWithdrawPasswordReset": {
-    "message": "User $ID$ withdrew from password reset.",
+  "eventWithdrawAccountRecovery": {
+    "message": "User $ID$ withdrew from account recovery.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -4577,11 +4577,11 @@
   "resetPasswordEnrollmentWarning": {
     "message": "Enrollment will allow organization administrators to change your master password"
   },
-  "resetPasswordPolicy": {
-    "message": "Master password reset"
+  "accountRecoveryPolicy": {
+    "message": "Account recovery administration"
   },
-  "resetPasswordPolicyDescription": {
-    "message": "Allow admins to reset master passwords for members."
+  "accountRecoveryPolicyDescription": {
+    "message": "Recover member accounts when master password or trusted devices are forgotten or lost. The recovery processes is based on the account encryption method."
   },
   "resetPasswordPolicyWarning": {
     "message": "Members in the organization will need to self-enroll or be auto-enrolled before administrators can reset their master password."
@@ -6818,16 +6818,22 @@
   "trustedDeviceEncryption": {
     "message": "Trusted device encryption"
   },
-  "memberDecryptionTdeDescStart": {
+  "memberDecryptionTdeDescriptionStart": {
     "message": "Once authenticated, members will decrypt vault data using a key stored on their device. The",
-    "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Once authenticated, members will decrypt vault data using a key stored on their device. The master password reset policy with automatic enrollment will turn on when this option is used.'"
+    "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Once authenticated, members will decrypt vault data using a key stored on their device. The account recovery administration policy with automatic enrollment will turn on when this option is used.'"
   },
-  "memberDecryptionTdeDescLink": {
-    "message": "master password reset policy",
-    "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Once authenticated, members will decrypt vault data using a key stored on their device. The master password reset policy with automatic enrollment will turn on when this option is used.'"
+  "memberDecryptionTdeDescriptionLink": {
+    "message": "account recovery administration policy",
+    "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Once authenticated, members will decrypt vault data using a key stored on their device. The account recovery administration policy with automatic enrollment will turn on when this option is used.'"
   },
-  "memberDecryptionTdeDescEnd": {
+  "memberDecryptionTdeDescriptionEnd": {
     "message": "with automatic enrollment will turn on when this option is used.",
-    "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Once authenticated, members will decrypt vault data using a key stored on their device. The master password reset policy with automatic enrollment will turn on when this option is used.'"
+    "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Once authenticated, members will decrypt vault data using a key stored on their device. The account recovery administration policy with automatic enrollment will turn on when this option is used.'"
+  },
+  "recoverAccount": {
+    "message": "Recover account"
+  },
+  "updatedTempPassword": {
+    "message": "User updated a password issued through account recovery."
   }
 }
diff --git a/bitwarden_license/bit-web/src/app/auth/sso/sso.component.html b/bitwarden_license/bit-web/src/app/auth/sso/sso.component.html
index 0f68788acd..de2c560ef8 100644
--- a/bitwarden_license/bit-web/src/app/auth/sso/sso.component.html
+++ b/bitwarden_license/bit-web/src/app/auth/sso/sso.component.html
@@ -81,9 +81,9 @@
           {{ "trustedDeviceEncryption" | i18n }}
         </bit-label>
         <bit-hint>
-          {{ "memberDecryptionTdeDescStart" | i18n }}
-          <a routerLink="../policies">{{ "memberDecryptionTdeDescLink" | i18n }}</a>
-          {{ "memberDecryptionTdeDescEnd" | i18n }}
+          {{ "memberDecryptionTdeDescriptionStart" | i18n }}
+          <a routerLink="../policies">{{ "memberDecryptionTdeDescriptionLink" | i18n }}</a>
+          {{ "memberDecryptionTdeDescriptionEnd" | i18n }}
         </bit-hint>
       </bit-radio-button>
     </bit-radio-group>