@better-auth/stripe 1.5.0-beta.7 → 1.5.0-beta.9

package/.turbo/turbo-build.log

@@ -1,5 +1,5 @@
 
-> @better-auth/stripe@1.5.0-beta.7 build /home/runner/work/better-auth/better-auth/packages/stripe
+> @better-auth/stripe@1.5.0-beta.9 build /home/runner/work/better-auth/better-auth/packages/stripe
 > tsdown
 
 ℹ tsdown v0.19.0 powered by rolldown v1.0.0-beta.59
@@ -7,11 +7,11 @@
 ℹ entry: src/index.ts, src/client.ts
 ℹ tsconfig: tsconfig.json
 ℹ Build start
-ℹ dist/index.mjs                 55.90 kB │ gzip: 10.02 kB
+ℹ dist/index.mjs                 56.45 kB │ gzip: 10.16 kB
 ℹ dist/client.mjs                 0.39 kB │ gzip:  0.26 kB
 ℹ dist/error-codes-Clj-xYDP.mjs   1.62 kB │ gzip:  0.75 kB
 ℹ dist/client.d.mts               6.71 kB │ gzip:  1.32 kB
 ℹ dist/index.d.mts                0.21 kB │ gzip:  0.14 kB
-ℹ dist/index-CkImGy5x.d.mts      31.76 kB │ gzip:  5.34 kB
-ℹ 6 files, total: 96.59 kB
-✔ Build complete in 21218ms
+ℹ dist/index-BqGWQFAv.d.mts      31.88 kB │ gzip:  5.35 kB
+ℹ 6 files, total: 97.26 kB
+✔ Build complete in 25066ms

package/dist/client.d.mts

