@better-auth/stripe 1.5.0-beta.16 → 1.5.0-beta.18

package/.turbo/turbo-build.log

@@ -1,5 +1,5 @@
 
-> @better-auth/stripe@1.5.0-beta.16 build /home/runner/work/better-auth/better-auth/packages/stripe
+> @better-auth/stripe@1.5.0-beta.18 build /home/runner/work/better-auth/better-auth/packages/stripe
 > tsdown
 
 ℹ tsdown v0.20.3 powered by rolldown v1.0.0-rc.3
@@ -7,16 +7,16 @@
 ℹ entry: src/index.ts, src/client.ts
 ℹ tsconfig: tsconfig.json
 ℹ Build start
-ℹ dist/index.mjs                      65.58 kB │ gzip: 12.29 kB
-[PLUGIN_TIMINGS] Warning: Your build spent significant time in plugin `rolldown-plugin-dts:generate`. See https://rolldown.rs/options/checks#plugintimings for more details.
+ℹ dist/index.mjs                      69.57 kB │ gzip: 13.19 kB
 ℹ dist/client.mjs                      0.43 kB │ gzip:  0.29 kB
-ℹ dist/index.mjs.map                 140.31 kB │ gzip: 26.79 kB
-ℹ dist/error-codes-CHMyMR5v.mjs.map    2.23 kB │ gzip:  1.01 kB
-ℹ dist/error-codes-CHMyMR5v.mjs        1.78 kB │ gzip:  0.82 kB
+ℹ dist/index.mjs.map                 150.44 kB │ gzip: 29.40 kB
+ℹ dist/error-codes-CCosYkXx.mjs.map    2.43 kB │ gzip:  1.08 kB
+ℹ dist/error-codes-CCosYkXx.mjs        1.89 kB │ gzip:  0.85 kB
 ℹ dist/client.mjs.map                  1.26 kB │ gzip:  0.59 kB
-ℹ dist/index.d.mts                    19.89 kB │ gzip:  3.12 kB
-ℹ dist/client.d.mts                    4.62 kB │ gzip:  0.92 kB
-ℹ dist/types-Bzc6yg83.d.mts           12.67 kB │ gzip:  2.91 kB
-ℹ 9 files, total: 248.77 kB
-✔ Build complete in 41456ms
+ℹ dist/index.d.mts                    19.78 kB │ gzip:  3.14 kB
+ℹ dist/client.d.mts                    4.80 kB │ gzip:  0.93 kB
+ℹ dist/types-OT6L84x4.d.mts           12.92 kB │ gzip:  2.96 kB
+ℹ 9 files, total: 263.52 kB
+[PLUGIN_TIMINGS] Warning: Your build spent significant time in plugin `rolldown-plugin-dts:generate`. See https://rolldown.rs/options/checks#plugintimings for more details.
 
+✔ Build complete in 43653ms

package/dist/client.d.mts

@@ -1,4 +1,4 @@
-import { a as StripePlan } from "./types-Bzc6yg83.mjs";
+import { a as StripePlan } from "./types-OT6L84x4.mjs";
 import { stripe } from "./index.mjs";
 import * as better_auth0 from "better-auth";
 
