Fix tests

Author: Hinton

apps/browser/src/vault/popup/services/vault-popup-list-filters.service.spec.ts

@@ -14,6 +14,7 @@ import { AccountService } from "@bitwarden/common/auth/abstractions/account.serv
 import { ProductTierType } from "@bitwarden/common/billing/enums";
 import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { asUuid } from "@bitwarden/common/platform/abstractions/sdk/sdk.service";
 import { StateProvider } from "@bitwarden/common/platform/state";
 import { mockAccountServiceWith } from "@bitwarden/common/spec";
 import { UserId } from "@bitwarden/common/types/guid";
@@ -514,8 +515,17 @@ describe("VaultPopupListFiltersService", () => {
   describe("filterFunction$", () => {
     const ciphers = [
       { type: CipherType.Login, collectionIds: [], organizationId: null },
-      { type: CipherType.Card, collectionIds: ["1234"], organizationId: "8978" },
-      { type: CipherType.Identity, collectionIds: [], folderId: "5432", organizationId: null },
+      {
+        type: CipherType.Card,
+        collectionIds: [asUuid("cbcae898-9f9a-48eb-863e-edf92e3ad7e0")],
+        organizationId: "8978" as any,
+      },
+      {
+        type: CipherType.Identity,
+        collectionIds: [],
+        folderId: "5432" as any,
+        organizationId: null,
+      },
       { type: CipherType.SecureNote, collectionIds: [], organizationId: null },
     ] as CipherView[];
 
@@ -529,7 +539,7 @@ describe("VaultPopupListFiltersService", () => {
     });
 
     it("filters by collection", (done) => {
-      const collection = { id: "1234" } as CollectionView;
+      const collection = { id: "cbcae898-9f9a-48eb-863e-edf92e3ad7e0" } as CollectionView;
 
       service.filterFunction$.subscribe((filterFunction) => {
         expect(filterFunction(ciphers)).toEqual([ciphers[1]]);

libs/angular/src/vault/vault-filter/models/vault-filter.model.spec.ts

@@ -118,15 +118,18 @@ describe("VaultFilter", () => {
     });
 
     describe("given an organizational cipher (with organization and collections)", () => {
+      const collection1 = "e9652fc0-1fe4-48d5-a3d8-d821e32fbd98";
+      const collection2 = "42a971a5-8c16-48a3-a725-4be27cd99bc9";
+
       const cipher = createCipher({
         organizationId: "organizationId",
-        collectionIds: ["collectionId", "anotherId"],
+        collectionIds: [collection1, collection2],
       });
 
       it("should return true when filter matches collection id", () => {
         const filterFunction = createFilterFunction({
           selectedCollection: true,
-          selectedCollectionId: "collectionId",
+          selectedCollectionId: collection1,
         });
 
         const result = filterFunction(cipher);
@@ -137,7 +140,7 @@ describe("VaultFilter", () => {
       it("should return false when filter does not match collection id", () => {
         const filterFunction = createFilterFunction({
           selectedCollection: true,
-          selectedCollectionId: "nonMatchingId",
+          selectedCollectionId: "1ea7ad96-3fc1-4567-8fe5-91aa9f697fd1",
         });
 
         const result = filterFunction(cipher);

libs/common/src/platform/services/sdk/default-sdk.service.spec.ts

@@ -62,7 +62,7 @@ describe("DefaultSdkService", () => {
     });
 
     describe("given the user is logged in", () => {
-      const userId = "user-id" as UserId;
+      const userId = "0da62ebd-98bb-4f42-a846-64e8555087d7" as UserId;
       beforeEach(() => {
         environmentService.getEnvironment$
           .calledWith(userId)

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

@@ -849,9 +849,9 @@ describe("Cipher DTO", () => {
       const lastLaunched = new Date("2025-04-15T12:00:00.000Z").getTime();
 
       const cipherData: CipherData = {
-        id: "id",
-        organizationId: "orgId",
-        folderId: "folderId",
+        id: "2afb03fd-0d8e-4c08-a316-18b2f0efa618",
+        organizationId: "4748ad12-212e-4bc8-82b7-a75f6709d033",
+        folderId: "b4dac811-e44a-495a-9334-9e53b7aaf54c",
         edit: true,
         permissions: new CipherPermissionsApi(),
         viewPassword: true,
@@ -920,9 +920,9 @@ describe("Cipher DTO", () => {
       const sdkCipher = cipher.toSdkCipher();
 
       expect(sdkCipher).toEqual({
-        id: "id",
-        organizationId: "orgId",
-        folderId: "folderId",
+        id: "2afb03fd-0d8e-4c08-a316-18b2f0efa618",
+        organizationId: "4748ad12-212e-4bc8-82b7-a75f6709d033",
+        folderId: "b4dac811-e44a-495a-9334-9e53b7aaf54c",
         collectionIds: [],
         key: "EncryptedString",
         name: "EncryptedString",
@@ -1007,9 +1007,9 @@ describe("Cipher DTO", () => {
     it("should map from SDK Cipher", () => {
       jest.restoreAllMocks();
       const sdkCipher: SdkCipher = {
-        id: "id",
-        organizationId: "orgId",
-        folderId: "folderId",
+        id: "id" as any,
+        organizationId: "orgId" as any,
+        folderId: "folderId" as any,
         collectionIds: [],
         key: "EncryptedString" as SdkEncString,
         name: "EncryptedString" as SdkEncString,

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

@@ -14,6 +14,7 @@ import {
 } from "@bitwarden/sdk-internal";
 
 import { mockFromJson, mockFromSdk } from "../../../../spec";
+import { asUuid } from "../../../platform/abstractions/sdk/sdk.service";
 import { CipherRepromptType } from "../../enums";
 import { CipherType } from "../../enums/cipher-type";
 
@@ -260,11 +261,11 @@ describe("CipherView", () => {
       const sdkCipherView = cipherView.toSdkCipherView();
 
       expect(sdkCipherView).toMatchObject({
-        id: "0a54d80c-14aa-4ef8-8c3a-7ea99ce5b602",
-        organizationId: "000f2a6e-da5e-4726-87ed-1c5c77322c3c",
-        folderId: "41b22db4-8e2a-4ed2-b568-f1186c72922f",
-        collectionIds: ["b0473506-3c3c-4260-a734-dfaaf833ab6f"],
-        key: "some-key",
+        id: asUuid("0a54d80c-14aa-4ef8-8c3a-7ea99ce5b602"),
+        organizationId: asUuid("000f2a6e-da5e-4726-87ed-1c5c77322c3c"),
+        folderId: asUuid("41b22db4-8e2a-4ed2-b568-f1186c72922f"),
+        collectionIds: [asUuid("b0473506-3c3c-4260-a734-dfaaf833ab6f")],
+        key: "some-key" as any,
         name: "name",
         notes: "notes",
         type: SdkCipherType.Login,

libs/common/src/vault/services/default-cipher-encryption.service.spec.ts

@@ -124,15 +124,15 @@ describe("DefaultCipherEncryptionService", () => {
     cipherViewObj = new CipherView(cipherObj);
 
     jest.spyOn(cipherObj, "toSdkCipher").mockImplementation(() => {
-      return { id: cipherData.id } as SdkCipher;
+      return { id: cipherData.id as any } as SdkCipher;
     });
 
     jest.spyOn(cipherViewObj, "toSdkCipherView").mockImplementation(() => {
-      return { id: cipherData.id } as SdkCipherView;
+      return { id: cipherData.id as any } as SdkCipherView;
     });
 
     sdkCipherView = {
-      id: cipherId as string,
+      id: cipherId as any,
       type: SdkCipherType.Login,
       name: "test-name",
       login: {
@@ -334,7 +334,7 @@ describe("DefaultCipherEncryptionService", () => {
         .vault()
         .ciphers()
         .set_fido2_credentials.mockReturnValue({
-          id: cipherId as string,
+          id: cipherId as any,
           login: {
             fido2Credentials: [mockSdkCredentialView],
           },
@@ -519,8 +519,8 @@ describe("DefaultCipherEncryptionService", () => {
       const ciphers = [new Cipher(cipherData), new Cipher(cipherData)];
 
       const expectedListViews = [
-        { id: "list1", name: "List 1" } as CipherListView,
-        { id: "list2", name: "List 2" } as CipherListView,
+        { id: "list1" as any, name: "List 1" } as CipherListView,
+        { id: "list2" as any, name: "List 2" } as CipherListView,
       ];
 
       mockSdkClient.vault().ciphers().decrypt_list.mockReturnValue(expectedListViews);
@@ -554,7 +554,7 @@ describe("DefaultCipherEncryptionService", () => {
       const encryptedContent = new Uint8Array([1, 2, 3, 4]);
       const expectedDecryptedContent = new Uint8Array([5, 6, 7, 8]);
 
-      jest.spyOn(cipher, "toSdkCipher").mockReturnValue({ id: "id" } as SdkCipher);
+      jest.spyOn(cipher, "toSdkCipher").mockReturnValue({ id: "id" as any } as SdkCipher);
       jest
         .spyOn(attachment, "toSdkAttachmentView")
         .mockReturnValue({ id: "a1" } as SdkAttachmentView);

libs/common/src/vault/utils/cipher-view-like-utils.spec.ts

@@ -175,13 +175,13 @@ describe("CipherViewLikeUtils", () => {
       });
 
       it("returns false when the cipher is assigned to an organization and cannot be edited", () => {
-        cipherListView.organizationId = "org-id";
+        cipherListView.organizationId = "org-id" as any;
 
         expect(CipherViewLikeUtils.canAssignToCollections(cipherListView)).toBe(false);
       });
 
       it("returns true when the cipher is assigned to an organization and can be edited", () => {
-        cipherListView.organizationId = "org-id";
+        cipherListView.organizationId = "org-id" as any;
         cipherListView.edit = true;
         cipherListView.viewPassword = true;