@better-auth/stripe 1.3.9 → 1.3.10-beta.2

package/.turbo/turbo-build.log

@@ -1,17 +1,17 @@
 
-> @better-auth/stripe@1.3.9 build /home/runner/work/better-auth/better-auth/packages/stripe
+> @better-auth/stripe@1.3.10-beta.2 build /home/runner/work/better-auth/better-auth/packages/stripe
 > unbuild
 
 [info] Automatically detected entries: src/index, src/client [esm] [cjs] [dts]
 [info] Building stripe
 [success] Build succeeded for stripe
-[log]   dist/index.cjs (total size: 44.2 kB, chunk size: 44.2 kB, exports: stripe)
+[log]   dist/index.cjs (total size: 45.4 kB, chunk size: 45.4 kB, exports: stripe)
 
 [log]   dist/client.cjs (total size: 224 B, chunk size: 224 B, exports: stripeClient)
 
-[log]   dist/index.mjs (total size: 43.4 kB, chunk size: 43.4 kB, exports: stripe)
+[log]   dist/index.mjs (total size: 44.5 kB, chunk size: 44.5 kB, exports: stripe)
 
 [log]   dist/client.mjs (total size: 197 B, chunk size: 197 B, exports: stripeClient)
 
-Σ Total dist size (byte size): 224 kB
+Σ Total dist size (byte size): 227 kB
 [log]

package/dist/index.cjs

@@ -23,10 +23,10 @@ const z__namespace = /*#__PURE__*/_interopNamespaceCompat(z);
 async function getPlans(options) {
   return typeof options?.subscription?.plans === "function" ? await options.subscription?.plans() : options.subscription?.plans;
 }