@@ -21,6 +21,7 @@ declare const STRIPE_ERROR_CODES: {
   EMAIL_VERIFICATION_REQUIRED: better_auth0.RawError<"EMAIL_VERIFICATION_REQUIRED">;
   SUBSCRIPTION_NOT_ACTIVE: better_auth0.RawError<"SUBSCRIPTION_NOT_ACTIVE">;
   SUBSCRIPTION_NOT_SCHEDULED_FOR_CANCELLATION: better_auth0.RawError<"SUBSCRIPTION_NOT_SCHEDULED_FOR_CANCELLATION">;
+  SUBSCRIPTION_NOT_PENDING_CHANGE: better_auth0.RawError<"SUBSCRIPTION_NOT_PENDING_CHANGE">;
   ORGANIZATION_NOT_FOUND: better_auth0.RawError<"ORGANIZATION_NOT_FOUND">;
   ORGANIZATION_SUBSCRIPTION_NOT_ENABLED: better_auth0.RawError<"ORGANIZATION_SUBSCRIPTION_NOT_ENABLED">;
   AUTHORIZE_REFERENCE_REQUIRED: better_auth0.RawError<"AUTHORIZE_REFERENCE_REQUIRED">;
@@ -66,6 +67,7 @@ declare const stripeClient: <O extends {
     EMAIL_VERIFICATION_REQUIRED: better_auth0.RawError<"EMAIL_VERIFICATION_REQUIRED">;
     SUBSCRIPTION_NOT_ACTIVE: better_auth0.RawError<"SUBSCRIPTION_NOT_ACTIVE">;
     SUBSCRIPTION_NOT_SCHEDULED_FOR_CANCELLATION: better_auth0.RawError<"SUBSCRIPTION_NOT_SCHEDULED_FOR_CANCELLATION">;
+    SUBSCRIPTION_NOT_PENDING_CHANGE: better_auth0.RawError<"SUBSCRIPTION_NOT_PENDING_CHANGE">;
     ORGANIZATION_NOT_FOUND: better_auth0.RawError<"ORGANIZATION_NOT_FOUND">;
     ORGANIZATION_SUBSCRIPTION_NOT_ENABLED: better_auth0.RawError<"ORGANIZATION_SUBSCRIPTION_NOT_ENABLED">;
     AUTHORIZE_REFERENCE_REQUIRED: better_auth0.RawError<"AUTHORIZE_REFERENCE_REQUIRED">;

package/dist/client.mjs

@@ -1,4 +1,4 @@
-import { t as STRIPE_ERROR_CODES } from "./error-codes-CHMyMR5v.mjs";
+import { t as STRIPE_ERROR_CODES } from "./error-codes-CCosYkXx.mjs";
 
 //#region src/client.ts
 const stripeClient = (options) => {

package/dist/{error-codes-CHMyMR5v.mjs → error-codes-CCosYkXx.mjs}

@@ -19,6 +19,7 @@ const STRIPE_ERROR_CODES = defineErrorCodes({
 	EMAIL_VERIFICATION_REQUIRED: "Email verification is required before you can subscribe to a plan",
 	SUBSCRIPTION_NOT_ACTIVE: "Subscription is not active",
 	SUBSCRIPTION_NOT_SCHEDULED_FOR_CANCELLATION: "Subscription is not scheduled for cancellation",
+	SUBSCRIPTION_NOT_PENDING_CHANGE: "Subscription has no pending cancellation or scheduled plan change",
 	ORGANIZATION_NOT_FOUND: "Organization not found",
 	ORGANIZATION_SUBSCRIPTION_NOT_ENABLED: "Organization subscription is not enabled",
 	AUTHORIZE_REFERENCE_REQUIRED: "Organization subscriptions require authorizeReference callback to be configured",
@@ -28,4 +29,4 @@ const STRIPE_ERROR_CODES = defineErrorCodes({
 
 //#endregion
 export { STRIPE_ERROR_CODES as t };
-//# sourceMappingURL=error-codes-CHMyMR5v.mjs.map
+//# sourceMappingURL=error-codes-CCosYkXx.mjs.map

package/dist/{error-codes-CHMyMR5v.mjs.map → error-codes-CCosYkXx.mjs.map}

@@ -1 +1 @@
-{"version":3,"file":"error-codes-CHMyMR5v.mjs","names":[],"sources":["../src/error-codes.ts"],"sourcesContent":["import { defineErrorCodes } from \"@better-auth/core/utils/error-codes\";\n\nexport const STRIPE_ERROR_CODES = defineErrorCodes({\n\tUNAUTHORIZED: \"Unauthorized access\",\n\tINVALID_REQUEST_BODY: \"Invalid request body\",\n\tSUBSCRIPTION_NOT_FOUND: \"Subscription not found\",\n\tSUBSCRIPTION_PLAN_NOT_FOUND: \"Subscription plan not found\",\n\tALREADY_SUBSCRIBED_PLAN: \"You're already subscribed to this plan\",\n\tREFERENCE_ID_NOT_ALLOWED: \"Reference id is not allowed\",\n\tCUSTOMER_NOT_FOUND: \"Stripe customer not found for this user\",\n\tUNABLE_TO_CREATE_CUSTOMER: \"Unable to create customer\",\n\tUNABLE_TO_CREATE_BILLING_PORTAL: \"Unable to create billing portal session\",\n\tSTRIPE_SIGNATURE_NOT_FOUND: \"Stripe signature not found\",\n\tSTRIPE_WEBHOOK_SECRET_NOT_FOUND: \"Stripe webhook secret not found\",\n\tSTRIPE_WEBHOOK_ERROR: \"Stripe webhook error\",\n\tFAILED_TO_CONSTRUCT_STRIPE_EVENT: \"Failed to construct Stripe event\",\n\tFAILED_TO_FETCH_PLANS: \"Failed to fetch plans\",\n\tEMAIL_VERIFICATION_REQUIRED:\n\t\t\"Email verification is required before you can subscribe to a plan\",\n\tSUBSCRIPTION_NOT_ACTIVE: \"Subscription is not active\",\n\tSUBSCRIPTION_NOT_SCHEDULED_FOR_CANCELLATION:\n\t\t\"Subscription is not scheduled for cancellation\",\n\tORGANIZATION_NOT_FOUND: \"Organization not found\",\n\tORGANIZATION_SUBSCRIPTION_NOT_ENABLED:\n\t\t\"Organization subscription is not enabled\",\n\tAUTHORIZE_REFERENCE_REQUIRED:\n\t\t\"Organization subscriptions require authorizeReference callback to be configured\",\n\tORGANIZATION_HAS_ACTIVE_SUBSCRIPTION:\n\t\t\"Cannot delete organization with active subscription\",\n\tORGANIZATION_REFERENCE_ID_REQUIRED:\n\t\t\"Reference ID is required. Provide referenceId or set activeOrganizationId in session\",\n});\n"],"mappings":";;;AAEA,MAAa,qBAAqB,iBAAiB;CAClD,cAAc;CACd,sBAAsB;CACtB,wBAAwB;CACxB,6BAA6B;CAC7B,yBAAyB;CACzB,0BAA0B;CAC1B,oBAAoB;CACpB,2BAA2B;CAC3B,iCAAiC;CACjC,4BAA4B;CAC5B,iCAAiC;CACjC,sBAAsB;CACtB,kCAAkC;CAClC,uBAAuB;CACvB,6BACC;CACD,yBAAyB;CACzB,6CACC;CACD,wBAAwB;CACxB,uCACC;CACD,8BACC;CACD,sCACC;CACD,oCACC;CACD,CAAC"}
+{"version":3,"file":"error-codes-CCosYkXx.mjs","names":[],"sources":["../src/error-codes.ts"],"sourcesContent":["import { defineErrorCodes } from \"@better-auth/core/utils/error-codes\";\n\nexport const STRIPE_ERROR_CODES = defineErrorCodes({\n\tUNAUTHORIZED: \"Unauthorized access\",\n\tINVALID_REQUEST_BODY: \"Invalid request body\",\n\tSUBSCRIPTION_NOT_FOUND: \"Subscription not found\",\n\tSUBSCRIPTION_PLAN_NOT_FOUND: \"Subscription plan not found\",\n\tALREADY_SUBSCRIBED_PLAN: \"You're already subscribed to this plan\",\n\tREFERENCE_ID_NOT_ALLOWED: \"Reference id is not allowed\",\n\tCUSTOMER_NOT_FOUND: \"Stripe customer not found for this user\",\n\tUNABLE_TO_CREATE_CUSTOMER: \"Unable to create customer\",\n\tUNABLE_TO_CREATE_BILLING_PORTAL: \"Unable to create billing portal session\",\n\tSTRIPE_SIGNATURE_NOT_FOUND: \"Stripe signature not found\",\n\tSTRIPE_WEBHOOK_SECRET_NOT_FOUND: \"Stripe webhook secret not found\",\n\tSTRIPE_WEBHOOK_ERROR: \"Stripe webhook error\",\n\tFAILED_TO_CONSTRUCT_STRIPE_EVENT: \"Failed to construct Stripe event\",\n\tFAILED_TO_FETCH_PLANS: \"Failed to fetch plans\",\n\tEMAIL_VERIFICATION_REQUIRED:\n\t\t\"Email verification is required before you can subscribe to a plan\",\n\tSUBSCRIPTION_NOT_ACTIVE: \"Subscription is not active\",\n\t/**\n\t * @deprecated Use `SUBSCRIPTION_NOT_PENDING_CHANGE` instead.\n\t */\n\tSUBSCRIPTION_NOT_SCHEDULED_FOR_CANCELLATION:\n\t\t\"Subscription is not scheduled for cancellation\",\n\tSUBSCRIPTION_NOT_PENDING_CHANGE:\n\t\t\"Subscription has no pending cancellation or scheduled plan change\",\n\tORGANIZATION_NOT_FOUND: \"Organization not found\",\n\tORGANIZATION_SUBSCRIPTION_NOT_ENABLED:\n\t\t\"Organization subscription is not enabled\",\n\tAUTHORIZE_REFERENCE_REQUIRED:\n\t\t\"Organization subscriptions require authorizeReference callback to be configured\",\n\tORGANIZATION_HAS_ACTIVE_SUBSCRIPTION:\n\t\t\"Cannot delete organization with active subscription\",\n\tORGANIZATION_REFERENCE_ID_REQUIRED:\n\t\t\"Reference ID is required. Provide referenceId or set activeOrganizationId in session\",\n});\n"],"mappings":";;;AAEA,MAAa,qBAAqB,iBAAiB;CAClD,cAAc;CACd,sBAAsB;CACtB,wBAAwB;CACxB,6BAA6B;CAC7B,yBAAyB;CACzB,0BAA0B;CAC1B,oBAAoB;CACpB,2BAA2B;CAC3B,iCAAiC;CACjC,4BAA4B;CAC5B,iCAAiC;CACjC,sBAAsB;CACtB,kCAAkC;CAClC,uBAAuB;CACvB,6BACC;CACD,yBAAyB;CAIzB,6CACC;CACD,iCACC;CACD,wBAAwB;CACxB,uCACC;CACD,8BACC;CACD,sCACC;CACD,oCACC;CACD,CAAC"}

package/dist/index.d.mts

@@ -1,4 +1,4 @@
-import { a as StripePlan, c as WithActiveOrganizationId, i as StripeOptions, l as WithStripeCustomerId, n as CustomerType, o as Subscription, r as StripeCtxSession, s as SubscriptionOptions, t as AuthorizeReferenceAction } from "./types-Bzc6yg83.mjs";
+import { a as StripePlan, c as WithActiveOrganizationId, i as StripeOptions, l as WithStripeCustomerId, n as CustomerType, o as Subscription, r as StripeCtxSession, s as SubscriptionOptions, t as AuthorizeReferenceAction } from "./types-OT6L84x4.mjs";
 import * as better_auth0 from "better-auth";
 import { User } from "better-auth";
 import * as better_call0 from "better-call";
@@ -49,6 +49,7 @@ declare const stripe: <O extends StripeOptions>(options: O) => {
         successUrl: zod.ZodDefault<zod.ZodString>;
         cancelUrl: zod.ZodDefault<zod.ZodString>;
         returnUrl: zod.ZodOptional<zod.ZodString>;
+        scheduleAtPeriodEnd: zod.ZodDefault<zod.ZodBoolean>;
         disableRedirect: zod.ZodDefault<zod.ZodBoolean>;
       }, better_auth0.$strip>;
       metadata: {
@@ -165,16 +166,6 @@ declare const stripe: <O extends StripeOptions>(options: O) => {
         stripeAccount?: string;
       };
     }>;
-    cancelSubscriptionCallback: better_call0.StrictEndpoint<"/subscription/cancel/callback", {
-      method: "GET";
-      query: zod.ZodOptional<zod.ZodRecord<zod.ZodString, zod.ZodAny>>;
-      metadata: {
-        openapi: {
-          operationId: string;
-        };
-      };
-      use: ((inputContext: better_call0.MiddlewareInputContext<better_call0.MiddlewareOptions>) => Promise<void>)[];
-    }, never>;
     cancelSubscription: better_call0.StrictEndpoint<"/subscription/cancel", {
       method: "POST";
       body: zod.ZodObject<{
@@ -327,6 +318,7 @@ declare const stripe: <O extends StripeOptions>(options: O) => {
       groupId?: string | undefined;
       seats?: number | undefined;
       billingInterval?: "day" | "week" | "month" | "year" | undefined;
+      stripeScheduleId?: string | undefined;
     }[]>;
     subscriptionSuccess: better_call0.StrictEndpoint<"/subscription/success", {
       method: "GET";
@@ -476,6 +468,10 @@ declare const stripe: <O extends StripeOptions>(options: O) => {
           type: "string";
           required: false;
         };
+        stripeScheduleId: {
+          type: "string";
+          required: false;
+        };
       };
     };
   } : {}) & (O["organization"] extends {
@@ -509,6 +505,7 @@ declare const stripe: <O extends StripeOptions>(options: O) => {
     EMAIL_VERIFICATION_REQUIRED: better_auth0.RawError<"EMAIL_VERIFICATION_REQUIRED">;
     SUBSCRIPTION_NOT_ACTIVE: better_auth0.RawError<"SUBSCRIPTION_NOT_ACTIVE">;
     SUBSCRIPTION_NOT_SCHEDULED_FOR_CANCELLATION: better_auth0.RawError<"SUBSCRIPTION_NOT_SCHEDULED_FOR_CANCELLATION">;
+    SUBSCRIPTION_NOT_PENDING_CHANGE: better_auth0.RawError<"SUBSCRIPTION_NOT_PENDING_CHANGE">;
     ORGANIZATION_NOT_FOUND: better_auth0.RawError<"ORGANIZATION_NOT_FOUND">;
     ORGANIZATION_SUBSCRIPTION_NOT_ENABLED: better_auth0.RawError<"ORGANIZATION_SUBSCRIPTION_NOT_ENABLED">;
     AUTHORIZE_REFERENCE_REQUIRED: better_auth0.RawError<"AUTHORIZE_REFERENCE_REQUIRED">;

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { t as STRIPE_ERROR_CODES } from "./error-codes-CHMyMR5v.mjs";
+import { t as STRIPE_ERROR_CODES } from "./error-codes-CCosYkXx.mjs";
 import { APIError, HIDE_METADATA } from "better-auth";
 import { defu } from "defu";
 import { createAuthEndpoint, createAuthMiddleware } from "@better-auth/core/api";
@@ -355,7 +355,8 @@ async function onSubscriptionUpdated(ctx, options, event) {
 				endedAt: subscriptionUpdated.ended_at ? /* @__PURE__ */ new Date(subscriptionUpdated.ended_at * 1e3) : null,
 				seats,
 				stripeSubscriptionId: subscriptionUpdated.id,
-				billingInterval: subscriptionItem.price.recurring?.interval
+				billingInterval: subscriptionItem.price.recurring?.interval,
+				stripeScheduleId: subscriptionUpdated.schedule ? typeof subscriptionUpdated.schedule === "string" ? subscriptionUpdated.schedule : subscriptionUpdated.schedule.id : null
 			},
 			where: [{
 				field: "id",
@@ -410,7 +411,8 @@ async function onSubscriptionDeleted(ctx, options, event) {
 					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
+					endedAt: subscriptionDeleted.ended_at ? /* @__PURE__ */ new Date(subscriptionDeleted.ended_at * 1e3) : null,
+					stripeScheduleId: null
 				}
 			});
 			await options.subscription.onSubscriptionDeleted?.({
@@ -514,6 +516,7 @@ const upgradeSubscriptionBodySchema = z.object({
 	successUrl: z.string().meta({ description: "Callback URL to redirect back after successful subscription. Eg: \"https://example.com/success\"" }).default("/"),
 	cancelUrl: z.string().meta({ description: "If set, checkout shows a back button and customers will be directed here if they cancel payment. Eg: \"https://example.com/pricing\"" }).default("/"),
 	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: \"https://example.com/dashboard\"" }).optional(),
+	scheduleAtPeriodEnd: z.boolean().meta({ description: "Schedule the plan change at the end of the current billing period instead of applying immediately." }).default(false),
 	disableRedirect: z.boolean().meta({ description: "Disable redirect after successful subscription. Eg: true" }).default(false)
 });
 /**
@@ -721,26 +724,151 @@ const upgradeSubscription = (options) => {
 				dbSubscription = activeOrTrialingSubscription;
 			}
 			if (!planItem) throw APIError$1.from("NOT_FOUND", STRIPE_ERROR_CODES.SUBSCRIPTION_NOT_FOUND);
-			const seatPortalItems = [];
-			if (isAutoManagedSeats && plan.seatPriceId) {
-				const oldPlan = activeOrTrialingSubscription ? await getPlanByName(options, activeOrTrialingSubscription.plan) : void 0;
-				if (oldPlan?.seatPriceId && oldPlan.seatPriceId !== plan.seatPriceId) {
-					const oldSeatItem = activeSubscription.items.data.find((item) => item.price.id === oldPlan.seatPriceId);
-					if (oldSeatItem) seatPortalItems.push({
-						id: oldSeatItem.id,
-						price: plan.seatPriceId,
-						quantity: memberCount
+			if (activeSubscription.schedule) {
+				const { data: existingSchedules } = await client.subscriptionSchedules.list({ customer: customerId });
+				const existingSchedule = existingSchedules.find((s) => (typeof s.subscription === "string" ? s.subscription : s.subscription?.id) === activeSubscription.id && s.status === "active");
+				if (existingSchedule && existingSchedule.metadata?.source === "@better-auth/stripe") {
+					await client.subscriptionSchedules.release(existingSchedule.id);
+					if (dbSubscription) await ctx.context.adapter.update({
+						model: "subscription",
+						update: {
+							stripeScheduleId: null,
+							updatedAt: /* @__PURE__ */ new Date()
+						},
+						where: [{
+							field: "id",
+							value: dbSubscription.id
+						}]
 					});
 				}
 			}
+			const oldPlan = activeOrTrialingSubscription ? await getPlanByName(options, activeOrTrialingSubscription.plan) : void 0;
+			const priceMap = /* @__PURE__ */ new Map();
+			if (isAutoManagedSeats && plan.seatPriceId) {
+				if (oldPlan?.seatPriceId && oldPlan.seatPriceId !== plan.seatPriceId) priceMap.set(oldPlan.seatPriceId, {
+					newPrice: plan.seatPriceId,
+					quantity: memberCount
+				});
+			}
+			const lineItemDelta = /* @__PURE__ */ new Map();
+			for (const li of oldPlan?.lineItems ?? []) if (typeof li.price === "string") lineItemDelta.set(li.price, (lineItemDelta.get(li.price) ?? 0) - 1);
+			for (const li of plan.lineItems ?? []) if (typeof li.price === "string") lineItemDelta.set(li.price, (lineItemDelta.get(li.price) ?? 0) + 1);
+			for (const [price, delta] of lineItemDelta) if (delta === 0) lineItemDelta.delete(price);
 			let upgradeUrl;
-			if (seatPortalItems.length > 0) {
-				const isSeatItem = seatPortalItems.some((s) => s.id === planItem.id);
+			if (ctx.body.scheduleAtPeriodEnd) {
+				const schedule = await client.subscriptionSchedules.create({ from_subscription: activeSubscription.id }).catch(async (e) => {
+					throw ctx.error("BAD_REQUEST", {
+						message: e.message,
+						code: e.code
+					});
+				});
+				const currentPhase = schedule.phases[0];
+				if (!currentPhase) throw ctx.error("BAD_REQUEST", { message: "Subscription schedule has no phases" });
+				const removeQuota = /* @__PURE__ */ new Map();
+				for (const [p, d] of lineItemDelta) if (d < 0) removeQuota.set(p, -d);
+				const newPhaseItems = [];
+				for (const item of currentPhase.items) {
+					const itemPriceId = typeof item.price === "string" ? item.price : item.price.id;
+					const quota = removeQuota.get(itemPriceId) ?? 0;
+					if (quota > 0) {
+						removeQuota.set(itemPriceId, quota - 1);
+						continue;
+					}
+					const replacement = priceMap.get(itemPriceId);
+					if (replacement) {
+						newPhaseItems.push({
+							price: replacement.newPrice,
+							quantity: replacement.quantity ?? item.quantity
+						});
+						continue;
+					}
+					if (itemPriceId === stripeSubscriptionPriceId) {
+						newPhaseItems.push({
+							price: priceIdToUse,
+							quantity: isAutoManagedSeats ? 1 : ctx.body.seats || 1
+						});
+						continue;
+					}
+					newPhaseItems.push({
+						price: itemPriceId,
+						quantity: item.quantity
+					});
+					const d = lineItemDelta.get(itemPriceId);
+					if (d !== void 0 && d > 0) if (d === 1) lineItemDelta.delete(itemPriceId);
+					else lineItemDelta.set(itemPriceId, d - 1);
+				}
+				for (const [price, delta] of lineItemDelta) for (let i = 0; i < delta; i++) newPhaseItems.push({ price });
+				await client.subscriptionSchedules.update(schedule.id, {
+					metadata: { source: "@better-auth/stripe" },
+					end_behavior: "release",
+					phases: [{
+						items: currentPhase.items.map((item) => ({
+							price: typeof item.price === "string" ? item.price : item.price.id,
+							quantity: item.quantity
+						})),
+						start_date: currentPhase.start_date,
+						end_date: currentPhase.end_date
+					}, {
+						items: newPhaseItems,
+						start_date: currentPhase.end_date,
+						proration_behavior: "none"
+					}]
+				}).catch(async (e) => {
+					throw ctx.error("BAD_REQUEST", {
+						message: e.message,
+						code: e.code
+					});
+				});
+				if (dbSubscription) await ctx.context.adapter.update({
+					model: "subscription",
+					update: {
+						stripeScheduleId: schedule.id,
+						updatedAt: /* @__PURE__ */ new Date()
+					},
+					where: [{
+						field: "id",
+						value: dbSubscription.id
+					}]
+				});
+				upgradeUrl = getUrl(ctx, ctx.body.returnUrl || "/");
+			} else if (priceMap.size > 0 || lineItemDelta.size > 0) {
+				const removeQuota = /* @__PURE__ */ new Map();
+				for (const [p, d] of lineItemDelta) if (d < 0) removeQuota.set(p, -d);
+				const itemUpdates = [];
+				for (const si of activeSubscription.items.data) {
+					const quota = removeQuota.get(si.price.id) ?? 0;
+					if (quota > 0) {
+						removeQuota.set(si.price.id, quota - 1);
+						itemUpdates.push({
+							id: si.id,
+							deleted: true
+						});
+						continue;
+					}
+					const replacement = priceMap.get(si.price.id);
+					if (replacement) {
+						itemUpdates.push({
+							id: si.id,
+							price: replacement.newPrice,
+							quantity: replacement.quantity
+						});
+						continue;
+					}
+					if (si.price.id === stripeSubscriptionPriceId) {
+						itemUpdates.push({
+							id: si.id,
+							price: priceIdToUse,
+							quantity: isAutoManagedSeats ? 1 : ctx.body.seats || 1
+						});
+						continue;
+					}
+					const d = lineItemDelta.get(si.price.id);
+					if (d !== void 0 && d > 0) if (d === 1) lineItemDelta.delete(si.price.id);
+					else lineItemDelta.set(si.price.id, d - 1);
+				}
+				for (const [price, delta] of lineItemDelta) for (let i = 0; i < delta; i++) itemUpdates.push({ price });
 				await client.subscriptions.update(activeSubscription.id, {
-					items: isSeatItem ? seatPortalItems : [{
-						id: planItem.id,
-						price: priceIdToUse
-					}, ...seatPortalItems],
+					items: itemUpdates,
 					proration_behavior: "create_prorations"
 				}).catch(async (e) => {
 					throw ctx.error("BAD_REQUEST", {
@@ -841,7 +969,7 @@ const upgradeSubscription = (options) => {
 				}
 			} : { customer_email: user.email },
 			locale: ctx.body.locale,
-			success_url: getUrl(ctx, `${ctx.context.baseURL}/subscription/success?callbackURL=${encodeURIComponent(ctx.body.successUrl)}&subscriptionId=${encodeURIComponent(subscription.id)}`),
+			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: [
 				...!isSeatOnlyPlan ? [{
@@ -882,61 +1010,6 @@ const upgradeSubscription = (options) => {
 		});
 	});
 };
-const cancelSubscriptionCallbackQuerySchema = z.record(z.string(), z.any()).optional();
-const cancelSubscriptionCallback = (options) => {
-	const client = options.stripeClient;
-	const subscriptionOptions = options.subscription;
-	return createAuthEndpoint("/subscription/cancel/callback", {
-		method: "GET",
-		query: cancelSubscriptionCallbackQuerySchema,
-		metadata: { openapi: { operationId: "cancelSubscriptionCallback" } },
-		use: [originCheck((ctx) => ctx.query.callbackURL)]
-	}, async (ctx) => {
-		if (!ctx.query || !ctx.query.callbackURL || !ctx.query.subscriptionId) throw ctx.redirect(getUrl(ctx, ctx.query?.callbackURL || "/"));
-		if (!await getSessionFromCtx(ctx)) throw ctx.redirect(getUrl(ctx, ctx.query?.callbackURL || "/"));
-		const { callbackURL, subscriptionId } = ctx.query;
-		try {
-			const subscription = await ctx.context.adapter.findOne({
-				model: "subscription",
-				where: [{
-					field: "id",
-					value: subscriptionId
-				}]
-			});
-			if (!subscription || subscription.status === "canceled" || isPendingCancel(subscription)) throw ctx.redirect(getUrl(ctx, callbackURL));
-			const customerId = subscription.stripeCustomerId;
-			if (!customerId) throw ctx.redirect(getUrl(ctx, callbackURL));
-			const currentSubscription = (await client.subscriptions.list({
-				customer: customerId,
-				status: "active"
-			})).data.find((sub) => sub.id === subscription.stripeSubscriptionId);
-			if (currentSubscription && isStripePendingCancel(currentSubscription) && !isPendingCancel(subscription)) {
-				await ctx.context.adapter.update({
-					model: "subscription",
-					update: {
-						status: currentSubscription?.status,
-						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",
-						value: subscription.id
-					}]
-				});
-				await subscriptionOptions.onSubscriptionCancel?.({
-					subscription,
-					cancellationDetails: currentSubscription.cancellation_details,
-					stripeSubscription: currentSubscription,
-					event: void 0
-				});
-			}
-		} catch (error) {
-			ctx.context.logger.error("Error checking subscription status from Stripe", error);
-		}
-		throw ctx.redirect(getUrl(ctx, callbackURL));
-	});
-};
 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(),
@@ -1008,7 +1081,7 @@ const cancelSubscription = (options) => {
 		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.context.baseURL}/subscription/cancel/callback?callbackURL=${encodeURIComponent(ctx.body?.returnUrl || "/")}&subscriptionId=${encodeURIComponent(subscription.id)}`),
+			return_url: getUrl(ctx, ctx.body?.returnUrl || "/"),
 			flow_data: {
 				type: "subscription_cancel",
 				subscription_cancel: { subscription: activeSubscription.id }
@@ -1078,7 +1151,36 @@ const restoreSubscription = (options) => {
 		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);
 		if (!isActiveOrTrialing(subscription)) throw APIError$1.from("BAD_REQUEST", STRIPE_ERROR_CODES.SUBSCRIPTION_NOT_ACTIVE);
-		if (!isPendingCancel(subscription)) throw APIError$1.from("BAD_REQUEST", STRIPE_ERROR_CODES.SUBSCRIPTION_NOT_SCHEDULED_FOR_CANCELLATION);
+		const hasPendingCancel = isPendingCancel(subscription);
+		const { stripeScheduleId } = subscription;
+		if (!hasPendingCancel && !stripeScheduleId) throw APIError$1.from("BAD_REQUEST", STRIPE_ERROR_CODES.SUBSCRIPTION_NOT_PENDING_CHANGE);
+		if (stripeScheduleId) {
+			if (!subscription.stripeSubscriptionId) throw APIError$1.from("BAD_REQUEST", STRIPE_ERROR_CODES.SUBSCRIPTION_NOT_FOUND);
+			if ((await client.subscriptionSchedules.retrieve(stripeScheduleId).catch((e) => {
+				throw ctx.error("BAD_REQUEST", {
+					message: e.message,
+					code: e.code
+				});
+			})).status === "active") await client.subscriptionSchedules.release(stripeScheduleId).catch((e) => {
+				throw ctx.error("BAD_REQUEST", {
+					message: e.message,
+					code: e.code
+				});
+			});
+			await ctx.context.adapter.update({
+				model: "subscription",
+				update: {
+					stripeScheduleId: null,
+					updatedAt: /* @__PURE__ */ new Date()
+				},
+				where: [{
+					field: "id",
+					value: subscription.id
+				}]
+			});
+			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);
 		const updateParams = {};
@@ -1165,10 +1267,20 @@ const subscriptionSuccess = (options) => {
 		metadata: { openapi: { operationId: "handleSubscriptionSuccess" } },
 		use: [originCheck((ctx) => ctx.query.callbackURL)]
 	}, async (ctx) => {
-		if (!ctx.query || !ctx.query.callbackURL || !ctx.query.subscriptionId) throw ctx.redirect(getUrl(ctx, ctx.query?.callbackURL || "/"));
-		const { callbackURL, subscriptionId } = ctx.query;
+		const callbackURL = ctx.query?.callbackURL || "/";
 		const session = await getSessionFromCtx(ctx);
-		if (!session) throw ctx.redirect(getUrl(ctx, ctx.query?.callbackURL || "/"));
+		if (!session) throw ctx.redirect(getUrl(ctx, callbackURL));
+		if (!ctx.query?.checkoutSessionId) throw ctx.redirect(getUrl(ctx, callbackURL));
+		const checkoutSession = await client.checkout.sessions.retrieve(ctx.query.checkoutSessionId).catch((error) => {
+			ctx.context.logger.error("Error retrieving checkout session from Stripe", error);
+			return null;
+		});
+		if (!checkoutSession) throw ctx.redirect(getUrl(ctx, callbackURL));
+		const { subscriptionId } = subscriptionMetadata.get(checkoutSession.metadata);
+		if (!subscriptionId) {
+			ctx.context.logger.warn(`No subscriptionId in checkout session metadata: ${checkoutSession.id}`);
+			throw ctx.redirect(getUrl(ctx, callbackURL));
+		}
 		const subscription = await ctx.context.adapter.findOne({
 			model: "subscription",
 			where: [{
@@ -1415,6 +1527,10 @@ const subscriptions = { subscription: { fields: {
 	billingInterval: {
 		type: "string",
 		required: false
+	},
+	stripeScheduleId: {
+		type: "string",
+		required: false
 	}
 } } };
 const user = { user: { fields: { stripeCustomerId: {
@@ -1449,7 +1565,6 @@ const stripe = (options) => {
 	const client = options.stripeClient;
 	const subscriptionEndpoints = {
 		upgradeSubscription: upgradeSubscription(options),
-		cancelSubscriptionCallback: cancelSubscriptionCallback(options),
 		cancelSubscription: cancelSubscription(options),
 		restoreSubscription: restoreSubscription(options),
 		listActiveSubscriptions: listActiveSubscriptions(options),