[PM-13374] Update all SDK uuids

libs/common/src/platform/abstractions/sdk/sdk.service.ts

@@ -32,7 +32,7 @@ export function asUuid<T extends Uuid>(uuid: string): T {
 /**
  * Converts a UUID to the string representation.
  */
-export function uuidToString<T extends Uuid>(uuid: T): string {
+export function uuidAsString<T extends Uuid>(uuid: T): string {
   return uuid as unknown as string;
 }
 

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

@@ -32,7 +32,7 @@ import { Environment, EnvironmentService } from "../../abstractions/environment.
 import { PlatformUtilsService } from "../../abstractions/platform-utils.service";
 import { SdkClientFactory } from "../../abstractions/sdk/sdk-client-factory";
 import { SdkLoadService } from "../../abstractions/sdk/sdk-load.service";
-import { SdkService, UserNotLoggedInError } from "../../abstractions/sdk/sdk.service";
+import { asUuid, SdkService, UserNotLoggedInError } from "../../abstractions/sdk/sdk.service";
 import { compareValues } from "../../misc/compare-values";
 import { Rc } from "../../misc/reference-counting/rc";
 import { EncryptedString } from "../../models/domain/enc-string";
@@ -200,7 +200,7 @@ export class DefaultSdkService implements SdkService {
     orgKeys: Record<OrganizationId, EncryptedOrganizationKeyData> | null,
   ) {
     await client.crypto().initialize_user_crypto({
-      userId,
+      userId: asUuid(userId),
       email: account.email,
       method: { decryptedKey: { decrypted_user_key: userKey.keyB64 } },
       kdfParams:
@@ -224,7 +224,7 @@ export class DefaultSdkService implements SdkService {
       organizationKeys: new Map(
         Object.entries(orgKeys ?? {})
           .filter(([_, v]) => v.type === "organization")
-          .map(([k, v]) => [k, v.key]),
+          .map(([k, v]) => [asUuid(k), v.key]),
       ),
     });
   }

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

@@ -4,6 +4,7 @@ import { Jsonify } from "type-fest";
 
 import { Cipher as SdkCipher } from "@bitwarden/sdk-internal";
 
+import { asUuid } from "../../../platform/abstractions/sdk/sdk.service";
 import { Decryptable } from "../../../platform/interfaces/decryptable.interface";
 import { Utils } from "../../../platform/misc/utils";
 import Domain from "../../../platform/models/domain/domain-base";
@@ -340,10 +341,10 @@ export class Cipher extends Domain implements Decryptable<CipherView> {
    */
   toSdkCipher(): SdkCipher {
     const sdkCipher: SdkCipher = {
-      id: this.id,
-      organizationId: this.organizationId,
-      folderId: this.folderId,
-      collectionIds: this.collectionIds || [],
+      id: asUuid(this.id),
+      organizationId: asUuid(this.organizationId),
+      folderId: asUuid(this.folderId),
+      collectionIds: (this.collectionIds || []).map((s) => asUuid(s)),
       key: this.key?.toJSON(),
       name: this.name.toJSON(),
       notes: this.notes?.toJSON(),

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

@@ -100,10 +100,10 @@ describe("CipherView", () => {
       jest.spyOn(FieldView, "fromSdkFieldView").mockImplementation(mockFromSdk);
 
       sdkCipherView = {
-        id: "id",
-        organizationId: "orgId",
-        folderId: "folderId",
-        collectionIds: ["collectionId"],
+        id: "id" as any,
+        organizationId: "orgId" as any,
+        folderId: "folderId" as any,
+        collectionIds: ["collectionId" as any],
         key: undefined,
         name: "name",
         notes: undefined,

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

@@ -3,6 +3,7 @@
 import { CipherView as SdkCipherView } from "@bitwarden/sdk-internal";
 
 import { View } from "../../../models/view/view";
+import { uuidAsString } from "../../../platform/abstractions/sdk/sdk.service";
 import { InitializerMetadata } from "../../../platform/interfaces/initializer-metadata.interface";
 import { InitializerKey } from "../../../platform/services/cryptography/initializer-key";
 import { DeepJsonify } from "../../../types/deep-jsonify";
@@ -234,9 +235,9 @@ export class CipherView implements View, InitializerMetadata {
     }
 
     const cipherView = new CipherView();
-    cipherView.id = obj.id ?? null;
-    cipherView.organizationId = obj.organizationId ?? null;
-    cipherView.folderId = obj.folderId ?? null;
+    cipherView.id = uuidAsString(obj.id) ?? null;
+    cipherView.organizationId = uuidAsString(obj.organizationId) ?? null;
+    cipherView.folderId = uuidAsString(obj.folderId) ?? null;
     cipherView.name = obj.name;
     cipherView.notes = obj.notes ?? null;
     cipherView.type = obj.type;
@@ -260,7 +261,7 @@ export class CipherView implements View, InitializerMetadata {
     cipherView.fields = obj.fields?.map((f) => FieldView.fromSdkFieldView(f)) ?? null;
     cipherView.passwordHistory =
       obj.passwordHistory?.map((ph) => PasswordHistoryView.fromSdkPasswordHistoryView(ph)) ?? null;
-    cipherView.collectionIds = obj.collectionIds ?? null;
+    cipherView.collectionIds = (obj.collectionIds ?? null)?.map((id) => uuidAsString(id));
     cipherView.revisionDate = obj.revisionDate == null ? null : new Date(obj.revisionDate);
     cipherView.creationDate = obj.creationDate == null ? null : new Date(obj.creationDate);
     cipherView.deletedDate = obj.deletedDate == null ? null : new Date(obj.deletedDate);