@better-auth/stripe 1.2.3 → 1.2.4-beta.10

package/dist/index.mjs

@@ -1,8 +1,8 @@
+import { logger } from 'better-auth';
 import { createAuthEndpoint, createAuthMiddleware } from 'better-auth/plugins';
 import { z } from 'zod';
-import { getSessionFromCtx, sessionMiddleware, originCheck, APIError } from 'better-auth/api';
+import { originCheck, getSessionFromCtx, sessionMiddleware, APIError } from 'better-auth/api';
 import { generateRandomString } from 'better-auth/crypto';
-import { logger } from 'better-auth';
 
 async function getPlans(options) {
   return typeof options?.subscription?.plans === "function" ? await options.subscription?.plans() : options.subscription?.plans;
@@ -93,11 +93,11 @@ 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 referenceId = subscriptionUpdated.metadata?.referenceId;
+    const subscriptionId = subscriptionUpdated.metadata?.subscriptionId;
     const customerId = subscriptionUpdated.customer?.toString();
     let subscription = await ctx.context.adapter.findOne({
       model: "subscription",
-      where: referenceId ? [{ field: "referenceId", value: referenceId }] : [{ field: "stripeSubscriptionId", value: subscriptionUpdated.id }]
+      where: subscriptionId ? [{ field: "id", value: subscriptionId }] : [{ field: "stripeSubscriptionId", value: subscriptionUpdated.id }]
     });
     if (!subscription) {
       const subs = await ctx.context.adapter.findMany({
@@ -311,25 +311,64 @@ const stripe = (options) => {
       {
         method: "POST",
         body: z.object({
+          /**
+           * The name of the plan to subscribe
+           */
           plan: z.string({
             description: "The name of the plan to upgrade to"
           }),
+          /**
+           * If annual plan should be applied.
+           */
           annual: z.boolean({
             description: "Whether to upgrade to an annual plan"
           }).optional(),
-          referenceId: z.string().optional(),
+          /**
+           * Reference id of the subscription to upgrade
+           * This is used to identify the subscription to upgrade
+           * If not provided, the user's id will be used
+           */
+          referenceId: z.string({
+            description: "Reference id of the subscription to upgrade"
+          }).optional(),
+          /**
+           * This is to allow a specific subscription to be upgrade.
+           * If subscription id is provided, and subscription isn't found,
+           * it'll throw an error.
+           */
+          subscriptionId: z.string({
+            description: "The id of the subscription to upgrade"
+          }).optional(),
+          /**
+           * Any additional data you want to store in your database
+           * subscriptions
+           */
           metadata: z.record(z.string(), z.any()).optional(),
+          /**
+           * If a subscription
+           */
           seats: z.number({
             description: "Number of seats to upgrade to (if applicable)"
           }).optional(),
-          uiMode: z.enum(["embedded", "hosted"]).default("hosted"),
+          /**
+           * Success url to redirect back after successful subscription
+           */
           successUrl: z.string({
             description: "callback url to redirect back after successful subscription"
           }).default("/"),
+          /**
+           * Cancel URL
+           */
           cancelUrl: z.string({
             description: "callback url to redirect back after successful subscription"
           }).default("/"),
+          /**
+           * Return URL
+           */
           returnUrl: z.string().optional(),
+          /**
+           * Disable Redirect
+           */
           disableRedirect: z.boolean().default(false)
         }),
         use: [
@@ -354,7 +393,16 @@ const stripe = (options) => {
             message: STRIPE_ERROR_CODES.SUBSCRIPTION_PLAN_NOT_FOUND
           });
         }
-        let customerId = user.stripeCustomerId;
+        const subscriptionToUpdate = ctx.body.subscriptionId ? await ctx.context.adapter.findOne({
+          model: "subscription",
+          where: [{ field: "id", value: ctx.body.subscriptionId }]
+        }) : null;
+        if (ctx.body.subscriptionId && !subscriptionToUpdate) {
+          throw new APIError("BAD_REQUEST", {
+            message: STRIPE_ERROR_CODES.SUBSCRIPTION_NOT_FOUND
+          });
+        }
+        let customerId = subscriptionToUpdate?.stripeCustomerId || user.stripeCustomerId;
         if (!customerId) {
           try {
             const stripeCustomer = await client.customers.create(
@@ -394,7 +442,7 @@ const stripe = (options) => {
           customer: customerId,
           status: "active"
         }).then((res) => res.data[0]).catch((e) => null) : null;
-        const subscriptions = await ctx.context.adapter.findMany({
+        const subscriptions = subscriptionToUpdate ? [subscriptionToUpdate] : await ctx.context.adapter.findMany({
           model: "subscription",
           where: [
             {
@@ -484,7 +532,7 @@ const stripe = (options) => {
               ctx,
               `${ctx.context.baseURL}/subscription/success?callbackURL=${encodeURIComponent(
                 ctx.body.successUrl
-              )}&reference=${encodeURIComponent(referenceId)}`
+              )}&subscriptionId=${encodeURIComponent(subscription.id)}`
             ),
             cancel_url: getUrl(ctx, ctx.body.cancelUrl),
             line_items: [
@@ -523,10 +571,11 @@ const stripe = (options) => {
       "/subscription/cancel/callback",
       {
         method: "GET",
-        query: z.record(z.string(), z.any()).optional()
+        query: z.record(z.string(), z.any()).optional(),
+        use: [originCheck((ctx) => ctx.query.callbackURL)]
       },
       async (ctx) => {
-        if (!ctx.query || !ctx.query.callbackURL || !ctx.query.reference) {
+        if (!ctx.query || !ctx.query.callbackURL || !ctx.query.subscriptionId) {
           throw ctx.redirect(getUrl(ctx, ctx.query?.callbackURL || "/"));
         }
         const session = await getSessionFromCtx(
@@ -536,15 +585,15 @@ const stripe = (options) => {
           throw ctx.redirect(getUrl(ctx, ctx.query?.callbackURL || "/"));
         }
         const { user } = session;
-        const { callbackURL, reference } = ctx.query;
+        const { callbackURL, subscriptionId } = ctx.query;
         if (user?.stripeCustomerId) {
           try {
             const subscription = await ctx.context.adapter.findOne({
               model: "subscription",
               where: [
                 {
-                  field: "referenceId",
-                  value: reference
+                  field: "id",
+                  value: subscriptionId
                 }
               ]
             });
@@ -567,8 +616,8 @@ const stripe = (options) => {
                 },
                 where: [
                   {
-                    field: "referenceId",
-                    value: reference
+                    field: "id",
+                    value: subscription.id
                   }
                 ]
               });
@@ -595,6 +644,7 @@ const stripe = (options) => {
         method: "POST",
         body: z.object({
           referenceId: z.string().optional(),
+          subscriptionId: z.string().optional(),
           returnUrl: z.string()
         }),
         use: [
@@ -605,15 +655,22 @@ const stripe = (options) => {
       },
       async (ctx) => {
         const referenceId = ctx.body?.referenceId || ctx.context.session.user.id;
-        const subscription = await ctx.context.adapter.findOne({
+        const subscription = ctx.body.subscriptionId ? await ctx.context.adapter.findOne({
           model: "subscription",
           where: [
             {
-              field: "referenceId",
-              value: referenceId
+              field: "id",
+              value: ctx.body.subscriptionId
             }
           ]
-        });
+        }) : await ctx.context.adapter.findMany({
+          model: "subscription",
+          where: [{ field: "referenceId", value: referenceId }]
+        }).then(
+          (subs) => subs.find(
+            (sub) => sub.status === "active" || sub.status === "trialing"
+          )
+        );
         if (!subscription || !subscription.stripeCustomerId) {
           throw ctx.error("BAD_REQUEST", {
             message: STRIPE_ERROR_CODES.SUBSCRIPTION_NOT_FOUND
@@ -654,7 +711,7 @@ const stripe = (options) => {
             ctx,
             `${ctx.context.baseURL}/subscription/cancel/callback?callbackURL=${encodeURIComponent(
               ctx.body?.returnUrl || "/"
-            )}&reference=${encodeURIComponent(referenceId)}`
+            )}&subscriptionId=${encodeURIComponent(subscription.id)}`
           ),
           flow_data: {
             type: "subscription_cancel",
@@ -736,10 +793,11 @@ const stripe = (options) => {
       "/subscription/success",
       {
         method: "GET",
-        query: z.record(z.string(), z.any()).optional()
+        query: z.record(z.string(), z.any()).optional(),
+        use: [originCheck((ctx) => ctx.query.callbackURL)]
       },
       async (ctx) => {
-        if (!ctx.query || !ctx.query.callbackURL || !ctx.query.reference) {
+        if (!ctx.query || !ctx.query.callbackURL || !ctx.query.subscriptionId) {
           throw ctx.redirect(getUrl(ctx, ctx.query?.callbackURL || "/"));
         }
         const session = await getSessionFromCtx(
@@ -749,38 +807,24 @@ const stripe = (options) => {
           throw ctx.redirect(getUrl(ctx, ctx.query?.callbackURL || "/"));
         }
         const { user } = session;
-        const { callbackURL, reference } = ctx.query;
-        const subscriptions = await ctx.context.adapter.findMany({
+        const { callbackURL, subscriptionId } = ctx.query;
+        const subscription = await ctx.context.adapter.findOne({
           model: "subscription",
           where: [
             {
-              field: "referenceId",
-              value: reference
+              field: "id",
+              value: subscriptionId
             }
           ]
         });
-        const activeSubscription = subscriptions.find(
-          (sub) => sub.status === "active" || sub.status === "trialing"
-        );
-        if (activeSubscription) {
+        if (subscription?.status === "active" || subscription?.status === "trialing") {
           return ctx.redirect(getUrl(ctx, callbackURL));
         }
-        if (user?.stripeCustomerId) {
+        const customerId = subscription?.stripeCustomerId || user.stripeCustomerId;
+        if (customerId) {
           try {
-            const subscription = await ctx.context.adapter.findOne({
-              model: "subscription",
-              where: [
-                {
-                  field: "referenceId",
-                  value: reference
-                }
-              ]
-            });
-            if (!subscription || subscription.status === "active") {
-              throw ctx.redirect(getUrl(ctx, callbackURL));
-            }
             const stripeSubscription = await client.subscriptions.list({
-              customer: user.stripeCustomerId,
+              customer: customerId,
               status: "active"
             }).then((res) => res.data[0]);
             if (stripeSubscription) {
@@ -788,21 +832,33 @@ const stripe = (options) => {
                 options,
                 stripeSubscription.items.data[0]?.plan.id
               );
-              if (plan && subscriptions.length > 0) {
+              if (plan && subscription) {
                 await ctx.context.adapter.update({
                   model: "subscription",
                   update: {
                     status: stripeSubscription.status,
                     seats: stripeSubscription.items.data[0]?.quantity || 1,
                     plan: plan.name.toLowerCase(),
-                    periodEnd: stripeSubscription.current_period_end,
-                    periodStart: stripeSubscription.current_period_start,
-                    stripeSubscriptionId: stripeSubscription.id
+                    periodEnd: new Date(
+                      stripeSubscription.current_period_end * 1e3
+                    ),
+                    periodStart: new Date(
+                      stripeSubscription.current_period_start * 1e3
+                    ),
+                    stripeSubscriptionId: stripeSubscription.id,
+                    ...stripeSubscription.trial_start && stripeSubscription.trial_end ? {
+                      trialStart: new Date(
+                        stripeSubscription.trial_start * 1e3
+                      ),
+                      trialEnd: new Date(
+                        stripeSubscription.trial_end * 1e3
+                      )
+                    } : {}
                   },
                   where: [
                     {
-                      field: "referenceId",
-                      value: reference
+                      field: "id",
+                      value: subscription.id
                     }
                   ]
                 });
@@ -845,7 +901,11 @@ const stripe = (options) => {
                 message: "Stripe webhook secret not found"
               });
             }
-            event = client.webhooks.constructEvent(buf, sig, webhookSecret);
+            event = await client.webhooks.constructEventAsync(
+              buf,
+              sig,
+              webhookSecret
+            );
           } catch (err) {
             ctx.context.logger.error(`${err.message}`);
             throw new APIError("BAD_REQUEST", {
@@ -898,18 +958,29 @@ const stripe = (options) => {
                         userId: user.id
                       }
                     });
-                    await ctx2.context.adapter.update({
-                      model: "user",
-                      update: {
-                        stripeCustomerId: stripeCustomer.id
-                      },
-                      where: [
-                        {
-                          field: "id",
-                          value: user.id
-                        }
-                      ]
-                    });
+                    const customer = await ctx2.context.adapter.update(
+                      {
+                        model: "user",
+                        update: {
+                          stripeCustomerId: stripeCustomer.id
+                        },
+                        where: [
+                          {
+                            field: "id",
+                            value: user.id
+                          }
+                        ]
+                      }
+                    );
+                    if (!customer) {
+                      logger.error("#BETTER_AUTH: Failed to create  customer");
+                    } else {
+                      await options.onCustomerCreate?.({
+                        customer,
+                        stripeCustomer,
+                        user
+                      });
+                    }
                   }
                 }
               }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@better-auth/stripe",
   "author": "Bereket Engida",
-  "version": "1.2.3",
+  "version": "1.2.4-beta.10",
   "main": "dist/index.cjs",
   "license": "MIT",
   "keywords": [
@@ -35,7 +35,7 @@
   },
   "dependencies": {
     "zod": "^3.24.1",
-    "better-auth": "^1.2.3"
+    "better-auth": "^1.2.4-beta.10"
   },
   "devDependencies": {
     "@types/better-sqlite3": "^7.6.12",

package/src/client.ts

@@ -15,7 +15,7 @@ export const stripeClient = <
 				O["subscription"] extends true
 					? {
 							stripeClient: any;
-							stripeWebhookSecret: "";
+							stripeWebhookSecret: string;
 							subscription: {
 								enabled: true;
 								plans: [];
@@ -23,7 +23,7 @@ export const stripeClient = <
 						}
 					: {
 							stripeClient: any;
-							stripeWebhookSecret: "";
+							stripeWebhookSecret: string;
 						}
 			>
 		>,

package/src/hooks.ts

@@ -95,12 +95,12 @@ export async function onSubscriptionUpdated(
 		const priceId = subscriptionUpdated.items.data[0].price.id;
 		const plan = await getPlanByPriceId(options, priceId);
 
-		const referenceId = subscriptionUpdated.metadata?.referenceId;
+		const subscriptionId = subscriptionUpdated.metadata?.subscriptionId;
 		const customerId = subscriptionUpdated.customer?.toString();
 		let subscription = await ctx.context.adapter.findOne<Subscription>({
 			model: "subscription",
-			where: referenceId
-				? [{ field: "referenceId", value: referenceId }]
+			where: subscriptionId
+				? [{ field: "id", value: subscriptionId }]
 				: [{ field: "stripeSubscriptionId", value: subscriptionUpdated.id }],
 		});
 		if (!subscription) {