@better-auth/stripe 1.5.0-beta.1 → 1.5.0-beta.2

package/.turbo/turbo-build.log

@@ -1,5 +1,5 @@
 
-> @better-auth/stripe@1.5.0-beta.1 build /home/runner/work/better-auth/better-auth/packages/stripe
+> @better-auth/stripe@1.5.0-beta.2 build /home/runner/work/better-auth/better-auth/packages/stripe
 > tsdown
 
 ℹ tsdown v0.17.2 powered by rolldown v1.0.0-beta.53
@@ -7,11 +7,11 @@
 ℹ entry: src/index.ts, src/client.ts
 ℹ tsconfig: tsconfig.json
 ℹ Build start
-ℹ dist/index.mjs                 40.12 kB │ gzip: 7.63 kB
-ℹ dist/client.mjs                 0.35 kB │ gzip: 0.25 kB
+ℹ dist/index.mjs                 46.22 kB │ gzip: 8.51 kB
+ℹ dist/client.mjs                 0.39 kB │ gzip: 0.27 kB
 ℹ dist/error-codes-qqooUh6R.mjs   0.72 kB │ gzip: 0.42 kB
-ℹ dist/client.d.mts               2.97 kB │ gzip: 0.79 kB
+ℹ dist/client.d.mts               3.01 kB │ gzip: 0.80 kB
 ℹ dist/index.d.mts                0.21 kB │ gzip: 0.14 kB
-ℹ dist/index-DpiQGYLJ.d.mts      25.42 kB │ gzip: 4.88 kB
-ℹ 6 files, total: 69.80 kB
-✔ Build complete in 16274ms
+ℹ dist/index-SbT5j9k6.d.mts      26.83 kB │ gzip: 5.12 kB
+ℹ 6 files, total: 77.38 kB
+✔ Build complete in 16492ms

package/dist/client.d.mts

