@better-auth/stripe 1.7.0-beta.2 → 1.7.0-beta.3

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-C-c67H8y.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-m_cDeAXN.mjs";
+import { n as STRIPE_ERROR_CODES, t as PACKAGE_VERSION } from "./version-CzGWwAIx.mjs";
 //#region src/client.ts
 const stripeClient = (options) => {
 	return {

package/dist/{index-C8Utp7ig.d.mts → index-C-c67H8y.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;
     stripeSubscription: Stripe.Subscription;
+    subscription: Subscription;
     cancellationDetails?: Stripe.Subscription.CancellationDetails | null;
   }) => Promise<void>) | undefined;
   /**

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-C-c67H8y.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-m_cDeAXN.mjs";
+import { n as STRIPE_ERROR_CODES, t as PACKAGE_VERSION } from "./version-CzGWwAIx.mjs";
 import { APIError, HIDE_METADATA } from "better-auth";
 import { defu } from "defu";
 import { createAuthEndpoint, createAuthMiddleware } from "@better-auth/core/api";
@@ -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) {
@@ -983,16 +992,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 +1022,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,

package/dist/{version-m_cDeAXN.mjs → version-CzGWwAIx.mjs}

@@ -27,6 +27,6 @@ const STRIPE_ERROR_CODES = defineErrorCodes({
 });
 //#endregion
 //#region src/version.ts
-const PACKAGE_VERSION = "1.7.0-beta.2";
+const PACKAGE_VERSION = "1.7.0-beta.3";
 //#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.2",
+  "version": "1.7.0-beta.3",
   "description": "Stripe plugin for Better Auth",
   "type": "module",
   "license": "MIT",
@@ -58,14 +58,14 @@
     "better-call": "1.3.5",
     "stripe": "^22.0.1",
     "tsdown": "0.21.1",
-    "@better-auth/core": "1.7.0-beta.2",
-    "better-auth": "1.7.0-beta.2"
+    "@better-auth/core": "1.7.0-beta.3",
+    "better-auth": "1.7.0-beta.3"
   },
   "peerDependencies": {
     "better-call": "1.3.5",
     "stripe": "^18 || ^19 || ^20 || ^21 || ^22",
-    "@better-auth/core": "^1.7.0-beta.2",
-    "better-auth": "^1.7.0-beta.2"
+    "@better-auth/core": "^1.7.0-beta.3",
+    "better-auth": "^1.7.0-beta.3"
   },
   "scripts": {
     "build": "tsdown",