@better-auth/stripe 1.2.3 → 1.2.4-beta.10

package/src/index.ts

@@ -1,6 +1,7 @@
 import {
 	type GenericEndpointContext,
 	type BetterAuthPlugin,
+	logger,
 } from "better-auth";
 import { createAuthEndpoint, createAuthMiddleware } from "better-auth/plugins";
 import Stripe from "stripe";
@@ -17,7 +18,12 @@ import {
 	onSubscriptionDeleted,
 	onSubscriptionUpdated,
 } from "./hooks";
-import type { InputSubscription, StripeOptions, Subscription } from "./types";
+import type {
+	Customer,
+	InputSubscription,
+	StripeOptions,
+	Subscription,
+} from "./types";
 import { getPlanByName, getPlanByPriceId, getPlans } from "./utils";
 import { getSchema } from "./schema";
 
@@ -77,35 +83,78 @@ export const stripe = <O extends StripeOptions>(options: O) => {
 			{
 				method: "POST",
 				body: z.object({
+					/**
+					 * The name of the plan to subscribe
+					 */
 					plan: z.string({
 						description: "The name of the plan to upgrade to",
 					}),
+					/**
+					 * If annual plan should be applied.
+					 */
 					annual: z
 						.boolean({
 							description: "Whether to upgrade to an annual plan",
 						})
 						.optional(),
-					referenceId: z.string().optional(),
+					/**
+					 * Reference id of the subscription to upgrade
+					 * This is used to identify the subscription to upgrade
+					 * If not provided, the user's id will be used
+					 */
+					referenceId: z
+						.string({
+							description: "Reference id of the subscription to upgrade",
+						})
+						.optional(),
+					/**
+					 * This is to allow a specific subscription to be upgrade.
+					 * If subscription id is provided, and subscription isn't found,
+					 * it'll throw an error.
+					 */
+					subscriptionId: z
+						.string({
+							description: "The id of the subscription to upgrade",
+						})
+						.optional(),
+					/**
+					 * Any additional data you want to store in your database
+					 * subscriptions
+					 */
 					metadata: z.record(z.string(), z.any()).optional(),
+					/**
+					 * If a subscription
+					 */
 					seats: z
 						.number({
 							description: "Number of seats to upgrade to (if applicable)",
 						})
 						.optional(),
-					uiMode: z.enum(["embedded", "hosted"]).default("hosted"),
+					/**
+					 * Success url to redirect back after successful subscription
+					 */
 					successUrl: z
 						.string({
 							description:
 								"callback url to redirect back after successful subscription",
 						})
 						.default("/"),
+					/**
+					 * Cancel URL
+					 */
 					cancelUrl: z
 						.string({
 							description:
 								"callback url to redirect back after successful subscription",
 						})
 						.default("/"),
+					/**
+					 * Return URL
+					 */
 					returnUrl: z.string().optional(),
+					/**
+					 * Disable Redirect
+					 */
 					disableRedirect: z.boolean().default(false),
 				}),
 				use: [
@@ -133,7 +182,22 @@ export const stripe = <O extends StripeOptions>(options: O) => {
 						message: STRIPE_ERROR_CODES.SUBSCRIPTION_PLAN_NOT_FOUND,
 					});
 				}
-				let customerId = user.stripeCustomerId;
+				const subscriptionToUpdate = ctx.body.subscriptionId
+					? await ctx.context.adapter.findOne<Subscription>({
+							model: "subscription",
+							where: [{ field: "id", value: ctx.body.subscriptionId }],
+						})
+					: null;
+
+				if (ctx.body.subscriptionId && !subscriptionToUpdate) {
+					throw new APIError("BAD_REQUEST", {
+						message: STRIPE_ERROR_CODES.SUBSCRIPTION_NOT_FOUND,
+					});
+				}
+
+				let customerId =
+					subscriptionToUpdate?.stripeCustomerId || user.stripeCustomerId;
+
 				if (!customerId) {
 					try {
 						const stripeCustomer = await client.customers.create(
@@ -179,15 +243,18 @@ export const stripe = <O extends StripeOptions>(options: O) => {
 							.then((res) => res.data[0])
 							.catch((e) => null)
 					: null;
-				const subscriptions = await ctx.context.adapter.findMany<Subscription>({
-					model: "subscription",
-					where: [
-						{
-							field: "referenceId",
-							value: ctx.body.referenceId || user.id,
-						},
-					],
-				});
+
+				const subscriptions = subscriptionToUpdate
+					? [subscriptionToUpdate]
+					: await ctx.context.adapter.findMany<Subscription>({
+							model: "subscription",
+							where: [
+								{
+									field: "referenceId",
+									value: ctx.body.referenceId || user.id,
+								},
+							],
+						});
 
 				const existingSubscription = subscriptions.find(
 					(sub) => sub.status === "active" || sub.status === "trialing",
@@ -295,7 +362,7 @@ export const stripe = <O extends StripeOptions>(options: O) => {
 									ctx.context.baseURL
 								}/subscription/success?callbackURL=${encodeURIComponent(
 									ctx.body.successUrl,
-								)}&reference=${encodeURIComponent(referenceId)}`,
+								)}&subscriptionId=${encodeURIComponent(subscription.id)}`,
 							),
 							cancel_url: getUrl(ctx, ctx.body.cancelUrl),
 							line_items: [
@@ -338,9 +405,10 @@ export const stripe = <O extends StripeOptions>(options: O) => {
 			{
 				method: "GET",
 				query: z.record(z.string(), z.any()).optional(),
+				use: [originCheck((ctx) => ctx.query.callbackURL)],
 			},
 			async (ctx) => {
-				if (!ctx.query || !ctx.query.callbackURL || !ctx.query.reference) {
+				if (!ctx.query || !ctx.query.callbackURL || !ctx.query.subscriptionId) {
 					throw ctx.redirect(getUrl(ctx, ctx.query?.callbackURL || "/"));
 				}
 				const session = await getSessionFromCtx<{ stripeCustomerId: string }>(
@@ -350,7 +418,7 @@ export const stripe = <O extends StripeOptions>(options: O) => {
 					throw ctx.redirect(getUrl(ctx, ctx.query?.callbackURL || "/"));
 				}
 				const { user } = session;
-				const { callbackURL, reference } = ctx.query;
+				const { callbackURL, subscriptionId } = ctx.query;
 
 				if (user?.stripeCustomerId) {
 					try {
@@ -359,8 +427,8 @@ export const stripe = <O extends StripeOptions>(options: O) => {
 								model: "subscription",
 								where: [
 									{
-										field: "referenceId",
-										value: reference,
+										field: "id",
+										value: subscriptionId,
 									},
 								],
 							});
@@ -388,8 +456,8 @@ export const stripe = <O extends StripeOptions>(options: O) => {
 								},
 								where: [
 									{
-										field: "referenceId",
-										value: reference,
+										field: "id",
+										value: subscription.id,
 									},
 								],
 							});
@@ -416,6 +484,7 @@ export const stripe = <O extends StripeOptions>(options: O) => {
 				method: "POST",
 				body: z.object({
 					referenceId: z.string().optional(),
+					subscriptionId: z.string().optional(),
 					returnUrl: z.string(),
 				}),
 				use: [
@@ -427,15 +496,27 @@ export const stripe = <O extends StripeOptions>(options: O) => {
 			async (ctx) => {
 				const referenceId =
 					ctx.body?.referenceId || ctx.context.session.user.id;
-				const subscription = await ctx.context.adapter.findOne<Subscription>({
-					model: "subscription",
-					where: [
-						{
-							field: "referenceId",
-							value: referenceId,
-						},
-					],
-				});
+				const subscription = ctx.body.subscriptionId
+					? await ctx.context.adapter.findOne<Subscription>({
+							model: "subscription",
+							where: [
+								{
+									field: "id",
+									value: ctx.body.subscriptionId,
+								},
+							],
+						})
+					: await ctx.context.adapter
+							.findMany<Subscription>({
+								model: "subscription",
+								where: [{ field: "referenceId", value: referenceId }],
+							})
+							.then((subs) =>
+								subs.find(
+									(sub) => sub.status === "active" || sub.status === "trialing",
+								),
+							);
+
 				if (!subscription || !subscription.stripeCustomerId) {
 					throw ctx.error("BAD_REQUEST", {
 						message: STRIPE_ERROR_CODES.SUBSCRIPTION_NOT_FOUND,
@@ -485,7 +566,7 @@ export const stripe = <O extends StripeOptions>(options: O) => {
 								ctx.context.baseURL
 							}/subscription/cancel/callback?callbackURL=${encodeURIComponent(
 								ctx.body?.returnUrl || "/",
-							)}&reference=${encodeURIComponent(referenceId)}`,
+							)}&subscriptionId=${encodeURIComponent(subscription.id)}`,
 						),
 						flow_data: {
 							type: "subscription_cancel",
@@ -575,9 +656,10 @@ export const stripe = <O extends StripeOptions>(options: O) => {
 			{
 				method: "GET",
 				query: z.record(z.string(), z.any()).optional(),
+				use: [originCheck((ctx) => ctx.query.callbackURL)],
 			},
 			async (ctx) => {
-				if (!ctx.query || !ctx.query.callbackURL || !ctx.query.reference) {
+				if (!ctx.query || !ctx.query.callbackURL || !ctx.query.subscriptionId) {
 					throw ctx.redirect(getUrl(ctx, ctx.query?.callbackURL || "/"));
 				}
 				const session = await getSessionFromCtx<{ stripeCustomerId: string }>(
@@ -587,44 +669,32 @@ export const stripe = <O extends StripeOptions>(options: O) => {
 					throw ctx.redirect(getUrl(ctx, ctx.query?.callbackURL || "/"));
 				}
 				const { user } = session;
-				const { callbackURL, reference } = ctx.query;
+				const { callbackURL, subscriptionId } = ctx.query;
 
-				const subscriptions = await ctx.context.adapter.findMany<Subscription>({
+				const subscription = await ctx.context.adapter.findOne<Subscription>({
 					model: "subscription",
 					where: [
 						{
-							field: "referenceId",
-							value: reference,
+							field: "id",
+							value: subscriptionId,
 						},
 					],
 				});
 
-				const activeSubscription = subscriptions.find(
-					(sub) => sub.status === "active" || sub.status === "trialing",
-				);
-
-				if (activeSubscription) {
+				if (
+					subscription?.status === "active" ||
+					subscription?.status === "trialing"
+				) {
 					return ctx.redirect(getUrl(ctx, callbackURL));
 				}
+				const customerId =
+					subscription?.stripeCustomerId || user.stripeCustomerId;
 
-				if (user?.stripeCustomerId) {
+				if (customerId) {
 					try {
-						const subscription =
-							await ctx.context.adapter.findOne<Subscription>({
-								model: "subscription",
-								where: [
-									{
-										field: "referenceId",
-										value: reference,
-									},
-								],
-							});
-						if (!subscription || subscription.status === "active") {
-							throw ctx.redirect(getUrl(ctx, callbackURL));
-						}
 						const stripeSubscription = await client.subscriptions
 							.list({
-								customer: user.stripeCustomerId,
+								customer: customerId,
 								status: "active",
 							})
 							.then((res) => res.data[0]);
@@ -635,21 +705,36 @@ export const stripe = <O extends StripeOptions>(options: O) => {
 								stripeSubscription.items.data[0]?.plan.id,
 							);
 
-							if (plan && subscriptions.length > 0) {
+							if (plan && subscription) {
 								await ctx.context.adapter.update({
 									model: "subscription",
 									update: {
 										status: stripeSubscription.status,
 										seats: stripeSubscription.items.data[0]?.quantity || 1,
 										plan: plan.name.toLowerCase(),
-										periodEnd: stripeSubscription.current_period_end,
-										periodStart: stripeSubscription.current_period_start,
+										periodEnd: new Date(
+											stripeSubscription.current_period_end * 1000,
+										),
+										periodStart: new Date(
+											stripeSubscription.current_period_start * 1000,
+										),
 										stripeSubscriptionId: stripeSubscription.id,
+										...(stripeSubscription.trial_start &&
+										stripeSubscription.trial_end
+											? {
+													trialStart: new Date(
+														stripeSubscription.trial_start * 1000,
+													),
+													trialEnd: new Date(
+														stripeSubscription.trial_end * 1000,
+													),
+												}
+											: {}),
 									},
 									where: [
 										{
-											field: "referenceId",
-											value: reference,
+											field: "id",
+											value: subscription.id,
 										},
 									],
 								});
@@ -692,7 +777,11 @@ export const stripe = <O extends StripeOptions>(options: O) => {
 								message: "Stripe webhook secret not found",
 							});
 						}
-						event = client.webhooks.constructEvent(buf, sig, webhookSecret);
+						event = await client.webhooks.constructEventAsync(
+							buf,
+							sig,
+							webhookSecret,
+						);
 					} catch (err: any) {
 						ctx.context.logger.error(`${err.message}`);
 						throw new APIError("BAD_REQUEST", {
@@ -751,18 +840,29 @@ export const stripe = <O extends StripeOptions>(options: O) => {
 												userId: user.id,
 											},
 										});
-										await ctx.context.adapter.update({
-											model: "user",
-											update: {
-												stripeCustomerId: stripeCustomer.id,
-											},
-											where: [
-												{
-													field: "id",
-													value: user.id,
+										const customer = await ctx.context.adapter.update<Customer>(
+											{
+												model: "user",
+												update: {
+													stripeCustomerId: stripeCustomer.id,
 												},
-											],
-										});
+												where: [
+													{
+														field: "id",
+														value: user.id,
+													},
+												],
+											},
+										);
+										if (!customer) {
+											logger.error("#BETTER_AUTH: Failed to create  customer");
+										} else {
+											await options.onCustomerCreate?.({
+												customer,
+												stripeCustomer,
+												user,
+											});
+										}
 									}
 								},
 							},

package/src/stripe.test.ts

@@ -298,7 +298,9 @@ describe("stripe", async () => {
 				retrieve: vi.fn().mockResolvedValue(mockSubscription),
 			},
 			webhooks: {
-				constructEvent: vi.fn().mockReturnValue(mockCheckoutSessionEvent),
+				constructEventAsync: vi
+					.fn()
+					.mockResolvedValue(mockCheckoutSessionEvent),
 			},
 		};
 
@@ -403,7 +405,7 @@ describe("stripe", async () => {
 		const stripeForTest = {
 			...stripeOptions.stripeClient,
 			webhooks: {
-				constructEvent: vi.fn().mockReturnValue(mockDeleteEvent),
+				constructEventAsync: vi.fn().mockResolvedValue(mockDeleteEvent),
 			},
 			subscriptions: {
 				retrieve: vi.fn().mockResolvedValue({
@@ -514,7 +516,7 @@ describe("stripe", async () => {
 				retrieve: vi.fn().mockResolvedValue(mockSubscription),
 			},
 			webhooks: {
-				constructEvent: vi.fn().mockReturnValue(completeEvent),
+				constructEventAsync: vi.fn().mockResolvedValue(completeEvent),
 			},
 		};
 
@@ -591,7 +593,9 @@ describe("stripe", async () => {
 			},
 		);
 
-		mockStripeForEvents.webhooks.constructEvent.mockReturnValue(updateEvent);
+		mockStripeForEvents.webhooks.constructEventAsync.mockReturnValue(
+			updateEvent,
+		);
 		await eventTestAuth.handler(updateRequest);
 		expect(onSubscriptionUpdate).toHaveBeenCalledWith(
 			expect.objectContaining({
@@ -632,7 +636,7 @@ describe("stripe", async () => {
 			},
 		);
 
-		mockStripeForEvents.webhooks.constructEvent.mockReturnValue(
+		mockStripeForEvents.webhooks.constructEventAsync.mockReturnValue(
 			userCancelEvent,
 		);
 		await eventTestAuth.handler(userCancelRequest);
@@ -664,7 +668,9 @@ describe("stripe", async () => {
 			},
 		);
 
-		mockStripeForEvents.webhooks.constructEvent.mockReturnValue(cancelEvent);
+		mockStripeForEvents.webhooks.constructEventAsync.mockReturnValue(
+			cancelEvent,
+		);
 		await eventTestAuth.handler(cancelRequest);
 
 		expect(onSubscriptionCancel).toHaveBeenCalled();
@@ -695,7 +701,9 @@ describe("stripe", async () => {
 			},
 		);
 
-		mockStripeForEvents.webhooks.constructEvent.mockReturnValue(deleteEvent);
+		mockStripeForEvents.webhooks.constructEventAsync.mockReturnValue(
+			deleteEvent,
+		);
 		await eventTestAuth.handler(deleteRequest);
 
 		expect(onSubscriptionDeleted).toHaveBeenCalled();

package/src/types.ts

@@ -1,7 +1,7 @@
 import type { Session, User } from "better-auth";
 import type Stripe from "stripe";
 
-export type Plan = {
+export type StripePlan = {
 	/**
 	 * Monthly price id
 	 */
@@ -20,6 +20,13 @@ export type Plan = {
 	 * yearly subscription
 	 */
 	annualDiscountPriceId?: string;
+	/**
+	 * To use lookup key instead of price id
+	 *
+	 * https://docs.stripe.com/products-prices/
+	 * manage-prices#lookup-keys
+	 */
+	annualDiscountLookupKey?: string;
 	/**
 	 * Plan name
 	 */
@@ -204,7 +211,7 @@ export interface StripeOptions {
 		/**
 		 * List of plan
 		 */
-		plans: Plan[] | (() => Promise<Plan[]>);
+		plans: StripePlan[] | (() => Promise<StripePlan[]>);
 		/**
 		 * Require email verification before a user is allowed to upgrade
 		 * their subscriptions
@@ -223,7 +230,7 @@ export interface StripeOptions {
 				event: Stripe.Event;
 				stripeSubscription: Stripe.Subscription;
 				subscription: Subscription;
-				plan: Plan;
+				plan: StripePlan;
 			},
 			request?: Request,
 		) => Promise<void>;
@@ -284,7 +291,7 @@ export interface StripeOptions {
 			data: {
 				user: User & Record<string, any>;
 				session: Session & Record<string, any>;
-				plan: Plan;
+				plan: StripePlan;
 				subscription: Subscription;
 			},
 			request?: Request,