[PM-17113] Fix system authentication setup (#12907)

* Fix system authentication setup * Fix biometric status * Remove debug log * Fix tests (cherry picked from commit 97ee050)
bitwarden · Jan 16, 2025 · da8a1bc · da8a1bc
1 parent 6a56357
commit da8a1bc
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 11 deletions.
diff --git a/apps/desktop/src/app/accounts/settings.component.ts b/apps/desktop/src/app/accounts/settings.component.ts
@@ -362,14 +362,24 @@ export class SettingsComponent implements OnInit, OnDestroy {
         }
       });
 
-    this.supportsBiometric =
-      (await this.biometricsService.getBiometricsStatus()) === BiometricsStatus.Available;
+    this.supportsBiometric = this.shouldAllowBiometricSetup(
+      await this.biometricsService.getBiometricsStatus(),
+    );
     this.timerId = setInterval(async () => {
-      this.supportsBiometric =
-        (await this.biometricsService.getBiometricsStatus()) === BiometricsStatus.Available;
+      this.supportsBiometric = this.shouldAllowBiometricSetup(
+        await this.biometricsService.getBiometricsStatus(),
+      );
     }, 1000);
   }
 
+  private shouldAllowBiometricSetup(biometricStatus: BiometricsStatus): boolean {
+    return [
+      BiometricsStatus.Available,
+      BiometricsStatus.AutoSetupNeeded,
+      BiometricsStatus.ManualSetupNeeded,
+    ].includes(biometricStatus);
+  }
+
   async saveVaultTimeout(newValue: VaultTimeout) {
     if (newValue === VaultTimeoutStringType.Never) {
       const confirmed = await this.dialogService.openSimpleDialog({

diff --git a/apps/desktop/src/key-management/biometrics/biometrics.service.spec.ts b/apps/desktop/src/key-management/biometrics/biometrics.service.spec.ts
@@ -117,15 +117,15 @@ describe("biometrics tests", function () {
       const testCases = [
         // happy path
         [true, false, false, BiometricsStatus.Available],
-        [false, true, true, BiometricsStatus.AutoSetupNeeded],
-        [false, true, false, BiometricsStatus.ManualSetupNeeded],
-        [false, false, false, BiometricsStatus.HardwareUnavailable],
+        [false, true, true, BiometricsStatus.HardwareUnavailable],
+        [true, true, true, BiometricsStatus.AutoSetupNeeded],
+        [true, true, false, BiometricsStatus.ManualSetupNeeded],
 
         // should not happen
         [false, false, true, BiometricsStatus.HardwareUnavailable],
-        [true, true, true, BiometricsStatus.Available],
-        [true, true, false, BiometricsStatus.Available],
         [true, false, true, BiometricsStatus.Available],
+        [false, true, false, BiometricsStatus.HardwareUnavailable],
+        [false, false, false, BiometricsStatus.HardwareUnavailable],
       ];
 
       for (const [supportsBiometric, needsSetup, canAutoSetup, expected] of testCases) {

diff --git a/apps/desktop/src/key-management/biometrics/main-biometrics.service.ts b/apps/desktop/src/key-management/biometrics/main-biometrics.service.ts
@@ -60,15 +60,15 @@ export class MainBiometricsService extends DesktopBiometricsService {
    */
   async getBiometricsStatus(): Promise<BiometricsStatus> {
     if (!(await this.osBiometricsService.osSupportsBiometric())) {
+      return BiometricsStatus.HardwareUnavailable;
+    } else {
       if (await this.osBiometricsService.osBiometricsNeedsSetup()) {
         if (await this.osBiometricsService.osBiometricsCanAutoSetup()) {
           return BiometricsStatus.AutoSetupNeeded;
         } else {
           return BiometricsStatus.ManualSetupNeeded;
         }
       }
-
-      return BiometricsStatus.HardwareUnavailable;
     }
     return BiometricsStatus.Available;
   }