[PM-17035] Fix biometric unlock badge in mv2

apps/browser/src/auth/popup/settings/account-security.component.html

@@ -20,7 +20,7 @@ <h2 bitTypography="h6">{{ "unlockMethods" | i18n }}</h2>
             {{ biometricUnavailabilityReason }}
           </bit-hint>
         </bit-form-control>
-        <bit-form-control class="tw-pl-5" *ngIf="this.form.value.biometric">
+        <bit-form-control class="tw-pl-5" *ngIf="this.form.value.biometric && showAutoPrompt">
           <input
             bitCheckbox
             id="autoBiometricsPrompt"

apps/browser/src/auth/popup/settings/account-security.component.ts

@@ -29,6 +29,7 @@
 import { PolicyType } from "@bitwarden/common/admin-console/enums";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { UserVerificationService } from "@bitwarden/common/auth/abstractions/user-verification/user-verification.service.abstraction";
+import { DeviceType } from "@bitwarden/common/enums";
 import { VaultTimeoutAction } from "@bitwarden/common/enums/vault-timeout-action.enum";
 import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
@@ -106,6 +107,7 @@
   hasVaultTimeoutPolicy = false;
   biometricUnavailabilityReason: string;
   showChangeMasterPass = true;
+  showAutoPrompt = true;
 
   form = this.formBuilder.group({
     vaultTimeout: [null as VaultTimeout | null],
@@ -141,6 +143,11 @@
   ) {}
 
   async ngOnInit() {
+    // Firefox popup closes when unfocused by biometrics, blocking all unlock methods
+    if (this.platformUtilsService.getDevice() === DeviceType.FirefoxExtension) {
+      this.showAutoPrompt = false;
+    }
+
     const hasMasterPassword = await this.userVerificationService.hasMasterPassword();
     this.showMasterPasswordOnClientRestartOption = hasMasterPassword;
     const maximumVaultTimeoutPolicy = this.policyService.get$(PolicyType.MaximumVaultTimeout);

apps/browser/src/background/main.background.ts

@@ -665,6 +665,7 @@ export default class MainBackground {
       this.logService,
       this.keyService,
       this.biometricStateService,
+      this.messagingService,
     );
 
     this.appIdService = new AppIdService(this.storageService, this.logService);

apps/browser/src/key-management/biometrics/background-browser-biometrics.service.ts

@@ -1,6 +1,7 @@
 import { Injectable } from "@angular/core";
 
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
+import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { SymmetricCryptoKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key";
 import { UserId } from "@bitwarden/common/types/guid";
@@ -23,6 +24,7 @@
     private logService: LogService,
     private keyService: KeyService,
     private biometricStateService: BiometricStateService,
+    private messagingService: MessagingService,
   ) {
     super();
   }
@@ -98,6 +100,8 @@
             await this.biometricStateService.setBiometricUnlockEnabled(true);
             await this.biometricStateService.setFingerprintValidated(true);
             await this.keyService.setUserKey(userKey, userId);
+            // to update badge and other things
+            this.messagingService.send("switchAccount", { userId });
             return userKey;
           }
         } else {
@@ -116,6 +120,8 @@
             await this.biometricStateService.setBiometricUnlockEnabled(true);
             await this.biometricStateService.setFingerprintValidated(true);
             await this.keyService.setUserKey(userKey, userId);
+            // to update badge and other things
+            this.messagingService.send("switchAccount", { userId });
             return userKey;
           }
         } else {

libs/key-management/src/angular/lock/components/lock.component.ts

@@ -30,7 +30,7 @@
   MasterPasswordVerification,
   MasterPasswordVerificationResponse,
 } from "@bitwarden/common/auth/types/verification";
-import { ClientType } from "@bitwarden/common/enums";
+import { ClientType, DeviceType } from "@bitwarden/common/enums";
 import { BroadcasterService } from "@bitwarden/common/platform/abstractions/broadcaster.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
@@ -301,6 +301,11 @@
     }
 
     if (this.clientType === "browser") {
+      // Firefox closes the popup when unfocused, so this would block all unlock methods
+      if (this.platformUtilsService.getDevice() === DeviceType.FirefoxExtension) {
+        return;
+      }
+
       if (
         this.unlockOptions.biometrics.enabled &&
         autoPromptBiometrics &&