Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/early-bats-shout.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/backend': minor
---

Add billing API for fetching available plans.
2 changes: 2 additions & 0 deletions .typedoc/__tests__/__snapshots__/file-structure.test.ts.snap
Original file line numberDiff line numberDiff line change
Expand Up@@ -221,6 +221,8 @@ exports[`Typedoc output > should have a deliberate file structure 1`] = `
"backend/auth-object.mdx",
"backend/authenticate-request-options.mdx",
"backend/client.mdx",
"backend/commerce-plan-json.mdx",
"backend/commerce-plan.mdx",
"backend/email-address.mdx",
"backend/external-account.mdx",
"backend/get-auth-fn.mdx",
Expand Down
26 changes: 26 additions & 0 deletions packages/backend/src/api/endpoints/BillingApi.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
import type { ClerkPaginationRequest } from '@clerk/types';

import { joinPaths } from '../../util/path';
import type { CommercePlan } from '../resources/CommercePlan';
import type { PaginatedResourceResponse } from '../resources/Deserializer';
import { AbstractAPI } from './AbstractApi';

const basePath = '/commerce';

type GetOrganizationListParams = ClerkPaginationRequest<{
payerType: 'org' | 'user';
}>;

export class BillingAPI extends AbstractAPI {
/**
* @experimental This is an experimental API for the Billing feature that is available under a public beta, and the API is subject to change.
* It is advised to pin the SDK version to avoid breaking changes.
*/
public async getPlanList(params?: GetOrganizationListParams) {
return this.request<PaginatedResourceResponse<CommercePlan[]>>({
method: 'GET',
path: joinPaths(basePath, 'plans'),
queryParams: params,
});
}
Comment thread
panteliselef marked this conversation as resolved.
}
6 changes: 6 additions & 0 deletions packages/backend/src/api/factory.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@ import {
WaitlistEntryAPI,
WebhookAPI,
} from './endpoints';
import { BillingAPI } from './endpoints/BillingApi';
import { buildRequest } from './request';

export type CreateBackendApiOptions = Parameters<typeof buildRequest>[0];
Expand All@@ -52,6 +53,11 @@ export function createBackendApiClient(options: CreateBackendApiOptions) {
),
betaFeatures: new BetaFeaturesAPI(request),
blocklistIdentifiers: new BlocklistIdentifierAPI(request),
/**
* @experimental This is an experimental API for the Billing feature that is available under a public beta, and the API is subject to change.
* It is advised to pin the SDK version to avoid breaking changes.
*/
billing: new BillingAPI(request),
clients: new ClientAPI(request),
domains: new DomainAPI(request),
emailAddresses: new EmailAddressAPI(request),
Expand Down
101 changes: 101 additions & 0 deletions packages/backend/src/api/resources/CommercePlan.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,101 @@
import { Feature } from './Feature';
import type { CommercePlanJSON } from './JSON';

type CommerceFee = {
amount: number;
amountFormatted: string;
currency: string;
currencySymbol: string;
};

/**
* @experimental This is an experimental API for the Billing feature that is available under a public beta, and the API is subject to change.
* It is advised to pin the SDK version to avoid breaking changes.
*/
export class CommercePlan {
Comment thread
panteliselef marked this conversation as resolved.
constructor(
/**
* The unique identifier for the plan.
*/
readonly id: string,
/**
* The id of the product the plan belongs to.
*/
readonly productId: string,
/**
* The name of the plan.
*/
readonly name: string,
/**
* The URL-friendly identifier of the plan.
*/
readonly slug: string,
/**
* The description of the plan.
*/
readonly description: string | undefined,
/**
* Whether the plan is the default plan.
*/
readonly isDefault: boolean,
/**
* Whether the plan is recurring.
*/
readonly isRecurring: boolean,
/**
* Whether the plan has a base fee.
*/
readonly hasBaseFee: boolean,
/**
* Whether the plan is displayed in the `<PriceTable/>` component.
*/
readonly publiclyVisible: boolean,
/**
* The monthly fee of the plan.
*/
readonly fee: CommerceFee,
/**
* The annual fee of the plan.
*/
readonly annualFee: CommerceFee,
/**
* The annual fee of the plan on a monthly basis.
*/
readonly annualMonthlyFee: CommerceFee,
/**
* The type of payer for the plan.
*/
readonly forPayerType: 'org' | 'user',
/**
* The features the plan offers.
*/
readonly features: Feature[],
) {}

static fromJSON(data: CommercePlanJSON): CommercePlan {
Comment thread
panteliselef marked this conversation as resolved.
const formatAmountJSON = (fee: CommercePlanJSON['fee']) => {
return {
amount: fee.amount,
amountFormatted: fee.amount_formatted,
currency: fee.currency,
currencySymbol: fee.currency_symbol,
};
};
return new CommercePlan(
data.id,
data.product_id,
data.name,
data.slug,
data.description,
data.is_default,
data.is_recurring,
data.has_base_fee,
data.publicly_visible,
formatAmountJSON(data.fee),
formatAmountJSON(data.annual_fee),
formatAmountJSON(data.annual_monthly_fee),
data.for_payer_type,
data.features.map(feature => Feature.fromJSON(feature)),
);
}
}
6 changes: 6 additions & 0 deletions packages/backend/src/api/resources/Deserializer.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,6 +37,8 @@ import {
User,
} from '.';
import { AccountlessApplication } from './AccountlessApplication';
import { CommercePlan } from './CommercePlan';
import { Feature } from './Feature';
import type { PaginatedResponseJSON } from './JSON';
import { ObjectType } from './JSON';
import { WaitlistEntry } from './WaitlistEntry';
Expand DownExpand Up@@ -179,6 +181,10 @@ function jsonToObject(item: any): any {
return User.fromJSON(item);
case ObjectType.WaitlistEntry:
return WaitlistEntry.fromJSON(item);
case ObjectType.CommercePlan:
return CommercePlan.fromJSON(item);
case ObjectType.Feature:
return Feature.fromJSON(item);
default:
return item;
}
Expand Down
15 changes: 15 additions & 0 deletions packages/backend/src/api/resources/Feature.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
import type { FeatureJSON } from './JSON';

export class Feature {
constructor(
readonly id: string,
readonly name: string,
readonly description: string,
readonly slug: string,
readonly avatarUrl: string,
) {}
Comment thread
panteliselef marked this conversation as resolved.

static fromJSON(data: FeatureJSON): Feature {
return new Feature(data.id, data.name, data.description, data.slug, data.avatar_url);
}
Comment thread
panteliselef marked this conversation as resolved.
}
102 changes: 63 additions & 39 deletions packages/backend/src/api/resources/JSON.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -69,6 +69,8 @@ export const ObjectType = {
CommercePaymentAttempt: 'commerce_payment_attempt',
CommerceSubscription: 'commerce_subscription',
CommerceSubscriptionItem: 'commerce_subscription_item',
CommercePlan: 'commerce_plan',
Feature: 'feature',
} as const;

export type ObjectType = (typeof ObjectType)[keyof typeof ObjectType];
Expand DownExpand Up@@ -791,71 +793,65 @@ export interface CommercePayerJSON extends ClerkResourceJSON {
updated_at: number;
}

export interface CommercePayeeJSON {
interface CommercePayeeJSON {
id: string;
gateway_type: string;
gateway_external_id: string;
gateway_status: 'active' | 'pending' | 'restricted' | 'disconnected';
}

export interface CommerceAmountJSON {
interface CommerceFeeJSON {
amount: number;
amount_formatted: string;
currency: string;
currency_symbol: string;
}

export interface CommerceTotalsJSON {
subtotal: CommerceAmountJSON;
tax_total: CommerceAmountJSON;
grand_total: CommerceAmountJSON;
interface CommerceTotalsJSON {
subtotal: CommerceFeeJSON;
tax_total: CommerceFeeJSON;
grand_total: CommerceFeeJSON;
}

export interface CommercePaymentSourceJSON {
id: string;
gateway: string;
gateway_external_id: string;
gateway_external_account_id?: string;
payment_method: string;
status: 'active' | 'disconnected';
card_type?: string;
last4?: string;
}

export interface CommercePaymentFailedReasonJSON {
code: string;
decline_code: string;
}

export interface CommerceSubscriptionCreditJSON {
amount: CommerceAmountJSON;
cycle_days_remaining: number;
cycle_days_total: number;
cycle_remaining_percent: number;
export interface FeatureJSON extends ClerkResourceJSON {
object: typeof ObjectType.Feature;
name: string;
description: string;
slug: string;
avatar_url: string;
}
Comment thread
panteliselef marked this conversation as resolved.

export interface CommercePlanJSON {
/**
* @experimental This is an experimental API for the Billing feature that is available under a public beta, and the API is subject to change.
* It is advised to pin the SDK version to avoid breaking changes.
*/
export interface CommercePlanJSON extends ClerkResourceJSON {
object: typeof ObjectType.CommercePlan;
id: string;
instance_id: string;
product_id: string;
name: string;
slug: string;
description?: string;
is_default: boolean;
is_recurring: boolean;
amount: number;
period: 'month' | 'annual';
interval: number;
has_base_fee: boolean;
currency: string;
annual_monthly_amount: number;
publicly_visible: boolean;
fee: CommerceFeeJSON;
annual_fee: CommerceFeeJSON;
annual_monthly_fee: CommerceFeeJSON;
for_payer_type: 'org' | 'user';
features: FeatureJSON[];
}

export interface CommerceSubscriptionItemJSON extends ClerkResourceJSON {
object: typeof ObjectType.CommerceSubscriptionItem;
status: 'abandoned' | 'active' | 'canceled' | 'ended' | 'expired' | 'incomplete' | 'past_due' | 'upcoming';
credit: CommerceSubscriptionCreditJSON;
credit: {
amount: CommerceFeeJSON;
cycle_days_remaining: number;
cycle_days_total: number;
cycle_remaining_percent: number;
};
proration_date: string;
plan_period: 'month' | 'annual';
period_start: number;
Expand All@@ -865,8 +861,24 @@ export interface CommerceSubscriptionItemJSON extends ClerkResourceJSON {
lifetime_paid: number;
next_payment_amount: number;
next_payment_date: number;
amount: CommerceAmountJSON;
plan: CommercePlanJSON;
amount: CommerceFeeJSON;
plan: {
id: string;
instance_id: string;
product_id: string;
name: string;
slug: string;
description?: string;
is_default: boolean;
is_recurring: boolean;
amount: number;
period: 'month' | 'annual';
interval: number;
has_base_fee: boolean;
currency: string;
annual_monthly_amount: number;
publicly_visible: boolean;
};
plan_id: string;
}

Expand All@@ -881,13 +893,25 @@ export interface CommercePaymentAttemptJSON extends ClerkResourceJSON {
updated_at: number;
paid_at?: number;
failed_at?: number;
failed_reason?: CommercePaymentFailedReasonJSON;
failed_reason?: {
code: string;
decline_code: string;
};
billing_date: number;
charge_type: 'checkout' | 'recurring';
payee: CommercePayeeJSON;
payer: CommercePayerJSON;
totals: CommerceTotalsJSON;
payment_source: CommercePaymentSourceJSON;
payment_source: {
id: string;
gateway: string;
gateway_external_id: string;
gateway_external_account_id?: string;
payment_method: string;
status: 'active' | 'disconnected';
card_type?: string;
last4?: string;
};
subscription_items: CommerceSubscriptionItemJSON[];
}

Expand Down
1 change: 1 addition & 0 deletions packages/backend/src/api/resources/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -57,6 +57,7 @@ export * from './User';
export * from './Verification';
export * from './WaitlistEntry';
export * from './Web3Wallet';
export * from './CommercePlan';

export type {
EmailWebhookEvent,
Expand Down
7 changes: 1 addition & 6 deletions packages/backend/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -101,12 +101,6 @@ export type {
TestingTokenJSON,
WebhooksSvixJSON,
CommercePayerJSON,
CommercePayeeJSON,
CommerceAmountJSON,
CommerceTotalsJSON,
CommercePaymentSourceJSON,
CommercePaymentFailedReasonJSON,
CommerceSubscriptionCreditJSON,
CommercePlanJSON,
CommerceSubscriptionItemJSON,
CommercePaymentAttemptJSON,
Expand DownExpand Up@@ -150,6 +144,7 @@ export type {
Token,
User,
TestingToken,
CommercePlan,
} from './api/resources';

/**
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/early-bats-shout.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/backend': minor
---

Add billing API for fetching available plans.
2 changes: 2 additions & 0 deletions .typedoc/__tests__/__snapshots__/file-structure.test.ts.snap
Original file line numberDiff line numberDiff line change
Expand Up@@ -221,6 +221,8 @@ exports[`Typedoc output > should have a deliberate file structure 1`] = `
"backend/auth-object.mdx",
"backend/authenticate-request-options.mdx",
"backend/client.mdx",
"backend/commerce-plan-json.mdx",
"backend/commerce-plan.mdx",
"backend/email-address.mdx",
"backend/external-account.mdx",
"backend/get-auth-fn.mdx",
Expand Down
26 changes: 26 additions & 0 deletions packages/backend/src/api/endpoints/BillingApi.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
import type { ClerkPaginationRequest } from '@clerk/types';

