@better-auth/stripe 1.4.17 → 1.4.19

package/.turbo/turbo-build.log

@@ -1,5 +1,5 @@
 
-> @better-auth/stripe@1.4.17 build /home/runner/work/better-auth/better-auth/packages/stripe
+> @better-auth/stripe@1.4.19 build /home/runner/work/better-auth/better-auth/packages/stripe
 > tsdown
 
 ℹ tsdown v0.17.2 powered by rolldown v1.0.0-beta.53
@@ -7,10 +7,12 @@
 ℹ entry: src/index.ts, src/client.ts
 ℹ tsconfig: tsconfig.json
 ℹ Build start
-ℹ dist/index.mjs             58.26 kB │ gzip: 10.62 kB
-ℹ dist/client.mjs             0.26 kB │ gzip:  0.20 kB
-ℹ dist/client.d.mts           0.62 kB │ gzip:  0.34 kB
-ℹ dist/index.d.mts            0.21 kB │ gzip:  0.14 kB
-ℹ dist/index-BTvn0abC.d.mts  30.34 kB │ gzip:  5.18 kB
-ℹ 5 files, total: 89.69 kB
-✔ Build complete in 25207ms
+ℹ dist/index.mjs              59.30 kB │ gzip: 10.90 kB
+ℹ dist/client.mjs              0.30 kB │ gzip:  0.23 kB
+ℹ dist/index.mjs.map         125.43 kB │ gzip: 23.81 kB
+ℹ dist/client.mjs.map          1.10 kB │ gzip:  0.53 kB
+ℹ dist/client.d.mts            0.66 kB │ gzip:  0.37 kB
+ℹ dist/index.d.mts             0.21 kB │ gzip:  0.14 kB
+ℹ dist/index-BfL0mL4D.d.mts   30.51 kB │ gzip:  5.24 kB
+ℹ 7 files, total: 217.51 kB
+✔ Build complete in 22270ms

package/dist/client.d.mts

@@ -1,4 +1,4 @@
-import { n as stripe } from "./index-BTvn0abC.mjs";
+import { n as stripe } from "./index-BfL0mL4D.mjs";
 
 //#region src/client.d.ts
 declare const stripeClient: <O extends {
@@ -22,4 +22,5 @@ declare const stripeClient: <O extends {
   };
 };
 //#endregion
-export { stripeClient };
+export { stripeClient };
+//# sourceMappingURL=client.d.mts.map

package/dist/client.mjs

@@ -11,4 +11,5 @@ const stripeClient = (options) => {
 };
 
 //#endregion
-export { stripeClient };
+export { stripeClient };
+//# sourceMappingURL=client.mjs.map

package/dist/client.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"client.mjs","names":[],"sources":["../src/client.ts"],"sourcesContent":["import type { BetterAuthClientPlugin } from \"better-auth/client\";\nimport type { stripe } from \"./index\";\n\nexport const stripeClient = <\n\tO extends {\n\t\tsubscription: boolean;\n\t},\n>(\n\toptions?: O | undefined,\n) => {\n\treturn {\n\t\tid: \"stripe-client\",\n\t\t$InferServerPlugin: {} as ReturnType<\n\t\t\ttypeof stripe<\n\t\t\t\tO[\"subscription\"] extends true\n\t\t\t\t\t? {\n\t\t\t\t\t\t\tstripeClient: any;\n\t\t\t\t\t\t\tstripeWebhookSecret: string;\n\t\t\t\t\t\t\tsubscription: {\n\t\t\t\t\t\t\t\tenabled: true;\n\t\t\t\t\t\t\t\tplans: [];\n\t\t\t\t\t\t\t};\n\t\t\t\t\t\t}\n\t\t\t\t\t: {\n\t\t\t\t\t\t\tstripeClient: any;\n\t\t\t\t\t\t\tstripeWebhookSecret: string;\n\t\t\t\t\t\t}\n\t\t\t>\n\t\t>,\n\t\tpathMethods: {\n\t\t\t\"/subscription/billing-portal\": \"POST\",\n\t\t\t\"/subscription/restore\": \"POST\",\n\t\t},\n\t} satisfies BetterAuthClientPlugin;\n};\n"],"mappings":";AAGA,MAAa,gBAKZ,YACI;AACJ,QAAO;EACN,IAAI;EACJ,oBAAoB,EAAE;EAiBtB,aAAa;GACZ,gCAAgC;GAChC,yBAAyB;GACzB;EACD"}

