clerk · chanioxaris · Jul 11, 2023 · Jul 10, 2023 · Jul 10, 2023 · Jul 10, 2023
diff --git a/.changeset/breezy-fans-punch.md b/.changeset/breezy-fans-punch.md
@@ -0,0 +1,5 @@
+---
+'@clerk/backend': patch
+---
+
+Add missing property 'adminDeleteEnabled' in Organization resource
diff --git a/.changeset/cyan-foxes-melt.md b/.changeset/cyan-foxes-melt.md
@@ -0,0 +1,6 @@
+---
+'@clerk/clerk-js': patch
+'@clerk/types': patch
+---
+
+Add missing property 'maxAllowedMemberships' in Organization resource
diff --git a/.changeset/gentle-kings-pretend.md b/.changeset/gentle-kings-pretend.md
@@ -0,0 +1,6 @@
+---
+'@clerk/backend': patch
+'@clerk/types': patch
+---
+
+Add missing property 'privateMetadata' in OrganizationInvitation resource
diff --git a/packages/backend/src/api/resources/JSON.ts b/packages/backend/src/api/resources/JSON.ts
@@ -144,12 +144,14 @@ export interface OrganizationJSON extends ClerkResourceJSON {
   created_at: number;
   updated_at: number;
   max_allowed_memberships: number;
+  admin_delete_enabled: boolean;
 }
 
 export interface OrganizationInvitationJSON extends ClerkResourceJSON {
   email_address: string;
   organization_id: string;
   public_metadata: OrganizationInvitationPublicMetadata;
+  private_metadata: OrganizationInvitationPrivateMetadata;
   role: OrganizationMembershipRole;
   status: OrganizationInvitationStatus;
   created_at: number;

diff --git a/packages/backend/src/api/resources/Organization.ts b/packages/backend/src/api/resources/Organization.ts
@@ -13,6 +13,7 @@ export class Organization {
     readonly publicMetadata: OrganizationPublicMetadata | null = {},
     readonly privateMetadata: OrganizationPrivateMetadata = {},
     readonly maxAllowedMemberships: number,
+    readonly adminDeleteEnabled: boolean,
   ) {}
 
   static fromJSON(data: OrganizationJSON): Organization {
@@ -28,6 +29,7 @@ export class Organization {
       data.public_metadata,
       data.private_metadata,
       data.max_allowed_memberships,
+      data.admin_delete_enabled,
     );
   }
 }
diff --git a/packages/backend/src/api/resources/OrganizationInvitation.ts b/packages/backend/src/api/resources/OrganizationInvitation.ts
@@ -11,6 +11,7 @@ export class OrganizationInvitation {
     readonly updatedAt: number,
     readonly status?: OrganizationInvitationStatus,
     readonly publicMetadata: OrganizationInvitationPublicMetadata = {},
+    readonly privateMetadata: OrganizationInvitationPrivateMetadata = {},
   ) {}
 
   static fromJSON(data: OrganizationInvitationJSON) {
@@ -23,6 +24,7 @@ export class OrganizationInvitation {
       data.updated_at,
       data.status,
       data.public_metadata,
+      data.private_metadata,
     );
   }
 }
diff --git a/packages/clerk-js/src/core/resources/Organization.test.ts b/packages/clerk-js/src/core/resources/Organization.test.ts
@@ -14,6 +14,8 @@ describe('Organization', () => {
       updated_at: 5678,
       members_count: 1,
       pending_invitations_count: 10,
+      admin_delete_enabled: true,
+      max_allowed_memberships: 3,
     });
 
     expect(organization).toMatchSnapshot();