import { joinPaths } from '../../util/path';
import type { CommercePlan } from '../resources/CommercePlan';
import type { PaginatedResourceResponse } from '../resources/Deserializer';
import { AbstractAPI } from './AbstractApi';

const basePath = '/commerce';

type GetOrganizationListParams = ClerkPaginationRequest<{
payerType: 'org' | 'user';
}>;

export class BillingAPI extends AbstractAPI {
/**
* @experimental This is an experimental API for the Billing feature that is available under a public beta, and the API is subject to change.
* It is advised to pin the SDK version to avoid breaking changes.
*/
public async getPlanList(params?: GetOrganizationListParams) {
return this.request<PaginatedResourceResponse<CommercePlan[]>>({
method: 'GET',
path: joinPaths(basePath, 'plans'),
queryParams: params,
});
}
Comment thread
panteliselef marked this conversation as resolved.
}
6 changes: 6 additions & 0 deletions packages/backend/src/api/factory.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@ import {
WaitlistEntryAPI,
WebhookAPI,
} from './endpoints';
import { BillingAPI } from './endpoints/BillingApi';
import { buildRequest } from './request';

export type CreateBackendApiOptions = Parameters<typeof buildRequest>[0];
Expand All@@ -52,6 +53,11 @@ export function createBackendApiClient(options: CreateBackendApiOptions) {
),
betaFeatures: new BetaFeaturesAPI(request),
blocklistIdentifiers: new BlocklistIdentifierAPI(request),
/**
* @experimental This is an experimental API for the Billing feature that is available under a public beta, and the API is subject to change.
* It is advised to pin the SDK version to avoid breaking changes.
*/
billing: new BillingAPI(request),
clients: new ClientAPI(request),
domains: new DomainAPI(request),
emailAddresses: new EmailAddressAPI(request),
Expand Down
101 changes: 101 additions & 0 deletions packages/backend/src/api/resources/CommercePlan.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,101 @@
import { Feature } from './Feature';
import type { CommercePlanJSON } from './JSON';

type CommerceFee = {
amount: number;
amountFormatted: string;
currency: string;
currencySymbol: string;
};

/**
* @experimental This is an experimental API for the Billing feature that is available under a public beta, and the API is subject to change.
* It is advised to pin the SDK version to avoid breaking changes.
*/
export class CommercePlan {
Comment thread
panteliselef marked this conversation as resolved.
constructor(
/**
* The unique identifier for the plan.
*/
readonly id: string,
/**
* The id of the product the plan belongs to.
*/
readonly productId: string,
/**
* The name of the plan.
*/
readonly name: string,
/**
* The URL-friendly identifier of the plan.
*/
readonly slug: string,
/**
* The description of the plan.
*/
readonly description: string | undefined,
/**
* Whether the plan is the default plan.
*/
readonly isDefault: boolean,
/**
* Whether the plan is recurring.
*/
readonly isRecurring: boolean,
/**
* Whether the plan has a base fee.
*/
readonly hasBaseFee: boolean,
/**
* Whether the plan is displayed in the `<PriceTable/>` component.
*/
readonly publiclyVisible: boolean,
/**
* The monthly fee of the plan.
*/
readonly fee: CommerceFee,
/**
* The annual fee of the plan.
*/
readonly annualFee: CommerceFee,
/**
* The annual fee of the plan on a monthly basis.
*/
readonly annualMonthlyFee: CommerceFee,
/**
* The type of payer for the plan.
*/
readonly forPayerType: 'org' | 'user',
/**
* The features the plan offers.
*/
readonly features: Feature[],
) {}

static fromJSON(data: CommercePlanJSON): CommercePlan {
Comment thread
panteliselef marked this conversation as resolved.
const formatAmountJSON = (fee: CommercePlanJSON['fee']) => {
return {
amount: fee.amount,
amountFormatted: fee.amount_formatted,
currency: fee.currency,
currencySymbol: fee.currency_symbol,
};
};
return new CommercePlan(
data.id,
data.product_id,
data.name,
data.slug,
data.description,
data.is_default,
data.is_recurring,
data.has_base_fee,
data.publicly_visible,
formatAmountJSON(data.fee),
formatAmountJSON(data.annual_fee),
formatAmountJSON(data.annual_monthly_fee),
data.for_payer_type,
data.features.map(feature => Feature.fromJSON(feature)),
);
}
}
6 changes: 6 additions & 0 deletions packages/backend/src/api/resources/Deserializer.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,6 +37,8 @@ import {
User,
} from '.';
import { AccountlessApplication } from './AccountlessApplication';
import { CommercePlan } from './CommercePlan';
import { Feature } from './Feature';
import type { PaginatedResponseJSON } from './JSON';
import { ObjectType } from './JSON';
import { WaitlistEntry } from './WaitlistEntry';
Expand DownExpand Up@@ -179,6 +181,10 @@ function jsonToObject(item: any): any {
return User.fromJSON(item);
case ObjectType.WaitlistEntry:
return WaitlistEntry.fromJSON(item);
case ObjectType.CommercePlan:
return CommercePlan.fromJSON(item);
case ObjectType.Feature:
return Feature.fromJSON(item);
default:
return item;
}
Expand Down
15 changes: 15 additions & 0 deletions packages/backend/src/api/resources/Feature.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
import type { FeatureJSON } from './JSON';

export class Feature {
constructor(
readonly id: string,
readonly name: string,
readonly description: string,
readonly slug: string,
readonly avatarUrl: string,
) {}
Comment thread
panteliselef marked this conversation as resolved.

static fromJSON(data: FeatureJSON): Feature {
return new Feature(data.id, data.name, data.description, data.slug, data.avatar_url);
}
Comment thread
panteliselef marked this conversation as resolved.
}
102 changes: 63 additions & 39 deletions packages/backend/src/api/resources/JSON.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -69,6 +69,8 @@ export const ObjectType = {
CommercePaymentAttempt: 'commerce_payment_attempt',
CommerceSubscription: 'commerce_subscription',
CommerceSubscriptionItem: 'commerce_subscription_item',
CommercePlan: 'commerce_plan',
Feature: 'feature',
} as const;

export type ObjectType = (typeof ObjectType)[keyof typeof ObjectType];
Expand DownExpand Up@@ -791,71 +793,65 @@ export interface CommercePayerJSON extends ClerkResourceJSON {
updated_at: number;
}