@@ -1,4 +1,4 @@
-import { n as stripe } from "./index-DpiQGYLJ.mjs";
+import { n as stripe } from "./index-SbT5j9k6.mjs";
 
 //#region src/error-codes.d.ts
 declare const STRIPE_ERROR_CODES: {
@@ -54,6 +54,7 @@ declare const stripeClient: <O extends {
   }>>;
   pathMethods: {
     "/subscription/billing-portal": "POST";
+    "/subscription/restore": "POST";
   };
   $ERROR_CODES: {
     readonly SUBSCRIPTION_NOT_FOUND: {

package/dist/client.mjs

@@ -5,7 +5,10 @@ const stripeClient = (options) => {
 	return {
 		id: "stripe-client",
 		$InferServerPlugin: {},
-		pathMethods: { "/subscription/billing-portal": "POST" },
+		pathMethods: {
+			"/subscription/billing-portal": "POST",
+			"/subscription/restore": "POST"
+		},
 		$ERROR_CODES: STRIPE_ERROR_CODES
 	};
 };

package/dist/{index-DpiQGYLJ.d.mts → index-SbT5j9k6.d.mts}

@@ -49,6 +49,18 @@ declare const subscriptions: {
         required: false;
         defaultValue: false;
       };
+      cancelAt: {
+        type: "date";
+        required: false;
+      };
+      canceledAt: {
+        type: "date";
+        required: false;
+      };
+      endedAt: {
+        type: "date";
+        required: false;
+      };
       seats: {
         type: "number";
         required: false;
@@ -198,9 +210,26 @@ interface Subscription {
    */
   periodEnd?: Date | undefined;
   /**
-   * Cancel at period end
+   * Whether this subscription will (if status=active)
+   * or did (if status=canceled) cancel at the end of the current billing period.
    */
   cancelAtPeriodEnd?: boolean | undefined;
+  /**
+   * If the subscription is scheduled to be canceled,
+   * this is the time at which the cancellation will take effect.
+   */
+  cancelAt?: Date | undefined;
+  /**
+   * If the subscription has been canceled, this is the time when it was canceled.
+   *
+   * Note: If the subscription was canceled with `cancel_at_period_end`,
+   * this reflects the cancellation request time, not when the subscription actually ends.
+   */
+  canceledAt?: Date | undefined;
+  /**
+   * If the subscription has ended, the date the subscription ended.
+   */
+  endedAt?: Date | undefined;
   /**
    * A field to group subscriptions so you can have multiple subscriptions
    * for one reference id
@@ -279,6 +308,16 @@ type SubscriptionOptions = {
     stripeSubscription: Stripe.Subscription;
     subscription: Subscription;
   }) => Promise<void>) | undefined;
+  /**
+   * A callback to run when a subscription is created
+   * @returns
+   */
+  onSubscriptionCreated?: ((data: {
+    event: Stripe.Event;
+    stripeSubscription: Stripe.Subscription;
+    subscription: Subscription;
+    plan: StripePlan;
+  }) => Promise<void>) | undefined;
   /**
    * parameters for session create params
    *
@@ -518,6 +557,7 @@ declare const stripe: <O extends StripeOptions>(options: O) => {
         referenceId: zod0.ZodOptional<zod0.ZodString>;
         subscriptionId: zod0.ZodOptional<zod0.ZodString>;
         returnUrl: zod0.ZodString;
+        disableRedirect: zod0.ZodDefault<zod0.ZodBoolean>;
       }, better_auth0.$strip>;
       metadata: {
         openapi: {
@@ -633,6 +673,9 @@ declare const stripe: <O extends StripeOptions>(options: O) => {
       periodStart?: Date | undefined;
       periodEnd?: Date | undefined;
       cancelAtPeriodEnd?: boolean | undefined;
+      cancelAt?: Date | undefined;
+      canceledAt?: Date | undefined;
+      endedAt?: Date | undefined;
       groupId?: string | undefined;
       seats?: number | undefined;
     }[]>;
@@ -665,6 +708,7 @@ declare const stripe: <O extends StripeOptions>(options: O) => {
         locale: zod0.ZodOptional<zod0.ZodCustom<Stripe.Checkout.Session.Locale, Stripe.Checkout.Session.Locale>>;
         referenceId: zod0.ZodOptional<zod0.ZodString>;
         returnUrl: zod0.ZodDefault<zod0.ZodString>;
+        disableRedirect: zod0.ZodDefault<zod0.ZodBoolean>;
       }, better_auth0.$strip>;
       metadata: {
         openapi: {

package/dist/index.d.mts

@@ -1,2 +1,2 @@
-import { a as SubscriptionOptions, i as Subscription, n as stripe, r as StripePlan, t as StripePlugin } from "./index-DpiQGYLJ.mjs";
+import { a as SubscriptionOptions, i as Subscription, n as stripe, r as StripePlan, t as StripePlugin } from "./index-SbT5j9k6.mjs";
 export { StripePlan, StripePlugin, Subscription, SubscriptionOptions, stripe };

package/dist/index.mjs

@@ -3,7 +3,7 @@ import { defineErrorCodes } from "@better-auth/core/utils";
 import { defu } from "defu";
 import { createAuthEndpoint, createAuthMiddleware } from "@better-auth/core/api";
 import { APIError } from "@better-auth/core/error";
-import { HIDE_METADATA, logger } from "better-auth";
+import { HIDE_METADATA } from "better-auth";
 import { APIError as APIError$1, getSessionFromCtx, originCheck, sessionMiddleware } from "better-auth/api";
 import * as z from "zod/v4";
 import { mergeSchema } from "better-auth/db";
@@ -19,6 +19,24 @@ async function getPlanByPriceInfo(options, priceId, priceLookupKey) {
 async function getPlanByName(options, name) {
 	return await getPlans(options.subscription).then((res) => res?.find((plan) => plan.name.toLowerCase() === name.toLowerCase()));
 }
+/**
+* Checks if a subscription is in an available state (active or trialing)
+*/
+function isActiveOrTrialing(sub) {
+	return sub.status === "active" || sub.status === "trialing";
+}
+/**
+* Check if a subscription is scheduled to be canceled (DB subscription object)
+*/
+function isPendingCancel(sub) {
+	return !!(sub.cancelAtPeriodEnd || sub.cancelAt);
+}
+/**
+* Check if a Stripe subscription is scheduled to be canceled (Stripe API response)
+*/
+function isStripePendingCancel(stripeSub) {
+	return !!(stripeSub.cancel_at_period_end || stripeSub.cancel_at);
+}
 
 //#endregion
 //#region src/hooks.ts
@@ -48,6 +66,10 @@ async function onCheckoutSessionCompleted(ctx, options, event) {
 						periodStart: /* @__PURE__ */ new Date(subscription.items.data[0].current_period_start * 1e3),
 						periodEnd: /* @__PURE__ */ new Date(subscription.items.data[0].current_period_end * 1e3),
 						stripeSubscriptionId: checkoutSession.subscription,
+						cancelAtPeriodEnd: subscription.cancel_at_period_end,
+						cancelAt: subscription.cancel_at ? /* @__PURE__ */ new Date(subscription.cancel_at * 1e3) : null,
+						canceledAt: subscription.canceled_at ? /* @__PURE__ */ new Date(subscription.canceled_at * 1e3) : null,
+						endedAt: subscription.ended_at ? /* @__PURE__ */ new Date(subscription.ended_at * 1e3) : null,
 						seats,
 						...trial
 					},
@@ -74,7 +96,81 @@ async function onCheckoutSessionCompleted(ctx, options, event) {
 			}
 		}
 	} catch (e) {
-		logger.error(`Stripe webhook failed. Error: ${e.message}`);
+		ctx.context.logger.error(`Stripe webhook failed. Error: ${e.message}`);
+	}
+}
+async function onSubscriptionCreated(ctx, options, event) {
+	try {
+		if (!options.subscription?.enabled) return;
+		const subscriptionCreated = event.data.object;
+		const stripeCustomerId = subscriptionCreated.customer?.toString();
+		if (!stripeCustomerId) {
+			ctx.context.logger.warn(`Stripe webhook warning: customer.subscription.created event received without customer ID`);
+			return;
+		}
+		if (await ctx.context.adapter.findOne({
+			model: "subscription",
+			where: [{
+				field: "stripeSubscriptionId",
+				value: subscriptionCreated.id
+			}]
+		})) {
+			ctx.context.logger.info(`Stripe webhook: Subscription ${subscriptionCreated.id} already exists in database, skipping creation`);
+			return;
+		}
+		const user$1 = await ctx.context.adapter.findOne({
+			model: "user",
+			where: [{
+				field: "stripeCustomerId",
+				value: stripeCustomerId
+			}]
+		});
+		if (!user$1) {
+			ctx.context.logger.warn(`Stripe webhook warning: No user found with stripeCustomerId: ${stripeCustomerId}`);
+			return;
+		}
+		const subscriptionItem = subscriptionCreated.items.data[0];
+		if (!subscriptionItem) {
+			ctx.context.logger.warn(`Stripe webhook warning: Subscription ${subscriptionCreated.id} has no items`);
+			return;
+		}
+		const priceId = subscriptionItem.price.id;
+		const plan = await getPlanByPriceInfo(options, priceId, subscriptionItem.price.lookup_key || null);
+		if (!plan) {
+			ctx.context.logger.warn(`Stripe webhook warning: No matching plan found for priceId: ${priceId}`);
+			return;
+		}
+		const seats = subscriptionItem.quantity;
+		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 newSubscription = await ctx.context.adapter.create({
+			model: "subscription",
+			data: {
+				referenceId: user$1.id,
+				stripeCustomerId,
+				stripeSubscriptionId: subscriptionCreated.id,
+				status: subscriptionCreated.status,
+				plan: plan.name.toLowerCase(),
+				periodStart,
+				periodEnd,
+				seats,
+				...plan.limits ? { limits: plan.limits } : {},
+				...trial
+			}
+		});
+		ctx.context.logger.info(`Stripe webhook: Created subscription ${subscriptionCreated.id} for user ${user$1.id} from dashboard`);
+		await options.subscription?.onSubscriptionCreated?.({
+			event,
+			subscription: newSubscription,
+			stripeSubscription: subscriptionCreated,
+			plan
+		});
+	} catch (error) {
+		ctx.context.logger.error(`Stripe webhook failed. Error: ${error}`);
 	}
 }
 async function onSubscriptionUpdated(ctx, options, event) {
@@ -104,9 +200,9 @@ async function onSubscriptionUpdated(ctx, options, event) {
 				}]
 			});
 			if (subs.length > 1) {
-				const activeSub = subs.find((sub) => sub.status === "active" || sub.status === "trialing");
+				const activeSub = subs.find((sub) => isActiveOrTrialing(sub));
 				if (!activeSub) {
-					logger.warn(`Stripe webhook error: Multiple subscriptions found for customerId: ${customerId} and no active subscription is found`);
+					ctx.context.logger.warn(`Stripe webhook error: Multiple subscriptions found for customerId: ${customerId} and no active subscription is found`);
 					return;
 				}
 				subscription = activeSub;
@@ -125,6 +221,9 @@ async function onSubscriptionUpdated(ctx, options, event) {
 				periodStart: /* @__PURE__ */ new Date(subscriptionUpdated.items.data[0].current_period_start * 1e3),
 				periodEnd: /* @__PURE__ */ new Date(subscriptionUpdated.items.data[0].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,
 				seats,
 				stripeSubscriptionId: subscriptionUpdated.id
 			},
@@ -133,7 +232,7 @@ async function onSubscriptionUpdated(ctx, options, event) {
 				value: subscription.id
 			}]
 		});
