@better-auth/stripe 1.7.0-beta.1 → 1.7.0-beta.10

package/dist/client.d.mts

@@ -1,4 +1,4 @@
-import { l as StripePlan, n as stripe } from "./index-C8Utp7ig.mjs";
+import { l as StripePlan, n as stripe } from "./index-XU8GMPhh.mjs";
 import * as better_auth0 from "better-auth";
 
 //#region src/error-codes.d.ts

package/dist/client.mjs

@@ -1,4 +1,4 @@
-import { n as STRIPE_ERROR_CODES, t as PACKAGE_VERSION } from "./version-Bf-a0R3x.mjs";
+import { n as STRIPE_ERROR_CODES, t as PACKAGE_VERSION } from "./version-Cup6oezK.mjs";
 //#region src/client.ts
 const stripeClient = (options) => {
 	return {

package/dist/{index-C8Utp7ig.d.mts → index-XU8GMPhh.d.mts}

@@ -341,21 +341,24 @@ type SubscriptionOptions = {
     plan: StripePlan;
   }, ctx: GenericEndpointContext) => Promise<void>) | undefined;
   /**
-   * A callback to run after a user is about to cancel their subscription
+   * A callback to run on every subscription update webhook. Use `stripeSubscription`
+   * to read fields that are not persisted in the local subscription row.
    * @returns
    */
   onSubscriptionUpdate?: ((data: {
     event: Stripe.Event;
+    stripeSubscription: Stripe.Subscription;
     subscription: Subscription;
   }) => Promise<void>) | undefined;
   /**
-   * A callback to run after a user is about to cancel their subscription
+   * A callback to run once when a subscription transitions into a pending-cancel state
+   * (e.g. `cancel_at_period_end` or a scheduled `cancel_at`).
    * @returns
    */
   onSubscriptionCancel?: ((data: {
-    event?: Stripe.Event;
-    subscription: Subscription;
+    event: Stripe.Event;
     stripeSubscription: Stripe.Subscription;
+    subscription: Subscription;
     cancellationDetails?: Stripe.Subscription.CancellationDetails | null;
   }) => Promise<void>) | undefined;
   /**
@@ -573,6 +576,8 @@ declare const stripe: <O extends StripeOptions>(options: O) => {
         }>)[];
       }>) => Promise<{
         session: StripeCtxSession;
+      }>) | ((inputContext: better_call0.MiddlewareInputContext<better_call0.MiddlewareOptions>) => Promise<{
+        referenceId: string;
       }>) | ((inputContext: better_call0.MiddlewareInputContext<better_call0.MiddlewareOptions>) => Promise<void>))[];
     }, {
       url: string;
@@ -634,6 +639,8 @@ declare const stripe: <O extends StripeOptions>(options: O) => {
         }>)[];
       }>) => Promise<{
         session: StripeCtxSession;
+      }>) | ((inputContext: better_call0.MiddlewareInputContext<better_call0.MiddlewareOptions>) => Promise<{
+        referenceId: string;
       }>) | ((inputContext: better_call0.MiddlewareInputContext<better_call0.MiddlewareOptions>) => Promise<void>))[];
     }, {
       url: string;
@@ -680,7 +687,9 @@ declare const stripe: <O extends StripeOptions>(options: O) => {
         }>)[];
       }>) => Promise<{
         session: StripeCtxSession;
-      }>) | ((inputContext: better_call0.MiddlewareInputContext<better_call0.MiddlewareOptions>) => Promise<void>))[];
+      }>) | ((inputContext: better_call0.MiddlewareInputContext<better_call0.MiddlewareOptions>) => Promise<{
+        referenceId: string;
+      }>))[];
     }, Stripe.Response<Stripe.Subscription>>;
     listActiveSubscriptions: better_call0.StrictEndpoint<"/subscription/list", {
       method: "GET";
@@ -722,7 +731,9 @@ declare const stripe: <O extends StripeOptions>(options: O) => {
         }>)[];
       }>) => Promise<{
         session: StripeCtxSession;
-      }>) | ((inputContext: better_call0.MiddlewareInputContext<better_call0.MiddlewareOptions>) => Promise<void>))[];
+      }>) | ((inputContext: better_call0.MiddlewareInputContext<better_call0.MiddlewareOptions>) => Promise<{
+        referenceId: string;
+      }>))[];
     }, {
       limits: Record<string, unknown> | undefined;
       priceId: string | undefined;
@@ -798,6 +809,8 @@ declare const stripe: <O extends StripeOptions>(options: O) => {
         }>)[];
       }>) => Promise<{
         session: StripeCtxSession;
+      }>) | ((inputContext: better_call0.MiddlewareInputContext<better_call0.MiddlewareOptions>) => Promise<{
+        referenceId: string;
       }>) | ((inputContext: better_call0.MiddlewareInputContext<better_call0.MiddlewareOptions>) => Promise<void>))[];
     }, {
       url: string;

package/dist/index.d.mts

@@ -1,2 +1,2 @@
-import { a as CheckoutSessionLocale, c as StripeOptions, d as SubscriptionOptions, f as WithActiveOrganizationId, i as CheckoutSessionLineItem, l as StripePlan, n as stripe, o as CustomerType, p as WithStripeCustomerId, r as AuthorizeReferenceAction, s as StripeCtxSession, t as StripePlugin, u as Subscription } from "./index-C8Utp7ig.mjs";
+import { a as CheckoutSessionLocale, c as StripeOptions, d as SubscriptionOptions, f as WithActiveOrganizationId, i as CheckoutSessionLineItem, l as StripePlan, n as stripe, o as CustomerType, p as WithStripeCustomerId, r as AuthorizeReferenceAction, s as StripeCtxSession, t as StripePlugin, u as Subscription } from "./index-XU8GMPhh.mjs";
 export { AuthorizeReferenceAction, CheckoutSessionLineItem, CheckoutSessionLocale, CustomerType, StripeCtxSession, StripeOptions, StripePlan, StripePlugin, Subscription, SubscriptionOptions, WithActiveOrganizationId, WithStripeCustomerId, stripe };

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { n as STRIPE_ERROR_CODES, t as PACKAGE_VERSION } from "./version-Bf-a0R3x.mjs";
+import { n as STRIPE_ERROR_CODES, t as PACKAGE_VERSION } from "./version-Cup6oezK.mjs";
 import { APIError, HIDE_METADATA } from "better-auth";
 import { defu } from "defu";
 import { createAuthEndpoint, createAuthMiddleware } from "@better-auth/core/api";
@@ -91,13 +91,13 @@ function isStripePendingCancel(stripeSub) {
 }
 /**
 * Escapes a value for use in Stripe search queries.
-* Stripe search query uses double quotes for string values,
-* and double quotes within the value need to be escaped with backslash.
+* Stripe search query uses backslash escaping inside double-quoted
+* string values, so literal backslashes must be escaped before quotes.
 *
 * @see https://docs.stripe.com/search#search-query-language
 */
 function escapeStripeSearchValue(value) {
-	return value.replace(/"/g, "\\\"");
+	return value.replaceAll("\\", "\\\\").replaceAll("\"", "\\\"");
 }
 /**
 * Resolve the quantity for a subscription by checking the seat item first,
@@ -234,13 +234,13 @@ async function onCheckoutSessionCompleted(ctx, options, event) {
 async function onSubscriptionCreated(ctx, options, event) {
 	try {
 		if (!options.subscription?.enabled) return;
-		const subscriptionCreated = event.data.object;
-		const stripeCustomerId = subscriptionCreated.customer?.toString();
+		const stripeSubscriptionCreated = event.data.object;
+		const stripeCustomerId = stripeSubscriptionCreated.customer?.toString();
 		if (!stripeCustomerId) {
 			ctx.context.logger.warn(`Stripe webhook warning: customer.subscription.created event received without customer ID`);
 			return;
 		}
-		const { subscriptionId } = subscriptionMetadata.get(subscriptionCreated.metadata);
+		const { subscriptionId } = subscriptionMetadata.get(stripeSubscriptionCreated.metadata);
 		const existingSubscription = await ctx.context.adapter.findOne({
 			model: "subscription",
 			where: subscriptionId ? [{
@@ -248,7 +248,7 @@ async function onSubscriptionCreated(ctx, options, event) {
 				value: subscriptionId
 			}] : [{
 				field: "stripeSubscriptionId",
-				value: subscriptionCreated.id
+				value: stripeSubscriptionCreated.id
 			}]
 		});
 		if (existingSubscription) {
@@ -261,9 +261,9 @@ async function onSubscriptionCreated(ctx, options, event) {
 			return;
 		}
 		const { referenceId, customerType } = reference;
-		const resolved = await resolvePlanItem(options, subscriptionCreated.items.data);
+		const resolved = await resolvePlanItem(options, stripeSubscriptionCreated.items.data);
 		if (!resolved) {
-			ctx.context.logger.warn(`Stripe webhook warning: Subscription ${subscriptionCreated.id} has no items matching a configured plan`);
+			ctx.context.logger.warn(`Stripe webhook warning: Subscription ${stripeSubscriptionCreated.id} has no items matching a configured plan`);
 			return;
 		}
 		const { item: subscriptionItem, plan } = resolved;
@@ -271,12 +271,12 @@ async function onSubscriptionCreated(ctx, options, event) {
 			ctx.context.logger.warn(`Stripe webhook warning: No matching plan found for priceId: ${subscriptionItem.price.id}`);
 			return;
 		}
-		const seats = resolveQuantity(subscriptionCreated.items.data, subscriptionItem, plan.seatPriceId);
+		const seats = resolveQuantity(stripeSubscriptionCreated.items.data, subscriptionItem, plan.seatPriceId);
 		const periodStart = /* @__PURE__ */ new Date(subscriptionItem.current_period_start * 1e3);
 		const periodEnd = /* @__PURE__ */ new Date(subscriptionItem.current_period_end * 1e3);
