[PM-23920] Admin Console - adopt strongly typed guids (#15814)

Update organization, collection and policy to use strongly typed IDs

libs/common/src/admin-console/models/domain/organization.ts

@@ -3,12 +3,13 @@
 import { Jsonify } from "type-fest";
 
 import { ProductTierType } from "../../../billing/enums";
+import { OrganizationId } from "../../../types/guid";
 import { OrganizationUserStatusType, OrganizationUserType, ProviderType } from "../../enums";
 import { PermissionsApi } from "../api/permissions.api";
 import { OrganizationData } from "../data/organization.data";
 
 export class Organization {
-  id: string;
+  id: OrganizationId;
   name: string;
   status: OrganizationUserStatusType;
 
@@ -99,7 +100,7 @@ export class Organization {
       return;
     }
 
-    this.id = obj.id;
+    this.id = obj.id as OrganizationId;
     this.name = obj.name;
     this.status = obj.status;
     this.type = obj.type;

libs/common/src/admin-console/models/domain/policy.ts

@@ -2,14 +2,14 @@
 // @ts-strict-ignore
 import { ListResponse } from "../../../models/response/list.response";
 import Domain from "../../../platform/models/domain/domain-base";
-import { PolicyId } from "../../../types/guid";
+import { OrganizationId, PolicyId } from "../../../types/guid";
 import { PolicyType } from "../../enums";
 import { PolicyData } from "../data/policy.data";
 import { PolicyResponse } from "../response/policy.response";
 
 export class Policy extends Domain {
   id: PolicyId;
-  organizationId: string;
+  organizationId: OrganizationId;
   type: PolicyType;
   data: any;
 
@@ -26,7 +26,7 @@ export class Policy extends Domain {
     }
 
     this.id = obj.id;
-    this.organizationId = obj.organizationId;
+    this.organizationId = obj.organizationId as OrganizationId;
     this.type = obj.type;
     this.data = obj.data;
     this.enabled = obj.enabled;

libs/common/src/models/export/collection-with-id.export.ts

@@ -4,10 +4,12 @@
 // eslint-disable-next-line no-restricted-imports
 import { Collection as CollectionDomain, CollectionView } from "@bitwarden/admin-console/common";
 
+import { CollectionId } from "../../types/guid";
+
 import { CollectionExport } from "./collection.export";
 
 export class CollectionWithIdExport extends CollectionExport {
-  id: string;
+  id: CollectionId;
 
   static toView(req: CollectionWithIdExport, view = new CollectionView()) {
     view.id = req.id;

libs/common/src/models/export/collection.export.ts

@@ -5,13 +5,14 @@
 import { Collection as CollectionDomain, CollectionView } from "@bitwarden/admin-console/common";
 
 import { EncString } from "../../key-management/crypto/models/enc-string";
+import { emptyGuid, OrganizationId } from "../../types/guid";
 
 import { safeGetString } from "./utils";
 
 export class CollectionExport {
   static template(): CollectionExport {
     const req = new CollectionExport();
-    req.organizationId = "00000000-0000-0000-0000-000000000000";
+    req.organizationId = emptyGuid as OrganizationId;
     req.name = "Collection name";
     req.externalId = null;
     return req;
@@ -35,7 +36,7 @@ export class CollectionExport {
     return domain;
   }
 
-  organizationId: string;
+  organizationId: OrganizationId;
   name: string;
   externalId: string;
 

libs/common/src/types/guid.ts

@@ -20,3 +20,8 @@ export type OrganizationIntegrationConfigurationId = Opaque<
   string,
   "OrganizationIntegrationConfigurationId"
 >;
+
+/**
+ * A string representation of an empty guid.
+ */
+export const emptyGuid = "00000000-0000-0000-0000-000000000000";