Skip to content
Open
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
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
},
"peerDependencies": {
"@polar-sh/checkout": ">=0.1.10",
"@polar-sh/sdk": ">=0.32.11",
"@polar-sh/sdk": ">=0.35.4",
"convex": "^1.29.0",
"react": "^18 || ^19",
"react-dom": "^18 || ^19"
Expand Down
20 changes: 19 additions & 1 deletion src/client/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -105,14 +105,18 @@ export class Polar<
origin,
successUrl,
subscriptionId,
trialInterval,
trialIntervalCount,
}: {
productIds: string[];
userId: string;
email: string;
origin: string;
successUrl: string;
subscriptionId?: string;
},
trialInterval?: "day" | "week" | "month" | "year" | null;
trialIntervalCount?: number | null;
}
): Promise<Checkout> {
const dbCustomer = await ctx.runQuery(
this.component.lib.getCustomerByUserId,
Expand Down Expand Up @@ -146,6 +150,8 @@ export class Polar<
subscriptionId,
embedOrigin: origin,
successUrl,
trialInterval,
trialIntervalCount,
...(productIds.length === 1
? { products: productIds }
: { products: productIds }),
Expand Down Expand Up @@ -309,6 +315,16 @@ export class Polar<
origin: v.string(),
successUrl: v.string(),
subscriptionId: v.optional(v.string()),
trialInterval: v.optional(
v.union(
v.literal("day"),
v.literal("week"),
v.literal("month"),
v.literal("year"),
v.null()
)
),
trialIntervalCount: v.optional(v.union(v.number(), v.null())),
},
returns: v.object({
url: v.string(),
Expand All @@ -322,6 +338,8 @@ export class Polar<
subscriptionId: args.subscriptionId,
origin: args.origin,
successUrl: args.successUrl,
trialInterval: args.trialInterval,
trialIntervalCount: args.trialIntervalCount,
});
return { url };
},
Expand Down
7 changes: 5 additions & 2 deletions src/component/lib.ts
Original file line number Diff line number Diff line change
Expand Up @@ -161,8 +161,11 @@ export const listUserSubscriptions = query({
.collect(),
async (subscription) => {
if (
subscription.endedAt &&
subscription.endedAt <= new Date().toISOString()
(subscription.endedAt &&
subscription.endedAt <= new Date().toISOString()) ||
(subscription.status === "trialing" &&
subscription.trialEnd &&
subscription.trialEnd <= new Date().toISOString())
) {
return;
}
Expand Down
12 changes: 12 additions & 0 deletions src/component/schema.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,16 @@ export default defineSchema(
description: v.union(v.string(), v.null()),
recurringInterval: v.optional(vRecurringInterval),
isRecurring: v.boolean(),
trialInterval: v.optional(
v.union(
v.literal("day"),
v.literal("week"),
v.literal("month"),
v.literal("year"),
v.null()
)
),
trialIntervalCount: v.optional(v.union(v.number(), v.null())),
isArchived: v.boolean(),
organizationId: v.string(),
metadata: v.optional(v.record(v.string(), v.any())),
Expand Down Expand Up @@ -82,6 +92,8 @@ export default defineSchema(
currentPeriodStart: v.string(),
currentPeriodEnd: v.union(v.string(), v.null()),
cancelAtPeriodEnd: v.boolean(),
trialStart: v.optional(v.union(v.string(), v.null())),
trialEnd: v.optional(v.union(v.string(), v.null())),
startedAt: v.union(v.string(), v.null()),
endedAt: v.union(v.string(), v.null()),
productId: v.string(),
Expand Down
4 changes: 4 additions & 0 deletions src/component/util.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ export const convertToDatabaseSubscription = (
currency: subscription.currency,
recurringInterval: subscription.recurringInterval,
status: subscription.status,
trialStart: subscription.trialStart?.toISOString() ?? null,
trialEnd: subscription.trialEnd?.toISOString() ?? null,
currentPeriodStart: subscription.currentPeriodStart.toISOString(),
currentPeriodEnd: subscription.currentPeriodEnd?.toISOString() ?? null,
cancelAtPeriodEnd: subscription.cancelAtPeriodEnd,
Expand All @@ -60,6 +62,8 @@ export const convertToDatabaseProduct = (
createdAt: product.createdAt.toISOString(),
modifiedAt: product.modifiedAt?.toISOString() ?? null,
recurringInterval: product.recurringInterval,
trialInterval: product.trialInterval,
trialIntervalCount: product.trialIntervalCount,
metadata: product.metadata,
prices: product.prices.map((price) => ({
id: price.id,
Expand Down
6 changes: 6 additions & 0 deletions src/react/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,14 @@ export const CheckoutLink = ({
subscriptionId,
theme = "dark",
embed = true,
trialInterval,
trialIntervalCount,
}: PropsWithChildren<{
polarApi: Pick<PolarComponentApi, "generateCheckoutLink">;
productIds: string[];
subscriptionId?: string;
trialInterval?: "day" | "week" | "month" | "year" | null;
trialIntervalCount?: number | null;
className?: string;
theme?: "dark" | "light";
embed?: boolean;
Expand All @@ -62,6 +66,8 @@ export const CheckoutLink = ({
subscriptionId,
origin: window.location.origin,
successUrl: window.location.href,
trialInterval,
trialIntervalCount,
}).then(({ url }) => setCheckoutLink(url));
}, [productIds, subscriptionId, embed, generateCheckoutLink]);

Expand Down