[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/web/src/app/auth/settings/account/change-email.component.ts

@@ -6,13 +6,13 @@ import { KdfConfigService } from "@bitwarden/common/auth/abstractions/kdf-config
 import { TwoFactorProviderType } from "@bitwarden/common/auth/enums/two-factor-provider-type";
 import { EmailTokenRequest } from "@bitwarden/common/auth/models/request/email-token.request";
 import { EmailRequest } from "@bitwarden/common/auth/models/request/email.request";
-import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.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 { StateService } from "@bitwarden/common/platform/abstractions/state.service";
 import { ToastService } from "@bitwarden/components";
+import { KeyService } from "@bitwarden/key-management";
 
 @Component({
   selector: "app-change-email",
@@ -34,7 +34,7 @@ export class ChangeEmailComponent implements OnInit {
     private apiService: ApiService,
     private i18nService: I18nService,
     private platformUtilsService: PlatformUtilsService,
-    private cryptoService: CryptoService,
+    private keyService: KeyService,
     private messagingService: MessagingService,
     private logService: LogService,
     private stateService: StateService,
@@ -69,9 +69,9 @@ export class ChangeEmailComponent implements OnInit {
     if (!this.tokenSent) {
       const request = new EmailTokenRequest();
       request.newEmail = newEmail;
-      request.masterPasswordHash = await this.cryptoService.hashMasterKey(
+      request.masterPasswordHash = await this.keyService.hashMasterKey(
         step1Value.masterPassword,
-        await this.cryptoService.getOrDeriveMasterKey(step1Value.masterPassword),
+        await this.keyService.getOrDeriveMasterKey(step1Value.masterPassword),
       );
       try {
         await this.apiService.postEmailToken(request);
@@ -83,21 +83,21 @@ export class ChangeEmailComponent implements OnInit {
       const request = new EmailRequest();
       request.token = this.formGroup.value.token;
       request.newEmail = newEmail;
-      request.masterPasswordHash = await this.cryptoService.hashMasterKey(
+      request.masterPasswordHash = await this.keyService.hashMasterKey(
         step1Value.masterPassword,
-        await this.cryptoService.getOrDeriveMasterKey(step1Value.masterPassword),
+        await this.keyService.getOrDeriveMasterKey(step1Value.masterPassword),
       );
       const kdfConfig = await this.kdfConfigService.getKdfConfig();
-      const newMasterKey = await this.cryptoService.makeMasterKey(
+      const newMasterKey = await this.keyService.makeMasterKey(
         step1Value.masterPassword,
         newEmail,
         kdfConfig,
       );
-      request.newMasterPasswordHash = await this.cryptoService.hashMasterKey(
+      request.newMasterPasswordHash = await this.keyService.hashMasterKey(
         step1Value.masterPassword,
         newMasterKey,
       );
-      const newUserKey = await this.cryptoService.encryptUserKeyWithMasterKey(newMasterKey);
+      const newUserKey = await this.keyService.encryptUserKeyWithMasterKey(newMasterKey);
       request.key = newUserKey[1].encryptedString;
       try {
         await this.apiService.postEmail(request);

apps/web/src/app/auth/settings/change-password.component.ts

@@ -11,7 +11,6 @@ import { KdfConfigService } from "@bitwarden/common/auth/abstractions/kdf-config
 import { InternalMasterPasswordServiceAbstraction } from "@bitwarden/common/auth/abstractions/master-password.service.abstraction";
 import { UserVerificationService } from "@bitwarden/common/auth/abstractions/user-verification/user-verification.service.abstraction";
 import { PasswordRequest } from "@bitwarden/common/auth/models/request/password.request";
-import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
@@ -24,6 +23,7 @@ import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.servi
 import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
 import { DialogService, ToastService } from "@bitwarden/components";
 import { PasswordGenerationServiceAbstraction } from "@bitwarden/generator-legacy";
+import { KeyService } from "@bitwarden/key-management";
 
 import { UserKeyRotationService } from "../key-rotation/user-key-rotation.service";
 
@@ -43,7 +43,7 @@ export class ChangePasswordComponent
 
   constructor(
     i18nService: I18nService,
-    cryptoService: CryptoService,
+    keyService: KeyService,
     messagingService: MessagingService,
     stateService: StateService,
     passwordGenerationService: PasswordGenerationServiceAbstraction,
@@ -64,7 +64,7 @@ export class ChangePasswordComponent
   ) {
     super(
       i18nService,
-      cryptoService,
+      keyService,
       messagingService,
       passwordGenerationService,
       platformUtilsService,
@@ -181,14 +181,14 @@ export class ChangePasswordComponent
     newMasterKey: MasterKey,
     newUserKey: [UserKey, EncString],
   ) {
-    const masterKey = await this.cryptoService.makeMasterKey(
+    const masterKey = await this.keyService.makeMasterKey(
       this.currentMasterPassword,
       await firstValueFrom(this.accountService.activeAccount$.pipe(map((a) => a?.email))),
       await this.kdfConfigService.getKdfConfig(),
     );
 
     const userId = await firstValueFrom(this.accountService.activeAccount$.pipe(map((a) => a?.id)));
-    const newLocalKeyHash = await this.cryptoService.hashMasterKey(
+    const newLocalKeyHash = await this.keyService.hashMasterKey(
       this.masterPassword,
       newMasterKey,
       HashPurpose.LocalAuthorization,
@@ -205,7 +205,7 @@ export class ChangePasswordComponent
     }
 
     const request = new PasswordRequest();
-    request.masterPasswordHash = await this.cryptoService.hashMasterKey(
+    request.masterPasswordHash = await this.keyService.hashMasterKey(
       this.currentMasterPassword,
       masterKey,
     );

apps/web/src/app/auth/settings/emergency-access/attachments/emergency-access-attachments.component.ts

@@ -4,7 +4,6 @@ import { AttachmentsComponent as BaseAttachmentsComponent } from "@bitwarden/ang
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions/account/billing-account-profile-state.service";
-import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service";
 import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.service";
 import { FileDownloadService } from "@bitwarden/common/platform/abstractions/file-download/file-download.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
@@ -14,6 +13,7 @@ import { StateService } from "@bitwarden/common/platform/abstractions/state.serv
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 import { AttachmentView } from "@bitwarden/common/vault/models/view/attachment.view";
 import { DialogService, ToastService } from "@bitwarden/components";
+import { KeyService } from "@bitwarden/key-management";
 
 @Component({
   selector: "emergency-access-attachments",
@@ -26,7 +26,7 @@ export class EmergencyAccessAttachmentsComponent extends BaseAttachmentsComponen
   constructor(
     cipherService: CipherService,
     i18nService: I18nService,
-    cryptoService: CryptoService,
+    keyService: KeyService,
     encryptService: EncryptService,
     stateService: StateService,
     platformUtilsService: PlatformUtilsService,
@@ -41,7 +41,7 @@ export class EmergencyAccessAttachmentsComponent extends BaseAttachmentsComponen
     super(
       cipherService,
       i18nService,
-      cryptoService,
+      keyService,
       encryptService,
       platformUtilsService,
       apiService,

apps/web/src/app/auth/settings/emergency-access/confirm/emergency-access-confirm.component.ts

@@ -4,10 +4,10 @@ import { FormBuilder } from "@angular/forms";
 
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { OrganizationManagementPreferencesService } from "@bitwarden/common/admin-console/abstractions/organization-management-preferences/organization-management-preferences.service";
-import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { DialogService } from "@bitwarden/components";
+import { KeyService } from "@bitwarden/key-management";
 
 export enum EmergencyAccessConfirmDialogResult {
   Confirmed = "confirmed",
@@ -35,7 +35,7 @@ export class EmergencyAccessConfirmComponent implements OnInit {
     @Inject(DIALOG_DATA) protected params: EmergencyAccessConfirmDialogData,
     private formBuilder: FormBuilder,
     private apiService: ApiService,
-    private cryptoService: CryptoService,
+    private keyService: KeyService,
     protected organizationManagementPreferencesService: OrganizationManagementPreferencesService,
     private logService: LogService,
     private dialogRef: DialogRef<EmergencyAccessConfirmDialogResult>,
@@ -46,7 +46,7 @@ export class EmergencyAccessConfirmComponent implements OnInit {
       const publicKeyResponse = await this.apiService.getUserPublicKey(this.params.userId);
       if (publicKeyResponse != null) {
         const publicKey = Utils.fromB64ToArray(publicKeyResponse.publicKey);
-        const fingerprint = await this.cryptoService.getFingerprint(this.params.userId, publicKey);
+        const fingerprint = await this.keyService.getFingerprint(this.params.userId, publicKey);
         if (fingerprint != null) {
           this.fingerprint = fingerprint.join("-");
         }

apps/web/src/app/auth/settings/emergency-access/takeover/emergency-access-takeover.component.ts

@@ -8,7 +8,6 @@ import { PolicyService } from "@bitwarden/common/admin-console/abstractions/poli
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { KdfConfigService } from "@bitwarden/common/auth/abstractions/kdf-config.service";
 import { InternalMasterPasswordServiceAbstraction } from "@bitwarden/common/auth/abstractions/master-password.service.abstraction";
-import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
@@ -17,6 +16,7 @@ import { StateService } from "@bitwarden/common/platform/abstractions/state.serv
 import { KdfType } from "@bitwarden/common/platform/enums";
 import { DialogService, ToastService } from "@bitwarden/components";
 import { PasswordGenerationServiceAbstraction } from "@bitwarden/generator-legacy";
+import { KeyService } from "@bitwarden/key-management";
 
 import { EmergencyAccessService } from "../../../emergency-access";
 
@@ -51,7 +51,7 @@ export class EmergencyAccessTakeoverComponent
     @Inject(DIALOG_DATA) protected params: EmergencyAccessTakeoverDialogData,
     private formBuilder: FormBuilder,
     i18nService: I18nService,
-    cryptoService: CryptoService,
+    keyService: KeyService,
     messagingService: MessagingService,
     stateService: StateService,
     passwordGenerationService: PasswordGenerationServiceAbstraction,
@@ -68,7 +68,7 @@ export class EmergencyAccessTakeoverComponent
   ) {
     super(
       i18nService,
-      cryptoService,
+      keyService,
       messagingService,
       passwordGenerationService,
       platformUtilsService,

apps/web/src/app/auth/settings/security/change-kdf/change-kdf-confirmation.component.ts

@@ -7,12 +7,12 @@ import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { KdfConfig } from "@bitwarden/common/auth/models/domain/kdf-config";
 import { KdfRequest } from "@bitwarden/common/models/request/kdf.request";
-import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { KdfType } from "@bitwarden/common/platform/enums";
 import { ToastService } from "@bitwarden/components";
+import { KeyService } from "@bitwarden/key-management";
 
 @Component({
   selector: "app-change-kdf-confirmation",
@@ -32,7 +32,7 @@ export class ChangeKdfConfirmationComponent {
     private apiService: ApiService,
     private i18nService: I18nService,
     private platformUtilsService: PlatformUtilsService,
-    private cryptoService: CryptoService,
+    private keyService: KeyService,
     private messagingService: MessagingService,
     @Inject(DIALOG_DATA) params: { kdf: KdfType; kdfConfig: KdfConfig },
     private accountService: AccountService,
@@ -70,22 +70,18 @@ export class ChangeKdfConfirmationComponent {
       request.kdfMemory = this.kdfConfig.memory;
       request.kdfParallelism = this.kdfConfig.parallelism;
     }
-    const masterKey = await this.cryptoService.getOrDeriveMasterKey(masterPassword);
-    request.masterPasswordHash = await this.cryptoService.hashMasterKey(masterPassword, masterKey);
+    const masterKey = await this.keyService.getOrDeriveMasterKey(masterPassword);
+    request.masterPasswordHash = await this.keyService.hashMasterKey(masterPassword, masterKey);
     const email = await firstValueFrom(
       this.accountService.activeAccount$.pipe(map((a) => a?.email)),
     );
 
-    const newMasterKey = await this.cryptoService.makeMasterKey(
-      masterPassword,
-      email,
-      this.kdfConfig,
-    );
-    request.newMasterPasswordHash = await this.cryptoService.hashMasterKey(
+    const newMasterKey = await this.keyService.makeMasterKey(masterPassword, email, this.kdfConfig);
+    request.newMasterPasswordHash = await this.keyService.hashMasterKey(
       masterPassword,
       newMasterKey,
     );
-    const newUserKey = await this.cryptoService.encryptUserKeyWithMasterKey(newMasterKey);
+    const newUserKey = await this.keyService.encryptUserKeyWithMasterKey(newMasterKey);
     request.key = newUserKey[1].encryptedString;
 
     await this.apiService.postAccountKdf(request);