package/dist/{index-BTvn0abC.d.mts → index-BfL0mL4D.d.mts}

@@ -936,10 +936,12 @@ declare const stripe: <O extends StripeOptions>(options: O) => {
     readonly SUBSCRIPTION_NOT_SCHEDULED_FOR_CANCELLATION: "Subscription is not scheduled for cancellation";
     readonly ORGANIZATION_NOT_FOUND: "Organization not found";
     readonly ORGANIZATION_SUBSCRIPTION_NOT_ENABLED: "Organization subscription is not enabled";
+    readonly AUTHORIZE_REFERENCE_REQUIRED: "Organization subscriptions require authorizeReference callback to be configured";
     readonly ORGANIZATION_HAS_ACTIVE_SUBSCRIPTION: "Cannot delete organization with active subscription";
     readonly ORGANIZATION_REFERENCE_ID_REQUIRED: "Reference ID is required. Provide referenceId or set activeOrganizationId in session";
   };
 };
 type StripePlugin<O extends StripeOptions> = ReturnType<typeof stripe<O>>;
 //#endregion
-export { SubscriptionOptions as a, Subscription as i, stripe as n, StripePlan as r, StripePlugin as t };
+export { SubscriptionOptions as a, Subscription as i, stripe as n, StripePlan as r, StripePlugin as t };
+//# sourceMappingURL=index-BfL0mL4D.d.mts.map

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

package/dist/index.mjs

@@ -27,10 +27,54 @@ const STRIPE_ERROR_CODES = defineErrorCodes({
 	SUBSCRIPTION_NOT_SCHEDULED_FOR_CANCELLATION: "Subscription is not scheduled for cancellation",
 	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",
 	ORGANIZATION_HAS_ACTIVE_SUBSCRIPTION: "Cannot delete organization with active subscription",
 	ORGANIZATION_REFERENCE_ID_REQUIRED: "Reference ID is required. Provide referenceId or set activeOrganizationId in session"
 });
 
