Revert "[PM-6296] Fix biometrics error prompt when biometrics are temporarily…" (#10373)

This reverts commit 1184c504d1.

apps/desktop/src/app/accounts/settings.component.ts

@@ -20,7 +20,6 @@ import { MessagingService } from "@bitwarden/common/platform/abstractions/messag
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { StateService } from "@bitwarden/common/platform/abstractions/state.service";
 import { BiometricStateService } from "@bitwarden/common/platform/biometrics/biometric-state.service";
-import { BiometricsService } from "@bitwarden/common/platform/biometrics/biometric.service";
 import { KeySuffixOptions, ThemeType } from "@bitwarden/common/platform/enums";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { ThemeStateService } from "@bitwarden/common/platform/theming/theme-state.service";
@@ -133,7 +132,6 @@ export class SettingsComponent implements OnInit {
     private userVerificationService: UserVerificationServiceAbstraction,
     private desktopSettingsService: DesktopSettingsService,
     private biometricStateService: BiometricStateService,
-    private biometricsService: BiometricsService,
     private desktopAutofillSettingsService: DesktopAutofillSettingsService,
     private pinService: PinServiceAbstraction,
     private logService: LogService,
@@ -287,7 +285,7 @@ export class SettingsComponent implements OnInit {
     // Non-form values
     this.showMinToTray = this.platformUtilsService.getDevice() !== DeviceType.LinuxDesktop;
     this.showAlwaysShowDock = this.platformUtilsService.getDevice() === DeviceType.MacOsDesktop;
-    this.supportsBiometric = await this.biometricsService.supportsBiometric();
+    this.supportsBiometric = await this.platformUtilsService.supportsBiometric();
     this.previousVaultTimeout = this.form.value.vaultTimeout;
 
     this.refreshTimeoutSettings$

apps/desktop/src/app/services/services.module.ts

@@ -56,7 +56,6 @@ import { StateService as StateServiceAbstraction } from "@bitwarden/common/platf
 import { AbstractStorageService } from "@bitwarden/common/platform/abstractions/storage.service";
 import { SystemService as SystemServiceAbstraction } from "@bitwarden/common/platform/abstractions/system.service";
 import { BiometricStateService } from "@bitwarden/common/platform/biometrics/biometric-state.service";
-import { BiometricsService } from "@bitwarden/common/platform/biometrics/biometric.service";
 import { Message, MessageListener, MessageSender } from "@bitwarden/common/platform/messaging";
 // eslint-disable-next-line no-restricted-imports -- Used for dependency injection
 import { SubjectMessageSender } from "@bitwarden/common/platform/messaging/internal";
@@ -73,7 +72,6 @@ import { PasswordGenerationServiceAbstraction } from "@bitwarden/generator-legac
 
 import { DesktopAutofillSettingsService } from "../../autofill/services/desktop-autofill-settings.service";
 import { DesktopSettingsService } from "../../platform/services/desktop-settings.service";
-import { ElectronBiometricsService } from "../../platform/services/electron-biometrics.service";
 import { ElectronCryptoService } from "../../platform/services/electron-crypto.service";
 import { ElectronLogRendererService } from "../../platform/services/electron-log.renderer.service";
 import {
@@ -106,11 +104,6 @@ const RELOAD_CALLBACK = new SafeInjectionToken<() => any>("RELOAD_CALLBACK");
  */
 const safeProviders: SafeProvider[] = [
   safeProvider(InitService),
-  safeProvider({
-    provide: BiometricsService,
-    useClass: ElectronBiometricsService,
-    deps: [],
-  }),
   safeProvider(NativeMessagingService),
   safeProvider(SearchBarService),
   safeProvider(DialogService),

apps/desktop/src/auth/lock.component.spec.ts

@@ -28,7 +28,6 @@ import { MessagingService } from "@bitwarden/common/platform/abstractions/messag
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { StateService } from "@bitwarden/common/platform/abstractions/state.service";
 import { BiometricStateService } from "@bitwarden/common/platform/biometrics/biometric-state.service";
-import { BiometricsService as AbstractBiometricService } from "@bitwarden/common/platform/biometrics/biometric.service";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { FakeAccountService, mockAccountServiceWith } from "@bitwarden/common/spec";
 import { PasswordStrengthServiceAbstraction } from "@bitwarden/common/tools/password-strength";
@@ -36,8 +35,6 @@ import { UserId } from "@bitwarden/common/types/guid";
 import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
 import { DialogService } from "@bitwarden/components";
 
-import { BiometricsService } from "src/platform/main/biometric";
-
 import { LockComponent } from "./lock.component";
 
 // ipc mock global
@@ -56,7 +53,6 @@ describe("LockComponent", () => {
   let fixture: ComponentFixture<LockComponent>;
   let stateServiceMock: MockProxy<StateService>;
   let biometricStateService: MockProxy<BiometricStateService>;
-  let biometricsService: MockProxy<BiometricsService>;
   let messagingServiceMock: MockProxy<MessagingService>;
   let broadcasterServiceMock: MockProxy<BroadcasterService>;
   let platformUtilsServiceMock: MockProxy<PlatformUtilsService>;
@@ -167,10 +163,6 @@ describe("LockComponent", () => {
           provide: BiometricStateService,
           useValue: biometricStateService,
         },
-        {
-          provide: AbstractBiometricService,
-          useValue: biometricsService,
-        },
         {
           provide: AccountService,
           useValue: accountService,

apps/desktop/src/auth/lock.component.ts

@@ -25,7 +25,6 @@ import { MessagingService } from "@bitwarden/common/platform/abstractions/messag
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { StateService } from "@bitwarden/common/platform/abstractions/state.service";
 import { BiometricStateService } from "@bitwarden/common/platform/biometrics/biometric-state.service";
-import { BiometricsService } from "@bitwarden/common/platform/biometrics/biometric.service";
 import { PasswordStrengthServiceAbstraction } from "@bitwarden/common/tools/password-strength";
 import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
 import { DialogService } from "@bitwarden/components";
@@ -67,7 +66,6 @@ export class LockComponent extends BaseLockComponent {
     userVerificationService: UserVerificationService,
     pinService: PinServiceAbstraction,
     biometricStateService: BiometricStateService,
-    biometricsService: BiometricsService,
     accountService: AccountService,
     authService: AuthService,
     kdfConfigService: KdfConfigService,
@@ -95,7 +93,6 @@ export class LockComponent extends BaseLockComponent {
       userVerificationService,
       pinService,
       biometricStateService,
-      biometricsService,
       accountService,
       authService,
       kdfConfigService,

apps/desktop/src/main.ts

@@ -32,7 +32,7 @@ import { PowerMonitorMain } from "./main/power-monitor.main";
 import { TrayMain } from "./main/tray.main";
 import { UpdaterMain } from "./main/updater.main";
 import { WindowMain } from "./main/window.main";
-import { BiometricsService, DesktopBiometricsService } from "./platform/main/biometric/index";
+import { BiometricsService, BiometricsServiceAbstraction } from "./platform/main/biometric/index";
 import { ClipboardMain } from "./platform/main/clipboard.main";
 import { DesktopCredentialStorageListener } from "./platform/main/desktop-credential-storage-listener";
 import { MainCryptoFunctionService } from "./platform/main/main-crypto-function.service";
@@ -63,7 +63,7 @@ export class Main {
   menuMain: MenuMain;
   powerMonitorMain: PowerMonitorMain;
   trayMain: TrayMain;
-  biometricsService: DesktopBiometricsService;
+  biometricsService: BiometricsServiceAbstraction;
   nativeMessagingMain: NativeMessagingMain;
   clipboardMain: ClipboardMain;
   desktopAutofillSettingsService: DesktopAutofillSettingsService;

apps/desktop/src/platform/main/biometric/biometric.darwin.main.ts

@@ -3,7 +3,7 @@ import { systemPreferences } from "electron";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { passwords } from "@bitwarden/desktop-napi";
 
-import { OsBiometricService } from "./desktop.biometrics.service";
+import { OsBiometricService } from "./biometrics.service.abstraction";
 
 export default class BiometricDarwinMain implements OsBiometricService {
   constructor(private i18nservice: I18nService) {}

apps/desktop/src/platform/main/biometric/biometric.noop.main.ts

@@ -1,4 +1,4 @@
-import { OsBiometricService } from "./desktop.biometrics.service";
+import { OsBiometricService } from "./biometrics.service.abstraction";
 
 export default class NoopBiometricsService implements OsBiometricService {
   constructor() {}

apps/desktop/src/platform/main/biometric/biometric.windows.main.ts

@@ -6,7 +6,7 @@ import { biometrics, passwords } from "@bitwarden/desktop-napi";
 
 import { WindowMain } from "../../../main/window.main";
 
-import { OsBiometricService } from "./desktop.biometrics.service";
+import { OsBiometricService } from "./biometrics.service.abstraction";
 
 const KEY_WITNESS_SUFFIX = "_witness";
 const WITNESS_VALUE = "known key";

apps/desktop/src/platform/main/biometric/biometrics.service.abstraction.ts

@@ -1,10 +1,5 @@
-import { BiometricsService } from "@bitwarden/common/platform/biometrics/biometric.service";
-
-/**
- * This service extends the base biometrics service to provide desktop specific functions,
- * specifically for the main process.
- */
-export abstract class DesktopBiometricsService extends BiometricsService {
+export abstract class BiometricsServiceAbstraction {
+  abstract osSupportsBiometric(): Promise<boolean>;
   abstract canAuthBiometric({
     service,
     key,
@@ -14,6 +9,7 @@ export abstract class DesktopBiometricsService extends BiometricsService {
     key: string;
     userId: string;
   }): Promise<boolean>;
+  abstract authenticateBiometric(): Promise<boolean>;
   abstract getBiometricKey(service: string, key: string): Promise<string | null>;
   abstract setBiometricKey(service: string, key: string, value: string): Promise<void>;
   abstract setEncryptionKeyHalf({

apps/desktop/src/platform/main/biometric/biometrics.service.spec.ts

@@ -11,7 +11,7 @@ import { WindowMain } from "../../../main/window.main";
 import BiometricDarwinMain from "./biometric.darwin.main";
 import BiometricWindowsMain from "./biometric.windows.main";
 import { BiometricsService } from "./biometrics.service";
-import { OsBiometricService } from "./desktop.biometrics.service";
+import { OsBiometricService } from "./biometrics.service.abstraction";
 
 jest.mock("@bitwarden/desktop-napi", () => {
   return {

apps/desktop/src/platform/main/biometric/biometrics.service.ts

@@ -6,9 +6,9 @@ import { UserId } from "@bitwarden/common/types/guid";
 
 import { WindowMain } from "../../../main/window.main";
 
-import { DesktopBiometricsService, OsBiometricService } from "./desktop.biometrics.service";
+import { BiometricsServiceAbstraction, OsBiometricService } from "./biometrics.service.abstraction";
 
-export class BiometricsService extends DesktopBiometricsService {
+export class BiometricsService implements BiometricsServiceAbstraction {
   private platformSpecificService: OsBiometricService;
   private clientKeyHalves = new Map<string, string>();
 
@@ -20,7 +20,6 @@ export class BiometricsService extends DesktopBiometricsService {
     private platform: NodeJS.Platform,
     private biometricStateService: BiometricStateService,
   ) {
-    super();
     this.loadPlatformSpecificService(this.platform);
   }
 
@@ -56,7 +55,7 @@ export class BiometricsService extends DesktopBiometricsService {
     this.platformSpecificService = new NoopBiometricsService();
   }
 
-  async supportsBiometric() {
+  async osSupportsBiometric() {
     return await this.platformSpecificService.osSupportsBiometric();
   }
 
@@ -72,7 +71,7 @@ export class BiometricsService extends DesktopBiometricsService {
     const requireClientKeyHalf = await this.biometricStateService.getRequirePasswordOnStart(userId);
     const clientKeyHalfB64 = this.getClientKeyHalf(service, key);
     const clientKeyHalfSatisfied = !requireClientKeyHalf || !!clientKeyHalfB64;
-    return clientKeyHalfSatisfied && (await this.supportsBiometric());
+    return clientKeyHalfSatisfied && (await this.osSupportsBiometric());
   }
 
   async authenticateBiometric(): Promise<boolean> {
@@ -91,10 +90,6 @@ export class BiometricsService extends DesktopBiometricsService {
     return result;
   }
 
-  async isBiometricUnlockAvailable(): Promise<boolean> {
-    return await this.platformSpecificService.osSupportsBiometric();
-  }
-
   async getBiometricKey(service: string, storageKey: string): Promise<string | null> {
     return await this.interruptProcessReload(async () => {
       await this.enforceClientKeyHalf(service, storageKey);

apps/desktop/src/platform/main/biometric/index.ts

@@ -1,2 +1,2 @@
-export * from "./desktop.biometrics.service";
+export * from "./biometrics.service.abstraction";
 export * from "./biometrics.service";

apps/desktop/src/platform/main/desktop-credential-storage-listener.ts

@@ -6,14 +6,14 @@ import { passwords } from "@bitwarden/desktop-napi";
 
 import { BiometricMessage, BiometricAction } from "../../types/biometric-message";
 
-import { DesktopBiometricsService } from "./biometric/index";
+import { BiometricsServiceAbstraction } from "./biometric/index";
 
 const AuthRequiredSuffix = "_biometric";
 
 export class DesktopCredentialStorageListener {
   constructor(
     private serviceName: string,
-    private biometricService: DesktopBiometricsService,
+    private biometricService: BiometricsServiceAbstraction,
     private logService: ConsoleLogService,
   ) {}
 
@@ -77,7 +77,7 @@ export class DesktopCredentialStorageListener {
             });
             break;
           case BiometricAction.OsSupported:
-            val = await this.biometricService.supportsBiometric();
+            val = await this.biometricService.osSupportsBiometric();
             break;
           default:
         }

apps/desktop/src/platform/services/electron-biometrics.service.ts

@@ -1,26 +0,0 @@
-import { Injectable } from "@angular/core";
-
-import { BiometricsService } from "@bitwarden/common/platform/biometrics/biometric.service";
-
-/**
- * This service implement the base biometrics service to provide desktop specific functions,
- * specifically for the renderer process by passing messages to the main process.
- */
-@Injectable()
-export class ElectronBiometricsService extends BiometricsService {
-  async supportsBiometric(): Promise<boolean> {
-    return await ipc.platform.biometric.osSupported();
-  }
-
-  async isBiometricUnlockAvailable(): Promise<boolean> {
-    return await ipc.platform.biometric.osSupported();
-  }
-
-  /** This method is used to authenticate the user presence _only_.
-   * It should not be used in the process to retrieve
-   * biometric keys, which has a separate authentication mechanism.
-   * For biometric keys, invoke "keytar" with a biometric key suffix */
-  async authenticateBiometric(): Promise<boolean> {
-    return await ipc.platform.biometric.authenticate();
-  }
-}

apps/desktop/src/platform/services/electron-platform-utils.service.ts

@@ -131,6 +131,18 @@ export class ElectronPlatformUtilsService implements PlatformUtilsService {
     return ipc.platform.clipboard.read();
   }
 
+  async supportsBiometric(): Promise<boolean> {
+    return await ipc.platform.biometric.osSupported();
+  }
+
+  /** This method is used to authenticate the user presence _only_.
+   * It should not be used in the process to retrieve
+   * biometric keys, which has a separate authentication mechanism.
+   * For biometric keys, invoke "keytar" with a biometric key suffix */
+  async authenticateBiometric(): Promise<boolean> {
+    return await ipc.platform.biometric.authenticate();
+  }
+
   supportsSecureStorage(): boolean {
     return ELECTRON_SUPPORTS_SECURE_STORAGE;
   }

apps/desktop/src/services/native-messaging.service.ts

@@ -7,8 +7,8 @@ import { CryptoFunctionService } from "@bitwarden/common/platform/abstractions/c
 import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
+import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { BiometricStateService } from "@bitwarden/common/platform/biometrics/biometric-state.service";
-import { BiometricsService } from "@bitwarden/common/platform/biometrics/biometric.service";
 import { KeySuffixOptions } from "@bitwarden/common/platform/enums";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { EncString } from "@bitwarden/common/platform/models/domain/enc-string";
@@ -32,11 +32,11 @@ export class NativeMessagingService {
   constructor(
     private cryptoFunctionService: CryptoFunctionService,
     private cryptoService: CryptoService,
+    private platformUtilService: PlatformUtilsService,
     private logService: LogService,
     private messagingService: MessagingService,
     private desktopSettingService: DesktopSettingsService,
     private biometricStateService: BiometricStateService,
-    private biometricsService: BiometricsService,
     private nativeMessageHandler: NativeMessageHandlerService,
     private dialogService: DialogService,
     private accountService: AccountService,
@@ -132,14 +132,7 @@ export class NativeMessagingService {
 
     switch (message.command) {
       case "biometricUnlock": {
-        const isTemporarilyDisabled =
-          (await this.biometricStateService.getBiometricUnlockEnabled(message.userId as UserId)) &&
-          !(await this.biometricsService.supportsBiometric());
-        if (isTemporarilyDisabled) {
-          return this.send({ command: "biometricUnlock", response: "not available" }, appId);
-        }
-
-        if (!(await this.biometricsService.supportsBiometric())) {
+        if (!(await this.platformUtilService.supportsBiometric())) {
           return this.send({ command: "biometricUnlock", response: "not supported" }, appId);
         }
 
@@ -194,18 +187,8 @@ export class NativeMessagingService {
 
         break;
       }
-      case "biometricUnlockAvailable": {
-        const isAvailable = await this.biometricsService.supportsBiometric();
-        return this.send(
-          {
-            command: "biometricUnlockAvailable",
-            response: isAvailable ? "available" : "not available",
-          },
-          appId,
-        );
-      }
       default:
-        this.logService.error("NativeMessage, got unknown command: " + message.command);
+        this.logService.error("NativeMessage, got unknown command.");
         break;
     }
   }