From 1a77128529790036d71ef31ffbb193ef5fe506e2 Mon Sep 17 00:00:00 2001
From: Patrick Pimentel <ppimentel@bitwarden.com>
Date: Wed, 28 May 2025 14:29:33 -0400
Subject: [PATCH] feat(change-password-component): Change Password Update
 [18720] - Undid some changes because they will be conflicts later on.

---
 apps/desktop/src/locales/en/messages.json       |  6 ++++++
 .../input-password.component.html               |  7 ++++++-
 .../input-password/input-password.component.ts  | 17 ++++++++---------
 3 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/apps/desktop/src/locales/en/messages.json b/apps/desktop/src/locales/en/messages.json
index 9d668d464ae..6aa5e50871f 100644
--- a/apps/desktop/src/locales/en/messages.json
+++ b/apps/desktop/src/locales/en/messages.json
@@ -2395,6 +2395,12 @@
   "updateWeakMasterPasswordWarning": {
     "message": "Your master password does not meet one or more of your organization policies. In order to access the vault, you must update your master password 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."
   },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Your master password does not meet this organization’s requirements. Change your master password to continue."
+  },
   "tdeDisabledMasterPasswordRequired": {
     "message": "Your organization has disabled trusted device encryption. Please set a master password to access your vault."
   },
diff --git a/libs/auth/src/angular/input-password/input-password.component.html b/libs/auth/src/angular/input-password/input-password.component.html
index 4111964f2db..14f35864ca0 100644
--- a/libs/auth/src/angular/input-password/input-password.component.html
+++ b/libs/auth/src/angular/input-password/input-password.component.html
@@ -8,7 +8,12 @@
     [policy]="masterPasswordPolicyOptions"
   ></auth-password-callout>
 
-  <bit-form-field *ngIf="isChangePasswordFlow()">
+  <bit-form-field
+    *ngIf="
+      flow === InputPasswordFlow.ChangePassword ||
+      flow === InputPasswordFlow.ChangePasswordWithOptionalUserKeyRotation
+    "
+  >
     <bit-label>{{ "currentMasterPass" | i18n }}</bit-label>
     <input
       id="input-password-form_current-password"
diff --git a/libs/auth/src/angular/input-password/input-password.component.ts b/libs/auth/src/angular/input-password/input-password.component.ts
index 0d790f85895..2c9eea12461 100644
--- a/libs/auth/src/angular/input-password/input-password.component.ts
+++ b/libs/auth/src/angular/input-password/input-password.component.ts
@@ -263,7 +263,10 @@ export class InputPasswordComponent implements OnInit {
     }
 
     // 2. Verify current password is correct (if necessary)
-    if (this.isChangePasswordFlow()) {
+    if (
+      this.flow === InputPasswordFlow.ChangePassword ||
+      this.flow === InputPasswordFlow.ChangePasswordWithOptionalUserKeyRotation
+    ) {
       const currentPasswordVerified = await this.verifyCurrentPassword(
         currentPassword,
         this.kdfConfig,
@@ -311,7 +314,10 @@ export class InputPasswordComponent implements OnInit {
       kdfConfig: this.kdfConfig,
     };
 
-    if (this.isChangePasswordFlow()) {
+    if (
+      this.flow === InputPasswordFlow.ChangePassword ||
+      this.flow === InputPasswordFlow.ChangePasswordWithOptionalUserKeyRotation
+    ) {
       const currentMasterKey = await this.keyService.makeMasterKey(
         currentPassword,
         this.email,
@@ -545,11 +551,4 @@ export class InputPasswordComponent implements OnInit {
   protected getPasswordStrengthScore(score: PasswordStrengthScore) {
     this.passwordStrengthScore = score;
   }
-
-  protected isChangePasswordFlow(): boolean {
-    return (
-      this.flow === InputPasswordFlow.ChangePassword ||
-      this.flow === InputPasswordFlow.ChangePasswordWithOptionalUserKeyRotation
-    );
-  }
 }