-		if (subscriptionUpdated.status === "active" && subscriptionUpdated.cancel_at_period_end && !subscription.cancelAtPeriodEnd) await options.subscription.onSubscriptionCancel?.({
+		if (subscriptionUpdated.status === "active" && isStripePendingCancel(subscriptionUpdated) && !isPendingCancel(subscription)) await options.subscription.onSubscriptionCancel?.({
 			subscription,
 			cancellationDetails: subscriptionUpdated.cancellation_details || void 0,
 			stripeSubscription: subscriptionUpdated,
@@ -148,7 +247,7 @@ async function onSubscriptionUpdated(ctx, options, event) {
 			if (subscriptionUpdated.status === "incomplete_expired" && subscription.status === "trialing" && plan.freeTrial?.onTrialExpired) await plan.freeTrial.onTrialExpired(subscription, ctx);
 		}
 	} catch (error) {
-		logger.error(`Stripe webhook failed. Error: ${error}`);
+		ctx.context.logger.error(`Stripe webhook failed. Error: ${error}`);
 	}
 }
 async function onSubscriptionDeleted(ctx, options, event) {
@@ -172,7 +271,11 @@ async function onSubscriptionDeleted(ctx, options, event) {
 				}],
 				update: {
 					status: "canceled",
-					updatedAt: /* @__PURE__ */ new Date()
+					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
 				}
 			});
 			await options.subscription.onSubscriptionDeleted?.({
@@ -180,9 +283,9 @@ async function onSubscriptionDeleted(ctx, options, event) {
 				stripeSubscription: subscriptionDeleted,
 				subscription
 			});
-		} else logger.warn(`Stripe webhook error: Subscription not found for subscriptionId: ${subscriptionId}`);
+		} else ctx.context.logger.warn(`Stripe webhook error: Subscription not found for subscriptionId: ${subscriptionId}`);
 	} catch (error) {
-		logger.error(`Stripe webhook failed. Error: ${error}`);
+		ctx.context.logger.error(`Stripe webhook failed. Error: ${error}`);
 	}
 }
 
