[Pm-13097] Rename cryptoservice to keyservice and move it to km ownership (#11358)

* Rename cryptoservice to keyservice

* Rename cryptoservice to keyservice

* Move key service to key management ownership

* Remove accidentally added file

* Fix cli build

* Fix browser build

* Run prettier

* Fix builds

* Fix cli build

* Fix tests

* Fix incorrect renames

* Rename webauthn-login-crypto-service

* Fix build errors due to merge conflicts

* Fix linting

apps/desktop/src/services/desktop-lock-component.service.spec.ts

@@ -9,10 +9,9 @@ import {
 } from "@bitwarden/auth/common";
 import { VaultTimeoutSettingsService } from "@bitwarden/common/abstractions/vault-timeout/vault-timeout-settings.service";
 import { DeviceType } from "@bitwarden/common/enums";
-import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { UserId } from "@bitwarden/common/types/guid";
-import { BiometricsService } from "@bitwarden/key-management";
+import { KeyService, BiometricsService } from "@bitwarden/key-management";
 
 import { DesktopLockComponentService } from "./desktop-lock-component.service";
 
@@ -38,7 +37,7 @@ describe("DesktopLockComponentService", () => {
   let biometricsService: MockProxy<BiometricsService>;
   let pinService: MockProxy<PinServiceAbstraction>;
   let vaultTimeoutSettingsService: MockProxy<VaultTimeoutSettingsService>;
-  let cryptoService: MockProxy<CryptoService>;
+  let keyService: MockProxy<KeyService>;
 
   beforeEach(() => {
     userDecryptionOptionsService = mock<UserDecryptionOptionsServiceAbstraction>();
@@ -46,7 +45,7 @@ describe("DesktopLockComponentService", () => {
     biometricsService = mock<BiometricsService>();
     pinService = mock<PinServiceAbstraction>();
     vaultTimeoutSettingsService = mock<VaultTimeoutSettingsService>();
-    cryptoService = mock<CryptoService>();
+    keyService = mock<KeyService>();
 
     TestBed.configureTestingModule({
       providers: [
@@ -72,8 +71,8 @@ describe("DesktopLockComponentService", () => {
           useValue: vaultTimeoutSettingsService,
         },
         {
-          provide: CryptoService,
-          useValue: cryptoService,
+          provide: KeyService,
+          useValue: keyService,
         },
       ],
     });
@@ -358,9 +357,7 @@ describe("DesktopLockComponentService", () => {
       // Biometrics
       biometricsService.supportsBiometric.mockResolvedValue(mockInputs.osSupportsBiometric);
       vaultTimeoutSettingsService.isBiometricLockSet.mockResolvedValue(mockInputs.biometricLockSet);
-      cryptoService.hasUserKeyStored.mockResolvedValue(
-        mockInputs.hasBiometricEncryptedUserKeyStored,
-      );
+      keyService.hasUserKeyStored.mockResolvedValue(mockInputs.hasBiometricEncryptedUserKeyStored);
       platformUtilsService.supportsSecureStorage.mockReturnValue(
         mockInputs.platformSupportsSecureStorage,
       );

apps/desktop/src/services/desktop-lock-component.service.ts

@@ -12,11 +12,10 @@ import {
 } from "@bitwarden/auth/common";
 import { VaultTimeoutSettingsService } from "@bitwarden/common/abstractions/vault-timeout/vault-timeout-settings.service";
 import { DeviceType } from "@bitwarden/common/enums";
-import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { KeySuffixOptions } from "@bitwarden/common/platform/enums";
 import { UserId } from "@bitwarden/common/types/guid";
-import { BiometricsService } from "@bitwarden/key-management";
+import { KeyService, BiometricsService } from "@bitwarden/key-management";
 
 export class DesktopLockComponentService implements LockComponentService {
   private readonly userDecryptionOptionsService = inject(UserDecryptionOptionsServiceAbstraction);
@@ -24,7 +23,7 @@ export class DesktopLockComponentService implements LockComponentService {
   private readonly biometricsService = inject(BiometricsService);
   private readonly pinService = inject(PinServiceAbstraction);
   private readonly vaultTimeoutSettingsService = inject(VaultTimeoutSettingsService);
-  private readonly cryptoService = inject(CryptoService);
+  private readonly keyService = inject(KeyService);
 
   constructor() {}
 
@@ -55,7 +54,7 @@ export class DesktopLockComponentService implements LockComponentService {
 
   private async isBiometricLockSet(userId: UserId): Promise<boolean> {
     const biometricLockSet = await this.vaultTimeoutSettingsService.isBiometricLockSet(userId);
-    const hasBiometricEncryptedUserKeyStored = await this.cryptoService.hasUserKeyStored(
+    const hasBiometricEncryptedUserKeyStored = await this.keyService.hasUserKeyStored(
       KeySuffixOptions.Biometric,
       userId,
     );

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

@@ -5,7 +5,6 @@ import { AccountService } from "@bitwarden/common/auth/abstractions/account.serv
 import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
 import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status";
 import { CryptoFunctionService } from "@bitwarden/common/platform/abstractions/crypto-function.service";
-import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service";
 import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
@@ -15,7 +14,7 @@ import { EncString } from "@bitwarden/common/platform/models/domain/enc-string";
 import { SymmetricCryptoKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key";
 import { UserId } from "@bitwarden/common/types/guid";
 import { DialogService } from "@bitwarden/components";
-import { BiometricsService, BiometricStateService } from "@bitwarden/key-management";
+import { KeyService, BiometricsService, BiometricStateService } from "@bitwarden/key-management";
 
 import { BrowserSyncVerificationDialogComponent } from "../app/components/browser-sync-verification-dialog.component";
 import { LegacyMessage } from "../models/native-messaging/legacy-message";
@@ -32,7 +31,7 @@ const HashAlgorithmForAsymmetricEncryption = "sha1";
 export class NativeMessagingService {
   constructor(
     private cryptoFunctionService: CryptoFunctionService,
-    private cryptoService: CryptoService,
+    private keyService: KeyService,
     private encryptService: EncryptService,
     private logService: LogService,
     private messagingService: MessagingService,
@@ -81,7 +80,7 @@ export class NativeMessagingService {
           appId: appId,
         });
 
-        const fingerprint = await this.cryptoService.getFingerprint(
+        const fingerprint = await this.keyService.getFingerprint(
           rawMessage.userId,
           remotePublicKey,
         );
@@ -172,7 +171,7 @@ export class NativeMessagingService {
         }
 
         try {
-          const userKey = await this.cryptoService.getUserKeyFromStorage(
+          const userKey = await this.keyService.getUserKeyFromStorage(
             KeySuffixOptions.Biometric,
             message.userId,
           );