-async function getPlanByPriceId(options, priceId) {
+async function getPlanByPriceInfo(options, priceId, priceLookupKey) {
   return await getPlans(options).then(
     (res) => res?.find(
-      (plan) => plan.priceId === priceId || plan.annualDiscountPriceId === priceId
+      (plan) => plan.priceId === priceId || plan.annualDiscountPriceId === priceId || priceLookupKey && (plan.lookupKey === priceLookupKey || plan.annualDiscountLookupKey === priceLookupKey)
     )
   );
 }
@@ -47,7 +47,12 @@ async function onCheckoutSessionCompleted(ctx, options, event) {
       checkoutSession.subscription
     );
     const priceId = subscription.items.data[0]?.price.id;
-    const plan = await getPlanByPriceId(options, priceId);
+    const priceLookupKey = subscription.items.data[0]?.price.lookup_key || null;
+    const plan = await getPlanByPriceInfo(
+      options,
+      priceId,
+      priceLookupKey
+    );
     if (plan) {
       const referenceId = checkoutSession?.client_reference_id || checkoutSession?.metadata?.referenceId;
       const subscriptionId = checkoutSession?.metadata?.subscriptionId;
@@ -117,7 +122,8 @@ async function onSubscriptionUpdated(ctx, options, event) {
     }
     const subscriptionUpdated = event.data.object;
     const priceId = subscriptionUpdated.items.data[0].price.id;
-    const plan = await getPlanByPriceId(options, priceId);
+    const priceLookupKey = subscriptionUpdated.items.data[0].price.lookup_key || null;
+    const plan = await getPlanByPriceInfo(options, priceId, priceLookupKey);
     const subscriptionId = subscriptionUpdated.metadata?.subscriptionId;
     const customerId = subscriptionUpdated.customer?.toString();
     let subscription = await ctx.context.adapter.findOne({
@@ -563,10 +569,13 @@ const stripe = (options) => {
             }
           ]
         });
-        const existingSubscription = subscriptions.find(
+        const activeOrTrialingSubscription = subscriptions.find(
           (sub) => sub.status === "active" || sub.status === "trialing"
         );
-        if (existingSubscription && existingSubscription.status === "active" && existingSubscription.plan === ctx.body.plan && existingSubscription.seats === (ctx.body.seats || 1)) {
+        const incompleteSubscription = subscriptions.find(
+          (sub) => sub.status === "incomplete"
+        );
+        if (activeOrTrialingSubscription && activeOrTrialingSubscription.status === "active" && activeOrTrialingSubscription.plan === ctx.body.plan && activeOrTrialingSubscription.seats === (ctx.body.seats || 1)) {
           throw new api.APIError("BAD_REQUEST", {
             message: STRIPE_ERROR_CODES.ALREADY_SUBSCRIBED_PLAN
           });
@@ -605,16 +614,36 @@ const stripe = (options) => {
             redirect: true
           });
         }
-        const subscription = existingSubscription || await ctx.context.adapter.create({
-          model: "subscription",
-          data: {
-            plan: plan.name.toLowerCase(),
-            stripeCustomerId: customerId,
-            status: "incomplete",
-            referenceId,
-            seats: ctx.body.seats || 1
-          }
-        });
+        let subscription = activeOrTrialingSubscription || incompleteSubscription;
+        if (incompleteSubscription && !activeOrTrialingSubscription) {
+          const updated = await ctx.context.adapter.update({
+            model: "subscription",
+            update: {
+              plan: plan.name.toLowerCase(),
+              seats: ctx.body.seats || 1,
+              updatedAt: /* @__PURE__ */ new Date()
+            },
+            where: [
+              {
+                field: "id",
+                value: incompleteSubscription.id
+              }
+            ]
+          });
+          subscription = updated || incompleteSubscription;
+        }
+        if (!subscription) {
+          subscription = await ctx.context.adapter.create({
+            model: "subscription",
+            data: {
+              plan: plan.name.toLowerCase(),
+              stripeCustomerId: customerId,
+              status: "incomplete",
+              referenceId,
+              seats: ctx.body.seats || 1
+            }
+          });
+        }
         if (!subscription) {
           ctx.context.logger.error("Subscription ID not found");
           throw new api.APIError("INTERNAL_SERVER_ERROR");
@@ -631,9 +660,8 @@ const stripe = (options) => {
           ctx
         );
         const hasEverTrialed = subscriptions.some((s) => {
-          const samePlan = s.plan?.toLowerCase() === plan.name.toLowerCase();
           const hadTrial = !!(s.trialStart || s.trialEnd) || s.status === "trialing";
-          return samePlan && hadTrial;
+          return hadTrial;
         });
         const freeTrial = !hasEverTrialed && plan.freeTrial ? { trial_period_days: plan.freeTrial.days } : void 0;
         let priceIdToUse = void 0;
@@ -1097,9 +1125,10 @@ const stripe = (options) => {
               status: "active"
             }).then((res) => res.data[0]);
             if (stripeSubscription) {
-              const plan = await getPlanByPriceId(
+              const plan = await getPlanByPriceInfo(
                 options,
-                stripeSubscription.items.data[0]?.plan.id
+                stripeSubscription.items.data[0]?.price.id,
+                stripeSubscription.items.data[0]?.price.lookup_key
               );
               if (plan && subscription) {
                 await ctx.context.adapter.update({

package/dist/index.mjs

@@ -7,10 +7,10 @@ import { mergeSchema } from 'better-auth/db';
 async function getPlans(options) {
   return typeof options?.subscription?.plans === "function" ? await options.subscription?.plans() : options.subscription?.plans;
 }
-async function getPlanByPriceId(options, priceId) {
+async function getPlanByPriceInfo(options, priceId, priceLookupKey) {
   return await getPlans(options).then(
     (res) => res?.find(
-      (plan) => plan.priceId === priceId || plan.annualDiscountPriceId === priceId
+      (plan) => plan.priceId === priceId || plan.annualDiscountPriceId === priceId || priceLookupKey && (plan.lookupKey === priceLookupKey || plan.annualDiscountLookupKey === priceLookupKey)
     )
   );
 }
@@ -31,7 +31,12 @@ async function onCheckoutSessionCompleted(ctx, options, event) {
       checkoutSession.subscription
     );
     const priceId = subscription.items.data[0]?.price.id;
-    const plan = await getPlanByPriceId(options, priceId);
+    const priceLookupKey = subscription.items.data[0]?.price.lookup_key || null;
+    const plan = await getPlanByPriceInfo(
+      options,
+      priceId,
+      priceLookupKey
+    );
     if (plan) {
       const referenceId = checkoutSession?.client_reference_id || checkoutSession?.metadata?.referenceId;
       const subscriptionId = checkoutSession?.metadata?.subscriptionId;
@@ -101,7 +106,8 @@ async function onSubscriptionUpdated(ctx, options, event) {
     }
     const subscriptionUpdated = event.data.object;
     const priceId = subscriptionUpdated.items.data[0].price.id;
-    const plan = await getPlanByPriceId(options, priceId);
+    const priceLookupKey = subscriptionUpdated.items.data[0].price.lookup_key || null;
+    const plan = await getPlanByPriceInfo(options, priceId, priceLookupKey);
     const subscriptionId = subscriptionUpdated.metadata?.subscriptionId;
     const customerId = subscriptionUpdated.customer?.toString();
     let subscription = await ctx.context.adapter.findOne({
@@ -547,10 +553,13 @@ const stripe = (options) => {
             }
           ]
         });
-        const existingSubscription = subscriptions.find(
+        const activeOrTrialingSubscription = subscriptions.find(
           (sub) => sub.status === "active" || sub.status === "trialing"
         );
-        if (existingSubscription && existingSubscription.status === "active" && existingSubscription.plan === ctx.body.plan && existingSubscription.seats === (ctx.body.seats || 1)) {
+        const incompleteSubscription = subscriptions.find(
+          (sub) => sub.status === "incomplete"
+        );
+        if (activeOrTrialingSubscription && activeOrTrialingSubscription.status === "active" && activeOrTrialingSubscription.plan === ctx.body.plan && activeOrTrialingSubscription.seats === (ctx.body.seats || 1)) {
           throw new APIError("BAD_REQUEST", {
             message: STRIPE_ERROR_CODES.ALREADY_SUBSCRIBED_PLAN
           });
@@ -589,16 +598,36 @@ const stripe = (options) => {
             redirect: true
           });
         }
-        const subscription = existingSubscription || await ctx.context.adapter.create({
-          model: "subscription",
-          data: {
-            plan: plan.name.toLowerCase(),
-            stripeCustomerId: customerId,
-            status: "incomplete",
-            referenceId,
-            seats: ctx.body.seats || 1
-          }
-        });
+        let subscription = activeOrTrialingSubscription || incompleteSubscription;
+        if (incompleteSubscription && !activeOrTrialingSubscription) {
+          const updated = await ctx.context.adapter.update({
+            model: "subscription",
+            update: {
+              plan: plan.name.toLowerCase(),
+              seats: ctx.body.seats || 1,
+              updatedAt: /* @__PURE__ */ new Date()
+            },
+            where: [
+              {
+                field: "id",
+                value: incompleteSubscription.id
+              }
+            ]
+          });
+          subscription = updated || incompleteSubscription;
+        }
+        if (!subscription) {
+          subscription = await ctx.context.adapter.create({
+            model: "subscription",
+            data: {
+              plan: plan.name.toLowerCase(),
+              stripeCustomerId: customerId,
+              status: "incomplete",
+              referenceId,
+              seats: ctx.body.seats || 1
+            }
+          });
+        }
         if (!subscription) {
           ctx.context.logger.error("Subscription ID not found");
           throw new APIError("INTERNAL_SERVER_ERROR");
@@ -615,9 +644,8 @@ const stripe = (options) => {
           ctx
         );
         const hasEverTrialed = subscriptions.some((s) => {
-          const samePlan = s.plan?.toLowerCase() === plan.name.toLowerCase();
           const hadTrial = !!(s.trialStart || s.trialEnd) || s.status === "trialing";
-          return samePlan && hadTrial;
+          return hadTrial;
         });
         const freeTrial = !hasEverTrialed && plan.freeTrial ? { trial_period_days: plan.freeTrial.days } : void 0;
         let priceIdToUse = void 0;
@@ -1081,9 +1109,10 @@ const stripe = (options) => {
               status: "active"
             }).then((res) => res.data[0]);
             if (stripeSubscription) {
-              const plan = await getPlanByPriceId(
+              const plan = await getPlanByPriceInfo(
                 options,
-                stripeSubscription.items.data[0]?.plan.id
+                stripeSubscription.items.data[0]?.price.id,
+                stripeSubscription.items.data[0]?.price.lookup_key
               );
               if (plan && subscription) {
                 await ctx.context.adapter.update({

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@better-auth/stripe",
   "author": "Bereket Engida",
-  "version": "1.3.9",
+  "version": "1.3.10-beta.2",
   "main": "dist/index.cjs",
   "license": "MIT",
   "keywords": [
@@ -41,12 +41,13 @@
   },
   "peerDependencies": {
     "stripe": "^18",
-    "better-auth": "1.3.9"
+    "better-auth": "1.3.10-beta.2"
   },
   "devDependencies": {
     "better-call": "1.0.18",
     "stripe": "^18.5.0",
-    "better-auth": "1.3.9"
+    "unbuild": "3.6.1",
+    "better-auth": "1.3.10-beta.2"
   },
   "scripts": {
     "test": "vitest",

package/src/hooks.ts

@@ -1,7 +1,7 @@
 import { type GenericEndpointContext, logger } from "better-auth";
 import type Stripe from "stripe";
 import type { InputSubscription, StripeOptions, Subscription } from "./types";
-import { getPlanByPriceId } from "./utils";
+import { getPlanByPriceInfo } from "./utils";
 
 export async function onCheckoutSessionCompleted(
 	ctx: GenericEndpointContext,
@@ -18,7 +18,12 @@ export async function onCheckoutSessionCompleted(
 			checkoutSession.subscription as string,
 		);
 		const priceId = subscription.items.data[0]?.price.id;
-		const plan = await getPlanByPriceId(options, priceId as string);
+		const priceLookupKey = subscription.items.data[0]?.price.lookup_key || null;
+		const plan = await getPlanByPriceInfo(
+			options,
+			priceId as string,
+			priceLookupKey,
+		);
 		if (plan) {
 			const referenceId =
 				checkoutSession?.client_reference_id ||
@@ -102,7 +107,9 @@ export async function onSubscriptionUpdated(
 		}
 		const subscriptionUpdated = event.data.object as Stripe.Subscription;
 		const priceId = subscriptionUpdated.items.data[0].price.id;
-		const plan = await getPlanByPriceId(options, priceId);
+		const priceLookupKey =
+			subscriptionUpdated.items.data[0].price.lookup_key || null;
+		const plan = await getPlanByPriceInfo(options, priceId, priceLookupKey);
 
 		const subscriptionId = subscriptionUpdated.metadata?.subscriptionId;
 		const customerId = subscriptionUpdated.customer?.toString();

package/src/index.ts

@@ -24,7 +24,7 @@ import type {
 	StripePlan,
 	Subscription,
 } from "./types";
-import { getPlanByName, getPlanByPriceId, getPlans } from "./utils";
+import { getPlanByName, getPlanByPriceInfo, getPlans } from "./utils";
 import { getSchema } from "./schema";
 
 const STRIPE_ERROR_CODES = {
@@ -354,15 +354,20 @@ export const stripe = <O extends StripeOptions>(options: O) => {
 							],
 						});
 
-				const existingSubscription = subscriptions.find(
+				const activeOrTrialingSubscription = subscriptions.find(
 					(sub) => sub.status === "active" || sub.status === "trialing",
 				);
 
+				// Also find any incomplete subscription that we can reuse
+				const incompleteSubscription = subscriptions.find(
+					(sub) => sub.status === "incomplete",
+				);
+
 				if (
-					existingSubscription &&
-					existingSubscription.status === "active" &&
-					existingSubscription.plan === ctx.body.plan &&
-					existingSubscription.seats === (ctx.body.seats || 1)
+					activeOrTrialingSubscription &&
+					activeOrTrialingSubscription.status === "active" &&
+					activeOrTrialingSubscription.plan === ctx.body.plan &&
+					activeOrTrialingSubscription.seats === (ctx.body.seats || 1)
 				) {
 					throw new APIError("BAD_REQUEST", {
 						message: STRIPE_ERROR_CODES.ALREADY_SUBSCRIBED_PLAN,
@@ -408,9 +413,32 @@ export const stripe = <O extends StripeOptions>(options: O) => {
 					});
 				}
 
-				const subscription =
-					existingSubscription ||
-					(await ctx.context.adapter.create<InputSubscription, Subscription>({
+				let subscription: Subscription | undefined =
+					activeOrTrialingSubscription || incompleteSubscription;
+
+				if (incompleteSubscription && !activeOrTrialingSubscription) {
+					const updated = await ctx.context.adapter.update<InputSubscription>({
+						model: "subscription",
+						update: {
+							plan: plan.name.toLowerCase(),
+							seats: ctx.body.seats || 1,
+							updatedAt: new Date(),
+						},
+						where: [
+							{
+								field: "id",
+								value: incompleteSubscription.id,
+							},
+						],
+					});
+					subscription = (updated as Subscription) || incompleteSubscription;
+				}
+
+				if (!subscription) {
+					subscription = await ctx.context.adapter.create<
+						InputSubscription,
+						Subscription
+					>({
 						model: "subscription",
 						data: {
 							plan: plan.name.toLowerCase(),
@@ -419,7 +447,8 @@ export const stripe = <O extends StripeOptions>(options: O) => {
 							referenceId,
 							seats: ctx.body.seats || 1,
 						},
-					}));
+					});
+				}
 
 				if (!subscription) {
 					ctx.context.logger.error("Subscription ID not found");
@@ -439,10 +468,11 @@ export const stripe = <O extends StripeOptions>(options: O) => {
 				);
 
 				const hasEverTrialed = subscriptions.some((s) => {
-					const samePlan = s.plan?.toLowerCase() === plan.name.toLowerCase();
+					// Check if user has ever had a trial for any plan (not just the same plan)
+					// This prevents users from getting multiple trials by switching plans
 					const hadTrial =
 						!!(s.trialStart || s.trialEnd) || s.status === "trialing";
-					return samePlan && hadTrial;
+					return hadTrial;
 				});
 
 				const freeTrial =
@@ -994,9 +1024,10 @@ export const stripe = <O extends StripeOptions>(options: O) => {
 							.then((res) => res.data[0]);
 
 						if (stripeSubscription) {
-							const plan = await getPlanByPriceId(
+							const plan = await getPlanByPriceInfo(
 								options,
-								stripeSubscription.items.data[0]?.plan.id,
+								stripeSubscription.items.data[0]?.price.id,
+								stripeSubscription.items.data[0]?.price.lookup_key,
 							);
 
 							if (plan && subscription) {

package/src/stripe.test.ts

@@ -1102,4 +1102,182 @@ describe("stripe", async () => {
 		});
 		expect(personalAfter?.status).toBe("active");
 	});
+
+	it("should prevent multiple free trials for the same user", async () => {
+		// Create a user
+		const userRes = await authClient.signUp.email(
+			{ ...testUser, email: "trial-prevention@email.com" },
+			{ throw: true },
+		);
+
+		const headers = new Headers();
+		await authClient.signIn.email(
+			{ ...testUser, email: "trial-prevention@email.com" },
+			{
+				throw: true,
+				onSuccess: setCookieToHeader(headers),
+			},
+		);
+
+		// First subscription with trial
+		const firstUpgradeRes = await authClient.subscription.upgrade({
+			plan: "starter",
+			fetchOptions: { headers },
+		});
+
+		expect(firstUpgradeRes.data?.url).toBeDefined();
+
+		// Simulate the subscription being created with trial data
+		await ctx.adapter.update({
+			model: "subscription",
+			update: {
+				status: "trialing",
+				trialStart: new Date(),
+				trialEnd: new Date(Date.now() + 7 * 24 * 60 * 60 * 1000), // 7 days from now
+			},
+			where: [
+				{
+					field: "referenceId",
+					value: userRes.user.id,
+				},
+			],
+		});
+
+		// Cancel the subscription
+		await ctx.adapter.update({
+			model: "subscription",
+			update: {
+				status: "canceled",
+			},
+			where: [
+				{
+					field: "referenceId",
+					value: userRes.user.id,
+				},
+			],
+		});
+
+		// Try to subscribe again - should NOT get a trial
+		const secondUpgradeRes = await authClient.subscription.upgrade({
+			plan: "starter",
+			fetchOptions: { headers },
+		});
+
+		expect(secondUpgradeRes.data?.url).toBeDefined();
+
+		// Verify that the checkout session was created without trial_period_days
+		// We can't directly test the Stripe session, but we can verify the logic
+		// by checking that the user has trial history
+		const subscriptions = (await ctx.adapter.findMany({
+			model: "subscription",
+			where: [
+				{
+					field: "referenceId",
+					value: userRes.user.id,
+				},
+			],
+		})) as Subscription[];
+
+		// Should have 2 subscriptions (first canceled, second new)
+		expect(subscriptions).toHaveLength(2);
+
+		// At least one should have trial data
+		const hasTrialData = subscriptions.some(
+			(s: Subscription) => s.trialStart || s.trialEnd,
+		);
+		expect(hasTrialData).toBe(true);
+	});
+
+	it("should prevent multiple free trials across different plans", async () => {
+		// Create a user
+		const userRes = await authClient.signUp.email(
+			{ ...testUser, email: "cross-plan-trial@email.com" },
+			{ throw: true },
+		);
+
+		const headers = new Headers();
+		await authClient.signIn.email(
+			{ ...testUser, email: "cross-plan-trial@email.com" },
+			{
+				throw: true,
+				onSuccess: setCookieToHeader(headers),
+			},
+		);
+
+		// First subscription with trial on starter plan
+		const firstUpgradeRes = await authClient.subscription.upgrade({
+			plan: "starter",
+			fetchOptions: { headers },
+		});
+
+		expect(firstUpgradeRes.data?.url).toBeDefined();
+
+		// Simulate the subscription being created with trial data
+		await ctx.adapter.update({
+			model: "subscription",
+			update: {
+				status: "trialing",
+				trialStart: new Date(),
+				trialEnd: new Date(Date.now() + 7 * 24 * 60 * 60 * 1000),
+			},
+			where: [
+				{
+					field: "referenceId",
+					value: userRes.user.id,
+				},
+			],
+		});
+
+		// Cancel the subscription
+		await ctx.adapter.update({
+			model: "subscription",
+			update: {
+				status: "canceled",
+			},
+			where: [
+				{
+					field: "referenceId",
+					value: userRes.user.id,
+				},
+			],
+		});
+
+		// Try to subscribe to a different plan - should NOT get a trial
+		const secondUpgradeRes = await authClient.subscription.upgrade({
+			plan: "premium",
+			fetchOptions: { headers },
+		});
+
+		expect(secondUpgradeRes.data?.url).toBeDefined();
+
+		// Verify that the user has trial history from the first plan
+		const subscriptions = (await ctx.adapter.findMany({
+			model: "subscription",
+			where: [
+				{
+					field: "referenceId",
+					value: userRes.user.id,
+				},
+			],
+		})) as Subscription[];
+
+		// Should have at least 1 subscription (the starter with trial data)
+		expect(subscriptions.length).toBeGreaterThanOrEqual(1);
+
+		// The starter subscription should have trial data
+		const starterSub = subscriptions.find(
+			(s: Subscription) => s.plan === "starter",
+		) as Subscription | undefined;
+		expect(starterSub?.trialStart).toBeDefined();
+		expect(starterSub?.trialEnd).toBeDefined();
+
+		// Verify that the trial eligibility logic is working by checking
+		// that the user has ever had a trial (which should prevent future trials)
+		const hasEverTrialed = subscriptions.some((s: Subscription) => {
+			const hadTrial =
+				!!(s.trialStart || s.trialEnd) || s.status === "trialing";
+			return hadTrial;
+		});
+		expect(hasEverTrialed).toBe(true);
+	});
 });

package/src/utils.ts

@@ -6,14 +6,19 @@ export async function getPlans(options: StripeOptions) {
 		: options.subscription?.plans;
 }
 
-export async function getPlanByPriceId(
+export async function getPlanByPriceInfo(
 	options: StripeOptions,
 	priceId: string,
+	priceLookupKey: string | null,
 ) {
 	return await getPlans(options).then((res) =>
 		res?.find(
 			(plan) =>
-				plan.priceId === priceId || plan.annualDiscountPriceId === priceId,
+				plan.priceId === priceId ||
+				plan.annualDiscountPriceId === priceId ||
+				(priceLookupKey &&
+					(plan.lookupKey === priceLookupKey ||
+						plan.annualDiscountLookupKey === priceLookupKey)),
 		),
 	);
 }

package/vitest.config.ts

@@ -5,6 +5,5 @@ export default defineConfig({
 	test: {
 		clearMocks: true,
 		globals: true,
-		setupFiles: ["dotenv/config"],
 	},
 });