@@ -193,7 +296,7 @@ const referenceMiddleware = (subscriptionOptions, action) => createAuthMiddlewar
 	if (!session) throw new APIError$1("UNAUTHORIZED");
 	const referenceId = ctx.body?.referenceId || ctx.query?.referenceId || session.user.id;
 	if (referenceId !== session.user.id && !subscriptionOptions.authorizeReference) {
-		logger.error(`Passing referenceId into a subscription action isn't allowed if subscription.authorizeReference isn't defined in your stripe plugin config.`);
+		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 new APIError$1("BAD_REQUEST", { message: "Reference id is not allowed. Read server logs for more details." });
 	}
 	/**
@@ -306,8 +409,8 @@ const upgradeSubscription = (options) => {
 				value: ctx.body.referenceId || user$1.id
 			}]
 		});
-		const activeOrTrialingSubscription = subscriptions$1.find((sub) => sub.status === "active" || sub.status === "trialing");
-		const activeSubscription = (await client.subscriptions.list({ customer: customerId }).then((res) => res.data.filter((sub) => sub.status === "active" || sub.status === "trialing"))).find((sub) => {
+		const activeOrTrialingSubscription = subscriptions$1.find((sub) => isActiveOrTrialing(sub));
+		const activeSubscription = (await client.subscriptions.list({ customer: customerId }).then((res) => res.data.filter((sub) => isActiveOrTrialing(sub)))).find((sub) => {
 			if (subscriptionToUpdate?.stripeSubscriptionId || ctx.body.subscriptionId) return sub.id === subscriptionToUpdate?.stripeSubscriptionId || sub.id === ctx.body.subscriptionId;
 			if (activeOrTrialingSubscription?.stripeSubscriptionId) return sub.id === activeOrTrialingSubscription.stripeSubscriptionId;
 			return false;
@@ -371,7 +474,7 @@ const upgradeSubscription = (options) => {
 			});
 			return ctx.json({
 				url,
-				redirect: true
+				redirect: !ctx.body.disableRedirect
 			});
 		}
 		let subscription = activeOrTrialingSubscription || incompleteSubscription;
@@ -407,7 +510,13 @@ const upgradeSubscription = (options) => {
 			plan,
 			subscription
 		}, ctx.request, ctx);
-		const freeTrial = !subscriptions$1.some((s) => {
+		const freeTrial = !(await ctx.context.adapter.findMany({
+			model: "subscription",
+			where: [{
+				field: "referenceId",
+				value: referenceId
+			}]
+		})).some((s) => {
 			return !!(s.trialStart || s.trialEnd) || s.status === "trialing";
 		}) && plan.freeTrial ? { trial_period_days: plan.freeTrial.days } : void 0;
 		let priceIdToUse = void 0;
@@ -477,17 +586,19 @@ const cancelSubscriptionCallback = (options) => {
 					value: subscriptionId
 				}]
 			});
-			if (!subscription || subscription.cancelAtPeriodEnd || subscription.status === "canceled") throw ctx.redirect(getUrl(ctx, callbackURL));
+			if (!subscription || subscription.status === "canceled" || isPendingCancel(subscription)) throw ctx.redirect(getUrl(ctx, callbackURL));
 			const currentSubscription = (await client.subscriptions.list({
 				customer: user$1.stripeCustomerId,
 				status: "active"
 			})).data.find((sub) => sub.id === subscription.stripeSubscriptionId);
-			if (currentSubscription?.cancel_at_period_end === true) {
+			if (currentSubscription && isStripePendingCancel(currentSubscription) && !isPendingCancel(subscription)) {
 				await ctx.context.adapter.update({
 					model: "subscription",
 					update: {
 						status: currentSubscription?.status,
-						cancelAtPeriodEnd: true
+						cancelAtPeriodEnd: currentSubscription?.cancel_at_period_end || false,
+						cancelAt: currentSubscription?.cancel_at ? /* @__PURE__ */ new Date(currentSubscription.cancel_at * 1e3) : null,
+						canceledAt: currentSubscription?.canceled_at ? /* @__PURE__ */ new Date(currentSubscription.canceled_at * 1e3) : null
 					},
 					where: [{
 						field: "id",
@@ -510,7 +621,8 @@ const cancelSubscriptionCallback = (options) => {
 const cancelSubscriptionBodySchema = z.object({
 	referenceId: z.string().meta({ description: "Reference id of the subscription to cancel. Eg: '123'" }).optional(),
 	subscriptionId: z.string().meta({ description: "The Stripe subscription ID to cancel. Eg: 'sub_1ABC2DEF3GHI4JKL'" }).optional(),
-	returnUrl: z.string().meta({ description: "URL to take customers to when they click on the billing portal's link to return to your website. Eg: \"/account\"" })
+	returnUrl: z.string().meta({ description: "URL to take customers to when they click on the billing portal's link to return to your website. Eg: \"/account\"" }),
+	disableRedirect: z.boolean().meta({ description: "Disable redirect after successful subscription cancellation. Eg: true" }).default(false)
 });
 /**
 * ### Endpoint
@@ -553,10 +665,10 @@ const cancelSubscription = (options) => {
 				field: "referenceId",
 				value: referenceId
 			}]
-		}).then((subs) => subs.find((sub) => sub.status === "active" || sub.status === "trialing"));
+		}).then((subs) => subs.find((sub) => isActiveOrTrialing(sub)));
 		if (ctx.body.subscriptionId && subscription && subscription.referenceId !== referenceId) subscription = void 0;
 		if (!subscription || !subscription.stripeCustomerId) throw APIError.from("BAD_REQUEST", STRIPE_ERROR_CODES$1.SUBSCRIPTION_NOT_FOUND);
-		const activeSubscriptions = await client.subscriptions.list({ customer: subscription.stripeCustomerId }).then((res) => res.data.filter((sub) => sub.status === "active" || sub.status === "trialing"));
+		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
@@ -581,29 +693,36 @@ const cancelSubscription = (options) => {
 				subscription_cancel: { subscription: activeSubscription.id }
 			}
 		}).catch(async (e) => {
-			if (e.message.includes("already set to be cancel")) {
+			if (e.message?.includes("already set to be canceled")) {
 				/**
-				* in-case we missed the event from stripe, we set it manually
+				* in-case we missed the event from stripe, we sync the actual state
 				* this is a rare case and should not happen
 				*/
-				if (!subscription.cancelAtPeriodEnd) await ctx.context.adapter.updateMany({
-					model: "subscription",
-					update: { cancelAtPeriodEnd: true },
-					where: [{
-						field: "referenceId",
-						value: referenceId
-					}]
-				});
+				if (!isPendingCancel(subscription)) {
+					const stripeSub = await client.subscriptions.retrieve(activeSubscription.id);
+					await ctx.context.adapter.update({
+						model: "subscription",
+						update: {
+							cancelAtPeriodEnd: stripeSub.cancel_at_period_end,
+							cancelAt: stripeSub.cancel_at ? /* @__PURE__ */ new Date(stripeSub.cancel_at * 1e3) : null,
+							canceledAt: stripeSub.canceled_at ? /* @__PURE__ */ new Date(stripeSub.canceled_at * 1e3) : null
+						},
+						where: [{
+							field: "id",
+							value: subscription.id
+						}]
+					});
+				}
 			}
 			throw ctx.error("BAD_REQUEST", {
 				message: e.message,
 				code: e.code
 			});
 		});
