[PM-15584] Fix autoprompt safari process reload

apps/browser/src/popup/app.component.ts

@@ -21,6 +21,7 @@
   ToastOptions,
   ToastService,
 } from "@bitwarden/components";
+import { BiometricStateService } from "@bitwarden/key-management";
 
 import { PopupCompactModeService } from "../platform/popup/layout/popup-compact-mode.service";
 import { PopupViewCacheService } from "../platform/popup/view-cache/popup-view-cache.service";
@@ -64,6 +65,7 @@
     private toastService: ToastService,
     private accountService: AccountService,
     private animationControlService: AnimationControlService,
+    private biometricStateService: BiometricStateService,
   ) {}
 
   async ngOnInit() {
@@ -134,6 +136,7 @@
           } else if (msg.command === "reloadProcess") {
             if (this.platformUtilsService.isSafari()) {
               window.setTimeout(() => {
+                this.biometricStateService.updateLastProcessReload();
                 window.location.reload();
               }, 2000);
             }

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

@@ -70,6 +70,9 @@
   [ClientType.Browser]: "/tabs/current",
 };
 
+/// The minimum amount of time to wait after a process reload for a biometrics auto prompt to be possible
+/// Fixes safari autoprompt behavior
+const AUTOPROMPT_BIOMETRICS_PROCESS_RELOAD_DELAY = 5000;
 @Component({
   selector: "bit-lock",
   templateUrl: "lock.component.html",
@@ -304,7 +307,13 @@
         (await this.biometricService.getShouldAutopromptNow())
       ) {
         await this.biometricService.setShouldAutopromptNow(false);
-        await this.unlockViaBiometrics();
+        if (
+          (await this.biometricStateService.getLastProcessReload()) == null ||
+          Date.now() - (await this.biometricStateService.getLastProcessReload()).getTime() >
+            AUTOPROMPT_BIOMETRICS_PROCESS_RELOAD_DELAY
+        ) {
+          await this.unlockViaBiometrics();
+        }
       }
     }
   }

libs/key-management/src/biometrics/biometric-state.service.ts

@@ -14,6 +14,7 @@
   PROMPT_AUTOMATICALLY,
   PROMPT_CANCELLED,
   FINGERPRINT_VALIDATED,
+  LAST_PROCESS_RELOAD,
 } from "./biometric.state";
 
 export abstract class BiometricStateService {
@@ -106,6 +107,10 @@
    */
   abstract setFingerprintValidated(validated: boolean): Promise<void>;
 
+  abstract updateLastProcessReload(): Promise<void>;
+
+  abstract getLastProcessReload(): Promise<Date>;
+
   abstract logout(userId: UserId): Promise<void>;
 }
 
@@ -117,13 +122,15 @@
   private promptCancelledState: GlobalState<Record<UserId, boolean>>;
   private promptAutomaticallyState: ActiveUserState<boolean>;
   private fingerprintValidatedState: GlobalState<boolean>;
+  private lastProcessReloadState: GlobalState<Date>;
   biometricUnlockEnabled$: Observable<boolean>;
   encryptedClientKeyHalf$: Observable<EncString | undefined>;
   requirePasswordOnStart$: Observable<boolean>;
   dismissedRequirePasswordOnStartCallout$: Observable<boolean>;
   promptCancelled$: Observable<boolean>;
   promptAutomatically$: Observable<boolean>;
   fingerprintValidated$: Observable<boolean>;
+  lastProcessReload$: Observable<Date>;
 
   constructor(private stateProvider: StateProvider) {
     this.biometricUnlockEnabledState = this.stateProvider.getActive(BIOMETRIC_UNLOCK_ENABLED);
@@ -159,6 +166,9 @@
 
     this.fingerprintValidatedState = this.stateProvider.getGlobal(FINGERPRINT_VALIDATED);
     this.fingerprintValidated$ = this.fingerprintValidatedState.state$.pipe(map(Boolean));
+
+    this.lastProcessReloadState = this.stateProvider.getGlobal(LAST_PROCESS_RELOAD);
+    this.lastProcessReload$ = this.lastProcessReloadState.state$;
   }
 
   async setBiometricUnlockEnabled(enabled: boolean): Promise<void> {
@@ -270,6 +280,14 @@
   async setFingerprintValidated(validated: boolean): Promise<void> {
     await this.fingerprintValidatedState.update(() => validated);
   }
+
+  async updateLastProcessReload(): Promise<void> {
+    await this.lastProcessReloadState.update(() => new Date());
+  }
+
+  async getLastProcessReload(): Promise<Date> {
+    return await firstValueFrom(this.lastProcessReload$);
+  }
 }
 
 function encryptedClientKeyHalfToEncString(

libs/key-management/src/biometrics/biometric.state.ts

@@ -95,3 +95,14 @@
     deserializer: (obj) => obj,
   },
 );
+
+/**
+ * Last process reload time
+ */
+export const LAST_PROCESS_RELOAD = new KeyDefinition<Date>(
+  BIOMETRIC_SETTINGS_DISK,
+  "lastProcessReload",
+  {
+    deserializer: (obj) => new Date(obj),
+  },
+);