From 01648e2cc39b9c2eb916dc2cb415d309cda8b309 Mon Sep 17 00:00:00 2001
From: Jared Snider <116684653+JaredSnider-Bitwarden@users.noreply.github.com>
Date: Mon, 3 Jun 2024 10:15:11 -0400
Subject: [PATCH] Auth/PM-8358 - User Verification dialog & form input fix for
 empty submit displaying wrong error (#9363)

* PM-8358 - UserVerificatonFormInput - fix incorrect init logic. We needed to execute the processSecretChanges logic to convert null into { type: 0, secret: null }  (VerificationWithSecret) for all non-biometric verification flows. .

* PM-8358 - UserVerificationService - verifyUser(...) - throw error if called with null. It should only happen if a dev makes a mistake in theory.
---
 .../user-verification-form-input.component.ts                 | 4 ++--
 .../services/user-verification/user-verification.service.ts   | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/libs/auth/src/angular/user-verification/user-verification-form-input.component.ts b/libs/auth/src/angular/user-verification/user-verification-form-input.component.ts
index 8cb40d9452..8c62136d63 100644
--- a/libs/auth/src/angular/user-verification/user-verification-form-input.component.ts
+++ b/libs/auth/src/angular/user-verification/user-verification-form-input.component.ts
@@ -197,8 +197,8 @@ export class UserVerificationFormInputComponent implements ControlValueAccessor,
       }
     }
 
-    // Don't bother executing secret changes if biometrics verification is active.
-    if (this.activeClientVerificationOption === ActiveClientVerificationOption.Biometrics) {
+    // Executing secret changes for all non biometrics verification. Biometrics doesn't have a user entered secret.
+    if (this.activeClientVerificationOption !== ActiveClientVerificationOption.Biometrics) {
       this.processSecretChanges(this.secret.value);
     }
 
diff --git a/libs/common/src/auth/services/user-verification/user-verification.service.ts b/libs/common/src/auth/services/user-verification/user-verification.service.ts
index 7561023a27..85640519ec 100644
--- a/libs/common/src/auth/services/user-verification/user-verification.service.ts
+++ b/libs/common/src/auth/services/user-verification/user-verification.service.ts
@@ -140,6 +140,10 @@ export class UserVerificationService implements UserVerificationServiceAbstracti
    * @param verification User-supplied verification data (OTP, MP, PIN, or biometrics)
    */
   async verifyUser(verification: Verification): Promise<boolean> {
+    if (verification == null) {
+      throw new Error("Verification is required.");
+    }
+
     const [userId, email] = await firstValueFrom(
       this.accountService.activeAccount$.pipe(map((a) => [a?.id, a?.email])),
     );