-		return {
+		return ctx.json({
 			url,
-			redirect: true
-		};
+			redirect: !ctx.body.disableRedirect
+		});
 	});
 };
 const restoreSubscriptionBodySchema = z.object({
@@ -632,31 +751,36 @@ const restoreSubscription = (options) => {
 				field: "referenceId",
 				value: referenceId
 			}]
-		}).then((subs) => subs.find((sub) => sub.status === "active" || sub.status === "trialing"));
+		}).then((subs) => subs.find((sub) => isActiveOrTrialing(sub)));
 		if (ctx.body.subscriptionId && subscription && subscription.referenceId !== referenceId) subscription = void 0;
 		if (!subscription || !subscription.stripeCustomerId) throw APIError.from("BAD_REQUEST", STRIPE_ERROR_CODES$1.SUBSCRIPTION_NOT_FOUND);
 		if (subscription.status != "active" && subscription.status != "trialing") throw APIError.from("BAD_REQUEST", STRIPE_ERROR_CODES$1.SUBSCRIPTION_NOT_ACTIVE);
-		if (!subscription.cancelAtPeriodEnd) throw APIError.from("BAD_REQUEST", STRIPE_ERROR_CODES$1.SUBSCRIPTION_NOT_SCHEDULED_FOR_CANCELLATION);
-		const activeSubscription = await client.subscriptions.list({ customer: subscription.stripeCustomerId }).then((res) => res.data.filter((sub) => sub.status === "active" || sub.status === "trialing")[0]);
+		if (!isPendingCancel(subscription)) throw APIError.from("BAD_REQUEST", STRIPE_ERROR_CODES$1.SUBSCRIPTION_NOT_SCHEDULED_FOR_CANCELLATION);
+		const activeSubscription = await client.subscriptions.list({ customer: subscription.stripeCustomerId }).then((res) => res.data.filter((sub) => isActiveOrTrialing(sub))[0]);
 		if (!activeSubscription) throw APIError.from("BAD_REQUEST", STRIPE_ERROR_CODES$1.SUBSCRIPTION_NOT_FOUND);