diff --git a/packages/clerk-js/src/core/resources/Organization.ts b/packages/clerk-js/src/core/resources/Organization.ts
@@ -32,6 +32,7 @@ export class Organization extends BaseResource implements OrganizationResource {
   updatedAt!: Date;
   membersCount = 0;
   pendingInvitationsCount = 0;
+  maxAllowedMemberships!: number;
 
   constructor(data: OrganizationJSON) {
     super();
@@ -180,6 +181,7 @@ export class Organization extends BaseResource implements OrganizationResource {
     this.publicMetadata = data.public_metadata;
     this.membersCount = data.members_count;
     this.pendingInvitationsCount = data.pending_invitations_count;
+    this.maxAllowedMemberships = data.max_allowed_memberships;
     this.adminDeleteEnabled = data.admin_delete_enabled;
     this.createdAt = unixEpochToDate(data.created_at);
     this.updatedAt = unixEpochToDate(data.updated_at);

diff --git a/packages/clerk-js/src/core/resources/OrganizationMembership.test.ts b/packages/clerk-js/src/core/resources/OrganizationMembership.test.ts
@@ -20,6 +20,8 @@ describe('OrganizationMembership', () => {
         updated_at: 67890,
         members_count: 1,
         pending_invitations_count: 10,
+        admin_delete_enabled: true,
+        max_allowed_memberships: 3,
       },
       public_metadata: {
         foo: 'bar',

diff --git a/packages/clerk-js/src/core/resources/__snapshots__/Organization.test.ts.snap b/packages/clerk-js/src/core/resources/__snapshots__/Organization.test.ts.snap
@@ -3,7 +3,7 @@
 exports[`Organization has the same initial properties 1`] = `
 Organization {
   "addMember": [Function],
-  "adminDeleteEnabled": undefined,
+  "adminDeleteEnabled": true,
   "createdAt": 1970-01-01T00:00:12.345Z,
   "destroy": [Function],
   "getMemberships": [Function],
@@ -13,6 +13,7 @@ Organization {
   "inviteMember": [Function],
   "inviteMembers": [Function],
   "logoUrl": "https://url-for-logo.png",
+  "maxAllowedMemberships": 3,
   "membersCount": 1,
   "name": "test_name",
   "pathRoot": "/organizations",

diff --git a/packages/clerk-js/src/core/resources/__snapshots__/OrganizationMembership.test.ts.snap b/packages/clerk-js/src/core/resources/__snapshots__/OrganizationMembership.test.ts.snap
@@ -7,7 +7,7 @@ OrganizationMembership {
   "id": "test_id",
   "organization": Organization {
     "addMember": [Function],
-    "adminDeleteEnabled": undefined,
+    "adminDeleteEnabled": true,
     "createdAt": 1970-01-01T00:00:12.345Z,
     "destroy": [Function],
     "getMemberships": [Function],
@@ -17,6 +17,7 @@ OrganizationMembership {
     "inviteMember": [Function],
     "inviteMembers": [Function],
     "logoUrl": "https://path-to-logo.png",
+    "maxAllowedMemberships": 3,
     "membersCount": 1,
     "name": "test_name",
     "pathRoot": "/organizations",

diff --git a/packages/types/src/json.ts b/packages/types/src/json.ts
@@ -308,6 +308,7 @@ export interface OrganizationJSON extends ClerkResourceJSON {
   members_count: number;
   pending_invitations_count: number;
   admin_delete_enabled: boolean;
+  max_allowed_memberships: number;
 }
 
 export interface OrganizationMembershipJSON extends ClerkResourceJSON {

diff --git a/packages/types/src/organization.ts b/packages/types/src/organization.ts
@@ -36,6 +36,7 @@ export interface OrganizationResource extends ClerkResource {
   pendingInvitationsCount: number;
   publicMetadata: OrganizationPublicMetadata;
   adminDeleteEnabled: boolean;
+  maxAllowedMemberships: number;
   createdAt: Date;
   updatedAt: Date;
   update: (params: UpdateOrganizationParams) => Promise<OrganizationResource>;

diff --git a/packages/types/src/organizationInvitation.ts b/packages/types/src/organizationInvitation.ts
@@ -10,6 +10,10 @@ declare global {
   interface OrganizationInvitationPublicMetadata {
     [k: string]: unknown;
   }
+
+  interface OrganizationInvitationPrivateMetadata {
+    [k: string]: unknown;
+  }
 }
 
 export interface OrganizationInvitationResource extends ClerkResource {