@better-auth/stripe 1.2.4-beta.1 → 1.2.4-beta.12

package/.turbo/turbo-build.log

@@ -1,17 +1,17 @@
 
-> @better-auth/stripe@1.2.4-beta.1 build /home/runner/work/better-auth/better-auth/packages/stripe
+> @better-auth/stripe@1.2.4-beta.12 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: 30.6 kB, chunk size: 30.6 kB, exports: stripe)
+[log]   dist/index.cjs (total size: 33.4 kB, chunk size: 33.4 kB, exports: stripe)
 
 [log]   dist/client.cjs (total size: 160 B, chunk size: 160 B, exports: stripeClient)
 
-[log]   dist/index.mjs (total size: 30.3 kB, chunk size: 30.3 kB, exports: stripe)
+[log]   dist/index.mjs (total size: 33.1 kB, chunk size: 33.1 kB, exports: stripe)
 
 [log]   dist/client.mjs (total size: 133 B, chunk size: 133 B, exports: stripeClient)
 
-Σ Total dist size (byte size): 170 kB
+Σ Total dist size (byte size): 184 kB
 [log]

package/dist/client.d.cts

@@ -11,14 +11,14 @@ declare const stripeClient: <O extends {
     id: "stripe-client";
     $InferServerPlugin: ReturnType<typeof stripe<O["subscription"] extends true ? {
         stripeClient: any;
-        stripeWebhookSecret: "";
+        stripeWebhookSecret: string;
         subscription: {
             enabled: true;
             plans: [];
         };
     } : {
         stripeClient: any;
-        stripeWebhookSecret: "";
+        stripeWebhookSecret: string;
     }>>;
 };
 

package/dist/client.d.mts

@@ -11,14 +11,14 @@ declare const stripeClient: <O extends {
     id: "stripe-client";
     $InferServerPlugin: ReturnType<typeof stripe<O["subscription"] extends true ? {
         stripeClient: any;
-        stripeWebhookSecret: "";
+        stripeWebhookSecret: string;
         subscription: {
             enabled: true;
             plans: [];
         };
     } : {
         stripeClient: any;
-        stripeWebhookSecret: "";
+        stripeWebhookSecret: string;
     }>>;
 };
 

package/dist/client.d.ts

@@ -11,14 +11,14 @@ declare const stripeClient: <O extends {
     id: "stripe-client";
     $InferServerPlugin: ReturnType<typeof stripe<O["subscription"] extends true ? {
         stripeClient: any;
-        stripeWebhookSecret: "";
+        stripeWebhookSecret: string;
         subscription: {
             enabled: true;
             plans: [];
         };
     } : {
         stripeClient: any;
-        stripeWebhookSecret: "";
+        stripeWebhookSecret: string;
     }>>;
 };
 

package/dist/index.cjs

@@ -1,10 +1,10 @@
 'use strict';
 
+const betterAuth = require('better-auth');
 const plugins = require('better-auth/plugins');
 const zod = require('zod');
 const api = require('better-auth/api');
 const crypto = require('better-auth/crypto');