-		try {
-			const newSub = await client.subscriptions.update(activeSubscription.id, { cancel_at_period_end: false });
-			await ctx.context.adapter.update({
-				model: "subscription",
-				update: {
-					cancelAtPeriodEnd: false,
-					updatedAt: /* @__PURE__ */ new Date()
-				},
-				where: [{
-					field: "id",
-					value: subscription.id
-				}]
+		const updateParams = {};
+		if (activeSubscription.cancel_at) updateParams.cancel_at = "";
+		else if (activeSubscription.cancel_at_period_end) updateParams.cancel_at_period_end = false;
+		const newSub = await client.subscriptions.update(activeSubscription.id, updateParams).catch((e) => {
+			throw ctx.error("BAD_REQUEST", {
+				message: e.message,
+				code: e.code
 			});
-			return ctx.json(newSub);
-		} catch (error) {
-			ctx.context.logger.error("Error restoring subscription", error);
-			throw APIError.from("BAD_REQUEST", STRIPE_ERROR_CODES$1.UNABLE_TO_CREATE_CUSTOMER);
-		}
+		});
+		await ctx.context.adapter.update({
+			model: "subscription",
+			update: {
+				cancelAtPeriodEnd: false,
+				cancelAt: null,
+				canceledAt: null,
+				updatedAt: /* @__PURE__ */ new Date()
+			},
+			where: [{
+				field: "id",
+				value: subscription.id
+			}]
+		});
+		return ctx.json(newSub);
 	});
 };
 const listActiveSubscriptionsQuerySchema = z.optional(z.object({ referenceId: z.string().meta({ description: "Reference id of the subscription to list. Eg: '123'" }).optional() }));