-		const trial = subscriptionCreated.trial_start && subscriptionCreated.trial_end ? {
-			trialStart: /* @__PURE__ */ new Date(subscriptionCreated.trial_start * 1e3),
-			trialEnd: /* @__PURE__ */ new Date(subscriptionCreated.trial_end * 1e3)
+		const trial = stripeSubscriptionCreated.trial_start && stripeSubscriptionCreated.trial_end ? {
+			trialStart: /* @__PURE__ */ new Date(stripeSubscriptionCreated.trial_start * 1e3),
+			trialEnd: /* @__PURE__ */ new Date(stripeSubscriptionCreated.trial_end * 1e3)
 		} : {};
 		const newSubscription = await ctx.context.adapter.create({
 			model: "subscription",
@@ -285,8 +285,8 @@ async function onSubscriptionCreated(ctx, options, event) {
 				...plan.limits ? { limits: plan.limits } : {},
 				referenceId,
 				stripeCustomerId,
-				stripeSubscriptionId: subscriptionCreated.id,
-				status: subscriptionCreated.status,
+				stripeSubscriptionId: stripeSubscriptionCreated.id,
+				status: stripeSubscriptionCreated.status,
 				plan: plan.name.toLowerCase(),
 				periodStart,
 				periodEnd,
@@ -294,11 +294,11 @@ async function onSubscriptionCreated(ctx, options, event) {
 				billingInterval: subscriptionItem.price.recurring?.interval
 			}
 		});
-		ctx.context.logger.info(`Stripe webhook: Created subscription ${subscriptionCreated.id} for ${customerType} ${referenceId} from dashboard`);
+		ctx.context.logger.info(`Stripe webhook: Created subscription ${stripeSubscriptionCreated.id} for ${customerType} ${referenceId} from dashboard`);
 		await options.subscription.onSubscriptionCreated?.({
 			event,
 			subscription: newSubscription,
-			stripeSubscription: subscriptionCreated,
+			stripeSubscription: stripeSubscriptionCreated,
 			plan
 		});
 	} catch (error) {
@@ -308,15 +308,15 @@ async function onSubscriptionCreated(ctx, options, event) {
 async function onSubscriptionUpdated(ctx, options, event) {
 	try {
 		if (!options.subscription?.enabled) return;
-		const subscriptionUpdated = event.data.object;
-		const resolved = await resolvePlanItem(options, subscriptionUpdated.items.data);
+		const stripeSubscriptionUpdated = event.data.object;
+		const resolved = await resolvePlanItem(options, stripeSubscriptionUpdated.items.data);
 		if (!resolved) {
-			ctx.context.logger.warn(`Stripe webhook warning: Subscription ${subscriptionUpdated.id} has no items matching a configured plan`);
+			ctx.context.logger.warn(`Stripe webhook warning: Subscription ${stripeSubscriptionUpdated.id} has no items matching a configured plan`);
 			return;
 		}
 		const { item: subscriptionItem, plan } = resolved;
-		const { subscriptionId } = subscriptionMetadata.get(subscriptionUpdated.metadata);
-		const customerId = subscriptionUpdated.customer?.toString();
+		const { subscriptionId } = subscriptionMetadata.get(stripeSubscriptionUpdated.metadata);
+		const customerId = stripeSubscriptionUpdated.customer?.toString();
 		let subscription = await ctx.context.adapter.findOne({
 			model: "subscription",
 			where: subscriptionId ? [{
@@ -324,7 +324,7 @@ async function onSubscriptionUpdated(ctx, options, event) {
 				value: subscriptionId
 			}] : [{
 				field: "stripeSubscriptionId",
-				value: subscriptionUpdated.id
+				value: stripeSubscriptionUpdated.id
 			}]
 		});
 		if (!subscription) {
@@ -344,12 +344,12 @@ async function onSubscriptionUpdated(ctx, options, event) {
 				subscription = activeSub;
 			} else subscription = subs[0];
 		}
-		const seats = plan ? resolveQuantity(subscriptionUpdated.items.data, subscriptionItem, plan.seatPriceId) : subscriptionItem.quantity;
-		const trial = subscriptionUpdated.trial_start && subscriptionUpdated.trial_end ? {
-			trialStart: /* @__PURE__ */ new Date(subscriptionUpdated.trial_start * 1e3),
-			trialEnd: /* @__PURE__ */ new Date(subscriptionUpdated.trial_end * 1e3)
+		const seats = plan ? resolveQuantity(stripeSubscriptionUpdated.items.data, subscriptionItem, plan.seatPriceId) : subscriptionItem.quantity;
+		const trial = stripeSubscriptionUpdated.trial_start && stripeSubscriptionUpdated.trial_end ? {
+			trialStart: /* @__PURE__ */ new Date(stripeSubscriptionUpdated.trial_start * 1e3),
+			trialEnd: /* @__PURE__ */ new Date(stripeSubscriptionUpdated.trial_end * 1e3)
 		} : {};
-		const updatedSubscription = await ctx.context.adapter.update({
+		const subscriptionUpdated = await ctx.context.adapter.update({
 			model: "subscription",
 			update: {
 				...trial,
@@ -358,36 +358,41 @@ async function onSubscriptionUpdated(ctx, options, event) {
 					limits: plan.limits
 				} : {},
 				updatedAt: /* @__PURE__ */ new Date(),
-				status: subscriptionUpdated.status,
+				status: stripeSubscriptionUpdated.status,
 				periodStart: /* @__PURE__ */ new Date(subscriptionItem.current_period_start * 1e3),
 				periodEnd: /* @__PURE__ */ new Date(subscriptionItem.current_period_end * 1e3),
-				cancelAtPeriodEnd: subscriptionUpdated.cancel_at_period_end,
-				cancelAt: subscriptionUpdated.cancel_at ? /* @__PURE__ */ new Date(subscriptionUpdated.cancel_at * 1e3) : null,
-				canceledAt: subscriptionUpdated.canceled_at ? /* @__PURE__ */ new Date(subscriptionUpdated.canceled_at * 1e3) : null,
-				endedAt: subscriptionUpdated.ended_at ? /* @__PURE__ */ new Date(subscriptionUpdated.ended_at * 1e3) : null,
+				cancelAtPeriodEnd: stripeSubscriptionUpdated.cancel_at_period_end,
+				cancelAt: stripeSubscriptionUpdated.cancel_at ? /* @__PURE__ */ new Date(stripeSubscriptionUpdated.cancel_at * 1e3) : null,
+				canceledAt: stripeSubscriptionUpdated.canceled_at ? /* @__PURE__ */ new Date(stripeSubscriptionUpdated.canceled_at * 1e3) : null,
+				endedAt: stripeSubscriptionUpdated.ended_at ? /* @__PURE__ */ new Date(stripeSubscriptionUpdated.ended_at * 1e3) : null,
 				seats,
-				stripeSubscriptionId: subscriptionUpdated.id,
+				stripeSubscriptionId: stripeSubscriptionUpdated.id,
 				billingInterval: subscriptionItem.price.recurring?.interval,
-				stripeScheduleId: subscriptionUpdated.schedule ? typeof subscriptionUpdated.schedule === "string" ? subscriptionUpdated.schedule : subscriptionUpdated.schedule.id : null
+				stripeScheduleId: stripeSubscriptionUpdated.schedule ? typeof stripeSubscriptionUpdated.schedule === "string" ? stripeSubscriptionUpdated.schedule : stripeSubscriptionUpdated.schedule.id : null
 			},
 			where: [{
 				field: "id",
 				value: subscription.id
 			}]
 		});
-		if (subscriptionUpdated.status === "active" && isStripePendingCancel(subscriptionUpdated) && !isPendingCancel(subscription)) await options.subscription.onSubscriptionCancel?.({
-			subscription,
-			cancellationDetails: subscriptionUpdated.cancellation_details || void 0,
-			stripeSubscription: subscriptionUpdated,
-			event
+		if (!subscriptionUpdated) {
+			ctx.context.logger.warn(`Stripe webhook warning: Subscription ${subscription.id} update returned no row (likely deleted concurrently), skipping callbacks`);
+			return;
+		}
+		if (stripeSubscriptionUpdated.status === "active" && isStripePendingCancel(stripeSubscriptionUpdated) && !isPendingCancel(subscription)) await options.subscription.onSubscriptionCancel?.({
+			event,
+			subscription: subscriptionUpdated,
+			stripeSubscription: stripeSubscriptionUpdated,
+			cancellationDetails: stripeSubscriptionUpdated.cancellation_details || void 0
 		});
 		await options.subscription.onSubscriptionUpdate?.({
 			event,
-			subscription: updatedSubscription || subscription
+			subscription: subscriptionUpdated,
+			stripeSubscription: stripeSubscriptionUpdated
 		});
 		if (plan) {
-			if (subscriptionUpdated.status === "active" && subscription.status === "trialing" && plan.freeTrial?.onTrialEnd) await plan.freeTrial.onTrialEnd({ subscription }, ctx);
-			if (subscriptionUpdated.status === "incomplete_expired" && subscription.status === "trialing" && plan.freeTrial?.onTrialExpired) await plan.freeTrial.onTrialExpired(subscription, ctx);
+			if (stripeSubscriptionUpdated.status === "active" && subscription.status === "trialing" && plan.freeTrial?.onTrialEnd) await plan.freeTrial.onTrialEnd({ subscription: subscriptionUpdated }, ctx);
+			if (stripeSubscriptionUpdated.status === "incomplete_expired" && subscription.status === "trialing" && plan.freeTrial?.onTrialExpired) await plan.freeTrial.onTrialExpired(subscriptionUpdated, ctx);
 		}
 	} catch (error) {
 		ctx.context.logger.error(`Stripe webhook failed. Error: ${error}`);
@@ -396,8 +401,8 @@ async function onSubscriptionUpdated(ctx, options, event) {
 async function onSubscriptionDeleted(ctx, options, event) {
 	if (!options.subscription?.enabled) return;
 	try {
-		const subscriptionDeleted = event.data.object;
-		const subscriptionId = subscriptionDeleted.id;
+		const stripeSubscriptionDeleted = event.data.object;
+		const subscriptionId = stripeSubscriptionDeleted.id;
 		const subscription = await ctx.context.adapter.findOne({
 			model: "subscription",
 			where: [{
@@ -406,11 +411,11 @@ async function onSubscriptionDeleted(ctx, options, event) {
 			}]
 		});
 		if (subscription) {
-			const trial = subscriptionDeleted.trial_start && subscriptionDeleted.trial_end ? {
-				trialStart: /* @__PURE__ */ new Date(subscriptionDeleted.trial_start * 1e3),
-				trialEnd: /* @__PURE__ */ new Date(subscriptionDeleted.trial_end * 1e3)
+			const trial = stripeSubscriptionDeleted.trial_start && stripeSubscriptionDeleted.trial_end ? {
+				trialStart: /* @__PURE__ */ new Date(stripeSubscriptionDeleted.trial_start * 1e3),
+				trialEnd: /* @__PURE__ */ new Date(stripeSubscriptionDeleted.trial_end * 1e3)
 			} : {};
-			await ctx.context.adapter.update({
+			const subscriptionUpdated = await ctx.context.adapter.update({
 				model: "subscription",
 				where: [{
 					field: "id",
@@ -420,17 +425,21 @@ async function onSubscriptionDeleted(ctx, options, event) {
 					...trial,
 					status: "canceled",
 					updatedAt: /* @__PURE__ */ new Date(),
-					cancelAtPeriodEnd: subscriptionDeleted.cancel_at_period_end,
-					cancelAt: subscriptionDeleted.cancel_at ? /* @__PURE__ */ new Date(subscriptionDeleted.cancel_at * 1e3) : null,
-					canceledAt: subscriptionDeleted.canceled_at ? /* @__PURE__ */ new Date(subscriptionDeleted.canceled_at * 1e3) : null,
-					endedAt: subscriptionDeleted.ended_at ? /* @__PURE__ */ new Date(subscriptionDeleted.ended_at * 1e3) : null,
+					cancelAtPeriodEnd: stripeSubscriptionDeleted.cancel_at_period_end,
+					cancelAt: stripeSubscriptionDeleted.cancel_at ? /* @__PURE__ */ new Date(stripeSubscriptionDeleted.cancel_at * 1e3) : null,
+					canceledAt: stripeSubscriptionDeleted.canceled_at ? /* @__PURE__ */ new Date(stripeSubscriptionDeleted.canceled_at * 1e3) : null,
+					endedAt: stripeSubscriptionDeleted.ended_at ? /* @__PURE__ */ new Date(stripeSubscriptionDeleted.ended_at * 1e3) : null,
 					stripeScheduleId: null
 				}
 			});
+			if (!subscriptionUpdated) {
+				ctx.context.logger.warn(`Stripe webhook warning: Subscription ${subscription.id} update returned no row (likely deleted concurrently), skipping callbacks`);
+				return;
+			}
 			await options.subscription.onSubscriptionDeleted?.({
 				event,
-				stripeSubscription: subscriptionDeleted,
-				subscription
+				stripeSubscription: stripeSubscriptionDeleted,
+				subscription: subscriptionUpdated
 			});
 		} else ctx.context.logger.warn(`Stripe webhook error: Subscription not found for subscriptionId: ${subscriptionId}`);
 	} catch (error) {
@@ -442,12 +451,14 @@ async function onSubscriptionDeleted(ctx, options, event) {
 const stripeSessionMiddleware = createAuthMiddleware({ use: [sessionMiddleware] }, async (ctx) => {
 	return { session: ctx.context.session };
 });
-const referenceMiddleware = (subscriptionOptions, action) => createAuthMiddleware(async (ctx) => {
+const referenceMiddleware = (options, action) => createAuthMiddleware(async (ctx) => {
+	const subscriptionOptions = options.subscription;
 	const ctxSession = ctx.context.session;
 	if (!ctxSession) throw APIError$1.from("UNAUTHORIZED", STRIPE_ERROR_CODES.UNAUTHORIZED);
 	const customerType = ctx.body?.customerType || ctx.query?.customerType;
 	const explicitReferenceId = ctx.body?.referenceId || ctx.query?.referenceId;
 	if (customerType === "organization") {
+		if (!options.organization?.enabled) throw APIError$1.from("BAD_REQUEST", STRIPE_ERROR_CODES.ORGANIZATION_SUBSCRIPTION_NOT_ENABLED);
 		if (!subscriptionOptions.authorizeReference) {
 			ctx.context.logger.error(`Organization subscriptions require authorizeReference to be defined in your stripe plugin config.`);
 			throw APIError$1.from("BAD_REQUEST", STRIPE_ERROR_CODES.AUTHORIZE_REFERENCE_REQUIRED);
@@ -460,10 +471,10 @@ const referenceMiddleware = (subscriptionOptions, action) => createAuthMiddlewar
 			referenceId,
 			action
 		}, ctx)) throw APIError$1.from("UNAUTHORIZED", STRIPE_ERROR_CODES.UNAUTHORIZED);
-		return;
+		return { referenceId };
 	}
-	if (!explicitReferenceId) return;
-	if (explicitReferenceId === ctxSession.user.id) return;
+	const referenceId = explicitReferenceId || ctxSession.user.id;
+	if (!explicitReferenceId || explicitReferenceId === ctxSession.user.id) return { referenceId };
 	if (!subscriptionOptions.authorizeReference) {
 		ctx.context.logger.error(`Passing referenceId into a subscription action isn't allowed if subscription.authorizeReference isn't defined in your stripe plugin config.`);
 		throw APIError$1.from("BAD_REQUEST", STRIPE_ERROR_CODES.REFERENCE_ID_NOT_ALLOWED);
@@ -471,9 +482,10 @@ const referenceMiddleware = (subscriptionOptions, action) => createAuthMiddlewar
 	if (!await subscriptionOptions.authorizeReference({
 		user: ctxSession.user,
 		session: ctxSession.session,
-		referenceId: explicitReferenceId,
+		referenceId,
 		action
 	}, ctx)) throw APIError$1.from("UNAUTHORIZED", STRIPE_ERROR_CODES.UNAUTHORIZED);
+	return { referenceId };
 });
 //#endregion
 //#region src/routes.ts
@@ -511,19 +523,21 @@ function getUrl(ctx, url) {
 	return `${ctx.context.options.baseURL}${url.startsWith("/") ? url : `/${url}`}`;
 }
 /**
-* Determines the reference ID based on customer type.
-* - `user` (default): uses userId
-* - `organization`: uses activeOrganizationId from session
+* Retrieve the subscription a row points to, or `null` if it no longer exists
+* (`resource_missing`) so callers can treat the row as stale.
 * @internal
 */
-function getReferenceId(ctxSession, customerType, options) {
-	const { user, session } = ctxSession;
-	if ((customerType || "user") === "organization") {
-		if (!options.organization?.enabled) throw APIError$1.from("BAD_REQUEST", STRIPE_ERROR_CODES.ORGANIZATION_SUBSCRIPTION_NOT_ENABLED);
-		if (!session.activeOrganizationId) throw APIError$1.from("BAD_REQUEST", STRIPE_ERROR_CODES.ORGANIZATION_NOT_FOUND);
-		return session.activeOrganizationId;
-	}
-	return user.id;
+async function retrieveStripeSubscription(client, ctx, stripeSubscriptionId) {
+	return await client.subscriptions.retrieve(stripeSubscriptionId).catch((e) => {
+		/**
+		* @see https://docs.stripe.com/error-codes
+		*/
+		if (e?.code === "resource_missing") return null;
+		throw ctx.error("BAD_REQUEST", {
+			code: e.code,
+			message: e.message
+		});
+	});
 }
 const upgradeSubscriptionBodySchema = z.object({
 	plan: z.string().meta({ description: "The name of the plan to upgrade to. Eg: \"pro\"" }),
@@ -566,15 +580,19 @@ const upgradeSubscription = (options) => {
 		metadata: { openapi: { operationId: "upgradeSubscription" } },
 		use: [
 			stripeSessionMiddleware,
-			referenceMiddleware(subscriptionOptions, "upgrade-subscription"),
+			referenceMiddleware(options, "upgrade-subscription"),
 			originCheck((c) => {
-				return [c.body.successUrl, c.body.cancelUrl];
+				return [
+					c.body.successUrl,
+					c.body.cancelUrl,
+					c.body.returnUrl
+				];
 			})
 		]
 	}, async (ctx) => {
 		const { user, session } = ctx.context.session;
 		const customerType = ctx.body.customerType || "user";
-		const referenceId = ctx.body.referenceId || getReferenceId(ctx.context.session, customerType, options);
+		const referenceId = ctx.context.referenceId;
 		if (!user.emailVerified && subscriptionOptions.requireEmailVerification) throw APIError$1.from("BAD_REQUEST", STRIPE_ERROR_CODES.EMAIL_VERIFICATION_REQUIRED);
 		const plan = await getPlanByName(options, ctx.body.plan);
 		if (!plan) throw APIError$1.from("BAD_REQUEST", STRIPE_ERROR_CODES.SUBSCRIPTION_PLAN_NOT_FOUND);
@@ -666,6 +684,10 @@ const upgradeSubscription = (options) => {
 						break;
 					}
 				}
+				if (stripeCustomer) {
+					const ownerId = customerMetadata.get(stripeCustomer.metadata).userId;
+					if (!!ownerId && ownerId !== user.id || !user.emailVerified) stripeCustomer = void 0;
+				}
 				if (!stripeCustomer) stripeCustomer = await client.customers.create({
 					email: user.email,
 					name: user.name,
@@ -983,16 +1005,23 @@ const upgradeSubscription = (options) => {
 		})).some((s) => {
 			return !!(s.trialStart || s.trialEnd) || s.status === "trialing";
 		}) && plan.freeTrial ? { trial_period_days: plan.freeTrial.days } : void 0;
+		const { mode: _mode, customer: _customer, customer_email: _customer_email, success_url: _success_url, cancel_url: _cancel_url, line_items: _line_items, client_reference_id: _client_reference_id, ...additionalParams } = params?.params ?? {};
 		const response = {
 			...await client.checkout.sessions.create({
+				...additionalParams,
+				mode: "subscription",
 				...customerId ? {
 					customer: customerId,
-					customer_update: customerType !== "user" ? { address: "auto" } : {
+					customer_email: void 0,
+					customer_update: additionalParams.customer_update ?? (customerType !== "user" ? { address: "auto" } : {
 						name: "auto",
 						address: "auto"
-					}
-				} : { customer_email: user.email },
-				locale: ctx.body.locale,
+					})
+				} : {
+					customer: void 0,
+					customer_email: user.email
+				},
+				locale: ctx.body.locale ?? additionalParams.locale,
 				success_url: getUrl(ctx, `${ctx.context.baseURL}/subscription/success?callbackURL=${encodeURIComponent(ctx.body.successUrl)}&checkoutSessionId={CHECKOUT_SESSION_ID}`),
 				cancel_url: getUrl(ctx, ctx.body.cancelUrl),
 				line_items: [
@@ -1006,22 +1035,21 @@ const upgradeSubscription = (options) => {
 					}] : [],
 					...plan.lineItems ?? []
 				],
+				client_reference_id: referenceId,
 				subscription_data: {
 					...freeTrial,
+					...additionalParams.subscription_data,
 					metadata: subscriptionMetadata.set({
 						userId: user.id,
 						subscriptionId: subscription.id,
 						referenceId
-					}, ctx.body.metadata, params?.params?.subscription_data?.metadata)
+					}, ctx.body.metadata, additionalParams.subscription_data?.metadata)
 				},
-				mode: "subscription",
-				client_reference_id: referenceId,
-				...params?.params,
 				metadata: subscriptionMetadata.set({
 					userId: user.id,
 					subscriptionId: subscription.id,
 					referenceId
-				}, ctx.body.metadata, params?.params?.metadata)
+				}, ctx.body.metadata, additionalParams.metadata)
 			}, params?.options).catch(async (e) => {
 				throw ctx.error("BAD_REQUEST", {
 					message: e.message,
@@ -1057,19 +1085,17 @@ const cancelSubscriptionBodySchema = z.object({
 */
 const cancelSubscription = (options) => {
 	const client = options.stripeClient;
-	const subscriptionOptions = options.subscription;
 	return createAuthEndpoint("/subscription/cancel", {
 		method: "POST",
 		body: cancelSubscriptionBodySchema,
 		metadata: { openapi: { operationId: "cancelSubscription" } },
 		use: [
 			stripeSessionMiddleware,
-			referenceMiddleware(subscriptionOptions, "cancel-subscription"),
+			referenceMiddleware(options, "cancel-subscription"),
 			originCheck((ctx) => ctx.body.returnUrl)
 		]
 	}, async (ctx) => {
-		const customerType = ctx.body.customerType || "user";
-		const referenceId = ctx.body.referenceId || getReferenceId(ctx.context.session, customerType, options);
+		const referenceId = ctx.context.referenceId;
 		let subscription = ctx.body.subscriptionId ? await ctx.context.adapter.findOne({
 			model: "subscription",
 			where: [{
@@ -1085,23 +1111,18 @@ const cancelSubscription = (options) => {
 		}).then((subs) => subs.find((sub) => isActiveOrTrialing(sub)));
 		if (ctx.body.subscriptionId && subscription && subscription.referenceId !== referenceId) subscription = void 0;
 		if (!subscription || !subscription.stripeCustomerId) throw APIError$1.from("BAD_REQUEST", STRIPE_ERROR_CODES.SUBSCRIPTION_NOT_FOUND);
-		const activeSubscriptions = await client.subscriptions.list({ customer: subscription.stripeCustomerId }).then((res) => res.data.filter((sub) => isActiveOrTrialing(sub)));
-		if (!activeSubscriptions.length) {
-			/**
-			* If the subscription is not found, we need to delete the subscription
-			* from the database. This is a rare case and should not happen.
-			*/
-			await ctx.context.adapter.deleteMany({
+		if (!subscription.stripeSubscriptionId) throw APIError$1.from("BAD_REQUEST", STRIPE_ERROR_CODES.SUBSCRIPTION_NOT_FOUND);
+		const activeSubscription = await retrieveStripeSubscription(client, ctx, subscription.stripeSubscriptionId);
+		if (!activeSubscription || !isActiveOrTrialing(activeSubscription)) {
+			await ctx.context.adapter.delete({
 				model: "subscription",
 				where: [{
-					field: "referenceId",
-					value: referenceId
+					field: "id",
+					value: subscription.id
 				}]
 			});
 			throw APIError$1.from("BAD_REQUEST", STRIPE_ERROR_CODES.SUBSCRIPTION_NOT_FOUND);
 		}
-		const activeSubscription = activeSubscriptions.find((sub) => sub.id === subscription.stripeSubscriptionId);
-		if (!activeSubscription) throw APIError$1.from("BAD_REQUEST", STRIPE_ERROR_CODES.SUBSCRIPTION_NOT_FOUND);
 		const { url } = await client.billingPortal.sessions.create({
 			customer: subscription.stripeCustomerId,
 			return_url: getUrl(ctx, ctx.body?.returnUrl || "/"),
@@ -1149,15 +1170,13 @@ const restoreSubscriptionBodySchema = z.object({
 });
 const restoreSubscription = (options) => {
 	const client = options.stripeClient;
-	const subscriptionOptions = options.subscription;
 	return createAuthEndpoint("/subscription/restore", {
 		method: "POST",
 		body: restoreSubscriptionBodySchema,
 		metadata: { openapi: { operationId: "restoreSubscription" } },
-		use: [stripeSessionMiddleware, referenceMiddleware(subscriptionOptions, "restore-subscription")]
+		use: [stripeSessionMiddleware, referenceMiddleware(options, "restore-subscription")]
 	}, async (ctx) => {
-		const customerType = ctx.body.customerType || "user";
-		const referenceId = ctx.body.referenceId || getReferenceId(ctx.context.session, customerType, options);
+		const referenceId = ctx.context.referenceId;
 		let subscription = ctx.body.subscriptionId ? await ctx.context.adapter.findOne({
 			model: "subscription",
 			where: [{
@@ -1204,8 +1223,9 @@ const restoreSubscription = (options) => {
 			const releasedSub = await client.subscriptions.retrieve(subscription.stripeSubscriptionId);
 			return ctx.json(releasedSub);
 		}
-		const activeSubscription = await client.subscriptions.list({ customer: subscription.stripeCustomerId }).then((res) => res.data.filter((sub) => isActiveOrTrialing(sub))[0]);
-		if (!activeSubscription) throw APIError$1.from("BAD_REQUEST", STRIPE_ERROR_CODES.SUBSCRIPTION_NOT_FOUND);
+		if (!subscription.stripeSubscriptionId) throw APIError$1.from("BAD_REQUEST", STRIPE_ERROR_CODES.SUBSCRIPTION_NOT_FOUND);
+		const activeSubscription = await retrieveStripeSubscription(client, ctx, subscription.stripeSubscriptionId);
+		if (!activeSubscription || !isActiveOrTrialing(activeSubscription)) throw APIError$1.from("BAD_REQUEST", STRIPE_ERROR_CODES.SUBSCRIPTION_NOT_FOUND);
 		const updateParams = {};
 		if (activeSubscription.cancel_at) updateParams.cancel_at = "";
 		else if (activeSubscription.cancel_at_period_end) updateParams.cancel_at_period_end = false;
@@ -1251,15 +1271,13 @@ const listActiveSubscriptionsQuerySchema = z.optional(z.object({
 * @see [Read our docs to learn more.](https://better-auth.com/docs/plugins/stripe#api-method-subscription-list)
 */
 const listActiveSubscriptions = (options) => {
-	const subscriptionOptions = options.subscription;
 	return createAuthEndpoint("/subscription/list", {
 		method: "GET",
 		query: listActiveSubscriptionsQuerySchema,
 		metadata: { openapi: { operationId: "listActiveSubscriptions" } },
-		use: [stripeSessionMiddleware, referenceMiddleware(subscriptionOptions, "list-subscription")]
+		use: [stripeSessionMiddleware, referenceMiddleware(options, "list-subscription")]
 	}, async (ctx) => {
-		const customerType = ctx.query?.customerType || "user";
-		const referenceId = ctx.query?.referenceId || getReferenceId(ctx.context.session, customerType, options);
+		const referenceId = ctx.context.referenceId;
 		const subscriptions = await ctx.context.adapter.findMany({
 			model: "subscription",
 			where: [{
@@ -1292,8 +1310,7 @@ const subscriptionSuccess = (options) => {
 		use: [originCheck((ctx) => ctx.query.callbackURL)]
 	}, async (ctx) => {
 		let callbackURL = ctx.query?.callbackURL || "/";
-		const session = await getSessionFromCtx(ctx);
-		if (!session) throw ctx.redirect(getUrl(ctx, callbackURL));
+		if (!await getSessionFromCtx(ctx)) throw ctx.redirect(getUrl(ctx, callbackURL));
 		if (!ctx.query?.checkoutSessionId) throw ctx.redirect(getUrl(ctx, callbackURL));
 		/**
 		* Replace the Stripe {CHECKOUT_SESSION_ID} template variable in callbackURL.
@@ -1322,12 +1339,9 @@ const subscriptionSuccess = (options) => {
 			throw ctx.redirect(getUrl(ctx, callbackURL));
 		}
 		if (isActiveOrTrialing(subscription)) throw ctx.redirect(getUrl(ctx, callbackURL));
-		const customerId = subscription.stripeCustomerId || session.user.stripeCustomerId;
-		if (!customerId) throw ctx.redirect(getUrl(ctx, callbackURL));
-		const stripeSubscription = await client.subscriptions.list({
-			customer: customerId,
-			status: "active"
-		}).then((res) => res.data[0]).catch((error) => {
+		const stripeSubscriptionId = typeof checkoutSession.subscription === "string" ? checkoutSession.subscription : checkoutSession.subscription?.id;
+		if (!stripeSubscriptionId || checkoutSession.payment_status === "unpaid") throw ctx.redirect(getUrl(ctx, callbackURL));
+		const stripeSubscription = await client.subscriptions.retrieve(stripeSubscriptionId).catch((error) => {
 			ctx.context.logger.error("Error fetching subscription from Stripe", error);
 			throw ctx.redirect(getUrl(ctx, callbackURL));
 		});
@@ -1380,20 +1394,19 @@ const createBillingPortalBodySchema = z.object({
 });
 const createBillingPortal = (options) => {
 	const client = options.stripeClient;
-	const subscriptionOptions = options.subscription;
 	return createAuthEndpoint("/subscription/billing-portal", {
 		method: "POST",
 		body: createBillingPortalBodySchema,
 		metadata: { openapi: { operationId: "createBillingPortal" } },
 		use: [
 			stripeSessionMiddleware,
-			referenceMiddleware(subscriptionOptions, "billing-portal"),
+			referenceMiddleware(options, "billing-portal"),
 			originCheck((ctx) => ctx.body.returnUrl)
 		]
 	}, async (ctx) => {
 		const { user } = ctx.context.session;
 		const customerType = ctx.body.customerType || "user";
-		const referenceId = ctx.body.referenceId || getReferenceId(ctx.context.session, customerType, options);
+		const referenceId = ctx.context.referenceId;
 		let customerId;
 		if (customerType === "organization") {
 			customerId = (await ctx.context.adapter.findOne({
@@ -1650,12 +1663,11 @@ const stripe = (options) => {
 					const { organization } = data;
 					if (!organization.stripeCustomerId) return;
 					try {
-						const subscriptions = await client.subscriptions.list({
+						for await (const sub of client.subscriptions.list({
 							customer: organization.stripeCustomerId,
 							status: "all",
 							limit: 100
-						});
-						for (const sub of subscriptions.data) if (sub.status !== "canceled" && sub.status !== "incomplete" && sub.status !== "incomplete_expired") throw APIError.from("BAD_REQUEST", STRIPE_ERROR_CODES.ORGANIZATION_HAS_ACTIVE_SUBSCRIPTION);
+						})) if (sub.status !== "canceled" && sub.status !== "incomplete" && sub.status !== "incomplete_expired") throw APIError.from("BAD_REQUEST", STRIPE_ERROR_CODES.ORGANIZATION_HAS_ACTIVE_SUBSCRIPTION);
 					} catch (error) {
 						if (error instanceof APIError) throw error;
 						ctx.logger.error(`Failed to check organization subscriptions: ${error.message}`);
@@ -1760,6 +1772,10 @@ const stripe = (options) => {
 								break;
 							}
 						}
+						if (stripeCustomer) {
+							const ownerId = customerMetadata.get(stripeCustomer.metadata).userId;
+							if (!!ownerId && ownerId !== user.id || !user.emailVerified) stripeCustomer = void 0;
+						}
 						if (stripeCustomer) {
 							await ctx.context.internalAdapter.updateUser(user.id, { stripeCustomerId: stripeCustomer.id });
 							await options.onCustomerCreate?.({

package/dist/{version-Bf-a0R3x.mjs → version-Cup6oezK.mjs}

@@ -27,6 +27,6 @@ const STRIPE_ERROR_CODES = defineErrorCodes({
 });
 //#endregion
 //#region src/version.ts
-const PACKAGE_VERSION = "1.7.0-beta.1";
+const PACKAGE_VERSION = "1.7.0-beta.10";
 //#endregion
 export { STRIPE_ERROR_CODES as n, PACKAGE_VERSION as t };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@better-auth/stripe",
-  "version": "1.7.0-beta.1",
+  "version": "1.7.0-beta.10",
   "description": "Stripe plugin for Better Auth",
   "type": "module",
   "license": "MIT",
@@ -55,17 +55,17 @@
     "zod": "^4.3.6"
   },
   "devDependencies": {
-    "better-call": "1.3.5",
+    "better-call": "1.3.7",
     "stripe": "^22.0.1",
     "tsdown": "0.21.1",
-    "@better-auth/core": "1.7.0-beta.1",
-    "better-auth": "1.7.0-beta.1"
+    "@better-auth/core": "1.7.0-beta.10",
+    "better-auth": "1.7.0-beta.10"
   },
   "peerDependencies": {
-    "better-call": "1.3.5",
+    "better-call": "1.3.7",
     "stripe": "^18 || ^19 || ^20 || ^21 || ^22",
-    "@better-auth/core": "^1.7.0-beta.1",
-    "better-auth": "^1.7.0-beta.1"
+    "@better-auth/core": "^1.7.0-beta.10",
+    "better-auth": "^1.7.0-beta.10"
   },
   "scripts": {
     "build": "tsdown",