@better-auth/stripe 1.2.2-beta.3 → 1.2.2-beta.5

package/.turbo/turbo-build.log

@@ -1,15 +1,15 @@
 
-> @better-auth/stripe@1.2.2-beta.3 build /home/runner/work/better-auth/better-auth/packages/stripe
+> @better-auth/stripe@1.2.2-beta.5 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.4 kB, chunk size: 30.4 kB, exports: stripe)
+[log]   dist/index.cjs (total size: 30.7 kB, chunk size: 30.7 kB, exports: stripe)
 
 [log]   dist/client.cjs (total size: 160 B, chunk size: 160 B, exports: stripeClient)
 
-[log]   dist/index.mjs (total size: 30.2 kB, chunk size: 30.2 kB, exports: stripe)
+[log]   dist/index.mjs (total size: 30.5 kB, chunk size: 30.5 kB, exports: stripe)
 
 [log]   dist/client.mjs (total size: 133 B, chunk size: 133 B, exports: stripeClient)
 

package/dist/index.cjs

@@ -51,6 +51,7 @@ async function onCheckoutSessionCompleted(ctx, options, event) {
             periodEnd: new Date(subscription.current_period_end * 1e3),
             stripeSubscriptionId: checkoutSession.subscription,
             seats,
+            stripeCustomerId: subscription.customer.toString(),
             ...trial
           },
           where: [
@@ -127,6 +128,7 @@ async function onSubscriptionUpdated(ctx, options, event) {
         periodStart: new Date(subscriptionUpdated.current_period_start * 1e3),
         periodEnd: new Date(subscriptionUpdated.current_period_end * 1e3),
         cancelAtPeriodEnd: subscriptionUpdated.cancel_at_period_end,
+        stripeCustomerId: subscriptionUpdated.customer.toString(),
         seats,
         stripeSubscriptionId: subscriptionUpdated.id
       },
@@ -175,40 +177,38 @@ async function onSubscriptionDeleted(ctx, options, event) {
   try {
     const subscriptionDeleted = event.data.object;
     const subscriptionId = subscriptionDeleted.id;
-    if (subscriptionDeleted.status === "canceled") {
-      const subscription = await ctx.context.adapter.findOne({
+    const subscription = await ctx.context.adapter.findOne({
+      model: "subscription",
+      where: [
+        {
+          field: "stripeSubscriptionId",
+          value: subscriptionId
+        }
+      ]
+    });
+    if (subscription) {
+      await ctx.context.adapter.update({
         model: "subscription",
         where: [
           {
             field: "stripeSubscriptionId",
             value: subscriptionId
           }
-        ]
+        ],
+        update: {
+          status: "canceled",
+          updatedAt: /* @__PURE__ */ new Date()
+        }
       });
-      if (subscription) {
-        await ctx.context.adapter.update({
-          model: "subscription",
-          where: [
-            {
-              field: "stripeSubscriptionId",
-              value: subscriptionId
-            }
-          ],
-          update: {
-            status: "canceled",
-            updatedAt: /* @__PURE__ */ new Date()
-          }
-        });
-        await options.subscription.onSubscriptionDeleted?.({
-          event,
-          stripeSubscription: subscriptionDeleted,
-          subscription
-        });
-      } else {
-        betterAuth.logger.warn(
-          `Stripe webhook error: Subscription not found for subscriptionId: ${subscriptionId}`
-        );
-      }
+      await options.subscription.onSubscriptionDeleted?.({
+        event,
+        stripeSubscription: subscriptionDeleted,
+        subscription
+      });
+    } else {
+      betterAuth.logger.warn(
+        `Stripe webhook error: Subscription not found for subscriptionId: ${subscriptionId}`
+      );
     }
   } catch (error) {
     betterAuth.logger.error(`Stripe webhook failed. Error: ${error}`);
@@ -314,7 +314,12 @@ const stripe = (options) => {
       {
         method: "POST",
         body: zod.z.object({
-          plan: zod.z.string(),
+          plan: zod.z.string({
+            description: "The name of the plan to upgrade to"
+          }),
+          annual: zod.z.boolean({
+            description: "Whether to upgrade to an annual plan"
+          }).optional(),
           referenceId: zod.z.string().optional(),
           metadata: zod.z.record(zod.z.string(), zod.z.any()).optional(),
           seats: zod.z.number({
@@ -328,7 +333,6 @@ const stripe = (options) => {
             description: "callback url to redirect back after successful subscription"
           }).default("/"),
           returnUrl: zod.z.string().optional(),
-          withoutTrial: zod.z.boolean().optional(),
           disableRedirect: zod.z.boolean().default(false)
         }),
         use: [
@@ -405,6 +409,11 @@ const stripe = (options) => {
         const existingSubscription = subscriptions.find(
           (sub) => sub.status === "active" || sub.status === "trialing"
         );
+        if (existingSubscription && existingSubscription.status === "active" && existingSubscription.plan === ctx.body.plan) {
+          throw new api.APIError("BAD_REQUEST", {
+            message: STRIPE_ERROR_CODES.ALREADY_SUBSCRIBED_PLAN
+          });
+        }
         if (activeSubscription && customerId) {
           const { url } = await client.billingPortal.sessions.create({
             customer: customerId,
@@ -417,35 +426,12 @@ const stripe = (options) => {
                   {
                     id: activeSubscription.items.data[0]?.id,
                     quantity: 1,
-                    price: plan.priceId
+                    price: ctx.body.annual ? plan.annualDiscountPriceId : plan.priceId
                   }
                 ]
               }
             }
           }).catch(async (e) => {
-            if (e.message.includes("no changes")) {
-              const plan2 = await getPlanByPriceId(
-                options,
-                activeSubscription.items.data[0]?.plan.id
-              );
-              await ctx.context.adapter.update({
-                model: "subscription",
-                update: {
-                  status: activeSubscription.status,
-                  seats: activeSubscription.items.data[0]?.quantity,
-                  plan: plan2?.name.toLowerCase()
-                },
-                where: [
-                  {
-                    field: "referenceId",
-                    value: referenceId
-                  }
-                ]
-              });
-              throw new api.APIError("BAD_REQUEST", {
-                message: STRIPE_ERROR_CODES.ALREADY_SUBSCRIBED_PLAN
-              });
-            }
             throw ctx.error("BAD_REQUEST", {
               message: e.message,
               code: e.code
@@ -456,11 +442,6 @@ const stripe = (options) => {
             redirect: true
           });
         }
-        if (existingSubscription && existingSubscription.status === "active" && existingSubscription.plan === ctx.body.plan) {
-          throw new api.APIError("BAD_REQUEST", {
-            message: STRIPE_ERROR_CODES.ALREADY_SUBSCRIBED_PLAN
-          });
-        }
         let subscription = existingSubscription;
         if (!subscription) {
           const newSubscription = await ctx.context.adapter.create({
@@ -488,39 +469,48 @@ const stripe = (options) => {
           },
           ctx.request
         );
-        const checkoutSession = await client.checkout.sessions.create({
-          ...customerId ? {
-            customer: customerId,
-            customer_update: {
-              name: "auto",
-              address: "auto"
+        const freeTrail = plan.freeTrial ? {
+          trial_period_days: plan.freeTrial.days
+        } : void 0;
+        const checkoutSession = await client.checkout.sessions.create(
+          {
+            ...customerId ? {
+              customer: customerId,
+              customer_update: {
+                name: "auto",
+                address: "auto"
+              }
+            } : {
+              customer_email: session.user.email
+            },
+            success_url: getUrl(
+              ctx,
+              `${ctx.context.baseURL}/subscription/success?callbackURL=${encodeURIComponent(
+                ctx.body.successUrl
+              )}&reference=${encodeURIComponent(referenceId)}`
+            ),
+            cancel_url: getUrl(ctx, ctx.body.cancelUrl),
+            line_items: [
+              {
+                price: ctx.body.annual ? plan.annualDiscountPriceId : plan.priceId,
+                quantity: ctx.body.seats || 1
+              }
+            ],
+            subscription_data: {
+              ...freeTrail
+            },
+            mode: "subscription",
+            client_reference_id: referenceId,
+            ...params?.params,
+            metadata: {
+              userId: user.id,
+              subscriptionId: subscription.id,
+              referenceId,
+              ...params?.params?.metadata
             }
-          } : {
-            customer_email: session.user.email
           },
-          success_url: getUrl(
-            ctx,
-            `${ctx.context.baseURL}/subscription/success?callbackURL=${encodeURIComponent(
-              ctx.body.successUrl
-            )}&reference=${encodeURIComponent(referenceId)}`
-          ),
-          cancel_url: getUrl(ctx, ctx.body.cancelUrl),
-          line_items: [
-            {
-              price: plan.priceId,
-              quantity: ctx.body.seats || 1
-            }
-          ],
-          mode: "subscription",
-          client_reference_id: referenceId,
-          ...params,
-          metadata: {
-            userId: user.id,
-            subscriptionId: subscription.id,
-            referenceId,
-            ...params?.params?.metadata
-          }
-        }).catch(async (e) => {
+          params?.options
+        ).catch(async (e) => {
           throw ctx.error("BAD_REQUEST", {
             message: e.message,
             code: e.code
@@ -632,10 +622,30 @@ const stripe = (options) => {
             message: STRIPE_ERROR_CODES.SUBSCRIPTION_NOT_FOUND
           });
         }
-        const activeSubscription = await client.subscriptions.list({
-          customer: subscription.stripeCustomerId,
-          status: "active"
-        }).then((res) => res.data[0]);
+        const activeSubscriptions = await client.subscriptions.list({
+          customer: subscription.stripeCustomerId
+        }).then(
+          (res) => res.data.filter(
+            (sub) => sub.status === "active" || sub.status === "trialing"
+          )
+        );
+        if (!activeSubscriptions.length) {
+          await ctx.context.adapter.deleteMany({
+            model: "subscription",
+            where: [
+              {
+                field: "referenceId",
+                value: referenceId
+              }
+            ]
+          });
+          throw ctx.error("BAD_REQUEST", {
+            message: STRIPE_ERROR_CODES.SUBSCRIPTION_NOT_FOUND
+          });
+        }
+        const activeSubscription = activeSubscriptions.find(
+          (sub) => sub.id === subscription.stripeSubscriptionId
+        );
         if (!activeSubscription) {
           throw ctx.error("BAD_REQUEST", {
             message: STRIPE_ERROR_CODES.SUBSCRIPTION_NOT_FOUND

package/dist/index.d.cts

@@ -47,12 +47,6 @@ type Plan = {
          * Number of days
          */
         days: number;
-        /**
-         * Only available for new users or users without existing subscription
-         *
-         * @default true
-         */
-        forNewUsersOnly?: boolean;
         /**
          * A function that will be called when the trial
          * starts.
@@ -335,13 +329,13 @@ declare const stripe: <O extends StripeOptions>(options: O) => {
                 body: {
                     plan: string;
                     metadata?: Record<string, any> | undefined;
+                    annual?: boolean | undefined;
                     referenceId?: string | undefined;
                     seats?: number | undefined;
                     uiMode?: "embedded" | "hosted" | undefined;
                     successUrl?: string | undefined;
                     cancelUrl?: string | undefined;
                     returnUrl?: string | undefined;
-                    withoutTrial?: boolean | undefined;
                     disableRedirect?: boolean | undefined;
                 };
                 method?: "POST" | undefined;
@@ -511,6 +505,7 @@ declare const stripe: <O extends StripeOptions>(options: O) => {
                 method: "POST";
                 body: z.ZodObject<{
                     plan: z.ZodString;
+                    annual: z.ZodOptional<z.ZodBoolean>;
                     referenceId: z.ZodOptional<z.ZodString>;
                     metadata: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodAny>>;
                     seats: z.ZodOptional<z.ZodNumber>;
@@ -518,7 +513,6 @@ declare const stripe: <O extends StripeOptions>(options: O) => {
                     successUrl: z.ZodDefault<z.ZodString>;
                     cancelUrl: z.ZodDefault<z.ZodString>;
                     returnUrl: z.ZodOptional<z.ZodString>;
-                    withoutTrial: z.ZodOptional<z.ZodBoolean>;
                     disableRedirect: z.ZodDefault<z.ZodBoolean>;
                 }, "strip", z.ZodTypeAny, {
                     plan: string;
@@ -527,20 +521,20 @@ declare const stripe: <O extends StripeOptions>(options: O) => {
                     cancelUrl: string;
                     disableRedirect: boolean;
                     metadata?: Record<string, any> | undefined;
+                    annual?: boolean | undefined;
                     referenceId?: string | undefined;
                     seats?: number | undefined;
                     returnUrl?: string | undefined;
-                    withoutTrial?: boolean | undefined;
                 }, {
                     plan: string;
                     metadata?: Record<string, any> | undefined;
+                    annual?: boolean | undefined;
                     referenceId?: string | undefined;
                     seats?: number | undefined;
                     uiMode?: "embedded" | "hosted" | undefined;
                     successUrl?: string | undefined;
                     cancelUrl?: string | undefined;
                     returnUrl?: string | undefined;
-                    withoutTrial?: boolean | undefined;
                     disableRedirect?: boolean | undefined;
                 }>;
                 use: (((inputContext: {

package/dist/index.d.mts

@@ -47,12 +47,6 @@ type Plan = {
          * Number of days
          */
         days: number;
-        /**
-         * Only available for new users or users without existing subscription
-         *
-         * @default true
-         */
-        forNewUsersOnly?: boolean;
         /**
          * A function that will be called when the trial
          * starts.
@@ -335,13 +329,13 @@ declare const stripe: <O extends StripeOptions>(options: O) => {
                 body: {
                     plan: string;
                     metadata?: Record<string, any> | undefined;
+                    annual?: boolean | undefined;
                     referenceId?: string | undefined;
                     seats?: number | undefined;
                     uiMode?: "embedded" | "hosted" | undefined;
                     successUrl?: string | undefined;
                     cancelUrl?: string | undefined;
                     returnUrl?: string | undefined;
-                    withoutTrial?: boolean | undefined;
                     disableRedirect?: boolean | undefined;
                 };
                 method?: "POST" | undefined;
@@ -511,6 +505,7 @@ declare const stripe: <O extends StripeOptions>(options: O) => {
                 method: "POST";
                 body: z.ZodObject<{
                     plan: z.ZodString;
+                    annual: z.ZodOptional<z.ZodBoolean>;
                     referenceId: z.ZodOptional<z.ZodString>;
                     metadata: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodAny>>;
                     seats: z.ZodOptional<z.ZodNumber>;
@@ -518,7 +513,6 @@ declare const stripe: <O extends StripeOptions>(options: O) => {
                     successUrl: z.ZodDefault<z.ZodString>;
                     cancelUrl: z.ZodDefault<z.ZodString>;
                     returnUrl: z.ZodOptional<z.ZodString>;
-                    withoutTrial: z.ZodOptional<z.ZodBoolean>;
                     disableRedirect: z.ZodDefault<z.ZodBoolean>;
                 }, "strip", z.ZodTypeAny, {
                     plan: string;
@@ -527,20 +521,20 @@ declare const stripe: <O extends StripeOptions>(options: O) => {
                     cancelUrl: string;
                     disableRedirect: boolean;
                     metadata?: Record<string, any> | undefined;
+                    annual?: boolean | undefined;
                     referenceId?: string | undefined;
                     seats?: number | undefined;
                     returnUrl?: string | undefined;
-                    withoutTrial?: boolean | undefined;
                 }, {
                     plan: string;
                     metadata?: Record<string, any> | undefined;
+                    annual?: boolean | undefined;
                     referenceId?: string | undefined;
                     seats?: number | undefined;
                     uiMode?: "embedded" | "hosted" | undefined;
                     successUrl?: string | undefined;
                     cancelUrl?: string | undefined;
                     returnUrl?: string | undefined;
-                    withoutTrial?: boolean | undefined;
                     disableRedirect?: boolean | undefined;
                 }>;
                 use: (((inputContext: {

package/dist/index.d.ts

@@ -47,12 +47,6 @@ type Plan = {
          * Number of days
          */
         days: number;
-        /**
-         * Only available for new users or users without existing subscription
-         *
-         * @default true
-         */
-        forNewUsersOnly?: boolean;
         /**
          * A function that will be called when the trial
          * starts.
@@ -335,13 +329,13 @@ declare const stripe: <O extends StripeOptions>(options: O) => {
                 body: {
                     plan: string;
                     metadata?: Record<string, any> | undefined;
+                    annual?: boolean | undefined;
                     referenceId?: string | undefined;
                     seats?: number | undefined;
                     uiMode?: "embedded" | "hosted" | undefined;
                     successUrl?: string | undefined;
                     cancelUrl?: string | undefined;
                     returnUrl?: string | undefined;
-                    withoutTrial?: boolean | undefined;
                     disableRedirect?: boolean | undefined;
                 };
                 method?: "POST" | undefined;
@@ -511,6 +505,7 @@ declare const stripe: <O extends StripeOptions>(options: O) => {
                 method: "POST";
                 body: z.ZodObject<{
                     plan: z.ZodString;
+                    annual: z.ZodOptional<z.ZodBoolean>;
                     referenceId: z.ZodOptional<z.ZodString>;
                     metadata: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodAny>>;
                     seats: z.ZodOptional<z.ZodNumber>;
@@ -518,7 +513,6 @@ declare const stripe: <O extends StripeOptions>(options: O) => {
                     successUrl: z.ZodDefault<z.ZodString>;
                     cancelUrl: z.ZodDefault<z.ZodString>;
                     returnUrl: z.ZodOptional<z.ZodString>;
-                    withoutTrial: z.ZodOptional<z.ZodBoolean>;
                     disableRedirect: z.ZodDefault<z.ZodBoolean>;
                 }, "strip", z.ZodTypeAny, {
                     plan: string;
@@ -527,20 +521,20 @@ declare const stripe: <O extends StripeOptions>(options: O) => {
                     cancelUrl: string;
                     disableRedirect: boolean;
                     metadata?: Record<string, any> | undefined;
+                    annual?: boolean | undefined;
                     referenceId?: string | undefined;
                     seats?: number | undefined;
                     returnUrl?: string | undefined;
-                    withoutTrial?: boolean | undefined;
                 }, {
                     plan: string;
                     metadata?: Record<string, any> | undefined;
+                    annual?: boolean | undefined;
                     referenceId?: string | undefined;
                     seats?: number | undefined;
                     uiMode?: "embedded" | "hosted" | undefined;
                     successUrl?: string | undefined;
                     cancelUrl?: string | undefined;
                     returnUrl?: string | undefined;
-                    withoutTrial?: boolean | undefined;
                     disableRedirect?: boolean | undefined;
                 }>;
                 use: (((inputContext: {

package/dist/index.mjs

@@ -49,6 +49,7 @@ async function onCheckoutSessionCompleted(ctx, options, event) {
             periodEnd: new Date(subscription.current_period_end * 1e3),
             stripeSubscriptionId: checkoutSession.subscription,
             seats,
+            stripeCustomerId: subscription.customer.toString(),
             ...trial
           },
           where: [
@@ -125,6 +126,7 @@ async function onSubscriptionUpdated(ctx, options, event) {
         periodStart: new Date(subscriptionUpdated.current_period_start * 1e3),
         periodEnd: new Date(subscriptionUpdated.current_period_end * 1e3),
         cancelAtPeriodEnd: subscriptionUpdated.cancel_at_period_end,
+        stripeCustomerId: subscriptionUpdated.customer.toString(),
         seats,
         stripeSubscriptionId: subscriptionUpdated.id
       },
@@ -173,40 +175,38 @@ async function onSubscriptionDeleted(ctx, options, event) {
   try {
     const subscriptionDeleted = event.data.object;
     const subscriptionId = subscriptionDeleted.id;
-    if (subscriptionDeleted.status === "canceled") {
-      const subscription = await ctx.context.adapter.findOne({
+    const subscription = await ctx.context.adapter.findOne({
+      model: "subscription",
+      where: [
+        {
+          field: "stripeSubscriptionId",
+          value: subscriptionId
+        }
+      ]
+    });
+    if (subscription) {
+      await ctx.context.adapter.update({
         model: "subscription",
         where: [
           {
             field: "stripeSubscriptionId",
             value: subscriptionId
           }
-        ]
+        ],
+        update: {
+          status: "canceled",
+          updatedAt: /* @__PURE__ */ new Date()
+        }
       });
-      if (subscription) {
-        await ctx.context.adapter.update({
-          model: "subscription",
-          where: [
-            {
-              field: "stripeSubscriptionId",
-              value: subscriptionId
-            }
-          ],
-          update: {
-            status: "canceled",
-            updatedAt: /* @__PURE__ */ new Date()
-          }
-        });
-        await options.subscription.onSubscriptionDeleted?.({
-          event,
-          stripeSubscription: subscriptionDeleted,
-          subscription
-        });
-      } else {
-        logger.warn(
-          `Stripe webhook error: Subscription not found for subscriptionId: ${subscriptionId}`
-        );
-      }
+      await options.subscription.onSubscriptionDeleted?.({
+        event,
+        stripeSubscription: subscriptionDeleted,
+        subscription
+      });
+    } else {
+      logger.warn(
+        `Stripe webhook error: Subscription not found for subscriptionId: ${subscriptionId}`
+      );
     }
   } catch (error) {
     logger.error(`Stripe webhook failed. Error: ${error}`);
@@ -312,7 +312,12 @@ const stripe = (options) => {
       {
         method: "POST",
         body: z.object({
-          plan: z.string(),
+          plan: z.string({
+            description: "The name of the plan to upgrade to"
+          }),
+          annual: z.boolean({
+            description: "Whether to upgrade to an annual plan"
+          }).optional(),
           referenceId: z.string().optional(),
           metadata: z.record(z.string(), z.any()).optional(),
           seats: z.number({
@@ -326,7 +331,6 @@ const stripe = (options) => {
             description: "callback url to redirect back after successful subscription"
           }).default("/"),
           returnUrl: z.string().optional(),
-          withoutTrial: z.boolean().optional(),
           disableRedirect: z.boolean().default(false)
         }),
         use: [
@@ -403,6 +407,11 @@ const stripe = (options) => {
         const existingSubscription = subscriptions.find(
           (sub) => sub.status === "active" || sub.status === "trialing"
         );
+        if (existingSubscription && existingSubscription.status === "active" && existingSubscription.plan === ctx.body.plan) {
+          throw new APIError("BAD_REQUEST", {
+            message: STRIPE_ERROR_CODES.ALREADY_SUBSCRIBED_PLAN
+          });
+        }
         if (activeSubscription && customerId) {
           const { url } = await client.billingPortal.sessions.create({
             customer: customerId,
@@ -415,35 +424,12 @@ const stripe = (options) => {
                   {
                     id: activeSubscription.items.data[0]?.id,
                     quantity: 1,
-                    price: plan.priceId
+                    price: ctx.body.annual ? plan.annualDiscountPriceId : plan.priceId
                   }
                 ]
               }
             }
           }).catch(async (e) => {
-            if (e.message.includes("no changes")) {
-              const plan2 = await getPlanByPriceId(
-                options,
-                activeSubscription.items.data[0]?.plan.id
-              );
-              await ctx.context.adapter.update({
-                model: "subscription",
-                update: {
-                  status: activeSubscription.status,
-                  seats: activeSubscription.items.data[0]?.quantity,
-                  plan: plan2?.name.toLowerCase()
-                },
-                where: [
-                  {
-                    field: "referenceId",
-                    value: referenceId
-                  }
-                ]
-              });
-              throw new APIError("BAD_REQUEST", {
-                message: STRIPE_ERROR_CODES.ALREADY_SUBSCRIBED_PLAN
-              });
-            }
             throw ctx.error("BAD_REQUEST", {
               message: e.message,
               code: e.code
@@ -454,11 +440,6 @@ const stripe = (options) => {
             redirect: true
           });
         }
-        if (existingSubscription && existingSubscription.status === "active" && existingSubscription.plan === ctx.body.plan) {
-          throw new APIError("BAD_REQUEST", {
-            message: STRIPE_ERROR_CODES.ALREADY_SUBSCRIBED_PLAN
-          });
-        }
         let subscription = existingSubscription;
         if (!subscription) {
           const newSubscription = await ctx.context.adapter.create({
@@ -486,39 +467,48 @@ const stripe = (options) => {
           },
           ctx.request
         );
-        const checkoutSession = await client.checkout.sessions.create({
-          ...customerId ? {
-            customer: customerId,
-            customer_update: {
-              name: "auto",
-              address: "auto"
+        const freeTrail = plan.freeTrial ? {
+          trial_period_days: plan.freeTrial.days
+        } : void 0;
+        const checkoutSession = await client.checkout.sessions.create(
+          {
+            ...customerId ? {
+              customer: customerId,
+              customer_update: {
+                name: "auto",
+                address: "auto"
+              }
+            } : {
+              customer_email: session.user.email
+            },
+            success_url: getUrl(
+              ctx,
+              `${ctx.context.baseURL}/subscription/success?callbackURL=${encodeURIComponent(
+                ctx.body.successUrl
+              )}&reference=${encodeURIComponent(referenceId)}`
+            ),
+            cancel_url: getUrl(ctx, ctx.body.cancelUrl),
+            line_items: [
+              {
+                price: ctx.body.annual ? plan.annualDiscountPriceId : plan.priceId,
+                quantity: ctx.body.seats || 1
+              }
+            ],
+            subscription_data: {
+              ...freeTrail
+            },
+            mode: "subscription",
+            client_reference_id: referenceId,
+            ...params?.params,
+            metadata: {
+              userId: user.id,
+              subscriptionId: subscription.id,
+              referenceId,
+              ...params?.params?.metadata
             }
-          } : {
-            customer_email: session.user.email
           },
-          success_url: getUrl(
-            ctx,
-            `${ctx.context.baseURL}/subscription/success?callbackURL=${encodeURIComponent(
-              ctx.body.successUrl
-            )}&reference=${encodeURIComponent(referenceId)}`
-          ),
-          cancel_url: getUrl(ctx, ctx.body.cancelUrl),
-          line_items: [
-            {
-              price: plan.priceId,
-              quantity: ctx.body.seats || 1
-            }
-          ],
-          mode: "subscription",
-          client_reference_id: referenceId,
-          ...params,
-          metadata: {
-            userId: user.id,
-            subscriptionId: subscription.id,
-            referenceId,
-            ...params?.params?.metadata
-          }
-        }).catch(async (e) => {
+          params?.options
+        ).catch(async (e) => {
           throw ctx.error("BAD_REQUEST", {
             message: e.message,
             code: e.code
@@ -630,10 +620,30 @@ const stripe = (options) => {
             message: STRIPE_ERROR_CODES.SUBSCRIPTION_NOT_FOUND
           });
         }
-        const activeSubscription = await client.subscriptions.list({
-          customer: subscription.stripeCustomerId,
-          status: "active"
-        }).then((res) => res.data[0]);
+        const activeSubscriptions = await client.subscriptions.list({
+          customer: subscription.stripeCustomerId
+        }).then(
+          (res) => res.data.filter(
+            (sub) => sub.status === "active" || sub.status === "trialing"
+          )
+        );
+        if (!activeSubscriptions.length) {
+          await ctx.context.adapter.deleteMany({
+            model: "subscription",
+            where: [
+              {
+                field: "referenceId",
+                value: referenceId
+              }
+            ]
+          });
+          throw ctx.error("BAD_REQUEST", {
+            message: STRIPE_ERROR_CODES.SUBSCRIPTION_NOT_FOUND
+          });
+        }
+        const activeSubscription = activeSubscriptions.find(
+          (sub) => sub.id === subscription.stripeSubscriptionId
+        );
         if (!activeSubscription) {
           throw ctx.error("BAD_REQUEST", {
             message: STRIPE_ERROR_CODES.SUBSCRIPTION_NOT_FOUND

package/package.json

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

package/src/hooks.ts

@@ -43,6 +43,7 @@ export async function onCheckoutSessionCompleted(
 							periodEnd: new Date(subscription.current_period_end * 1000),
 							stripeSubscriptionId: checkoutSession.subscription as string,
 							seats,
+							stripeCustomerId: subscription.customer.toString(),
 							...trial,
 						},
 						where: [
@@ -132,6 +133,7 @@ export async function onSubscriptionUpdated(
 				periodStart: new Date(subscriptionUpdated.current_period_start * 1000),
 				periodEnd: new Date(subscriptionUpdated.current_period_end * 1000),
 				cancelAtPeriodEnd: subscriptionUpdated.cancel_at_period_end,
+				stripeCustomerId: subscriptionUpdated.customer.toString(),
 				seats,
 				stripeSubscriptionId: subscriptionUpdated.id,
 			},
@@ -197,8 +199,17 @@ export async function onSubscriptionDeleted(
 	try {
 		const subscriptionDeleted = event.data.object as Stripe.Subscription;
 		const subscriptionId = subscriptionDeleted.id;
-		if (subscriptionDeleted.status === "canceled") {
-			const subscription = await ctx.context.adapter.findOne<Subscription>({
+		const subscription = await ctx.context.adapter.findOne<Subscription>({
+			model: "subscription",
+			where: [
+				{
+					field: "stripeSubscriptionId",
+					value: subscriptionId,
+				},
+			],
+		});
+		if (subscription) {
+			await ctx.context.adapter.update({
 				model: "subscription",
 				where: [
 					{
@@ -206,31 +217,20 @@ export async function onSubscriptionDeleted(
 						value: subscriptionId,
 					},
 				],
+				update: {
+					status: "canceled",
+					updatedAt: new Date(),
+				},
 			});
-			if (subscription) {
-				await ctx.context.adapter.update({
-					model: "subscription",
-					where: [
-						{
-							field: "stripeSubscriptionId",
-							value: subscriptionId,
-						},
-					],
-					update: {
-						status: "canceled",
-						updatedAt: new Date(),
-					},
-				});
-				await options.subscription.onSubscriptionDeleted?.({
-					event,
-					stripeSubscription: subscriptionDeleted,
-					subscription,
-				});
-			} else {
-				logger.warn(
-					`Stripe webhook error: Subscription not found for subscriptionId: ${subscriptionId}`,
-				);
-			}
+			await options.subscription.onSubscriptionDeleted?.({
+				event,
+				stripeSubscription: subscriptionDeleted,
+				subscription,
+			});
+		} else {
+			logger.warn(
+				`Stripe webhook error: Subscription not found for subscriptionId: ${subscriptionId}`,
+			);
 		}
 	} catch (error: any) {
 		logger.error(`Stripe webhook failed. Error: ${error}`);

package/src/index.ts

@@ -77,7 +77,14 @@ export const stripe = <O extends StripeOptions>(options: O) => {
 			{
 				method: "POST",
 				body: z.object({
-					plan: z.string(),
+					plan: z.string({
+						description: "The name of the plan to upgrade to",
+					}),
+					annual: z
+						.boolean({
+							description: "Whether to upgrade to an annual plan",
+						})
+						.optional(),
 					referenceId: z.string().optional(),
 					metadata: z.record(z.string(), z.any()).optional(),
 					seats: z
@@ -99,7 +106,6 @@ export const stripe = <O extends StripeOptions>(options: O) => {
 						})
 						.default("/"),
 					returnUrl: z.string().optional(),
-					withoutTrial: z.boolean().optional(),
 					disableRedirect: z.boolean().default(false),
 				}),
 				use: [
@@ -182,9 +188,21 @@ export const stripe = <O extends StripeOptions>(options: O) => {
 						},
 					],
 				});
+
 				const existingSubscription = subscriptions.find(
 					(sub) => sub.status === "active" || sub.status === "trialing",
 				);
+
+				if (
+					existingSubscription &&
+					existingSubscription.status === "active" &&
+					existingSubscription.plan === ctx.body.plan
+				) {
+					throw new APIError("BAD_REQUEST", {
+						message: STRIPE_ERROR_CODES.ALREADY_SUBSCRIBED_PLAN,
+					});
+				}
+
 				if (activeSubscription && customerId) {
 					const { url } = await client.billingPortal.sessions
 						.create({
@@ -198,40 +216,15 @@ export const stripe = <O extends StripeOptions>(options: O) => {
 										{
 											id: activeSubscription.items.data[0]?.id as string,
 											quantity: 1,
-											price: plan.priceId,
+											price: ctx.body.annual
+												? plan.annualDiscountPriceId
+												: plan.priceId,
 										},
 									],
 								},
 							},
 						})
 						.catch(async (e) => {
-							if (e.message.includes("no changes")) {
-								/**
-								 * If the subscription is already active on stripe, we need to
-								 * update the status to the new status.
-								 */
-								const plan = await getPlanByPriceId(
-									options,
-									activeSubscription.items.data[0]?.plan.id,
-								);
-								await ctx.context.adapter.update({
-									model: "subscription",
-									update: {
-										status: activeSubscription.status,
-										seats: activeSubscription.items.data[0]?.quantity,
-										plan: plan?.name.toLowerCase(),
-									},
-									where: [
-										{
-											field: "referenceId",
-											value: referenceId,
-										},
-									],
-								});
-								throw new APIError("BAD_REQUEST", {
-									message: STRIPE_ERROR_CODES.ALREADY_SUBSCRIBED_PLAN,
-								});
-							}
 							throw ctx.error("BAD_REQUEST", {
 								message: e.message,
 								code: e.code,
@@ -243,15 +236,6 @@ export const stripe = <O extends StripeOptions>(options: O) => {
 					});
 				}
 
-				if (
-					existingSubscription &&
-					existingSubscription.status === "active" &&
-					existingSubscription.plan === ctx.body.plan
-				) {
-					throw new APIError("BAD_REQUEST", {
-						message: STRIPE_ERROR_CODES.ALREADY_SUBSCRIBED_PLAN,
-					});
-				}
 				let subscription = existingSubscription;
 				if (!subscription) {
 					const newSubscription = await ctx.context.adapter.create<
@@ -285,44 +269,58 @@ export const stripe = <O extends StripeOptions>(options: O) => {
 					ctx.request,
 				);
 
+				const freeTrail = plan.freeTrial
+					? {
+							trial_period_days: plan.freeTrial.days,
+						}
+					: undefined;
+
 				const checkoutSession = await client.checkout.sessions
-					.create({
-						...(customerId
-							? {
-									customer: customerId,
-									customer_update: {
-										name: "auto",
-										address: "auto",
-									},
-								}
-							: {
-									customer_email: session.user.email,
-								}),
-						success_url: getUrl(
-							ctx,
-							`${
-								ctx.context.baseURL
-							}/subscription/success?callbackURL=${encodeURIComponent(
-								ctx.body.successUrl,
-							)}&reference=${encodeURIComponent(referenceId)}`,
-						),
-						cancel_url: getUrl(ctx, ctx.body.cancelUrl),
-						line_items: [
-							{
-								price: plan.priceId,
-								quantity: ctx.body.seats || 1,
+					.create(
+						{
+							...(customerId
+								? {
+										customer: customerId,
+										customer_update: {
+											name: "auto",
+											address: "auto",
+										},
+									}
+								: {
+										customer_email: session.user.email,
+									}),
+							success_url: getUrl(
+								ctx,
+								`${
+									ctx.context.baseURL
+								}/subscription/success?callbackURL=${encodeURIComponent(
+									ctx.body.successUrl,
+								)}&reference=${encodeURIComponent(referenceId)}`,
+							),
+							cancel_url: getUrl(ctx, ctx.body.cancelUrl),
+							line_items: [
+								{
+									price: ctx.body.annual
+										? plan.annualDiscountPriceId
+										: plan.priceId,
+									quantity: ctx.body.seats || 1,
+								},
+							],
+							subscription_data: {
+								...freeTrail,
+							},
+							mode: "subscription",
+							client_reference_id: referenceId,
+							...params?.params,
+							metadata: {
+								userId: user.id,
+								subscriptionId: subscription.id,
+								referenceId,
+								...params?.params?.metadata,
 							},
-						],
-						mode: "subscription",
-						client_reference_id: referenceId,
-						...params,
-						metadata: {
-							userId: user.id,
-							subscriptionId: subscription.id,
-							referenceId,
-							...params?.params?.metadata,
 						},
-					})
+						params?.options,
+					)
 					.catch(async (e) => {
 						throw ctx.error("BAD_REQUEST", {
 							message: e.message,
@@ -443,12 +441,36 @@ export const stripe = <O extends StripeOptions>(options: O) => {
 						message: STRIPE_ERROR_CODES.SUBSCRIPTION_NOT_FOUND,
 					});
 				}
-				const activeSubscription = await client.subscriptions
+				const activeSubscriptions = await client.subscriptions
 					.list({
 						customer: subscription.stripeCustomerId,
-						status: "active",
 					})
-					.then((res) => res.data[0]);
+					.then((res) =>
+						res.data.filter(
+							(sub) => sub.status === "active" || sub.status === "trialing",
+						),
+					);
+				if (!activeSubscriptions.length) {
+					/**
+					 * If the subscription is not found, we need to delete the subscription
+					 * from the database. This is a rare case and should not happen.
+					 */
+					await ctx.context.adapter.deleteMany({
+						model: "subscription",
+						where: [
+							{
+								field: "referenceId",
+								value: referenceId,
+							},
+						],
+					});
+					throw ctx.error("BAD_REQUEST", {
+						message: STRIPE_ERROR_CODES.SUBSCRIPTION_NOT_FOUND,
+					});
+				}
+				const activeSubscription = activeSubscriptions.find(
+					(sub) => sub.id === subscription.stripeSubscriptionId,
+				);
 				if (!activeSubscription) {
 					throw ctx.error("BAD_REQUEST", {
 						message: STRIPE_ERROR_CODES.SUBSCRIPTION_NOT_FOUND,

package/src/types.ts

@@ -43,12 +43,6 @@ export type Plan = {
 		 * Number of days
 		 */
 		days: number;
-		/**
-		 * Only available for new users or users without existing subscription
-		 *
-		 * @default true
-		 */
-		forNewUsersOnly?: boolean;
 		/**
 		 * A function that will be called when the trial
 		 * starts.