@@ -1,4 +1,4 @@
-import { n as stripe } from "./index-CkImGy5x.mjs";
+import { n as stripe } from "./index-BqGWQFAv.mjs";
 
 //#region src/error-codes.d.ts
 declare const STRIPE_ERROR_CODES: {

package/dist/{index-CkImGy5x.d.mts → index-BqGWQFAv.d.mts}

@@ -483,6 +483,7 @@ declare const stripe: <O extends StripeOptions>(options: O) => {
         }>>;
         metadata: zod0.ZodOptional<zod0.ZodRecord<zod0.ZodString, zod0.ZodAny>>;
         seats: zod0.ZodOptional<zod0.ZodNumber>;
+        locale: zod0.ZodOptional<zod0.ZodCustom<Stripe.Checkout.Session.Locale, Stripe.Checkout.Session.Locale>>;
         successUrl: zod0.ZodDefault<zod0.ZodString>;
         cancelUrl: zod0.ZodDefault<zod0.ZodString>;
         returnUrl: zod0.ZodOptional<zod0.ZodString>;

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-CkImGy5x.mjs";
+import { a as SubscriptionOptions, i as Subscription, n as stripe, r as StripePlan, t as StripePlugin } from "./index-BqGWQFAv.mjs";
 export { StripePlan, StripePlugin, Subscription, SubscriptionOptions, stripe };

package/dist/index.mjs

@@ -424,6 +424,9 @@ const upgradeSubscriptionBodySchema = z.object({
 	customerType: z.enum(["user", "organization"]).meta({ description: "Customer type for the subscription. Eg: \"user\" or \"organization\"" }).optional(),
 	metadata: z.record(z.string(), z.any()).optional(),
 	seats: z.number().meta({ description: "Number of seats to upgrade to (if applicable). Eg: 1" }).optional(),
+	locale: z.custom((localization) => {
+		return typeof localization === "string";
+	}).meta({ description: "The locale to display Checkout in. Eg: 'en', 'ko'. If not provided or set to `auto`, the browser's locale is used." }).optional(),
 	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(),
@@ -576,7 +579,7 @@ const upgradeSubscription = (options) => {
 			return false;
 		});
 		const incompleteSubscription = subscriptions$1.find((sub) => sub.status === "incomplete");
-		if (activeOrTrialingSubscription && activeOrTrialingSubscription.status === "active" && activeOrTrialingSubscription.plan === ctx.body.plan && activeOrTrialingSubscription.seats === (ctx.body.seats || 1)) throw APIError$1.from("BAD_REQUEST", STRIPE_ERROR_CODES.ALREADY_SUBSCRIBED_PLAN);
+		if (activeOrTrialingSubscription && activeOrTrialingSubscription.status === "active" && activeOrTrialingSubscription.plan === ctx.body.plan && activeOrTrialingSubscription.seats === (ctx.body.seats || 1) && (!activeOrTrialingSubscription.periodEnd || activeOrTrialingSubscription.periodEnd > /* @__PURE__ */ new Date())) throw APIError$1.from("BAD_REQUEST", STRIPE_ERROR_CODES.ALREADY_SUBSCRIBED_PLAN);
 		if (activeSubscription && customerId) {
 			let dbSubscription = await ctx.context.adapter.findOne({
 				model: "subscription",
@@ -695,6 +698,7 @@ const upgradeSubscription = (options) => {
 					address: "auto"
 				}
 			} : { customer_email: user$1.email },
+			locale: ctx.body.locale,
 			success_url: getUrl(ctx, `${ctx.context.baseURL}/subscription/success?callbackURL=${encodeURIComponent(ctx.body.successUrl)}&subscriptionId=${encodeURIComponent(subscription.id)}`),
 			cancel_url: getUrl(ctx, ctx.body.cancelUrl),
 			line_items: [{
@@ -1080,7 +1084,7 @@ const subscriptionSuccess = (options) => {
 const createBillingPortalBodySchema = z.object({
 	locale: z.custom((localization) => {
 		return typeof localization === "string";
-	}).optional(),
+	}).meta({ description: "The IETF language tag of the locale Customer Portal is displayed in. Eg: 'en', 'ko'. If not provided or set to `auto`, the browser's locale is used." }).optional(),
 	referenceId: z.string().optional(),
 	customerType: z.enum(["user", "organization"]).meta({ description: "Customer type for the subscription. Eg: \"user\" or \"organization\"" }).optional(),
 	returnUrl: z.string().default("/"),

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@better-auth/stripe",
   "author": "Bereket Engida",
-  "version": "1.5.0-beta.7",
+  "version": "1.5.0-beta.9",
   "type": "module",
   "main": "dist/index.mjs",
   "types": "dist/index.d.mts",
@@ -46,19 +46,19 @@
   },
   "dependencies": {
     "defu": "^6.1.4",
-    "zod": "^4.1.12"
+    "zod": "^4.3.5"
   },
   "peerDependencies": {
     "stripe": "^18 || ^19 || ^20",
-    "@better-auth/core": "1.5.0-beta.7",
-    "better-auth": "1.5.0-beta.7"
+    "@better-auth/core": "1.5.0-beta.9",
+    "better-auth": "1.5.0-beta.9"
   },
   "devDependencies": {
-    "better-call": "1.1.8",
+    "better-call": "1.2.0",
     "stripe": "^20.0.0",
     "tsdown": "^0.19.0",
-    "@better-auth/core": "1.5.0-beta.7",
-    "better-auth": "1.5.0-beta.7"
+    "@better-auth/core": "1.5.0-beta.9",
+    "better-auth": "1.5.0-beta.9"
   },
   "scripts": {
     "test": "vitest",

package/src/routes.ts

@@ -161,6 +161,19 @@ const upgradeSubscriptionBodySchema = z.object({
 			description: "Number of seats to upgrade to (if applicable). Eg: 1",
 		})
 		.optional(),
+	/**
+	 * The IETF language tag of the locale Checkout is displayed in.
+	 * If not provided or set to `auto`, the browser's locale is used.
+	 */
+	locale: z
+		.custom<StripeType.Checkout.Session.Locale>((localization) => {
+			return typeof localization === "string";
+		})
+		.meta({
+			description:
+				"The locale to display Checkout in. Eg: 'en', 'ko'. If not provided or set to `auto`, the browser's locale is used.",
+		})
+		.optional(),
 	/**
 	 * The URL to which Stripe should send customers when payment or setup is complete.
 	 */
@@ -498,7 +511,10 @@ export const upgradeSubscription = (options: StripeOptions) => {
 				activeOrTrialingSubscription &&
 				activeOrTrialingSubscription.status === "active" &&
 				activeOrTrialingSubscription.plan === ctx.body.plan &&
-				activeOrTrialingSubscription.seats === (ctx.body.seats || 1)
+				activeOrTrialingSubscription.seats === (ctx.body.seats || 1) &&
+				// Skip if periodEnd has passed, in case status is stale
+				(!activeOrTrialingSubscription.periodEnd ||
+					activeOrTrialingSubscription.periodEnd > new Date())
 			) {
 				throw APIError.from(
 					"BAD_REQUEST",
@@ -702,6 +718,7 @@ export const upgradeSubscription = (options: StripeOptions) => {
 							: {
 									customer_email: user.email,
 								}),
+						locale: ctx.body.locale,
 						success_url: getUrl(
 							ctx,
 							`${
@@ -1429,10 +1446,18 @@ export const subscriptionSuccess = (options: StripeOptions) => {
 };
 
 const createBillingPortalBodySchema = z.object({
+	/**
+	 * The IETF language tag of the locale Customer Portal is displayed in.
+	 * If not provided or set to `auto`, the browser's locale is used.
+	 */
 	locale: z
 		.custom<StripeType.Checkout.Session.Locale>((localization) => {
 			return typeof localization === "string";
 		})
+		.meta({
+			description:
+				"The IETF language tag of the locale Customer Portal is displayed in. Eg: 'en', 'ko'. If not provided or set to `auto`, the browser's locale is used.",
+		})
 		.optional(),
 	referenceId: z.string().optional(),
 	/**

package/test/stripe.test.ts

@@ -1915,6 +1915,72 @@ describe("stripe", () => {
 		expect(upgradeRes.error?.message).toContain("already subscribed");
 	});
 
+	it.each([
+		{
+			name: "past",
+			periodEnd: new Date(Date.now() - 24 * 60 * 60 * 1000),
+			shouldAllow: true,
+		},
+		{
+			name: "future",
+			periodEnd: new Date(Date.now() + 30 * 24 * 60 * 60 * 1000),
+			shouldAllow: false,
+		},
+	])("should handle re-subscribing when periodEnd is in the $name", async ({
+		periodEnd,
+		shouldAllow,
+	}) => {
+		const { client, auth, sessionSetter } = await getTestInstance(
+			{
+				database: memory,
+				plugins: [stripe(stripeOptions)],
+			},
+			{
+				disableTestUser: true,
+				clientOptions: {
+					plugins: [stripeClient({ subscription: true })],
+				},
+			},
+		);
+		const ctx = await auth.$context;
+
+		const userRes = await client.signUp.email(
+			{ ...testUser, email: `periodend-${periodEnd.getTime()}@email.com` },
+			{ throw: true },
+		);
+
+		const headers = new Headers();
+		await client.signIn.email(
+			{ ...testUser, email: `periodend-${periodEnd.getTime()}@email.com` },
+			{ throw: true, onSuccess: sessionSetter(headers) },
+		);
+
+		await client.subscription.upgrade({
+			plan: "starter",
+			seats: 1,
+			fetchOptions: { headers },
+		});
+
+		await ctx.adapter.update({
+			model: "subscription",
+			update: { status: "active", seats: 1, periodEnd },
+			where: [{ field: "referenceId", value: userRes.user.id }],
+		});
+
+		const upgradeRes = await client.subscription.upgrade({
+			plan: "starter",
+			seats: 1,
+			fetchOptions: { headers },
+		});
+
+		if (shouldAllow) {
+			expect(upgradeRes.error).toBeNull();
+			expect(upgradeRes.data?.url).toBeDefined();
+		} else {
+			expect(upgradeRes.error?.message).toContain("already subscribed");
+		}
+	});
+
 	it("should only call Stripe customers.create once for signup and upgrade", async () => {
 		const { client, sessionSetter } = await getTestInstance(
 			{