[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/common/src/vault/models/domain/attachment.spec.ts

@@ -1,7 +1,7 @@
 import { mock, MockProxy } from "jest-mock-extended";
 
+import { KeyService } from "../../../../../key-management/src/abstractions/key.service";
 import { makeStaticByteArray, mockEnc, mockFromJson } from "../../../../spec";
-import { CryptoService } from "../../../platform/abstractions/crypto.service";
 import { EncryptService } from "../../../platform/abstractions/encrypt.service";
 import { EncryptedString, EncString } from "../../../platform/models/domain/enc-string";
 import { SymmetricCryptoKey } from "../../../platform/models/domain/symmetric-crypto-key";
@@ -57,17 +57,14 @@ describe("Attachment", () => {
   });
 
   describe("decrypt", () => {
-    let cryptoService: MockProxy<CryptoService>;
+    let keyService: MockProxy<KeyService>;
     let encryptService: MockProxy<EncryptService>;
 
     beforeEach(() => {
-      cryptoService = mock<CryptoService>();
+      keyService = mock<KeyService>();
       encryptService = mock<EncryptService>();
 
-      (window as any).bitwardenContainerService = new ContainerService(
-        cryptoService,
-        encryptService,
-      );
+      (window as any).bitwardenContainerService = new ContainerService(keyService, encryptService);
     });
 
     it("expected output", async () => {
@@ -101,32 +98,32 @@ describe("Attachment", () => {
         attachment.key = mock<EncString>();
       });
 
-      it("uses the provided key without depending on CryptoService", async () => {
+      it("uses the provided key without depending on KeyService", async () => {
         const providedKey = mock<SymmetricCryptoKey>();
 
         await attachment.decrypt(null, providedKey);
 
-        expect(cryptoService.getUserKeyWithLegacySupport).not.toHaveBeenCalled();
+        expect(keyService.getUserKeyWithLegacySupport).not.toHaveBeenCalled();
         expect(encryptService.decryptToBytes).toHaveBeenCalledWith(attachment.key, providedKey);
       });
 
       it("gets an organization key if required", async () => {
         const orgKey = mock<OrgKey>();
-        cryptoService.getOrgKey.calledWith("orgId").mockResolvedValue(orgKey);
+        keyService.getOrgKey.calledWith("orgId").mockResolvedValue(orgKey);
 
         await attachment.decrypt("orgId", null);
 
-        expect(cryptoService.getOrgKey).toHaveBeenCalledWith("orgId");
+        expect(keyService.getOrgKey).toHaveBeenCalledWith("orgId");
         expect(encryptService.decryptToBytes).toHaveBeenCalledWith(attachment.key, orgKey);
       });
 
       it("gets the user's decryption key if required", async () => {
         const userKey = mock<UserKey>();
-        cryptoService.getUserKeyWithLegacySupport.mockResolvedValue(userKey);
+        keyService.getUserKeyWithLegacySupport.mockResolvedValue(userKey);
 
         await attachment.decrypt(null, null);
 
-        expect(cryptoService.getUserKeyWithLegacySupport).toHaveBeenCalled();
+        expect(keyService.getUserKeyWithLegacySupport).toHaveBeenCalled();
         expect(encryptService.decryptToBytes).toHaveBeenCalledWith(attachment.key, userKey);
       });
     });

libs/common/src/vault/models/domain/attachment.ts

@@ -68,10 +68,10 @@ export class Attachment extends Domain {
   }
 
   private async getKeyForDecryption(orgId: string) {
-    const cryptoService = Utils.getContainerService().getCryptoService();
+    const keyService = Utils.getContainerService().getKeyService();
     return orgId != null
-      ? await cryptoService.getOrgKey(orgId)
-      : await cryptoService.getUserKeyWithLegacySupport();
+      ? await keyService.getOrgKey(orgId)
+      : await keyService.getUserKeyWithLegacySupport();
   }
 
   toAttachmentData(): AttachmentData {

libs/common/src/vault/models/domain/cipher.spec.ts

@@ -3,9 +3,9 @@ import { Jsonify } from "type-fest";
 
 import { UserId } from "@bitwarden/common/types/guid";
 
+import { KeyService } from "../../../../../key-management/src/abstractions/key.service";
 import { makeStaticByteArray, mockEnc, mockFromJson } from "../../../../spec/utils";
 import { UriMatchStrategy } from "../../../models/domain/domain-service";
-import { CryptoService } from "../../../platform/abstractions/crypto.service";
 import { EncryptService } from "../../../platform/abstractions/encrypt.service";
 import { EncString } from "../../../platform/models/domain/enc-string";
 import { ContainerService } from "../../../platform/services/container.service";
@@ -237,16 +237,13 @@ describe("Cipher DTO", () => {
       login.decrypt.mockResolvedValue(loginView);
       cipher.login = login;
 
-      const cryptoService = mock<CryptoService>();
+      const keyService = mock<KeyService>();
       const encryptService = mock<EncryptService>();
       const cipherService = mock<CipherService>();
 
       encryptService.decryptToBytes.mockResolvedValue(makeStaticByteArray(64));
 
-      (window as any).bitwardenContainerService = new ContainerService(
-        cryptoService,
-        encryptService,
-      );
+      (window as any).bitwardenContainerService = new ContainerService(keyService, encryptService);
 
       const cipherView = await cipher.decrypt(
         await cipherService.getKeyForCipherKeyDecryption(cipher, mockUserId),
@@ -357,16 +354,13 @@ describe("Cipher DTO", () => {
       cipher.secureNote.type = SecureNoteType.Generic;
       cipher.key = mockEnc("EncKey");
 
-      const cryptoService = mock<CryptoService>();
+      const keyService = mock<KeyService>();
       const encryptService = mock<EncryptService>();
       const cipherService = mock<CipherService>();
 
       encryptService.decryptToBytes.mockResolvedValue(makeStaticByteArray(64));
 
-      (window as any).bitwardenContainerService = new ContainerService(
-        cryptoService,
-        encryptService,
-      );
+      (window as any).bitwardenContainerService = new ContainerService(keyService, encryptService);
 
       const cipherView = await cipher.decrypt(
         await cipherService.getKeyForCipherKeyDecryption(cipher, mockUserId),
@@ -495,16 +489,13 @@ describe("Cipher DTO", () => {
       card.decrypt.mockResolvedValue(cardView);
       cipher.card = card;
 
-      const cryptoService = mock<CryptoService>();
+      const keyService = mock<KeyService>();
       const encryptService = mock<EncryptService>();
       const cipherService = mock<CipherService>();
 
       encryptService.decryptToBytes.mockResolvedValue(makeStaticByteArray(64));
 
-      (window as any).bitwardenContainerService = new ContainerService(
-        cryptoService,
-        encryptService,
-      );
+      (window as any).bitwardenContainerService = new ContainerService(keyService, encryptService);
 
       const cipherView = await cipher.decrypt(
         await cipherService.getKeyForCipherKeyDecryption(cipher, mockUserId),
@@ -657,16 +648,13 @@ describe("Cipher DTO", () => {
       identity.decrypt.mockResolvedValue(identityView);
       cipher.identity = identity;
 
-      const cryptoService = mock<CryptoService>();
+      const keyService = mock<KeyService>();
       const encryptService = mock<EncryptService>();
       const cipherService = mock<CipherService>();
 
       encryptService.decryptToBytes.mockResolvedValue(makeStaticByteArray(64));
 
-      (window as any).bitwardenContainerService = new ContainerService(
-        cryptoService,
-        encryptService,
-      );
+      (window as any).bitwardenContainerService = new ContainerService(keyService, encryptService);
 
       const cipherView = await cipher.decrypt(
         await cipherService.getKeyForCipherKeyDecryption(cipher, mockUserId),

libs/common/src/vault/models/domain/login-uri.spec.ts

@@ -70,7 +70,7 @@ describe("LoginUri", () => {
       encryptService = mock();
       global.bitwardenContainerService = {
         getEncryptService: () => encryptService,
-        getCryptoService: () => null,
+        getKeyService: () => null,
       };
     });
 

libs/common/src/vault/models/domain/login-uri.ts

@@ -47,8 +47,8 @@ export class LoginUri extends Domain {
       return false;
     }
 
-    const cryptoService = Utils.getContainerService().getEncryptService();
-    const localChecksum = await cryptoService.hash(clearTextUri, "sha256");
+    const keyService = Utils.getContainerService().getEncryptService();
+    const localChecksum = await keyService.hash(clearTextUri, "sha256");
 
     const remoteChecksum = await this.uriChecksum.decrypt(orgId, encKey);
     return remoteChecksum === localChecksum;