From 1806cc9402a3beeccc776ec712f52a4fa832158c Mon Sep 17 00:00:00 2001
From: Bernd Schoolmann <mail@quexten.com>
Date: Thu, 30 Oct 2025 16:48:23 +0100
Subject: [PATCH] Address component feedback

---
 .../prompt-migration-password.component.html  |  8 ++++-
 .../prompt-migration-password.component.ts    | 31 ++++++++++++++++++-
 2 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/libs/angular/src/key-management/encrypted-migration/prompt-migration-password.component.html b/libs/angular/src/key-management/encrypted-migration/prompt-migration-password.component.html
index e75734c136d..6df08342885 100644
--- a/libs/angular/src/key-management/encrypted-migration/prompt-migration-password.component.html
+++ b/libs/angular/src/key-management/encrypted-migration/prompt-migration-password.component.html
@@ -38,7 +38,13 @@
       </bit-form-field>
     </div>
     <ng-container bitDialogFooter>
-      <button type="submit" bitButton bitFormButton buttonType="primary">
+      <button
+        type="submit"
+        bitButton
+        bitFormButton
+        buttonType="primary"
+        [disabled]="migrationPasswordForm.invalid"
+      >
         <span>{{ "updateSettings" | i18n }}</span>
       </button>
       <button type="button" bitButton bitFormButton buttonType="secondary" bitDialogClose>
diff --git a/libs/angular/src/key-management/encrypted-migration/prompt-migration-password.component.ts b/libs/angular/src/key-management/encrypted-migration/prompt-migration-password.component.ts
index bb7547826b1..1b36f91ab44 100644
--- a/libs/angular/src/key-management/encrypted-migration/prompt-migration-password.component.ts
+++ b/libs/angular/src/key-management/encrypted-migration/prompt-migration-password.component.ts
@@ -1,8 +1,12 @@
 import { CommonModule } from "@angular/common";
-import { Component, inject } from "@angular/core";
+import { Component, inject, ChangeDetectionStrategy } from "@angular/core";
 import { FormBuilder, ReactiveFormsModule, Validators } from "@angular/forms";
+import { filter, firstValueFrom, map } from "rxjs";
 
 import { JslibModule } from "@bitwarden/angular/jslib.module";
+import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { UserVerificationService } from "@bitwarden/common/auth/abstractions/user-verification/user-verification.service.abstraction";
+import { VerificationType } from "@bitwarden/common/auth/enums/verification-type";
 import {
   AsyncActionsModule,
   ButtonModule,
@@ -17,6 +21,7 @@ import {
  * This is a generic prompt to run encryption migrations that require the master password.
  */
 @Component({
+  changeDetection: ChangeDetectionStrategy.OnPush,
   templateUrl: "prompt-migration-password.component.html",
   imports: [
     DialogModule,
@@ -32,6 +37,8 @@ import {
 export class PromptMigrationPasswordComponent {
   private dialogRef = inject(DialogRef<string>);
   private formBuilder = inject(FormBuilder);
+  private uvService = inject(UserVerificationService);
+  private accountService = inject(AccountService);
 
   migrationPasswordForm = this.formBuilder.group({
     masterPassword: ["", [Validators.required]],
@@ -48,6 +55,28 @@ export class PromptMigrationPasswordComponent {
       return;
     }
 
+    const { userId, email } = await firstValueFrom(
+      this.accountService.activeAccount$.pipe(
+        filter((account) => account != null),
+        map((account) => {
+          return {
+            userId: account!.id,
+            email: account!.email,
+          };
+        }),
+      ),
+    );
+
+    if (
+      !(await this.uvService.verifyUserByMasterPassword(
+        { type: VerificationType.MasterPassword, secret: masterPasswordControl.value },
+        userId,
+        email,
+      ))
+    ) {
+      return;
+    }
+
     // Return the master password to the caller
     this.dialogRef.close(masterPasswordControl.value);
   };