[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

libs/admin-console/src/common/collections/services/default-collection-admin.service.ts

@@ -1,8 +1,8 @@
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { SelectionReadOnlyRequest } from "@bitwarden/common/admin-console/models/request/selection-read-only.request";
-import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service";
 import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.service";
 import { EncString } from "@bitwarden/common/platform/models/domain/enc-string";
+import { KeyService } from "@bitwarden/key-management";
 
 import { CollectionAdminService, CollectionService } from "../abstractions";
 import {
@@ -19,7 +19,7 @@ import {
 export class DefaultCollectionAdminService implements CollectionAdminService {
   constructor(
     private apiService: ApiService,
-    private cryptoService: CryptoService,
+    private keyService: KeyService,
     private encryptService: EncryptService,
     private collectionService: CollectionService,
   ) {}
@@ -109,7 +109,7 @@ export class DefaultCollectionAdminService implements CollectionAdminService {
     organizationId: string,
     collections: CollectionResponse[] | CollectionAccessDetailsResponse[],
   ): Promise<CollectionAdminView[]> {
-    const orgKey = await this.cryptoService.getOrgKey(organizationId);
+    const orgKey = await this.keyService.getOrgKey(organizationId);
 
     const promises = collections.map(async (c) => {
       const view = new CollectionAdminView();
@@ -138,7 +138,7 @@ export class DefaultCollectionAdminService implements CollectionAdminService {
     if (model.organizationId == null) {
       throw new Error("Collection has no organization id.");
     }
-    const key = await this.cryptoService.getOrgKey(model.organizationId);
+    const key = await this.keyService.getOrgKey(model.organizationId);
     if (key == null) {
       throw new Error("No key for this collection's organization.");
     }

libs/admin-console/src/common/collections/services/default-collection.service.spec.ts

@@ -1,7 +1,6 @@
 import { mock } from "jest-mock-extended";
 import { firstValueFrom, of } from "rxjs";
 
-import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service";
 import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
@@ -15,6 +14,7 @@ import {
 } from "@bitwarden/common/spec";
 import { CollectionId, OrganizationId, UserId } from "@bitwarden/common/types/guid";
 import { OrgKey } from "@bitwarden/common/types/key";
+import { KeyService } from "@bitwarden/key-management";
 
 import { CollectionData } from "../models";
 
@@ -118,15 +118,15 @@ const mockStateProvider = () => {
 };
 
 const mockCryptoService = () => {
-  const cryptoService = mock<CryptoService>();
+  const keyService = mock<KeyService>();
   const encryptService = mock<EncryptService>();
   encryptService.decryptToUtf8
     .calledWith(expect.any(EncString), expect.anything())
     .mockResolvedValue("DECRYPTED_STRING");
 
-  (window as any).bitwardenContainerService = new ContainerService(cryptoService, encryptService);
+  (window as any).bitwardenContainerService = new ContainerService(keyService, encryptService);
 
-  return cryptoService;
+  return keyService;
 };
 
 const collectionDataFactory = (orgId: OrganizationId) => {

libs/admin-console/src/common/collections/services/default-collection.service.ts

@@ -1,7 +1,6 @@
 import { combineLatest, firstValueFrom, map, Observable, of, switchMap } from "rxjs";
 import { Jsonify } from "type-fest";
 
-import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service";
 import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
@@ -17,6 +16,7 @@ import { CollectionId, OrganizationId, UserId } from "@bitwarden/common/types/gu
 import { OrgKey } from "@bitwarden/common/types/key";
 import { TreeNode } from "@bitwarden/common/vault/models/domain/tree-node";
 import { ServiceUtils } from "@bitwarden/common/vault/service-utils";
+import { KeyService } from "@bitwarden/key-management";
 
 import { CollectionService } from "../abstractions";
 import { Collection, CollectionData, CollectionView } from "../models";
@@ -61,7 +61,7 @@ export class DefaultCollectionService implements CollectionService {
   }
 
   constructor(
-    private cryptoService: CryptoService,
+    private keyService: KeyService,
     private encryptService: EncryptService,
     private i18nService: I18nService,
     protected stateProvider: StateProvider,
@@ -80,7 +80,7 @@ export class DefaultCollectionService implements CollectionService {
 
     const encryptedCollectionsWithKeys = this.encryptedCollectionDataState.combinedState$.pipe(
       switchMap(([userId, collectionData]) =>
-        combineLatest([of(collectionData), this.cryptoService.orgKeys$(userId)]),
+        combineLatest([of(collectionData), this.keyService.orgKeys$(userId)]),
       ),
     );
 
@@ -101,7 +101,7 @@ export class DefaultCollectionService implements CollectionService {
     if (model.organizationId == null) {
       throw new Error("Collection has no organization id.");
     }
-    const key = await this.cryptoService.getOrgKey(model.organizationId);
+    const key = await this.keyService.getOrgKey(model.organizationId);
     if (key == null) {
       throw new Error("No key for this collection's organization.");
     }
@@ -125,7 +125,7 @@ export class DefaultCollectionService implements CollectionService {
     }
     const decCollections: CollectionView[] = [];
 
-    orgKeys ??= await firstValueFrom(this.cryptoService.activeUserOrgKeys$);
+    orgKeys ??= await firstValueFrom(this.keyService.activeUserOrgKeys$);
 
     const promises: Promise<any>[] = [];
     collections.forEach((collection) => {