@@ -700,9 +824,7 @@ const listActiveSubscriptions = (options) => {
 				limits: plan?.limits,
 				priceId: plan?.priceId
 			};
-		}).filter((sub) => {
-			return sub.status === "active" || sub.status === "trialing";
-		});
+		}).filter((sub) => isActiveOrTrialing(sub));
 		return ctx.json(subs);
 	});
 };
@@ -745,6 +867,9 @@ const subscriptionSuccess = (options) => {
 						periodEnd: /* @__PURE__ */ new Date(stripeSubscription.items.data[0]?.current_period_end * 1e3),
 						periodStart: /* @__PURE__ */ new Date(stripeSubscription.items.data[0]?.current_period_start * 1e3),
 						stripeSubscriptionId: stripeSubscription.id,
+						cancelAtPeriodEnd: stripeSubscription.cancel_at_period_end,
+						cancelAt: stripeSubscription.cancel_at ? /* @__PURE__ */ new Date(stripeSubscription.cancel_at * 1e3) : null,
+						canceledAt: stripeSubscription.canceled_at ? /* @__PURE__ */ new Date(stripeSubscription.canceled_at * 1e3) : null,
 						...stripeSubscription.trial_start && stripeSubscription.trial_end ? {
 							trialStart: /* @__PURE__ */ new Date(stripeSubscription.trial_start * 1e3),
 							trialEnd: /* @__PURE__ */ new Date(stripeSubscription.trial_end * 1e3)
@@ -767,7 +892,8 @@ const createBillingPortalBodySchema = z.object({
 		return typeof localization === "string";
 	}).optional(),
 	referenceId: z.string().optional(),
-	returnUrl: z.string().default("/")
+	returnUrl: z.string().default("/"),
+	disableRedirect: z.boolean().meta({ description: "Disable redirect after creating billing portal session. Eg: true" }).default(false)
 });
 const createBillingPortal = (options) => {
 	const client = options.stripeClient;
@@ -791,7 +917,7 @@ const createBillingPortal = (options) => {
 				field: "referenceId",
 				value: referenceId
 			}]