+//#endregion
+//#region src/metadata.ts
+/**
+* Customer metadata - set internal fields and extract typed fields.
+*/
+const customerMetadata = {
+	keys: {
+		userId: "userId",
+		organizationId: "organizationId",
+		customerType: "customerType"
+	},
+	set(internalFields, ...userMetadata) {
+		return defu(internalFields, ...userMetadata.filter(Boolean));
+	},
+	get(metadata) {
+		return {
+			userId: metadata?.userId,
+			organizationId: metadata?.organizationId,
+			customerType: metadata?.customerType
+		};
+	}
+};
+/**
+* Subscription/Checkout metadata - set internal fields and extract typed fields.
+*/
+const subscriptionMetadata = {
+	keys: {
+		userId: "userId",
+		subscriptionId: "subscriptionId",
+		referenceId: "referenceId"
+	},
+	set(internalFields, ...userMetadata) {
+		return defu(internalFields, ...userMetadata.filter(Boolean));
+	},
+	get(metadata) {
+		return {
+			userId: metadata?.userId,
+			subscriptionId: metadata?.subscriptionId,
+			referenceId: metadata?.referenceId
+		};
+	}
+};
+
 //#endregion
 //#region src/utils.ts
 async function getPlans(subscriptionOptions) {
@@ -120,8 +164,9 @@ async function onCheckoutSessionCompleted(ctx, options, event) {
 		const priceLookupKey = subscriptionItem.price.lookup_key;
 		const plan = await getPlanByPriceInfo(options, priceId, priceLookupKey);
 		if (plan) {
-			const referenceId = checkoutSession?.client_reference_id || checkoutSession?.metadata?.referenceId;
-			const subscriptionId = checkoutSession?.metadata?.subscriptionId;
+			const checkoutMeta = subscriptionMetadata.get(checkoutSession?.metadata);
+			const referenceId = checkoutSession?.client_reference_id || checkoutMeta.referenceId;
+			const { subscriptionId } = checkoutMeta;
 			const seats = subscriptionItem.quantity;
 			if (referenceId && subscriptionId) {
 				const trial = subscription.trial_start && subscription.trial_end ? {
@@ -179,7 +224,7 @@ async function onSubscriptionCreated(ctx, options, event) {
 			ctx.context.logger.warn(`Stripe webhook warning: customer.subscription.created event received without customer ID`);
 			return;
 		}
-		const subscriptionId = subscriptionCreated.metadata?.subscriptionId;
+		const { subscriptionId } = subscriptionMetadata.get(subscriptionCreated.metadata);
 		const existingSubscription = await ctx.context.adapter.findOne({
 			model: "subscription",
 			where: subscriptionId ? [{
@@ -256,7 +301,7 @@ async function onSubscriptionUpdated(ctx, options, event) {
 		const priceId = subscriptionItem.price.id;
 		const priceLookupKey = subscriptionItem.price.lookup_key;
 		const plan = await getPlanByPriceInfo(options, priceId, priceLookupKey);
-		const subscriptionId = subscriptionUpdated.metadata?.subscriptionId;
+		const { subscriptionId } = subscriptionMetadata.get(subscriptionUpdated.metadata);
 		const customerId = subscriptionUpdated.customer?.toString();
 		let subscription = await ctx.context.adapter.findOne({
 			model: "subscription",
@@ -378,7 +423,7 @@ const referenceMiddleware = (subscriptionOptions, action) => createAuthMiddlewar
 	if (customerType === "organization") {
 		if (!subscriptionOptions.authorizeReference) {
 			ctx.context.logger.error(`Organization subscriptions require authorizeReference to be defined in your stripe plugin config.`);
-			throw new APIError$1("BAD_REQUEST", { message: STRIPE_ERROR_CODES.ORGANIZATION_SUBSCRIPTION_NOT_ENABLED });
+			throw new APIError$1("BAD_REQUEST", { message: STRIPE_ERROR_CODES.AUTHORIZE_REFERENCE_REQUIRED });
 		}
 		const referenceId = explicitReferenceId || ctxSession.session.activeOrganizationId;
 		if (!referenceId) throw new APIError$1("BAD_REQUEST", { message: STRIPE_ERROR_CODES.ORGANIZATION_REFERENCE_ID_REQUIRED });
@@ -493,21 +538,15 @@ const upgradeSubscription = (options) => {
 		if (!user$1.emailVerified && subscriptionOptions.requireEmailVerification) throw new APIError$1("BAD_REQUEST", { message: STRIPE_ERROR_CODES.EMAIL_VERIFICATION_REQUIRED });
 		const plan = await getPlanByName(options, ctx.body.plan);
 		if (!plan) throw new APIError$1("BAD_REQUEST", { message: STRIPE_ERROR_CODES.SUBSCRIPTION_PLAN_NOT_FOUND });
-		let subscriptionToUpdate = ctx.body.subscriptionId ? await ctx.context.adapter.findOne({
+		const subscriptionToUpdate = ctx.body.subscriptionId ? await ctx.context.adapter.findOne({
 			model: "subscription",
 			where: [{
 				field: "stripeSubscriptionId",
 				value: ctx.body.subscriptionId
 			}]
-		}) : referenceId ? await ctx.context.adapter.findOne({
-			model: "subscription",
-			where: [{
-				field: "referenceId",
-				value: referenceId
-			}]
 		}) : null;
-		if (ctx.body.subscriptionId && subscriptionToUpdate && subscriptionToUpdate.referenceId !== referenceId) subscriptionToUpdate = null;
 		if (ctx.body.subscriptionId && !subscriptionToUpdate) throw new APIError$1("BAD_REQUEST", { message: STRIPE_ERROR_CODES.SUBSCRIPTION_NOT_FOUND });
+		if (ctx.body.subscriptionId && subscriptionToUpdate && subscriptionToUpdate.referenceId !== referenceId) throw new APIError$1("BAD_REQUEST", { message: STRIPE_ERROR_CODES.SUBSCRIPTION_NOT_FOUND });
 		let customerId;
 		if (customerType === "organization") {
 			customerId = subscriptionToUpdate?.stripeCustomerId;
@@ -523,7 +562,7 @@ const upgradeSubscription = (options) => {
 				customerId = org.stripeCustomerId;
 				if (!customerId) try {
 					let stripeCustomer = (await client.customers.search({
-						query: `metadata["organizationId"]:"${org.id}"`,
+						query: `metadata["${customerMetadata.keys.organizationId}"]:"${org.id}"`,
 						limit: 1
 					})).data[0];
 					if (!stripeCustomer) {
@@ -531,11 +570,10 @@ const upgradeSubscription = (options) => {
 						if (options.organization?.getCustomerCreateParams) extraCreateParams = await options.organization.getCustomerCreateParams(org, ctx);
 						const customerParams = defu({
 							name: org.name,
-							metadata: {
-								...ctx.body.metadata,
+							metadata: customerMetadata.set({
 								organizationId: org.id,
 								customerType: "organization"
-							}
+							}, ctx.body.metadata)
 						}, extraCreateParams);
 						stripeCustomer = await client.customers.create(customerParams);
 						await options.organization?.onCustomerCreate?.({
@@ -564,17 +602,16 @@ const upgradeSubscription = (options) => {
 			customerId = subscriptionToUpdate?.stripeCustomerId || user$1.stripeCustomerId;
 			if (!customerId) try {
 				let stripeCustomer = (await client.customers.search({
-					query: `email:"${escapeStripeSearchValue(user$1.email)}" AND -metadata["customerType"]:"organization"`,
+					query: `email:"${escapeStripeSearchValue(user$1.email)}" AND -metadata["${customerMetadata.keys.customerType}"]:"organization"`,
 					limit: 1
 				})).data[0];
 				if (!stripeCustomer) stripeCustomer = await client.customers.create({
 					email: user$1.email,
 					name: user$1.name,
-					metadata: {
-						...ctx.body.metadata,
+					metadata: customerMetadata.set({
 						userId: user$1.id,
 						customerType: "user"
-					}
+					}, ctx.body.metadata)
 				});
 				await ctx.context.adapter.update({
 					model: "user",
@@ -603,8 +640,18 @@ const upgradeSubscription = (options) => {
 			if (activeOrTrialingSubscription?.stripeSubscriptionId) return sub.id === activeOrTrialingSubscription.stripeSubscriptionId;
 			return false;
 		});
+		const stripeSubscriptionPriceId = activeSubscription?.items.data[0]?.price.id;
 		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) && (!activeOrTrialingSubscription.periodEnd || activeOrTrialingSubscription.periodEnd > /* @__PURE__ */ new Date())) throw new APIError$1("BAD_REQUEST", { message: STRIPE_ERROR_CODES.ALREADY_SUBSCRIBED_PLAN });
+		const priceId = ctx.body.annual ? plan.annualDiscountPriceId : plan.priceId;
+		const lookupKey = ctx.body.annual ? plan.annualDiscountLookupKey : plan.lookupKey;
+		const resolvedPriceId = lookupKey ? await resolvePriceIdFromLookupKey(client, lookupKey) : void 0;
+		const priceIdToUse = priceId || resolvedPriceId;
+		if (!priceIdToUse) throw ctx.error("BAD_REQUEST", { message: "Price ID not found for the selected plan" });
+		const isSamePlan = activeOrTrialingSubscription?.plan === ctx.body.plan;
+		const isSameSeats = activeOrTrialingSubscription?.seats === (ctx.body.seats || 1);
+		const isSamePriceId = stripeSubscriptionPriceId === priceIdToUse;
+		const isSubscriptionStillValid = !activeOrTrialingSubscription?.periodEnd || activeOrTrialingSubscription.periodEnd > /* @__PURE__ */ new Date();
+		if (activeOrTrialingSubscription?.status === "active" && isSamePlan && isSameSeats && isSamePriceId && isSubscriptionStillValid) throw new APIError$1("BAD_REQUEST", { message: STRIPE_ERROR_CODES.ALREADY_SUBSCRIBED_PLAN });
 		if (activeSubscription && customerId) {
 			let dbSubscription = await ctx.context.adapter.findOne({
 				model: "subscription",
@@ -627,15 +674,6 @@ const upgradeSubscription = (options) => {
 				});
 				dbSubscription = activeOrTrialingSubscription;
 			}
-			let priceIdToUse$1 = void 0;
-			if (ctx.body.annual) {
-				priceIdToUse$1 = plan.annualDiscountPriceId;
-				if (!priceIdToUse$1 && plan.annualDiscountLookupKey) priceIdToUse$1 = await resolvePriceIdFromLookupKey(client, plan.annualDiscountLookupKey);
-			} else {
-				priceIdToUse$1 = plan.priceId;
-				if (!priceIdToUse$1 && plan.lookupKey) priceIdToUse$1 = await resolvePriceIdFromLookupKey(client, plan.lookupKey);
-			}
-			if (!priceIdToUse$1) throw ctx.error("BAD_REQUEST", { message: "Price ID not found for the selected plan" });
 			const { url } = await client.billingPortal.sessions.create({
 				customer: customerId,
 				return_url: getUrl(ctx, ctx.body.returnUrl || "/"),
@@ -650,7 +688,7 @@ const upgradeSubscription = (options) => {
 						items: [{
 							id: activeSubscription.items.data[0]?.id,
 							quantity: ctx.body.seats || 1,
-							price: priceIdToUse$1
+							price: priceIdToUse
 						}]
 					}
 				}
@@ -707,14 +745,6 @@ const upgradeSubscription = (options) => {
 		})).some((s) => {
 			return !!(s.trialStart || s.trialEnd) || s.status === "trialing";
 		}) && plan.freeTrial ? { trial_period_days: plan.freeTrial.days } : void 0;
-		let priceIdToUse = void 0;
-		if (ctx.body.annual) {
-			priceIdToUse = plan.annualDiscountPriceId;
-			if (!priceIdToUse && plan.annualDiscountLookupKey) priceIdToUse = await resolvePriceIdFromLookupKey(client, plan.annualDiscountLookupKey);
-		} else {
-			priceIdToUse = plan.priceId;
-			if (!priceIdToUse && plan.lookupKey) priceIdToUse = await resolvePriceIdFromLookupKey(client, plan.lookupKey);
-		}
 		const checkoutSession = await client.checkout.sessions.create({
 			...customerId ? {
 				customer: customerId,
@@ -732,24 +762,20 @@ const upgradeSubscription = (options) => {
 			}],
 			subscription_data: {
 				...freeTrial,
-				metadata: {
-					...ctx.body.metadata,
-					...params?.params?.subscription_data?.metadata,
+				metadata: subscriptionMetadata.set({
 					userId: user$1.id,
 					subscriptionId: subscription.id,
 					referenceId
-				}
+				}, ctx.body.metadata, params?.params?.subscription_data?.metadata)
 			},
 			mode: "subscription",
 			client_reference_id: referenceId,
 			...params?.params,
-			metadata: {
-				...ctx.body.metadata,
-				...params?.params?.metadata,
+			metadata: subscriptionMetadata.set({
 				userId: user$1.id,
 				subscriptionId: subscription.id,
 				referenceId
-			}
+			}, ctx.body.metadata, params?.params?.metadata)
 		}, params?.options).catch(async (e) => {
 			throw ctx.error("BAD_REQUEST", {
 				message: e.message,
@@ -773,11 +799,9 @@ const cancelSubscriptionCallback = (options) => {
 		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 session = await getSessionFromCtx(ctx);
-		if (!session) throw ctx.redirect(getUrl(ctx, ctx.query?.callbackURL || "/"));
-		const { user: user$1 } = session;
+		if (!await getSessionFromCtx(ctx)) throw ctx.redirect(getUrl(ctx, ctx.query?.callbackURL || "/"));
 		const { callbackURL, subscriptionId } = ctx.query;
-		if (user$1?.stripeCustomerId) try {
+		try {
 			const subscription = await ctx.context.adapter.findOne({
 				model: "subscription",
 				where: [{
@@ -786,8 +810,10 @@ const cancelSubscriptionCallback = (options) => {
 				}]
 			});
 			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: user$1.stripeCustomerId,
+				customer: customerId,
 				status: "active"
 			})).data.find((sub) => sub.id === subscription.stripeSubscriptionId);
 			if (currentSubscription && isStripePendingCancel(currentSubscription) && !isPendingCancel(subscription)) {
@@ -1400,7 +1426,7 @@ const stripe = (options) => {
 					if (!ctx$1 || !options.createCustomerOnSignUp || user$1.stripeCustomerId) return;
 					try {
 						let stripeCustomer = (await client.customers.search({
-							query: `email:"${escapeStripeSearchValue(user$1.email)}" AND -metadata["customerType"]:"organization"`,
+							query: `email:"${escapeStripeSearchValue(user$1.email)}" AND -metadata["${customerMetadata.keys.customerType}"]:"organization"`,
 							limit: 1
 						})).data[0];
 						if (stripeCustomer) {
@@ -1420,10 +1446,10 @@ const stripe = (options) => {
 						const params = defu({
 							email: user$1.email,
 							name: user$1.name,
-							metadata: {
+							metadata: customerMetadata.set({
 								userId: user$1.id,
 								customerType: "user"
-							}
+							}, extraCreateParams?.metadata)
 						}, extraCreateParams);
 						stripeCustomer = await client.customers.create(params);
 						await ctx$1.context.internalAdapter.updateUser(user$1.id, { stripeCustomerId: stripeCustomer.id });
@@ -1464,4 +1490,5 @@ const stripe = (options) => {
 };
 
 //#endregion
-export { stripe };
+export { stripe };
+//# sourceMappingURL=index.mjs.map