export interface CommercePayeeJSON {
interface CommercePayeeJSON {
id: string;
gateway_type: string;
gateway_external_id: string;
gateway_status: 'active' | 'pending' | 'restricted' | 'disconnected';
}

export interface CommerceAmountJSON {
interface CommerceFeeJSON {
amount: number;
amount_formatted: string;
currency: string;
currency_symbol: string;
}

export interface CommerceTotalsJSON {
subtotal: CommerceAmountJSON;
tax_total: CommerceAmountJSON;
grand_total: CommerceAmountJSON;
interface CommerceTotalsJSON {
subtotal: CommerceFeeJSON;
tax_total: CommerceFeeJSON;
grand_total: CommerceFeeJSON;
}

export interface CommercePaymentSourceJSON {
id: string;
gateway: string;
gateway_external_id: string;
gateway_external_account_id?: string;
payment_method: string;
status: 'active' | 'disconnected';
card_type?: string;
last4?: string;
}

export interface CommercePaymentFailedReasonJSON {
code: string;
decline_code: string;
}

export interface CommerceSubscriptionCreditJSON {
amount: CommerceAmountJSON;
cycle_days_remaining: number;
cycle_days_total: number;
cycle_remaining_percent: number;
export interface FeatureJSON extends ClerkResourceJSON {
object: typeof ObjectType.Feature;
name: string;
description: string;
slug: string;
avatar_url: string;
}
Comment thread
panteliselef marked this conversation as resolved.

export interface CommercePlanJSON {
/**
* @experimental This is an experimental API for the Billing feature that is available under a public beta, and the API is subject to change.
* It is advised to pin the SDK version to avoid breaking changes.
*/
export interface CommercePlanJSON extends ClerkResourceJSON {
object: typeof ObjectType.CommercePlan;
id: string;
instance_id: string;
product_id: string;
name: string;
slug: string;
description?: string;
is_default: boolean;
is_recurring: boolean;
amount: number;
period: 'month' | 'annual';
interval: number;
has_base_fee: boolean;
currency: string;
annual_monthly_amount: number;
publicly_visible: boolean;
fee: CommerceFeeJSON;
annual_fee: CommerceFeeJSON;
annual_monthly_fee: CommerceFeeJSON;
for_payer_type: 'org' | 'user';
features: FeatureJSON[];
}

export interface CommerceSubscriptionItemJSON extends ClerkResourceJSON {
object: typeof ObjectType.CommerceSubscriptionItem;
status: 'abandoned' | 'active' | 'canceled' | 'ended' | 'expired' | 'incomplete' | 'past_due' | 'upcoming';
credit: CommerceSubscriptionCreditJSON;
credit: {
amount: CommerceFeeJSON;
cycle_days_remaining: number;
cycle_days_total: number;
cycle_remaining_percent: number;
};
proration_date: string;
plan_period: 'month' | 'annual';
period_start: number;
Expand All@@ -865,8 +861,24 @@ export interface CommerceSubscriptionItemJSON extends ClerkResourceJSON {
lifetime_paid: number;
next_payment_amount: number;
next_payment_date: number;
amount: CommerceAmountJSON;
plan: CommercePlanJSON;
amount: CommerceFeeJSON;
plan: {
id: string;
instance_id: string;
product_id: string;
name: string;
slug: string;
description?: string;
is_default: boolean;
is_recurring: boolean;
amount: number;
period: 'month' | 'annual';
interval: number;
has_base_fee: boolean;
currency: string;
annual_monthly_amount: number;
publicly_visible: boolean;
};
plan_id: string;
}

Expand All@@ -881,13 +893,25 @@ export interface CommercePaymentAttemptJSON extends ClerkResourceJSON {
updated_at: number;
paid_at?: number;
failed_at?: number;
failed_reason?: CommercePaymentFailedReasonJSON;
failed_reason?: {
code: string;
decline_code: string;
};
billing_date: number;
charge_type: 'checkout' | 'recurring';
payee: CommercePayeeJSON;
payer: CommercePayerJSON;
totals: CommerceTotalsJSON;
payment_source: CommercePaymentSourceJSON;
payment_source: {
id: string;
gateway: string;
gateway_external_id: string;
gateway_external_account_id?: string;
payment_method: string;
status: 'active' | 'disconnected';
card_type?: string;
last4?: string;
};
subscription_items: CommerceSubscriptionItemJSON[];
}

Expand Down
1 change: 1 addition & 0 deletions packages/backend/src/api/resources/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -57,6 +57,7 @@ export * from './User';
export * from './Verification';
export * from './WaitlistEntry';
export * from './Web3Wallet';
export * from './CommercePlan';

export type {
EmailWebhookEvent,
Expand Down
7 changes: 1 addition & 6 deletions packages/backend/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -101,12 +101,6 @@ export type {
TestingTokenJSON,
WebhooksSvixJSON,
CommercePayerJSON,
CommercePayeeJSON,
CommerceAmountJSON,
CommerceTotalsJSON,
CommercePaymentSourceJSON,
CommercePaymentFailedReasonJSON,
CommerceSubscriptionCreditJSON,
CommercePlanJSON,
CommerceSubscriptionItemJSON,
CommercePaymentAttemptJSON,
Expand DownExpand Up@@ -150,6 +144,7 @@ export type {
Token,
User,
TestingToken,
CommercePlan,
} from './api/resources';

/**
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/early-bats-shout.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/backend': minor
---

Add billing API for fetching available plans.
2 changes: 2 additions & 0 deletions .typedoc/__tests__/__snapshots__/file-structure.test.ts.snap
Original file line numberDiff line numberDiff line change
Expand Up@@ -221,6 +221,8 @@ exports[`Typedoc output > should have a deliberate file structure 1`] = `
"backend/auth-object.mdx",
"backend/authenticate-request-options.mdx",
"backend/client.mdx",
"backend/commerce-plan-json.mdx",
"backend/commerce-plan.mdx",
"backend/email-address.mdx",
"backend/external-account.mdx",
"backend/get-auth-fn.mdx",
Expand Down
26 changes: 26 additions & 0 deletions packages/backend/src/api/endpoints/BillingApi.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
import type { ClerkPaginationRequest } from '@clerk/types';

import { joinPaths } from '../../util/path';
import type { CommercePlan } from '../resources/CommercePlan';
import type { PaginatedResourceResponse } from '../resources/Deserializer';
import { AbstractAPI } from './AbstractApi';

const basePath = '/commerce';

type GetOrganizationListParams = ClerkPaginationRequest<{
payerType: 'org' | 'user';
}>;

export class BillingAPI extends AbstractAPI {
/**
* @experimental This is an experimental API for the Billing feature that is available under a public beta, and the API is subject to change.
* It is advised to pin the SDK version to avoid breaking changes.
*/
public async getPlanList(params?: GetOrganizationListParams) {
return this.request<PaginatedResourceResponse<CommercePlan[]>>({
method: 'GET',
path: joinPaths(basePath, 'plans'),
queryParams: params,
});
}
Comment thread
panteliselef marked this conversation as resolved.
}
6 changes: 6 additions & 0 deletions packages/backend/src/api/factory.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@ import {
WaitlistEntryAPI,
WebhookAPI,
} from './endpoints';
import { BillingAPI } from './endpoints/BillingApi';
import { buildRequest } from './request';

export type CreateBackendApiOptions = Parameters<typeof buildRequest>[0];
Expand All@@ -52,6 +53,11 @@ export function createBackendApiClient(options: CreateBackendApiOptions) {
),
betaFeatures: new BetaFeaturesAPI(request),
blocklistIdentifiers: new BlocklistIdentifierAPI(request),
/**
* @experimental This is an experimental API for the Billing feature that is available under a public beta, and the API is subject to change.
* It is advised to pin the SDK version to avoid breaking changes.
*/
billing: new BillingAPI(request),
clients: new ClientAPI(request),
domains: new DomainAPI(request),
emailAddresses: new EmailAddressAPI(request),
Expand Down
101 changes: 101 additions & 0 deletions packages/backend/src/api/resources/CommercePlan.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,101 @@
import { Feature } from './Feature';
import type { CommercePlanJSON } from './JSON';

type CommerceFee = {
amount: number;
amountFormatted: string;
currency: string;
currencySymbol: string;
};

/**
* @experimental This is an experimental API for the Billing feature that is available under a public beta, and the API is subject to change.
* It is advised to pin the SDK version to avoid breaking changes.
*/
export class CommercePlan {
Comment thread
panteliselef marked this conversation as resolved.
constructor(
/**
* The unique identifier for the plan.
*/
readonly id: string,
/**
* The id of the product the plan belongs to.
*/
readonly productId: string,
/**
* The name of the plan.
*/
readonly name: string,
/**
* The URL-friendly identifier of the plan.
*/
readonly slug: string,
/**
* The description of the plan.
*/
readonly description: string | undefined,
/**
* Whether the plan is the default plan.
*/
readonly isDefault: boolean,
/**
* Whether the plan is recurring.
*/
readonly isRecurring: boolean,
/**
* Whether the plan has a base fee.
*/
readonly hasBaseFee: boolean,
/**
* Whether the plan is displayed in the `<PriceTable/>` component.
*/
readonly publiclyVisible: boolean,
/**
* The monthly fee of the plan.
*/
readonly fee: CommerceFee,
/**
* The annual fee of the plan.
*/
readonly annualFee: CommerceFee,
/**
* The annual fee of the plan on a monthly basis.
*/
readonly annualMonthlyFee: CommerceFee,
/**
* The type of payer for the plan.
*/
readonly forPayerType: 'org' | 'user',
/**
* The features the plan offers.
*/
readonly features: Feature[],
) {}

static fromJSON(data: CommercePlanJSON): CommercePlan {
Comment thread
panteliselef marked this conversation as resolved.
const formatAmountJSON = (fee: CommercePlanJSON['fee']) => {
return {
amount: fee.amount,
amountFormatted: fee.amount_formatted,
currency: fee.currency,
currencySymbol: fee.currency_symbol,
};
};
return new CommercePlan(
data.id,
data.product_id,
data.name,
data.slug,
data.description,
data.is_default,
data.is_recurring,
data.has_base_fee,
data.publicly_visible,
formatAmountJSON(data.fee),
formatAmountJSON(data.annual_fee),
formatAmountJSON(data.annual_monthly_fee),
data.for_payer_type,
data.features.map(feature => Feature.fromJSON(feature)),
);
}
}
6 changes: 6 additions & 0 deletions packages/backend/src/api/resources/Deserializer.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,6 +37,8 @@ import {
User,
} from '.';
import { AccountlessApplication } from './AccountlessApplication';
import { CommercePlan } from './CommercePlan';
import { Feature } from './Feature';
import type { PaginatedResponseJSON } from './JSON';
import { ObjectType } from './JSON';
import { WaitlistEntry } from './WaitlistEntry';
Expand DownExpand Up@@ -179,6 +181,10 @@ function jsonToObject(item: any): any {
return User.fromJSON(item);
case ObjectType.WaitlistEntry:
return WaitlistEntry.fromJSON(item);
case ObjectType.CommercePlan:
return CommercePlan.fromJSON(item);
case ObjectType.Feature:
return Feature.fromJSON(item);
default:
return item;
}
Expand Down
15 changes: 15 additions & 0 deletions packages/backend/src/api/resources/Feature.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
import type { FeatureJSON } from './JSON';

export class Feature {
constructor(
readonly id: string,
readonly name: string,
readonly description: string,
readonly slug: string,
readonly avatarUrl: string,
) {}
Comment thread
panteliselef marked this conversation as resolved.

static fromJSON(data: FeatureJSON): Feature {
return new Feature(data.id, data.name, data.description, data.slug, data.avatar_url);
}
Comment thread
panteliselef marked this conversation as resolved.
}
102 changes: 63 additions & 39 deletions packages/backend/src/api/resources/JSON.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -69,6 +69,8 @@ export const ObjectType = {
CommercePaymentAttempt: 'commerce_payment_attempt',
CommerceSubscription: 'commerce_subscription',
CommerceSubscriptionItem: 'commerce_subscription_item',
CommercePlan: 'commerce_plan',
Feature: 'feature',
} as const;

export type ObjectType = (typeof ObjectType)[keyof typeof ObjectType];
Expand DownExpand Up@@ -791,71 +793,65 @@ export interface CommercePayerJSON extends ClerkResourceJSON {
updated_at: number;
}

export interface CommercePayeeJSON {
interface CommercePayeeJSON {
id: string;
gateway_type: string;
gateway_external_id: string;
gateway_status: 'active' | 'pending' | 'restricted' | 'disconnected';
}

export interface CommerceAmountJSON {
interface CommerceFeeJSON {
amount: number;
amount_formatted: string;
currency: string;
currency_symbol: string;
}

export interface CommerceTotalsJSON {
subtotal: CommerceAmountJSON;
tax_total: CommerceAmountJSON;
grand_total: CommerceAmountJSON;
interface CommerceTotalsJSON {
subtotal: CommerceFeeJSON;
tax_total: CommerceFeeJSON;
grand_total: CommerceFeeJSON;
}

export interface CommercePaymentSourceJSON {
id: string;
gateway: string;
gateway_external_id: string;
gateway_external_account_id?: string;
payment_method: string;
status: 'active' | 'disconnected';
card_type?: string;
last4?: string;
}

export interface CommercePaymentFailedReasonJSON {
code: string;
decline_code: string;
}

export interface CommerceSubscriptionCreditJSON {
amount: CommerceAmountJSON;
cycle_days_remaining: number;
cycle_days_total: number;
cycle_remaining_percent: number;
export interface FeatureJSON extends ClerkResourceJSON {
object: typeof ObjectType.Feature;
name: string;
description: string;
slug: string;
avatar_url: string;
}
Comment thread
panteliselef marked this conversation as resolved.

export interface CommercePlanJSON {
/**
* @experimental This is an experimental API for the Billing feature that is available under a public beta, and the API is subject to change.
* It is advised to pin the SDK version to avoid breaking changes.
*/
export interface CommercePlanJSON extends ClerkResourceJSON {
object: typeof ObjectType.CommercePlan;
id: string;
instance_id: string;
product_id: string;
name: string;
slug: string;
description?: string;
is_default: boolean;
is_recurring: boolean;
amount: number;
period: 'month' | 'annual';
interval: number;
has_base_fee: boolean;
currency: string;
annual_monthly_amount: number;
publicly_visible: boolean;
fee: CommerceFeeJSON;
annual_fee: CommerceFeeJSON;
annual_monthly_fee: CommerceFeeJSON;
for_payer_type: 'org' | 'user';
features: FeatureJSON[];
}

export interface CommerceSubscriptionItemJSON extends ClerkResourceJSON {
object: typeof ObjectType.CommerceSubscriptionItem;
status: 'abandoned' | 'active' | 'canceled' | 'ended' | 'expired' | 'incomplete' | 'past_due' | 'upcoming';
credit: CommerceSubscriptionCreditJSON;
credit: {
amount: CommerceFeeJSON;
cycle_days_remaining: number;
cycle_days_total: number;
cycle_remaining_percent: number;
};
proration_date: string;
plan_period: 'month' | 'annual';
period_start: number;
Expand All@@ -865,8 +861,24 @@ export interface CommerceSubscriptionItemJSON extends ClerkResourceJSON {
lifetime_paid: number;
next_payment_amount: number;
next_payment_date: number;
amount: CommerceAmountJSON;
plan: CommercePlanJSON;
amount: CommerceFeeJSON;
plan: {
id: string;
instance_id: string;
product_id: string;
name: string;
slug: string;
description?: string;
is_default: boolean;
is_recurring: boolean;
amount: number;
period: 'month' | 'annual';
interval: number;
has_base_fee: boolean;
currency: string;
annual_monthly_amount: number;
publicly_visible: boolean;
};
plan_id: string;
}

Expand All@@ -881,13 +893,25 @@ export interface CommercePaymentAttemptJSON extends ClerkResourceJSON {
updated_at: number;
paid_at?: number;
failed_at?: number;
failed_reason?: CommercePaymentFailedReasonJSON;
failed_reason?: {
code: string;
decline_code: string;
};
billing_date: number;
charge_type: 'checkout' | 'recurring';
payee: CommercePayeeJSON;
payer: CommercePayerJSON;
totals: CommerceTotalsJSON;
payment_source: CommercePaymentSourceJSON;
payment_source: {
id: string;
gateway: string;
gateway_external_id: string;
gateway_external_account_id?: string;
payment_method: string;
status: 'active' | 'disconnected';
card_type?: string;
last4?: string;
};
subscription_items: CommerceSubscriptionItemJSON[];
}

Expand Down
1 change: 1 addition & 0 deletions packages/backend/src/api/resources/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -57,6 +57,7 @@ export * from './User';
export * from './Verification';
export * from './WaitlistEntry';
export * from './Web3Wallet';
export * from './CommercePlan';

export type {
EmailWebhookEvent,
Expand Down
7 changes: 1 addition & 6 deletions packages/backend/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -101,12 +101,6 @@ export type {
TestingTokenJSON,
WebhooksSvixJSON,
CommercePayerJSON,
CommercePayeeJSON,
CommerceAmountJSON,
CommerceTotalsJSON,
CommercePaymentSourceJSON,
CommercePaymentFailedReasonJSON,
CommerceSubscriptionCreditJSON,
CommercePlanJSON,
CommerceSubscriptionItemJSON,
CommercePaymentAttemptJSON,
Expand DownExpand Up@@ -150,6 +144,7 @@ export type {
Token,
User,
TestingToken,
CommercePlan,
} from './api/resources';

/**
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/early-bats-shout.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/backend': minor
---

Add billing API for fetching available plans.
2 changes: 2 additions & 0 deletions .typedoc/__tests__/__snapshots__/file-structure.test.ts.snap
Original file line numberDiff line numberDiff line change
Expand Up@@ -221,6 +221,8 @@ exports[`Typedoc output > should have a deliberate file structure 1`] = `
"backend/auth-object.mdx",
"backend/authenticate-request-options.mdx",
"backend/client.mdx",
"backend/commerce-plan-json.mdx",
"backend/commerce-plan.mdx",
"backend/email-address.mdx",
"backend/external-account.mdx",
"backend/get-auth-fn.mdx",
Expand Down
26 changes: 26 additions & 0 deletions packages/backend/src/api/endpoints/BillingApi.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
import type { ClerkPaginationRequest } from '@clerk/types';

import { joinPaths } from '../../util/path';
import type { CommercePlan } from '../resources/CommercePlan';
import type { PaginatedResourceResponse } from '../resources/Deserializer';
import { AbstractAPI } from './AbstractApi';

const basePath = '/commerce';

type GetOrganizationListParams = ClerkPaginationRequest<{
payerType: 'org' | 'user';
}>;

export class BillingAPI extends AbstractAPI {
/**
* @experimental This is an experimental API for the Billing feature that is available under a public beta, and the API is subject to change.
* It is advised to pin the SDK version to avoid breaking changes.
*/
public async getPlanList(params?: GetOrganizationListParams) {
return this.request<PaginatedResourceResponse<CommercePlan[]>>({
method: 'GET',
path: joinPaths(basePath, 'plans'),
queryParams: params,
});
}
Comment thread
panteliselef marked this conversation as resolved.
}
6 changes: 6 additions & 0 deletions packages/backend/src/api/factory.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@ import {
WaitlistEntryAPI,
WebhookAPI,
} from './endpoints';
import { BillingAPI } from './endpoints/BillingApi';
import { buildRequest } from './request';

export type CreateBackendApiOptions = Parameters<typeof buildRequest>[0];
Expand All@@ -52,6 +53,11 @@ export function createBackendApiClient(options: CreateBackendApiOptions) {
),
betaFeatures: new BetaFeaturesAPI(request),
blocklistIdentifiers: new BlocklistIdentifierAPI(request),
/**
* @experimental This is an experimental API for the Billing feature that is available under a public beta, and the API is subject to change.
* It is advised to pin the SDK version to avoid breaking changes.
*/
billing: new BillingAPI(request),
clients: new ClientAPI(request),
domains: new DomainAPI(request),
emailAddresses: new EmailAddressAPI(request),
Expand Down
101 changes: 101 additions & 0 deletions packages/backend/src/api/resources/CommercePlan.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,101 @@
import { Feature } from './Feature';
import type { CommercePlanJSON } from './JSON';

type CommerceFee = {
amount: number;
amountFormatted: string;
currency: string;
currencySymbol: string;
};

/**
* @experimental This is an experimental API for the Billing feature that is available under a public beta, and the API is subject to change.
* It is advised to pin the SDK version to avoid breaking changes.
*/
export class CommercePlan {
Comment thread
panteliselef marked this conversation as resolved.
constructor(
/**
* The unique identifier for the plan.
*/
readonly id: string,
/**
* The id of the product the plan belongs to.
*/
readonly productId: string,
/**
* The name of the plan.
*/
readonly name: string,
/**
* The URL-friendly identifier of the plan.
*/
readonly slug: string,
/**
* The description of the plan.
*/
readonly description: string | undefined,
/**
* Whether the plan is the default plan.
*/
readonly isDefault: boolean,
/**
* Whether the plan is recurring.
*/
readonly isRecurring: boolean,
/**
* Whether the plan has a base fee.
*/
readonly hasBaseFee: boolean,
/**
* Whether the plan is displayed in the `<PriceTable/>` component.
*/
readonly publiclyVisible: boolean,
/**
* The monthly fee of the plan.
*/
readonly fee: CommerceFee,
/**
* The annual fee of the plan.
*/
readonly annualFee: CommerceFee,
/**
* The annual fee of the plan on a monthly basis.
*/
readonly annualMonthlyFee: CommerceFee,
/**
* The type of payer for the plan.
*/
readonly forPayerType: 'org' | 'user',
/**
* The features the plan offers.
*/
readonly features: Feature[],
) {}

static fromJSON(data: CommercePlanJSON): CommercePlan {
Comment thread
panteliselef marked this conversation as resolved.
const formatAmountJSON = (fee: CommercePlanJSON['fee']) => {
return {
amount: fee.amount,
amountFormatted: fee.amount_formatted,
currency: fee.currency,
currencySymbol: fee.currency_symbol,
};
};
return new CommercePlan(
data.id,
data.product_id,
data.name,
data.slug,
data.description,
data.is_default,
data.is_recurring,
data.has_base_fee,
data.publicly_visible,
formatAmountJSON(data.fee),
formatAmountJSON(data.annual_fee),
formatAmountJSON(data.annual_monthly_fee),
data.for_payer_type,
data.features.map(feature => Feature.fromJSON(feature)),
);
}
}
6 changes: 6 additions & 0 deletions packages/backend/src/api/resources/Deserializer.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,6 +37,8 @@ import {
User,
} from '.';
import { AccountlessApplication } from './AccountlessApplication';
import { CommercePlan } from './CommercePlan';
import { Feature } from './Feature';
import type { PaginatedResponseJSON } from './JSON';
import { ObjectType } from './JSON';
import { WaitlistEntry } from './WaitlistEntry';
Expand DownExpand Up@@ -179,6 +181,10 @@ function jsonToObject(item: any): any {
return User.fromJSON(item);
case ObjectType.WaitlistEntry:
return WaitlistEntry.fromJSON(item);
case ObjectType.CommercePlan:
return CommercePlan.fromJSON(item);
case ObjectType.Feature:
return Feature.fromJSON(item);
default:
return item;
}
Expand Down
15 changes: 15 additions & 0 deletions packages/backend/src/api/resources/Feature.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
import type { FeatureJSON } from './JSON';

export class Feature {
constructor(
readonly id: string,
readonly name: string,
readonly description: string,
readonly slug: string,
readonly avatarUrl: string,
) {}
Comment thread
panteliselef marked this conversation as resolved.

static fromJSON(data: FeatureJSON): Feature {
return new Feature(data.id, data.name, data.description, data.slug, data.avatar_url);
}
Comment thread
panteliselef marked this conversation as resolved.
}
102 changes: 63 additions & 39 deletions packages/backend/src/api/resources/JSON.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -69,6 +69,8 @@ export const ObjectType = {
CommercePaymentAttempt: 'commerce_payment_attempt',
CommerceSubscription: 'commerce_subscription',
CommerceSubscriptionItem: 'commerce_subscription_item',
CommercePlan: 'commerce_plan',
Feature: 'feature',
} as const;

export type ObjectType = (typeof ObjectType)[keyof typeof ObjectType];
Expand DownExpand Up@@ -791,71 +793,65 @@ export interface CommercePayerJSON extends ClerkResourceJSON {
updated_at: number;
}

export interface CommercePayeeJSON {
interface CommercePayeeJSON {
id: string;
gateway_type: string;
gateway_external_id: string;
gateway_status: 'active' | 'pending' | 'restricted' | 'disconnected';
}

export interface CommerceAmountJSON {
interface CommerceFeeJSON {
amount: number;
amount_formatted: string;
currency: string;
currency_symbol: string;
}

export interface CommerceTotalsJSON {
subtotal: CommerceAmountJSON;
tax_total: CommerceAmountJSON;
grand_total: CommerceAmountJSON;
interface CommerceTotalsJSON {
subtotal: CommerceFeeJSON;
tax_total: CommerceFeeJSON;
grand_total: CommerceFeeJSON;
}

export interface CommercePaymentSourceJSON {
id: string;
gateway: string;
gateway_external_id: string;
gateway_external_account_id?: string;
payment_method: string;
status: 'active' | 'disconnected';
card_type?: string;
last4?: string;
}

export interface CommercePaymentFailedReasonJSON {
code: string;
decline_code: string;
}

export interface CommerceSubscriptionCreditJSON {
amount: CommerceAmountJSON;
cycle_days_remaining: number;
cycle_days_total: number;
cycle_remaining_percent: number;
export interface FeatureJSON extends ClerkResourceJSON {
object: typeof ObjectType.Feature;
name: string;
description: string;
slug: string;
avatar_url: string;
}
Comment thread
panteliselef marked this conversation as resolved.

export interface CommercePlanJSON {
/**
* @experimental This is an experimental API for the Billing feature that is available under a public beta, and the API is subject to change.
* It is advised to pin the SDK version to avoid breaking changes.
*/
export interface CommercePlanJSON extends ClerkResourceJSON {
object: typeof ObjectType.CommercePlan;
id: string;
instance_id: string;
product_id: string;
name: string;
slug: string;
description?: string;
is_default: boolean;
is_recurring: boolean;
amount: number;
period: 'month' | 'annual';
interval: number;
has_base_fee: boolean;
currency: string;
annual_monthly_amount: number;
publicly_visible: boolean;
fee: CommerceFeeJSON;
annual_fee: CommerceFeeJSON;
annual_monthly_fee: CommerceFeeJSON;
for_payer_type: 'org' | 'user';
features: FeatureJSON[];
}

export interface CommerceSubscriptionItemJSON extends ClerkResourceJSON {
object: typeof ObjectType.CommerceSubscriptionItem;
status: 'abandoned' | 'active' | 'canceled' | 'ended' | 'expired' | 'incomplete' | 'past_due' | 'upcoming';
credit: CommerceSubscriptionCreditJSON;
credit: {
amount: CommerceFeeJSON;
cycle_days_remaining: number;
cycle_days_total: number;
cycle_remaining_percent: number;
};
proration_date: string;
plan_period: 'month' | 'annual';
period_start: number;
Expand All@@ -865,8 +861,24 @@ export interface CommerceSubscriptionItemJSON extends ClerkResourceJSON {
lifetime_paid: number;
next_payment_amount: number;
next_payment_date: number;
amount: CommerceAmountJSON;
plan: CommercePlanJSON;
amount: CommerceFeeJSON;
plan: {
id: string;
instance_id: string;
product_id: string;
name: string;
slug: string;
description?: string;
is_default: boolean;
is_recurring: boolean;
amount: number;
period: 'month' | 'annual';
interval: number;
has_base_fee: boolean;
currency: string;
annual_monthly_amount: number;
publicly_visible: boolean;
};
plan_id: string;
}

Expand All@@ -881,13 +893,25 @@ export interface CommercePaymentAttemptJSON extends ClerkResourceJSON {
updated_at: number;
paid_at?: number;
failed_at?: number;
failed_reason?: CommercePaymentFailedReasonJSON;
failed_reason?: {
code: string;
decline_code: string;
};
billing_date: number;
charge_type: 'checkout' | 'recurring';
payee: CommercePayeeJSON;
payer: CommercePayerJSON;
totals: CommerceTotalsJSON;
payment_source: CommercePaymentSourceJSON;
payment_source: {
id: string;
gateway: string;
gateway_external_id: string;
gateway_external_account_id?: string;
payment_method: string;
status: 'active' | 'disconnected';
card_type?: string;
last4?: string;
};
subscription_items: CommerceSubscriptionItemJSON[];
}

Expand Down
1 change: 1 addition & 0 deletions packages/backend/src/api/resources/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -57,6 +57,7 @@ export * from './User';
export * from './Verification';
export * from './WaitlistEntry';
export * from './Web3Wallet';
export * from './CommercePlan';

export type {
EmailWebhookEvent,
Expand Down
7 changes: 1 addition & 6 deletions packages/backend/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -101,12 +101,6 @@ export type {
TestingTokenJSON,
WebhooksSvixJSON,
CommercePayerJSON,
CommercePayeeJSON,
CommerceAmountJSON,
CommerceTotalsJSON,
CommercePaymentSourceJSON,
CommercePaymentFailedReasonJSON,
CommerceSubscriptionCreditJSON,
CommercePlanJSON,
CommerceSubscriptionItemJSON,
CommercePaymentAttemptJSON,
Expand DownExpand Up@@ -150,6 +144,7 @@ export type {
Token,
User,
TestingToken,
CommercePlan,
} from './api/resources';

/**
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/early-bats-shout.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/backend': minor
---

Add billing API for fetching available plans.
2 changes: 2 additions & 0 deletions .typedoc/__tests__/__snapshots__/file-structure.test.ts.snap
Original file line numberDiff line numberDiff line change
Expand Up@@ -221,6 +221,8 @@ exports[`Typedoc output > should have a deliberate file structure 1`] = `
"backend/auth-object.mdx",
"backend/authenticate-request-options.mdx",
"backend/client.mdx",
"backend/commerce-plan-json.mdx",
"backend/commerce-plan.mdx",
"backend/email-address.mdx",
"backend/external-account.mdx",
"backend/get-auth-fn.mdx",
Expand Down
26 changes: 26 additions & 0 deletions packages/backend/src/api/endpoints/BillingApi.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
import type { ClerkPaginationRequest } from '@clerk/types';

import { joinPaths } from '../../util/path';
import type { CommercePlan } from '../resources/CommercePlan';
import type { PaginatedResourceResponse } from '../resources/Deserializer';
import { AbstractAPI } from './AbstractApi';

const basePath = '/commerce';

type GetOrganizationListParams = ClerkPaginationRequest<{
payerType: 'org' | 'user';
}>;

export class BillingAPI extends AbstractAPI {
/**
* @experimental This is an experimental API for the Billing feature that is available under a public beta, and the API is subject to change.
* It is advised to pin the SDK version to avoid breaking changes.
*/
public async getPlanList(params?: GetOrganizationListParams) {
return this.request<PaginatedResourceResponse<CommercePlan[]>>({
method: 'GET',
path: joinPaths(basePath, 'plans'),
queryParams: params,
});
}
Comment thread
panteliselef marked this conversation as resolved.
}
6 changes: 6 additions & 0 deletions packages/backend/src/api/factory.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@ import {
WaitlistEntryAPI,
WebhookAPI,
} from './endpoints';
import { BillingAPI } from './endpoints/BillingApi';
import { buildRequest } from './request';

export type CreateBackendApiOptions = Parameters<typeof buildRequest>[0];
Expand All@@ -52,6 +53,11 @@ export function createBackendApiClient(options: CreateBackendApiOptions) {
),
betaFeatures: new BetaFeaturesAPI(request),
blocklistIdentifiers: new BlocklistIdentifierAPI(request),
/**
* @experimental This is an experimental API for the Billing feature that is available under a public beta, and the API is subject to change.
* It is advised to pin the SDK version to avoid breaking changes.
*/
billing: new BillingAPI(request),
clients: new ClientAPI(request),
domains: new DomainAPI(request),
emailAddresses: new EmailAddressAPI(request),
Expand Down
101 changes: 101 additions & 0 deletions packages/backend/src/api/resources/CommercePlan.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,101 @@
import { Feature } from './Feature';
import type { CommercePlanJSON } from './JSON';

type CommerceFee = {
amount: number;
amountFormatted: string;
currency: string;
currencySymbol: string;
};

/**
* @experimental This is an experimental API for the Billing feature that is available under a public beta, and the API is subject to change.
* It is advised to pin the SDK version to avoid breaking changes.
*/
export class CommercePlan {
Comment thread
panteliselef marked this conversation as resolved.
constructor(
/**
* The unique identifier for the plan.
*/
readonly id: string,
/**
* The id of the product the plan belongs to.
*/
readonly productId: string,
/**
* The name of the plan.
*/
readonly name: string,
/**
* The URL-friendly identifier of the plan.
*/
readonly slug: string,
/**
* The description of the plan.
*/
readonly description: string | undefined,
/**
* Whether the plan is the default plan.
*/
readonly isDefault: boolean,
/**
* Whether the plan is recurring.
*/
readonly isRecurring: boolean,
/**
* Whether the plan has a base fee.
*/
readonly hasBaseFee: boolean,
/**
* Whether the plan is displayed in the `<PriceTable/>` component.
*/
readonly publiclyVisible: boolean,
/**
* The monthly fee of the plan.
*/
readonly fee: CommerceFee,
/**
* The annual fee of the plan.
*/
readonly annualFee: CommerceFee,
/**
* The annual fee of the plan on a monthly basis.
*/
readonly annualMonthlyFee: CommerceFee,
/**
* The type of payer for the plan.
*/
readonly forPayerType: 'org' | 'user',
/**
* The features the plan offers.
*/
readonly features: Feature[],
) {}

static fromJSON(data: CommercePlanJSON): CommercePlan {
Comment thread
panteliselef marked this conversation as resolved.
const formatAmountJSON = (fee: CommercePlanJSON['fee']) => {
return {
amount: fee.amount,
amountFormatted: fee.amount_formatted,
currency: fee.currency,
currencySymbol: fee.currency_symbol,
};
};
return new CommercePlan(
data.id,
data.product_id,
data.name,
data.slug,
data.description,
data.is_default,
data.is_recurring,
data.has_base_fee,
data.publicly_visible,
formatAmountJSON(data.fee),
formatAmountJSON(data.annual_fee),
formatAmountJSON(data.annual_monthly_fee),
data.for_payer_type,
data.features.map(feature => Feature.fromJSON(feature)),
);
}
}
6 changes: 6 additions & 0 deletions packages/backend/src/api/resources/Deserializer.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,6 +37,8 @@ import {
User,
} from '.';
import { AccountlessApplication } from './AccountlessApplication';
import { CommercePlan } from './CommercePlan';
import { Feature } from './Feature';
import type { PaginatedResponseJSON } from './JSON';
import { ObjectType } from './JSON';
import { WaitlistEntry } from './WaitlistEntry';
Expand DownExpand Up@@ -179,6 +181,10 @@ function jsonToObject(item: any): any {
return User.fromJSON(item);
case ObjectType.WaitlistEntry:
return WaitlistEntry.fromJSON(item);
case ObjectType.CommercePlan:
return CommercePlan.fromJSON(item);
case ObjectType.Feature:
return Feature.fromJSON(item);
default:
return item;
}
Expand Down
15 changes: 15 additions & 0 deletions packages/backend/src/api/resources/Feature.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
import type { FeatureJSON } from './JSON';

export class Feature {
constructor(
readonly id: string,
readonly name: string,
readonly description: string,
readonly slug: string,
readonly avatarUrl: string,
) {}
Comment thread
panteliselef marked this conversation as resolved.

static fromJSON(data: FeatureJSON): Feature {
return new Feature(data.id, data.name, data.description, data.slug, data.avatar_url);
}
Comment thread
panteliselef marked this conversation as resolved.
}
102 changes: 63 additions & 39 deletions packages/backend/src/api/resources/JSON.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -69,6 +69,8 @@ export const ObjectType = {
CommercePaymentAttempt: 'commerce_payment_attempt',
CommerceSubscription: 'commerce_subscription',
CommerceSubscriptionItem: 'commerce_subscription_item',
CommercePlan: 'commerce_plan',
Feature: 'feature',
} as const;

export type ObjectType = (typeof ObjectType)[keyof typeof ObjectType];
Expand DownExpand Up@@ -791,71 +793,65 @@ export interface CommercePayerJSON extends ClerkResourceJSON {
updated_at: number;
}

export interface CommercePayeeJSON {
interface CommercePayeeJSON {
id: string;
gateway_type: string;
gateway_external_id: string;
gateway_status: 'active' | 'pending' | 'restricted' | 'disconnected';
}

export interface CommerceAmountJSON {
interface CommerceFeeJSON {
amount: number;
amount_formatted: string;
currency: string;
currency_symbol: string;
}

export interface CommerceTotalsJSON {
subtotal: CommerceAmountJSON;
tax_total: CommerceAmountJSON;
grand_total: CommerceAmountJSON;
interface CommerceTotalsJSON {
subtotal: CommerceFeeJSON;
tax_total: CommerceFeeJSON;
grand_total: CommerceFeeJSON;
}

export interface CommercePaymentSourceJSON {
id: string;
gateway: string;
gateway_external_id: string;
gateway_external_account_id?: string;
payment_method: string;
status: 'active' | 'disconnected';
card_type?: string;
last4?: string;
}

export interface CommercePaymentFailedReasonJSON {
code: string;
decline_code: string;
}

export interface CommerceSubscriptionCreditJSON {
amount: CommerceAmountJSON;
cycle_days_remaining: number;
cycle_days_total: number;
cycle_remaining_percent: number;
export interface FeatureJSON extends ClerkResourceJSON {
object: typeof ObjectType.Feature;
name: string;
description: string;
slug: string;
avatar_url: string;
}
Comment thread
panteliselef marked this conversation as resolved.

export interface CommercePlanJSON {
/**
* @experimental This is an experimental API for the Billing feature that is available under a public beta, and the API is subject to change.
* It is advised to pin the SDK version to avoid breaking changes.
*/
export interface CommercePlanJSON extends ClerkResourceJSON {
object: typeof ObjectType.CommercePlan;
id: string;
instance_id: string;
product_id: string;
name: string;
slug: string;
description?: string;
is_default: boolean;
is_recurring: boolean;
amount: number;
period: 'month' | 'annual';
interval: number;
has_base_fee: boolean;
currency: string;
annual_monthly_amount: number;
publicly_visible: boolean;
fee: CommerceFeeJSON;
annual_fee: CommerceFeeJSON;
annual_monthly_fee: CommerceFeeJSON;
for_payer_type: 'org' | 'user';
features: FeatureJSON[];
}

export interface CommerceSubscriptionItemJSON extends ClerkResourceJSON {
object: typeof ObjectType.CommerceSubscriptionItem;
status: 'abandoned' | 'active' | 'canceled' | 'ended' | 'expired' | 'incomplete' | 'past_due' | 'upcoming';
credit: CommerceSubscriptionCreditJSON;
credit: {
amount: CommerceFeeJSON;
cycle_days_remaining: number;
cycle_days_total: number;
cycle_remaining_percent: number;
};
proration_date: string;
plan_period: 'month' | 'annual';
period_start: number;
Expand All@@ -865,8 +861,24 @@ export interface CommerceSubscriptionItemJSON extends ClerkResourceJSON {
lifetime_paid: number;
next_payment_amount: number;
next_payment_date: number;
amount: CommerceAmountJSON;
plan: CommercePlanJSON;
amount: CommerceFeeJSON;
plan: {
id: string;
instance_id: string;
product_id: string;
name: string;
slug: string;
description?: string;
is_default: boolean;
is_recurring: boolean;
amount: number;
period: 'month' | 'annual';
interval: number;
has_base_fee: boolean;
currency: string;
annual_monthly_amount: number;
publicly_visible: boolean;
};
plan_id: string;
}

Expand All@@ -881,13 +893,25 @@ export interface CommercePaymentAttemptJSON extends ClerkResourceJSON {
updated_at: number;
paid_at?: number;
failed_at?: number;
failed_reason?: CommercePaymentFailedReasonJSON;
failed_reason?: {
code: string;
decline_code: string;
};
billing_date: number;
charge_type: 'checkout' | 'recurring';
payee: CommercePayeeJSON;
payer: CommercePayerJSON;
totals: CommerceTotalsJSON;
payment_source: CommercePaymentSourceJSON;
payment_source: {
id: string;
gateway: string;
gateway_external_id: string;
gateway_external_account_id?: string;
payment_method: string;
status: 'active' | 'disconnected';
card_type?: string;
last4?: string;
};
subscription_items: CommerceSubscriptionItemJSON[];
}

Expand Down
1 change: 1 addition & 0 deletions packages/backend/src/api/resources/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -57,6 +57,7 @@ export * from './User';
export * from './Verification';
export * from './WaitlistEntry';
export * from './Web3Wallet';
export * from './CommercePlan';

export type {
EmailWebhookEvent,
Expand Down
7 changes: 1 addition & 6 deletions packages/backend/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -101,12 +101,6 @@ export type {
TestingTokenJSON,
WebhooksSvixJSON,
CommercePayerJSON,
CommercePayeeJSON,
CommerceAmountJSON,
CommerceTotalsJSON,
CommercePaymentSourceJSON,
CommercePaymentFailedReasonJSON,
CommerceSubscriptionCreditJSON,
CommercePlanJSON,
CommerceSubscriptionItemJSON,
CommercePaymentAttemptJSON,
Expand DownExpand Up@@ -150,6 +144,7 @@ export type {
Token,
User,
TestingToken,
CommercePlan,
} from './api/resources';

/**
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/early-bats-shout.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/backend': minor
---

Add billing API for fetching available plans.
2 changes: 2 additions & 0 deletions .typedoc/__tests__/__snapshots__/file-structure.test.ts.snap
Original file line numberDiff line numberDiff line change
Expand Up@@ -221,6 +221,8 @@ exports[`Typedoc output > should have a deliberate file structure 1`] = `
"backend/auth-object.mdx",
"backend/authenticate-request-options.mdx",
"backend/client.mdx",
"backend/commerce-plan-json.mdx",
"backend/commerce-plan.mdx",
"backend/email-address.mdx",
"backend/external-account.mdx",
"backend/get-auth-fn.mdx",
Expand Down
26 changes: 26 additions & 0 deletions packages/backend/src/api/endpoints/BillingApi.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
import type { ClerkPaginationRequest } from '@clerk/types';

import { joinPaths } from '../../util/path';
import type { CommercePlan } from '../resources/CommercePlan';
import type { PaginatedResourceResponse } from '../resources/Deserializer';
import { AbstractAPI } from './AbstractApi';

const basePath = '/commerce';

type GetOrganizationListParams = ClerkPaginationRequest<{
payerType: 'org' | 'user';
}>;

export class BillingAPI extends AbstractAPI {
/**
* @experimental This is an experimental API for the Billing feature that is available under a public beta, and the API is subject to change.
* It is advised to pin the SDK version to avoid breaking changes.
*/
public async getPlanList(params?: GetOrganizationListParams) {
return this.request<PaginatedResourceResponse<CommercePlan[]>>({
method: 'GET',
path: joinPaths(basePath, 'plans'),
queryParams: params,
});
}
Comment thread
panteliselef marked this conversation as resolved.
}
6 changes: 6 additions & 0 deletions packages/backend/src/api/factory.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@ import {
WaitlistEntryAPI,
WebhookAPI,
} from './endpoints';
import { BillingAPI } from './endpoints/BillingApi';
import { buildRequest } from './request';

export type CreateBackendApiOptions = Parameters<typeof buildRequest>[0];
Expand All@@ -52,6 +53,11 @@ export function createBackendApiClient(options: CreateBackendApiOptions) {
),
betaFeatures: new BetaFeaturesAPI(request),
blocklistIdentifiers: new BlocklistIdentifierAPI(request),
/**
* @experimental This is an experimental API for the Billing feature that is available under a public beta, and the API is subject to change.
* It is advised to pin the SDK version to avoid breaking changes.
*/
billing: new BillingAPI(request),
clients: new ClientAPI(request),
domains: new DomainAPI(request),
emailAddresses: new EmailAddressAPI(request),
Expand Down
101 changes: 101 additions & 0 deletions packages/backend/src/api/resources/CommercePlan.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,101 @@
import { Feature } from './Feature';
import type { CommercePlanJSON } from './JSON';

type CommerceFee = {
amount: number;
amountFormatted: string;
currency: string;
currencySymbol: string;
};

/**
* @experimental This is an experimental API for the Billing feature that is available under a public beta, and the API is subject to change.
* It is advised to pin the SDK version to avoid breaking changes.
*/
export class CommercePlan {
Comment thread
panteliselef marked this conversation as resolved.
constructor(
/**
* The unique identifier for the plan.
*/
readonly id: string,
/**
* The id of the product the plan belongs to.
*/
readonly productId: string,
/**
* The name of the plan.
*/
readonly name: string,
/**
* The URL-friendly identifier of the plan.
*/
readonly slug: string,
/**
* The description of the plan.
*/
readonly description: string | undefined,
/**
* Whether the plan is the default plan.
*/
readonly isDefault: boolean,
/**
* Whether the plan is recurring.
*/
readonly isRecurring: boolean,
/**
* Whether the plan has a base fee.
*/
readonly hasBaseFee: boolean,
/**
* Whether the plan is displayed in the `<PriceTable/>` component.
*/
readonly publiclyVisible: boolean,
/**
* The monthly fee of the plan.
*/
readonly fee: CommerceFee,
/**
* The annual fee of the plan.
*/
readonly annualFee: CommerceFee,
/**
* The annual fee of the plan on a monthly basis.
*/
readonly annualMonthlyFee: CommerceFee,
/**
* The type of payer for the plan.
*/
readonly forPayerType: 'org' | 'user',
/**
* The features the plan offers.
*/
readonly features: Feature[],
) {}

static fromJSON(data: CommercePlanJSON): CommercePlan {
Comment thread
panteliselef marked this conversation as resolved.
const formatAmountJSON = (fee: CommercePlanJSON['fee']) => {
return {
amount: fee.amount,
amountFormatted: fee.amount_formatted,
currency: fee.currency,
currencySymbol: fee.currency_symbol,
};
};
return new CommercePlan(
data.id,
data.product_id,
data.name,
data.slug,
data.description,
data.is_default,
data.is_recurring,
data.has_base_fee,
data.publicly_visible,
formatAmountJSON(data.fee),
formatAmountJSON(data.annual_fee),
formatAmountJSON(data.annual_monthly_fee),
data.for_payer_type,
data.features.map(feature => Feature.fromJSON(feature)),
);
}
}
6 changes: 6 additions & 0 deletions packages/backend/src/api/resources/Deserializer.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,6 +37,8 @@ import {
User,
} from '.';
import { AccountlessApplication } from './AccountlessApplication';
import { CommercePlan } from './CommercePlan';
import { Feature } from './Feature';
import type { PaginatedResponseJSON } from './JSON';
import { ObjectType } from './JSON';
import { WaitlistEntry } from './WaitlistEntry';
Expand DownExpand Up@@ -179,6 +181,10 @@ function jsonToObject(item: any): any {
return User.fromJSON(item);
case ObjectType.WaitlistEntry:
return WaitlistEntry.fromJSON(item);
case ObjectType.CommercePlan:
return CommercePlan.fromJSON(item);
case ObjectType.Feature:
return Feature.fromJSON(item);
default:
return item;
}
Expand Down
15 changes: 15 additions & 0 deletions packages/backend/src/api/resources/Feature.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
import type { FeatureJSON } from './JSON';

export class Feature {
constructor(
readonly id: string,
readonly name: string,
readonly description: string,
readonly slug: string,
readonly avatarUrl: string,
) {}
Comment thread
panteliselef marked this conversation as resolved.

static fromJSON(data: FeatureJSON): Feature {
return new Feature(data.id, data.name, data.description, data.slug, data.avatar_url);
}
Comment thread
panteliselef marked this conversation as resolved.
}
102 changes: 63 additions & 39 deletions packages/backend/src/api/resources/JSON.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -69,6 +69,8 @@ export const ObjectType = {
CommercePaymentAttempt: 'commerce_payment_attempt',
CommerceSubscription: 'commerce_subscription',
CommerceSubscriptionItem: 'commerce_subscription_item',
CommercePlan: 'commerce_plan',
Feature: 'feature',
} as const;

export type ObjectType = (typeof ObjectType)[keyof typeof ObjectType];
Expand DownExpand Up@@ -791,71 +793,65 @@ export interface CommercePayerJSON extends ClerkResourceJSON {
updated_at: number;
}

export interface CommercePayeeJSON {
interface CommercePayeeJSON {
id: string;
gateway_type: string;
gateway_external_id: string;
gateway_status: 'active' | 'pending' | 'restricted' | 'disconnected';
}

export interface CommerceAmountJSON {
interface CommerceFeeJSON {
amount: number;
amount_formatted: string;
currency: string;
currency_symbol: string;
}

export interface CommerceTotalsJSON {
subtotal: CommerceAmountJSON;
tax_total: CommerceAmountJSON;
grand_total: CommerceAmountJSON;
interface CommerceTotalsJSON {
subtotal: CommerceFeeJSON;
tax_total: CommerceFeeJSON;
grand_total: CommerceFeeJSON;
}

export interface CommercePaymentSourceJSON {
id: string;
gateway: string;
gateway_external_id: string;
gateway_external_account_id?: string;
payment_method: string;
status: 'active' | 'disconnected';
card_type?: string;
last4?: string;
}

export interface CommercePaymentFailedReasonJSON {
code: string;
decline_code: string;
}

export interface CommerceSubscriptionCreditJSON {
amount: CommerceAmountJSON;
cycle_days_remaining: number;
cycle_days_total: number;
cycle_remaining_percent: number;
export interface FeatureJSON extends ClerkResourceJSON {
object: typeof ObjectType.Feature;
name: string;
description: string;
slug: string;
avatar_url: string;
}
Comment thread
panteliselef marked this conversation as resolved.

export interface CommercePlanJSON {
/**
* @experimental This is an experimental API for the Billing feature that is available under a public beta, and the API is subject to change.
* It is advised to pin the SDK version to avoid breaking changes.
*/
export interface CommercePlanJSON extends ClerkResourceJSON {
object: typeof ObjectType.CommercePlan;
id: string;
instance_id: string;
product_id: string;
name: string;
slug: string;
description?: string;
is_default: boolean;
is_recurring: boolean;
amount: number;
period: 'month' | 'annual';
interval: number;
has_base_fee: boolean;
currency: string;
annual_monthly_amount: number;
publicly_visible: boolean;
fee: CommerceFeeJSON;
annual_fee: CommerceFeeJSON;
annual_monthly_fee: CommerceFeeJSON;
for_payer_type: 'org' | 'user';
features: FeatureJSON[];
}

export interface CommerceSubscriptionItemJSON extends ClerkResourceJSON {
object: typeof ObjectType.CommerceSubscriptionItem;
status: 'abandoned' | 'active' | 'canceled' | 'ended' | 'expired' | 'incomplete' | 'past_due' | 'upcoming';
credit: CommerceSubscriptionCreditJSON;
credit: {
amount: CommerceFeeJSON;
cycle_days_remaining: number;
cycle_days_total: number;
cycle_remaining_percent: number;
};
proration_date: string;
plan_period: 'month' | 'annual';
period_start: number;
Expand All@@ -865,8 +861,24 @@ export interface CommerceSubscriptionItemJSON extends ClerkResourceJSON {
lifetime_paid: number;
next_payment_amount: number;
next_payment_date: number;
amount: CommerceAmountJSON;
plan: CommercePlanJSON;
amount: CommerceFeeJSON;
plan: {
id: string;
instance_id: string;
product_id: string;
name: string;
slug: string;
description?: string;
is_default: boolean;
is_recurring: boolean;
amount: number;
period: 'month' | 'annual';
interval: number;
has_base_fee: boolean;
currency: string;
annual_monthly_amount: number;
publicly_visible: boolean;
};
plan_id: string;
}

Expand All@@ -881,13 +893,25 @@ export interface CommercePaymentAttemptJSON extends ClerkResourceJSON {
updated_at: number;
paid_at?: number;
failed_at?: number;
failed_reason?: CommercePaymentFailedReasonJSON;
failed_reason?: {
code: string;
decline_code: string;
};
billing_date: number;
charge_type: 'checkout' | 'recurring';
payee: CommercePayeeJSON;
payer: CommercePayerJSON;
totals: CommerceTotalsJSON;
payment_source: CommercePaymentSourceJSON;
payment_source: {
id: string;
gateway: string;
gateway_external_id: string;
gateway_external_account_id?: string;
payment_method: string;
status: 'active' | 'disconnected';
card_type?: string;
last4?: string;
};
subscription_items: CommerceSubscriptionItemJSON[];
}

Expand Down
1 change: 1 addition & 0 deletions packages/backend/src/api/resources/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -57,6 +57,7 @@ export * from './User';
export * from './Verification';
export * from './WaitlistEntry';
export * from './Web3Wallet';
export * from './CommercePlan';

export type {
EmailWebhookEvent,
Expand Down
7 changes: 1 addition & 6 deletions packages/backend/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -101,12 +101,6 @@ export type {
TestingTokenJSON,
WebhooksSvixJSON,
CommercePayerJSON,
CommercePayeeJSON,
CommerceAmountJSON,
CommerceTotalsJSON,
CommercePaymentSourceJSON,
CommercePaymentFailedReasonJSON,
CommerceSubscriptionCreditJSON,
CommercePlanJSON,
CommerceSubscriptionItemJSON,
CommercePaymentAttemptJSON,
Expand DownExpand Up@@ -150,6 +144,7 @@ export type {
Token,
User,
TestingToken,
CommercePlan,
} from './api/resources';

/**
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/early-bats-shout.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/backend': minor
---

Add billing API for fetching available plans.
2 changes: 2 additions & 0 deletions .typedoc/__tests__/__snapshots__/file-structure.test.ts.snap
Original file line numberDiff line numberDiff line change
Expand Up@@ -221,6 +221,8 @@ exports[`Typedoc output > should have a deliberate file structure 1`] = `
"backend/auth-object.mdx",
"backend/authenticate-request-options.mdx",
"backend/client.mdx",
"backend/commerce-plan-json.mdx",
"backend/commerce-plan.mdx",
"backend/email-address.mdx",
"backend/external-account.mdx",
"backend/get-auth-fn.mdx",
Expand Down
26 changes: 26 additions & 0 deletions packages/backend/src/api/endpoints/BillingApi.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
import type { ClerkPaginationRequest } from '@clerk/types';

import { joinPaths } from '../../util/path';
import type { CommercePlan } from '../resources/CommercePlan';
import type { PaginatedResourceResponse } from '../resources/Deserializer';
import { AbstractAPI } from './AbstractApi';

const basePath = '/commerce';

type GetOrganizationListParams = ClerkPaginationRequest<{
payerType: 'org' | 'user';
}>;

export class BillingAPI extends AbstractAPI {
/**
* @experimental This is an experimental API for the Billing feature that is available under a public beta, and the API is subject to change.
* It is advised to pin the SDK version to avoid breaking changes.
*/
public async getPlanList(params?: GetOrganizationListParams) {
return this.request<PaginatedResourceResponse<CommercePlan[]>>({
method: 'GET',
path: joinPaths(basePath, 'plans'),
queryParams: params,
});
}
Comment thread
panteliselef marked this conversation as resolved.
}
6 changes: 6 additions & 0 deletions packages/backend/src/api/factory.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@ import {
WaitlistEntryAPI,
WebhookAPI,
} from './endpoints';
import { BillingAPI } from './endpoints/BillingApi';
import { buildRequest } from './request';

export type CreateBackendApiOptions = Parameters<typeof buildRequest>[0];
Expand All@@ -52,6 +53,11 @@ export function createBackendApiClient(options: CreateBackendApiOptions) {
),
betaFeatures: new BetaFeaturesAPI(request),
blocklistIdentifiers: new BlocklistIdentifierAPI(request),
/**
* @experimental This is an experimental API for the Billing feature that is available under a public beta, and the API is subject to change.
* It is advised to pin the SDK version to avoid breaking changes.
*/
billing: new BillingAPI(request),
clients: new ClientAPI(request),
domains: new DomainAPI(request),
emailAddresses: new EmailAddressAPI(request),
Expand Down
101 changes: 101 additions & 0 deletions packages/backend/src/api/resources/CommercePlan.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,101 @@
import { Feature } from './Feature';
import type { CommercePlanJSON } from './JSON';

type CommerceFee = {
amount: number;
amountFormatted: string;
currency: string;
currencySymbol: string;
};

/**
* @experimental This is an experimental API for the Billing feature that is available under a public beta, and the API is subject to change.
* It is advised to pin the SDK version to avoid breaking changes.
*/
export class CommercePlan {
Comment thread
panteliselef marked this conversation as resolved.
constructor(
/**
* The unique identifier for the plan.
*/
readonly id: string,
/**
* The id of the product the plan belongs to.
*/
readonly productId: string,
/**
* The name of the plan.
*/
readonly name: string,
/**
* The URL-friendly identifier of the plan.
*/
readonly slug: string,
/**
* The description of the plan.
*/
readonly description: string | undefined,
/**
* Whether the plan is the default plan.
*/
readonly isDefault: boolean,
/**
* Whether the plan is recurring.
*/
readonly isRecurring: boolean,
/**
* Whether the plan has a base fee.
*/
readonly hasBaseFee: boolean,
/**
* Whether the plan is displayed in the `<PriceTable/>` component.
*/
readonly publiclyVisible: boolean,
/**
* The monthly fee of the plan.
*/
readonly fee: CommerceFee,
/**
* The annual fee of the plan.
*/
readonly annualFee: CommerceFee,
/**
* The annual fee of the plan on a monthly basis.
*/
readonly annualMonthlyFee: CommerceFee,
/**
* The type of payer for the plan.
*/
readonly forPayerType: 'org' | 'user',
/**
* The features the plan offers.
*/
readonly features: Feature[],
) {}

static fromJSON(data: CommercePlanJSON): CommercePlan {
Comment thread
panteliselef marked this conversation as resolved.
const formatAmountJSON = (fee: CommercePlanJSON['fee']) => {
return {
amount: fee.amount,
amountFormatted: fee.amount_formatted,
currency: fee.currency,
currencySymbol: fee.currency_symbol,
};
};
return new CommercePlan(
data.id,
data.product_id,
data.name,
data.slug,
data.description,
data.is_default,
data.is_recurring,
data.has_base_fee,
data.publicly_visible,
formatAmountJSON(data.fee),
formatAmountJSON(data.annual_fee),
formatAmountJSON(data.annual_monthly_fee),
data.for_payer_type,
data.features.map(feature => Feature.fromJSON(feature)),
);
}
}
6 changes: 6 additions & 0 deletions packages/backend/src/api/resources/Deserializer.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,6 +37,8 @@ import {
User,
} from '.';
import { AccountlessApplication } from './AccountlessApplication';
import { CommercePlan } from './CommercePlan';
import { Feature } from './Feature';
import type { PaginatedResponseJSON } from './JSON';
import { ObjectType } from './JSON';
import { WaitlistEntry } from './WaitlistEntry';
Expand DownExpand Up@@ -179,6 +181,10 @@ function jsonToObject(item: any): any {
return User.fromJSON(item);
case ObjectType.WaitlistEntry:
return WaitlistEntry.fromJSON(item);
case ObjectType.CommercePlan:
return CommercePlan.fromJSON(item);
case ObjectType.Feature:
return Feature.fromJSON(item);
default:
return item;
}
Expand Down
15 changes: 15 additions & 0 deletions packages/backend/src/api/resources/Feature.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
import type { FeatureJSON } from './JSON';

export class Feature {
constructor(
readonly id: string,
readonly name: string,
readonly description: string,
readonly slug: string,
readonly avatarUrl: string,
) {}
Comment thread
panteliselef marked this conversation as resolved.

static fromJSON(data: FeatureJSON): Feature {
return new Feature(data.id, data.name, data.description, data.slug, data.avatar_url);
}
Comment thread
panteliselef marked this conversation as resolved.
}
102 changes: 63 additions & 39 deletions packages/backend/src/api/resources/JSON.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -69,6 +69,8 @@ export const ObjectType = {
CommercePaymentAttempt: 'commerce_payment_attempt',
CommerceSubscription: 'commerce_subscription',
CommerceSubscriptionItem: 'commerce_subscription_item',
CommercePlan: 'commerce_plan',
Feature: 'feature',
} as const;

export type ObjectType = (typeof ObjectType)[keyof typeof ObjectType];
Expand DownExpand Up@@ -791,71 +793,65 @@ export interface CommercePayerJSON extends ClerkResourceJSON {
updated_at: number;
}

export interface CommercePayeeJSON {
interface CommercePayeeJSON {
id: string;
gateway_type: string;
gateway_external_id: string;
gateway_status: 'active' | 'pending' | 'restricted' | 'disconnected';
}

export interface CommerceAmountJSON {
interface CommerceFeeJSON {
amount: number;
amount_formatted: string;
currency: string;
currency_symbol: string;
}

export interface CommerceTotalsJSON {
subtotal: CommerceAmountJSON;
tax_total: CommerceAmountJSON;
grand_total: CommerceAmountJSON;
interface CommerceTotalsJSON {
subtotal: CommerceFeeJSON;
tax_total: CommerceFeeJSON;
grand_total: CommerceFeeJSON;
}

export interface CommercePaymentSourceJSON {
id: string;
gateway: string;
gateway_external_id: string;
gateway_external_account_id?: string;
payment_method: string;
status: 'active' | 'disconnected';
card_type?: string;
last4?: string;
}

export interface CommercePaymentFailedReasonJSON {
code: string;
decline_code: string;
}

export interface CommerceSubscriptionCreditJSON {
amount: CommerceAmountJSON;
cycle_days_remaining: number;
cycle_days_total: number;
cycle_remaining_percent: number;
export interface FeatureJSON extends ClerkResourceJSON {
object: typeof ObjectType.Feature;
name: string;
description: string;
slug: string;
avatar_url: string;
}
Comment thread
panteliselef marked this conversation as resolved.

export interface CommercePlanJSON {
/**
* @experimental This is an experimental API for the Billing feature that is available under a public beta, and the API is subject to change.
* It is advised to pin the SDK version to avoid breaking changes.
*/
export interface CommercePlanJSON extends ClerkResourceJSON {
object: typeof ObjectType.CommercePlan;
id: string;
instance_id: string;
product_id: string;
name: string;
slug: string;
description?: string;
is_default: boolean;
is_recurring: boolean;
amount: number;
period: 'month' | 'annual';
interval: number;
has_base_fee: boolean;
currency: string;
annual_monthly_amount: number;
publicly_visible: boolean;
fee: CommerceFeeJSON;
annual_fee: CommerceFeeJSON;
annual_monthly_fee: CommerceFeeJSON;
for_payer_type: 'org' | 'user';
features: FeatureJSON[];
}

export interface CommerceSubscriptionItemJSON extends ClerkResourceJSON {
object: typeof ObjectType.CommerceSubscriptionItem;
status: 'abandoned' | 'active' | 'canceled' | 'ended' | 'expired' | 'incomplete' | 'past_due' | 'upcoming';
credit: CommerceSubscriptionCreditJSON;
credit: {
amount: CommerceFeeJSON;
cycle_days_remaining: number;
cycle_days_total: number;
cycle_remaining_percent: number;
};
proration_date: string;
plan_period: 'month' | 'annual';
period_start: number;
Expand All@@ -865,8 +861,24 @@ export interface CommerceSubscriptionItemJSON extends ClerkResourceJSON {
lifetime_paid: number;
next_payment_amount: number;
next_payment_date: number;
amount: CommerceAmountJSON;
plan: CommercePlanJSON;
amount: CommerceFeeJSON;
plan: {
id: string;
instance_id: string;
product_id: string;
name: string;
slug: string;
description?: string;
is_default: boolean;
is_recurring: boolean;
amount: number;
period: 'month' | 'annual';
interval: number;
has_base_fee: boolean;
currency: string;
annual_monthly_amount: number;
publicly_visible: boolean;
};
plan_id: string;
}

Expand All@@ -881,13 +893,25 @@ export interface CommercePaymentAttemptJSON extends ClerkResourceJSON {
updated_at: number;
paid_at?: number;
failed_at?: number;
failed_reason?: CommercePaymentFailedReasonJSON;
failed_reason?: {
code: string;
decline_code: string;
};
billing_date: number;
charge_type: 'checkout' | 'recurring';
payee: CommercePayeeJSON;
payer: CommercePayerJSON;
totals: CommerceTotalsJSON;
payment_source: CommercePaymentSourceJSON;
payment_source: {
id: string;
gateway: string;
gateway_external_id: string;
gateway_external_account_id?: string;
payment_method: string;
status: 'active' | 'disconnected';
card_type?: string;
last4?: string;
};
subscription_items: CommerceSubscriptionItemJSON[];
}

Expand Down
1 change: 1 addition & 0 deletions packages/backend/src/api/resources/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -57,6 +57,7 @@ export * from './User';
export * from './Verification';
export * from './WaitlistEntry';
export * from './Web3Wallet';
export * from './CommercePlan';

export type {
EmailWebhookEvent,
Expand Down
7 changes: 1 addition & 6 deletions packages/backend/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -101,12 +101,6 @@ export type {
TestingTokenJSON,
WebhooksSvixJSON,
CommercePayerJSON,
CommercePayeeJSON,
CommerceAmountJSON,
CommerceTotalsJSON,
CommercePaymentSourceJSON,
CommercePaymentFailedReasonJSON,
CommerceSubscriptionCreditJSON,
CommercePlanJSON,
CommerceSubscriptionItemJSON,
CommercePaymentAttemptJSON,
Expand DownExpand Up@@ -150,6 +144,7 @@ export type {
Token,
User,
TestingToken,
CommercePlan,
} from './api/resources';

/**
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/early-bats-shout.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/backend': minor
---

Add billing API for fetching available plans.
2 changes: 2 additions & 0 deletions .typedoc/__tests__/__snapshots__/file-structure.test.ts.snap
Original file line numberDiff line numberDiff line change
Expand Up@@ -221,6 +221,8 @@ exports[`Typedoc output > should have a deliberate file structure 1`] = `
"backend/auth-object.mdx",
"backend/authenticate-request-options.mdx",
"backend/client.mdx",
"backend/commerce-plan-json.mdx",
"backend/commerce-plan.mdx",
"backend/email-address.mdx",
"backend/external-account.mdx",
"backend/get-auth-fn.mdx",
Expand Down
26 changes: 26 additions & 0 deletions packages/backend/src/api/endpoints/BillingApi.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
import type { ClerkPaginationRequest } from '@clerk/types';

import { joinPaths } from '../../util/path';
import type { CommercePlan } from '../resources/CommercePlan';
import type { PaginatedResourceResponse } from '../resources/Deserializer';
import { AbstractAPI } from './AbstractApi';

const basePath = '/commerce';

type GetOrganizationListParams = ClerkPaginationRequest<{
payerType: 'org' | 'user';
}>;

export class BillingAPI extends AbstractAPI {
/**
* @experimental This is an experimental API for the Billing feature that is available under a public beta, and the API is subject to change.
* It is advised to pin the SDK version to avoid breaking changes.
*/
public async getPlanList(params?: GetOrganizationListParams) {
return this.request<PaginatedResourceResponse<CommercePlan[]>>({
method: 'GET',
path: joinPaths(basePath, 'plans'),
queryParams: params,
});
}
Comment thread
panteliselef marked this conversation as resolved.
}
6 changes: 6 additions & 0 deletions packages/backend/src/api/factory.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@ import {
WaitlistEntryAPI,
WebhookAPI,
} from './endpoints';
import { BillingAPI } from './endpoints/BillingApi';
import { buildRequest } from './request';

export type CreateBackendApiOptions = Parameters<typeof buildRequest>[0];
Expand All@@ -52,6 +53,11 @@ export function createBackendApiClient(options: CreateBackendApiOptions) {
),
betaFeatures: new BetaFeaturesAPI(request),
blocklistIdentifiers: new BlocklistIdentifierAPI(request),
/**
* @experimental This is an experimental API for the Billing feature that is available under a public beta, and the API is subject to change.
* It is advised to pin the SDK version to avoid breaking changes.
*/
billing: new BillingAPI(request),
clients: new ClientAPI(request),
domains: new DomainAPI(request),
emailAddresses: new EmailAddressAPI(request),
Expand Down
101 changes: 101 additions & 0 deletions packages/backend/src/api/resources/CommercePlan.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,101 @@
import { Feature } from './Feature';
import type { CommercePlanJSON } from './JSON';

type CommerceFee = {
amount: number;
amountFormatted: string;
currency: string;
currencySymbol: string;
};

/**
* @experimental This is an experimental API for the Billing feature that is available under a public beta, and the API is subject to change.
* It is advised to pin the SDK version to avoid breaking changes.
*/
export class CommercePlan {
Comment thread
panteliselef marked this conversation as resolved.
constructor(
/**
* The unique identifier for the plan.
*/
readonly id: string,
/**
* The id of the product the plan belongs to.
*/
readonly productId: string,
/**
* The name of the plan.
*/
readonly name: string,
/**
* The URL-friendly identifier of the plan.
*/
readonly slug: string,
/**
* The description of the plan.
*/
readonly description: string | undefined,
/**
* Whether the plan is the default plan.
*/
readonly isDefault: boolean,
/**
* Whether the plan is recurring.
*/
readonly isRecurring: boolean,
/**
* Whether the plan has a base fee.
*/
readonly hasBaseFee: boolean,
/**
* Whether the plan is displayed in the `<PriceTable/>` component.
*/
readonly publiclyVisible: boolean,
/**
* The monthly fee of the plan.
*/
readonly fee: CommerceFee,
/**
* The annual fee of the plan.
*/
readonly annualFee: CommerceFee,
/**
* The annual fee of the plan on a monthly basis.
*/
readonly annualMonthlyFee: CommerceFee,
/**
* The type of payer for the plan.
*/
readonly forPayerType: 'org' | 'user',
/**
* The features the plan offers.
*/
readonly features: Feature[],
) {}

static fromJSON(data: CommercePlanJSON): CommercePlan {
Comment thread
panteliselef marked this conversation as resolved.
const formatAmountJSON = (fee: CommercePlanJSON['fee']) => {
return {
amount: fee.amount,
amountFormatted: fee.amount_formatted,
currency: fee.currency,
currencySymbol: fee.currency_symbol,
};
};
return new CommercePlan(
data.id,
data.product_id,
data.name,
data.slug,
data.description,
data.is_default,
data.is_recurring,
data.has_base_fee,
data.publicly_visible,
formatAmountJSON(data.fee),
formatAmountJSON(data.annual_fee),
formatAmountJSON(data.annual_monthly_fee),
data.for_payer_type,
data.features.map(feature => Feature.fromJSON(feature)),
);
}
}
6 changes: 6 additions & 0 deletions packages/backend/src/api/resources/Deserializer.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,6 +37,8 @@ import {
User,
} from '.';
import { AccountlessApplication } from './AccountlessApplication';
import { CommercePlan } from './CommercePlan';
import { Feature } from './Feature';
import type { PaginatedResponseJSON } from './JSON';
import { ObjectType } from './JSON';
import { WaitlistEntry } from './WaitlistEntry';
Expand DownExpand Up@@ -179,6 +181,10 @@ function jsonToObject(item: any): any {
return User.fromJSON(item);
case ObjectType.WaitlistEntry:
return WaitlistEntry.fromJSON(item);
case ObjectType.CommercePlan:
return CommercePlan.fromJSON(item);
case ObjectType.Feature:
return Feature.fromJSON(item);
default:
return item;
}
Expand Down
15 changes: 15 additions & 0 deletions packages/backend/src/api/resources/Feature.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
import type { FeatureJSON } from './JSON';

export class Feature {
constructor(
readonly id: string,
readonly name: string,
readonly description: string,
readonly slug: string,
readonly avatarUrl: string,
) {}
Comment thread
panteliselef marked this conversation as resolved.

static fromJSON(data: FeatureJSON): Feature {
return new Feature(data.id, data.name, data.description, data.slug, data.avatar_url);
}
Comment thread
panteliselef marked this conversation as resolved.
}
102 changes: 63 additions & 39 deletions packages/backend/src/api/resources/JSON.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -69,6 +69,8 @@ export const ObjectType = {
CommercePaymentAttempt: 'commerce_payment_attempt',
CommerceSubscription: 'commerce_subscription',
CommerceSubscriptionItem: 'commerce_subscription_item',
CommercePlan: 'commerce_plan',
Feature: 'feature',
} as const;

export type ObjectType = (typeof ObjectType)[keyof typeof ObjectType];
Expand DownExpand Up@@ -791,71 +793,65 @@ export interface CommercePayerJSON extends ClerkResourceJSON {
updated_at: number;
}

export interface CommercePayeeJSON {
interface CommercePayeeJSON {
id: string;
gateway_type: string;
gateway_external_id: string;
gateway_status: 'active' | 'pending' | 'restricted' | 'disconnected';
}

export interface CommerceAmountJSON {
interface CommerceFeeJSON {
amount: number;
amount_formatted: string;
currency: string;
currency_symbol: string;
}

export interface CommerceTotalsJSON {
subtotal: CommerceAmountJSON;
tax_total: CommerceAmountJSON;
grand_total: CommerceAmountJSON;
interface CommerceTotalsJSON {
subtotal: CommerceFeeJSON;
tax_total: CommerceFeeJSON;
grand_total: CommerceFeeJSON;
}

export interface CommercePaymentSourceJSON {
id: string;
gateway: string;
gateway_external_id: string;
gateway_external_account_id?: string;
payment_method: string;
status: 'active' | 'disconnected';
card_type?: string;
last4?: string;
}

export interface CommercePaymentFailedReasonJSON {
code: string;
decline_code: string;
}

export interface CommerceSubscriptionCreditJSON {
amount: CommerceAmountJSON;
cycle_days_remaining: number;
cycle_days_total: number;
cycle_remaining_percent: number;
export interface FeatureJSON extends ClerkResourceJSON {
object: typeof ObjectType.Feature;
name: string;
description: string;
slug: string;
avatar_url: string;
}
Comment thread
panteliselef marked this conversation as resolved.

export interface CommercePlanJSON {
/**
* @experimental This is an experimental API for the Billing feature that is available under a public beta, and the API is subject to change.
* It is advised to pin the SDK version to avoid breaking changes.
*/
export interface CommercePlanJSON extends ClerkResourceJSON {
object: typeof ObjectType.CommercePlan;
id: string;
instance_id: string;
product_id: string;
name: string;
slug: string;
description?: string;
is_default: boolean;
is_recurring: boolean;
amount: number;
period: 'month' | 'annual';
interval: number;
has_base_fee: boolean;
currency: string;
annual_monthly_amount: number;
publicly_visible: boolean;
fee: CommerceFeeJSON;
annual_fee: CommerceFeeJSON;
annual_monthly_fee: CommerceFeeJSON;
for_payer_type: 'org' | 'user';
features: FeatureJSON[];
}

export interface CommerceSubscriptionItemJSON extends ClerkResourceJSON {
object: typeof ObjectType.CommerceSubscriptionItem;
status: 'abandoned' | 'active' | 'canceled' | 'ended' | 'expired' | 'incomplete' | 'past_due' | 'upcoming';
credit: CommerceSubscriptionCreditJSON;
credit: {
amount: CommerceFeeJSON;
cycle_days_remaining: number;
cycle_days_total: number;
cycle_remaining_percent: number;
};
proration_date: string;
plan_period: 'month' | 'annual';
period_start: number;
Expand All@@ -865,8 +861,24 @@ export interface CommerceSubscriptionItemJSON extends ClerkResourceJSON {
lifetime_paid: number;
next_payment_amount: number;
next_payment_date: number;
amount: CommerceAmountJSON;
plan: CommercePlanJSON;
amount: CommerceFeeJSON;
plan: {
id: string;
instance_id: string;
product_id: string;
name: string;
slug: string;
description?: string;
is_default: boolean;
is_recurring: boolean;
amount: number;
period: 'month' | 'annual';
interval: number;
has_base_fee: boolean;
currency: string;
annual_monthly_amount: number;
publicly_visible: boolean;
};
plan_id: string;
}

Expand All@@ -881,13 +893,25 @@ export interface CommercePaymentAttemptJSON extends ClerkResourceJSON {
updated_at: number;
paid_at?: number;
failed_at?: number;
failed_reason?: CommercePaymentFailedReasonJSON;
failed_reason?: {
code: string;
decline_code: string;
};
billing_date: number;
charge_type: 'checkout' | 'recurring';
payee: CommercePayeeJSON;
payer: CommercePayerJSON;
totals: CommerceTotalsJSON;
payment_source: CommercePaymentSourceJSON;
payment_source: {
id: string;
gateway: string;
gateway_external_id: string;
gateway_external_account_id?: string;
payment_method: string;
status: 'active' | 'disconnected';
card_type?: string;
last4?: string;
};
subscription_items: CommerceSubscriptionItemJSON[];
}

Expand Down
1 change: 1 addition & 0 deletions packages/backend/src/api/resources/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -57,6 +57,7 @@ export * from './User';
export * from './Verification';
export * from './WaitlistEntry';
export * from './Web3Wallet';
export * from './CommercePlan';

export type {
EmailWebhookEvent,
Expand Down
7 changes: 1 addition & 6 deletions packages/backend/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -101,12 +101,6 @@ export type {
TestingTokenJSON,
WebhooksSvixJSON,
CommercePayerJSON,
CommercePayeeJSON,
CommerceAmountJSON,
CommerceTotalsJSON,
CommercePaymentSourceJSON,
CommercePaymentFailedReasonJSON,
CommerceSubscriptionCreditJSON,
CommercePlanJSON,
CommerceSubscriptionItemJSON,
CommercePaymentAttemptJSON,
Expand DownExpand Up@@ -150,6 +144,7 @@ export type {
Token,
User,
TestingToken,
CommercePlan,
} from './api/resources';

/**
Expand Down