-		}).then((subs) => subs.find((sub) => sub.status === "active" || sub.status === "trialing")))?.stripeCustomerId;
+		}).then((subs) => subs.find((sub) => isActiveOrTrialing(sub))))?.stripeCustomerId;
 		if (!customerId) throw new APIError("BAD_REQUEST", { message: "No Stripe customer found for this user" });
 		try {
 			const { url } = await client.billingPortal.sessions.create({
@@ -801,7 +927,7 @@ const createBillingPortal = (options) => {
 			});
 			return ctx.json({
 				url,
-				redirect: true
+				redirect: !ctx.body.disableRedirect
 			});
 		} catch (error) {
 			ctx.context.logger.error("Error creating billing portal session", error);
@@ -840,6 +966,10 @@ const stripeWebhook = (options) => {
 					await onCheckoutSessionCompleted(ctx, options, event);
 					await options.onEvent?.(event);
 					break;
+				case "customer.subscription.created":
+					await onSubscriptionCreated(ctx, options, event);
+					await options.onEvent?.(event);
+					break;
 				case "customer.subscription.updated":
 					await onSubscriptionUpdated(ctx, options, event);
 					await options.onEvent?.(event);
@@ -916,6 +1046,18 @@ const subscriptions = { subscription: { fields: {
 		required: false,
 		defaultValue: false
 	},
+	cancelAt: {
+		type: "date",
+		required: false
+	},
+	canceledAt: {
+		type: "date",
+		required: false
+	},
+	endedAt: {
+		type: "date",
+		required: false
+	},
 	seats: {
 		type: "number",
 		required: false

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@better-auth/stripe",
   "author": "Bereket Engida",
-  "version": "1.5.0-beta.1",
+  "version": "1.5.0-beta.2",
   "type": "module",
   "main": "dist/index.mjs",
   "types": "dist/index.d.mts",
@@ -50,15 +50,15 @@
   },
   "peerDependencies": {
     "stripe": "^18 || ^19 || ^20",
-    "@better-auth/core": "1.5.0-beta.1",
-    "better-auth": "1.5.0-beta.1"
+    "@better-auth/core": "1.5.0-beta.2",
+    "better-auth": "1.5.0-beta.2"
   },
   "devDependencies": {
     "better-call": "1.1.7",
     "stripe": "^20.0.0",
     "tsdown": "^0.17.2",
-    "@better-auth/core": "1.5.0-beta.1",
-    "better-auth": "1.5.0-beta.1"
+    "@better-auth/core": "1.5.0-beta.2",
+    "better-auth": "1.5.0-beta.2"
   },
   "scripts": {
     "test": "vitest",

package/src/client.ts

@@ -30,6 +30,7 @@ export const stripeClient = <
 		>,
 		pathMethods: {
 			"/subscription/billing-portal": "POST",
+			"/subscription/restore": "POST",
 		},
 		$ERROR_CODES: STRIPE_ERROR_CODES,
 	} satisfies BetterAuthClientPlugin;