-const betterAuth = require('better-auth');
 
 async function getPlans(options) {
   return typeof options?.subscription?.plans === "function" ? await options.subscription?.plans() : options.subscription?.plans;
@@ -95,11 +95,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({
@@ -313,25 +313,64 @@ const stripe = (options) => {
       {
         method: "POST",
         body: zod.z.object({
+          /**
+           * The name of the plan to subscribe
+           */
           plan: zod.z.string({
             description: "The name of the plan to upgrade to"
           }),
+          /**
+           * If annual plan should be applied.
+           */
           annual: zod.z.boolean({
             description: "Whether to upgrade to an annual plan"
           }).optional(),
-          referenceId: zod.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: zod.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: zod.z.string({
+            description: "The id of the subscription to upgrade"
+          }).optional(),
+          /**
+           * Any additional data you want to store in your database
+           * subscriptions
+           */
           metadata: zod.z.record(zod.z.string(), zod.z.any()).optional(),
+          /**
+           * If a subscription
+           */
           seats: zod.z.number({
             description: "Number of seats to upgrade to (if applicable)"
           }).optional(),
-          uiMode: zod.z.enum(["embedded", "hosted"]).default("hosted"),
+          /**
+           * Success url to redirect back after successful subscription
+           */
           successUrl: zod.z.string({
             description: "callback url to redirect back after successful subscription"
           }).default("/"),
+          /**
+           * Cancel URL
+           */
           cancelUrl: zod.z.string({
             description: "callback url to redirect back after successful subscription"
           }).default("/"),
+          /**
+           * Return URL
+           */
           returnUrl: zod.z.string().optional(),
+          /**
+           * Disable Redirect
+           */
           disableRedirect: zod.z.boolean().default(false)
         }),
         use: [
@@ -356,7 +395,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 api.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(
@@ -395,8 +443,12 @@ const stripe = (options) => {
         const activeSubscription = customerId ? await client.subscriptions.list({
           customer: customerId,
           status: "active"
-        }).then((res) => res.data[0]).catch((e) => null) : null;
-        const subscriptions = await ctx.context.adapter.findMany({
+        }).then(
+          (res) => res.data.find(
+            (subscription2) => subscription2.id === ctx.body.subscriptionId
+          )
+        ).catch((e) => null) : null;
+        const subscriptions = subscriptionToUpdate ? [subscriptionToUpdate] : await ctx.context.adapter.findMany({
           model: "subscription",
           where: [
             {
@@ -486,7 +538,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: [
@@ -525,10 +577,11 @@ const stripe = (options) => {
       "/subscription/cancel/callback",
       {
         method: "GET",
-        query: zod.z.record(zod.z.string(), zod.z.any()).optional()
+        query: zod.z.record(zod.z.string(), zod.z.any()).optional(),
+        use: [api.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 api.getSessionFromCtx(
@@ -538,15 +591,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
                 }
               ]
             });
@@ -569,8 +622,8 @@ const stripe = (options) => {
                 },
                 where: [
                   {
-                    field: "referenceId",
-                    value: reference
+                    field: "id",
+                    value: subscription.id
                   }
                 ]
               });
@@ -597,6 +650,7 @@ const stripe = (options) => {
         method: "POST",
         body: zod.z.object({
           referenceId: zod.z.string().optional(),
+          subscriptionId: zod.z.string().optional(),
           returnUrl: zod.z.string()
         }),
         use: [
@@ -607,15 +661,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
@@ -656,7 +717,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",
@@ -738,10 +799,11 @@ const stripe = (options) => {
       "/subscription/success",
       {
         method: "GET",
-        query: zod.z.record(zod.z.string(), zod.z.any()).optional()
+        query: zod.z.record(zod.z.string(), zod.z.any()).optional(),
+        use: [api.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 api.getSessionFromCtx(
@@ -751,38 +813,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) {
@@ -790,21 +838,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
                     }
                   ]
                 });
@@ -847,7 +907,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 api.APIError("BAD_REQUEST", {
@@ -900,18 +964,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) {
+                      betterAuth.logger.error("#BETTER_AUTH: Failed to create  customer");
+                    } else {
+                      await options.onCustomerCreate?.({
+                        customer,
+                        stripeCustomer,
+                        user
+                      });
+                    }
                   }
                 }
               }

package/dist/index.d.cts

@@ -5,7 +5,7 @@ import Stripe from 'stripe';
 import { z } from 'zod';
 import { APIError } from 'better-auth/api';
 
-type Plan = {
+type StripePlan = {
     /**
      * Monthly price id
      */
@@ -24,6 +24,13 @@ type Plan = {
      * yearly subscription
      */
     annualDiscountPriceId?: string;
+    /**
+     * To use lookup key instead of price id
+     *
+     * https://docs.stripe.com/products-prices/
+     * manage-prices#lookup-keys
+     */
+    annualDiscountLookupKey?: string;
     /**
      * Plan name
      */
@@ -186,7 +193,7 @@ interface StripeOptions {
         /**
          * List of plan
          */
-        plans: Plan[] | (() => Promise<Plan[]>);
+        plans: StripePlan[] | (() => Promise<StripePlan[]>);
         /**
          * Require email verification before a user is allowed to upgrade
          * their subscriptions
@@ -204,7 +211,7 @@ interface StripeOptions {
             event: Stripe.Event;
             stripeSubscription: Stripe.Subscription;
             subscription: Subscription;
-            plan: Plan;
+            plan: StripePlan;
         }, request?: Request) => Promise<void>;
         /**
          * A callback to run after a user is about to cancel their subscription
@@ -256,7 +263,7 @@ interface StripeOptions {
         getCheckoutSessionParams?: (data: {
             user: User & Record<string, any>;
             session: Session & Record<string, any>;
-            plan: Plan;
+            plan: StripePlan;
             subscription: Subscription;
         }, request?: Request) => Promise<{
             params?: Stripe.Checkout.SessionCreateParams;
@@ -330,8 +337,8 @@ declare const stripe: <O extends StripeOptions>(options: O) => {
                     metadata?: Record<string, any> | undefined;
                     annual?: boolean | undefined;
                     referenceId?: string | undefined;
+                    subscriptionId?: string | undefined;
                     seats?: number | undefined;
-                    uiMode?: "embedded" | "hosted" | undefined;
                     successUrl?: string | undefined;
                     cancelUrl?: string | undefined;
                     returnUrl?: string | undefined;
@@ -503,25 +510,60 @@ declare const stripe: <O extends StripeOptions>(options: O) => {
             options: {
                 method: "POST";
                 body: z.ZodObject<{
+                    /**
+                     * The name of the plan to subscribe
+                     */
                     plan: z.ZodString;
+                    /**
+                     * If annual plan should be applied.
+                     */
                     annual: z.ZodOptional<z.ZodBoolean>;
+                    /**
+                     * 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.ZodOptional<z.ZodString>;
+                    /**
+                     * 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.ZodOptional<z.ZodString>;
+                    /**
+                     * Any additional data you want to store in your database
+                     * subscriptions
+                     */
                     metadata: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodAny>>;
+                    /**
+                     * If a subscription
+                     */
                     seats: z.ZodOptional<z.ZodNumber>;
-                    uiMode: z.ZodDefault<z.ZodEnum<["embedded", "hosted"]>>;
+                    /**
+                     * Success url to redirect back after successful subscription
+                     */
                     successUrl: z.ZodDefault<z.ZodString>;
+                    /**
+                     * Cancel URL
+                     */
                     cancelUrl: z.ZodDefault<z.ZodString>;
+                    /**
+                     * Return URL
+                     */
                     returnUrl: z.ZodOptional<z.ZodString>;
+                    /**
+                     * Disable Redirect
+                     */
                     disableRedirect: z.ZodDefault<z.ZodBoolean>;
                 }, "strip", z.ZodTypeAny, {
                     plan: string;
-                    uiMode: "embedded" | "hosted";
                     successUrl: string;
                     cancelUrl: string;
                     disableRedirect: boolean;
                     metadata?: Record<string, any> | undefined;
                     annual?: boolean | undefined;
                     referenceId?: string | undefined;
+                    subscriptionId?: string | undefined;
                     seats?: number | undefined;
                     returnUrl?: string | undefined;
                 }, {
@@ -529,8 +571,8 @@ declare const stripe: <O extends StripeOptions>(options: O) => {
                     metadata?: Record<string, any> | undefined;
                     annual?: boolean | undefined;
                     referenceId?: string | undefined;
+                    subscriptionId?: string | undefined;
                     seats?: number | undefined;
-                    uiMode?: "embedded" | "hosted" | undefined;
                     successUrl?: string | undefined;
                     cancelUrl?: string | undefined;
                     returnUrl?: string | undefined;
@@ -603,6 +645,15 @@ declare const stripe: <O extends StripeOptions>(options: O) => {
             options: {
                 method: "GET";
                 query: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodAny>>;
+                use: ((inputContext: {
+                    body?: any;
+                    query?: Record<string, any> | undefined;
+                    request?: Request | undefined;
+                    headers?: Headers | undefined;
+                    asResponse?: boolean | undefined;
+                    returnHeaders?: boolean | undefined;
+                    use?: better_call.Middleware[] | undefined;
+                }) => Promise<void>)[];
             } & {
                 use: any[];
             };
@@ -613,6 +664,7 @@ declare const stripe: <O extends StripeOptions>(options: O) => {
                 body: {
                     returnUrl: string;
                     referenceId?: string | undefined;
+                    subscriptionId?: string | undefined;
                 };
                 method?: "POST" | undefined;
                 query?: Record<string, any> | undefined;
@@ -641,13 +693,16 @@ declare const stripe: <O extends StripeOptions>(options: O) => {
                 method: "POST";
                 body: z.ZodObject<{
                     referenceId: z.ZodOptional<z.ZodString>;
+                    subscriptionId: z.ZodOptional<z.ZodString>;
                     returnUrl: z.ZodString;
                 }, "strip", z.ZodTypeAny, {
                     returnUrl: string;
                     referenceId?: string | undefined;
+                    subscriptionId?: string | undefined;
                 }, {
                     returnUrl: string;
                     referenceId?: string | undefined;
+                    subscriptionId?: string | undefined;
                 }>;
                 use: (((inputContext: {
                     body?: any;
@@ -823,6 +878,15 @@ declare const stripe: <O extends StripeOptions>(options: O) => {
             options: {
                 method: "GET";
                 query: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodAny>>;
+                use: ((inputContext: {
+                    body?: any;
+                    query?: Record<string, any> | undefined;
+                    request?: Request | undefined;
+                    headers?: Headers | undefined;
+                    asResponse?: boolean | undefined;
+                    returnHeaders?: boolean | undefined;
+                    use?: better_call.Middleware[] | undefined;
+                }) => Promise<void>)[];
             } & {
                 use: any[];
             };