From 4fc2842f9b065944269c171ea103be9120d7fb7a Mon Sep 17 00:00:00 2001 From: Mackenzie Nolan Date: Thu, 13 Feb 2025 10:45:49 -0500 Subject: [PATCH 1/7] feat: added types to webhook json for waitlist entry --- packages/backend/src/api/resources/JSON.ts | 11 +++++++++++ packages/backend/src/api/resources/Webhooks.ts | 6 +++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/packages/backend/src/api/resources/JSON.ts b/packages/backend/src/api/resources/JSON.ts index c734c56c846..abf708429b1 100644 --- a/packages/backend/src/api/resources/JSON.ts +++ b/packages/backend/src/api/resources/JSON.ts @@ -34,6 +34,7 @@ export const ObjectType = { SignUpAttempt: 'sign_up_attempt', SmsMessage: 'sms_message', User: 'user', + WaitlistEntry: 'waitlist_entry', Web3Wallet: 'web3_wallet', Token: 'token', TotalCount: 'total_count', @@ -382,6 +383,16 @@ export interface VerificationJSON extends ClerkResourceJSON { message?: string | null; } +export interface WaitlistEntryJSON extends ClerkResourceJSON { + created_at: number; + email_address: string; + id: string; + invitation: InvitationJSON | null; + object: typeof ObjectType.WaitlistEntry; + status: string; + updated_at: number; +} + export interface Web3WalletJSON extends ClerkResourceJSON { object: typeof ObjectType.Web3Wallet; web3_wallet: string; diff --git a/packages/backend/src/api/resources/Webhooks.ts b/packages/backend/src/api/resources/Webhooks.ts index ea0c0e6be97..5cec4379e3a 100644 --- a/packages/backend/src/api/resources/Webhooks.ts +++ b/packages/backend/src/api/resources/Webhooks.ts @@ -10,6 +10,7 @@ import type { SessionJSON, SMSMessageJSON, UserJSON, + WaitlistEntryJSON, } from './JSON'; type Webhook = { type: EvtType; object: 'event'; data: Data }; @@ -52,6 +53,8 @@ export type PermissionWebhookEvent = Webhook< PermissionJSON >; +export type WaitlistEntryWebhookEvent = Webhook<'waitlistEntry.created' | 'waitlistEntry.updated', WaitlistEntryJSON>; + export type WebhookEvent = | UserWebhookEvent | SessionWebhookEvent @@ -62,6 +65,7 @@ export type WebhookEvent = | OrganizationMembershipWebhookEvent | OrganizationInvitationWebhookEvent | RoleWebhookEvent - | PermissionWebhookEvent; + | PermissionWebhookEvent + | WaitlistEntryWebhookEvent; export type WebhookEventType = WebhookEvent['type']; From ff940833d2d5c18399bfa412026a51e8573ab9f7 Mon Sep 17 00:00:00 2001 From: Mackenzie Nolan Date: Thu, 13 Feb 2025 10:56:05 -0500 Subject: [PATCH 2/7] feat: added changeset --- .changeset/green-starfishes-hear.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/green-starfishes-hear.md diff --git a/.changeset/green-starfishes-hear.md b/.changeset/green-starfishes-hear.md new file mode 100644 index 00000000000..25305868176 --- /dev/null +++ b/.changeset/green-starfishes-hear.md @@ -0,0 +1,5 @@ +--- +'@clerk/backend': patch +--- + +Added WaitlistEntryJSON and updated WebhookEvent to include WaitlistEntry From d9766ecca055b3ed4058dd65857169e30f5dd1b9 Mon Sep 17 00:00:00 2001 From: Mackenzie Nolan Date: Fri, 14 Feb 2025 13:19:14 -0500 Subject: [PATCH 3/7] added is_locked to waitlist entry per api --- packages/backend/src/api/resources/JSON.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/backend/src/api/resources/JSON.ts b/packages/backend/src/api/resources/JSON.ts index abf708429b1..b4730cfd920 100644 --- a/packages/backend/src/api/resources/JSON.ts +++ b/packages/backend/src/api/resources/JSON.ts @@ -388,6 +388,7 @@ export interface WaitlistEntryJSON extends ClerkResourceJSON { email_address: string; id: string; invitation: InvitationJSON | null; + is_locked: boolean; object: typeof ObjectType.WaitlistEntry; status: string; updated_at: number; From 5bb6da0136d9eec691677610716c9c95caadbaef Mon Sep 17 00:00:00 2001 From: Mackenzie Nolan Date: Fri, 21 Feb 2025 08:14:12 -0500 Subject: [PATCH 4/7] chore: added events to nextjs exports and also added Waitlist events to backend index exports --- packages/backend/src/api/resources/index.ts | 1 + packages/backend/src/index.ts | 2 ++ packages/nextjs/src/server/index.ts | 2 ++ 3 files changed, 5 insertions(+) diff --git a/packages/backend/src/api/resources/index.ts b/packages/backend/src/api/resources/index.ts index eb99325ca7f..c384c95f8e0 100644 --- a/packages/backend/src/api/resources/index.ts +++ b/packages/backend/src/api/resources/index.ts @@ -46,6 +46,7 @@ export type { SessionWebhookEvent, SMSWebhookEvent, UserWebhookEvent, + WaitlistEntryWebhookEvent, WebhookEvent, WebhookEventType, } from './Webhooks'; diff --git a/packages/backend/src/index.ts b/packages/backend/src/index.ts index f772e66bdc9..f5b77e1698a 100644 --- a/packages/backend/src/index.ts +++ b/packages/backend/src/index.ts @@ -80,6 +80,7 @@ export type { SMSMessageJSON, UserJSON, VerificationJSON, + WaitlistEntryJSON, Web3WalletJSON, DeletedObjectJSON, PaginatedResponseJSON, @@ -126,6 +127,7 @@ export type { SessionWebhookEvent, SMSWebhookEvent, UserWebhookEvent, + WaitlistEntryWebhookEvent, WebhookEvent, WebhookEventType, } from './api/resources/Webhooks'; diff --git a/packages/nextjs/src/server/index.ts b/packages/nextjs/src/server/index.ts index 1d4e3482a29..93348d9d7f5 100644 --- a/packages/nextjs/src/server/index.ts +++ b/packages/nextjs/src/server/index.ts @@ -20,6 +20,7 @@ export type { SessionJSON, SMSMessageJSON, UserJSON, + WaitlistEntryJSON, WebhookEvent, WebhookEventType, UserWebhookEvent, @@ -32,6 +33,7 @@ export type { RoleWebhookEvent, SessionWebhookEvent, SMSWebhookEvent, + WaitlistEntryWebhookEvent, } from '@clerk/backend'; /** From fa5e0082e22b3e4933fb6b248ec8d65cc2a17008 Mon Sep 17 00:00:00 2001 From: panteliselef Date: Tue, 4 Mar 2025 12:29:16 +0200 Subject: [PATCH 5/7] Update .changeset/green-starfishes-hear.md --- .changeset/green-starfishes-hear.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.changeset/green-starfishes-hear.md b/.changeset/green-starfishes-hear.md index 25305868176..9a0c11b4ce4 100644 --- a/.changeset/green-starfishes-hear.md +++ b/.changeset/green-starfishes-hear.md @@ -2,4 +2,8 @@ '@clerk/backend': patch --- -Added WaitlistEntryJSON and updated WebhookEvent to include WaitlistEntry +Add waitlist entry types +- `WaitlistEntryJSON` +- `WaitlistEntryWebhookEvent` + +Update `WebhookEvent` to include `WaitlistEntryWebhookEvent` From cf77868195f3701b87f69c4354d0094a9e56b7b4 Mon Sep 17 00:00:00 2001 From: panteliselef Date: Tue, 4 Mar 2025 12:31:06 +0200 Subject: [PATCH 6/7] Create tender-suits-rush.md --- .changeset/tender-suits-rush.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/tender-suits-rush.md diff --git a/.changeset/tender-suits-rush.md b/.changeset/tender-suits-rush.md new file mode 100644 index 00000000000..55291e9dbd9 --- /dev/null +++ b/.changeset/tender-suits-rush.md @@ -0,0 +1,5 @@ +--- +"@clerk/nextjs": patch +--- + +Re-export `WaitlistEntryJSON` from `@clerk/nextjs/server`. From 9f9b02163b1bc1749880c4fb1bae21dac7e73171 Mon Sep 17 00:00:00 2001 From: panteliselef Date: Tue, 4 Mar 2025 12:32:06 +0200 Subject: [PATCH 7/7] Update to minor --- .changeset/green-starfishes-hear.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changeset/green-starfishes-hear.md b/.changeset/green-starfishes-hear.md index 9a0c11b4ce4..881da7eb933 100644 --- a/.changeset/green-starfishes-hear.md +++ b/.changeset/green-starfishes-hear.md @@ -1,5 +1,5 @@ --- -'@clerk/backend': patch +'@clerk/backend': minor --- Add waitlist entry types