@deiondz/better-auth-razorpay 2.0.11 → 2.0.13

package/dist/index.js

@@ -4122,7 +4122,9 @@ var createOrUpdateSubscriptionSchema = external_exports.object({
   seats: external_exports.number().int().min(1).optional().default(1),
   subscriptionId: external_exports.string().optional(),
   successUrl: external_exports.string().url().optional(),
-  disableRedirect: external_exports.boolean().optional().default(false)
+  disableRedirect: external_exports.boolean().optional().default(false),
+  /** When true, checkout runs in-page via Razorpay modal; no checkoutUrl redirect. */
+  embed: external_exports.boolean().optional().default(false)
 });
 var cancelSubscriptionSchema = external_exports.object({
   subscriptionId: external_exports.string().min(1, "Subscription ID (local) is required"),
@@ -4306,23 +4308,49 @@ var createOrUpdateSubscription = (razorpay, options) => createAuthEndpoint2(
         }
         const rpSub = existing.razorpaySubscriptionId ? await razorpay.subscriptions.fetch(existing.razorpaySubscriptionId) : null;
         if (rpSub) {
-          return {
-            success: true,
-            data: {
-              checkoutUrl: rpSub.short_url,
-              subscription: {
-                id: existing.id,
-                plan: existing.plan,
-                status: existing.status,
-                razorpaySubscriptionId: existing.razorpaySubscriptionId,
-                cancelAtPeriodEnd: existing.cancelAtPeriodEnd,
-                periodEnd: existing.periodEnd,
-                seats: existing.seats
-              }
+          const data2 = {
+            subscription: {
+              id: existing.id,
+              plan: existing.plan,
+              status: existing.status,
+              razorpaySubscriptionId: existing.razorpaySubscriptionId ?? null,
+              cancelAtPeriodEnd: existing.cancelAtPeriodEnd ?? false,
+              periodEnd: existing.periodEnd ?? null,
+              seats: existing.seats ?? 1
             }
           };
+          if (!body.embed) data2.checkoutUrl = rpSub.short_url;
+          return { success: true, data: data2 };
         }
       }
+      const existingSubs = await ctx.context.adapter.findMany({
+        model: "subscription",
+        where: [{ field: "referenceId", value: userId }]
+      });
+      const activeStatuses = [
+        "active",
+        "trialing",
+        "pending",
+        "created",
+        "halted"
+      ];
+      const subs = existingSubs ?? [];
+      const activePaidSubs = subs.filter(
+        (s) => activeStatuses.includes(s.status) && s.razorpaySubscriptionId
+      );
+      const appTrialSubs = subs.filter(
+        (s) => s.status === "trialing" && !s.razorpaySubscriptionId
+      );
+      const appTrialSub = appTrialSubs.length === 1 ? appTrialSubs[0] : null;
+      if (activePaidSubs.length > 0) {
+        return {
+          success: false,
+          error: {
+            code: "ALREADY_SUBSCRIBED",
+            description: "You already have an active subscription. Cancel or let it expire before creating another."
+          }
+        };
+      }
       const totalCount = body.annual ? 1 : 12;
       const subscriptionPayload = {
         plan_id: planId,
@@ -4333,7 +4361,7 @@ var createOrUpdateSubscription = (razorpay, options) => createAuthEndpoint2(
       };
       if (subOpts.getSubscriptionCreateParams) {
         const tempSub = {
-          id: "",
+          id: appTrialSub?.id ?? "",
           plan: plan.name,
           referenceId: userId,
           status: "created",
@@ -4358,17 +4386,64 @@ var createOrUpdateSubscription = (razorpay, options) => createAuthEndpoint2(
       const rpSubscription = await razorpay.subscriptions.create(
         subscriptionPayload
       );
+      const periodStart = rpSubscription.current_start ? new Date(rpSubscription.current_start * 1e3) : null;
+      const periodEnd = rpSubscription.current_end ? new Date(rpSubscription.current_end * 1e3) : null;
+      const newStatus = toLocalStatus(rpSubscription.status);
+      if (appTrialSub) {
+        await ctx.context.adapter.update({
+          model: "subscription",
+          where: [{ field: "id", value: appTrialSub.id }],
+          update: {
+            data: {
+              plan: plan.name,
+              razorpaySubscriptionId: rpSubscription.id,
+              status: newStatus,
+              trialEnd: now,
+              periodStart,
+              periodEnd,
+              seats: body.seats,
+              updatedAt: now
+            }
+          }
+        });
+        if (subOpts.onSubscriptionCreated) {
+          const updatedRecord = {
+            ...appTrialSub,
+            plan: plan.name,
+            razorpaySubscriptionId: rpSubscription.id,
+            status: newStatus,
+            trialEnd: now,
+            periodStart,
+            periodEnd,
+            seats: body.seats,
+            updatedAt: now
+          };
+          await subOpts.onSubscriptionCreated({
+            razorpaySubscription: rpSubscription,
+            subscription: updatedRecord,
+            plan
+          });
+        }
+        const data2 = {
+          subscriptionId: appTrialSub.id,
+          razorpaySubscriptionId: rpSubscription.id
+        };
+        if (!body.embed) {
+          data2.checkoutUrl = body.disableRedirect ? rpSubscription.short_url : body.successUrl ? `${rpSubscription.short_url}?redirect=${encodeURIComponent(body.successUrl)}` : rpSubscription.short_url;
+        }
+        return { success: true, data: data2 };
+      }
       const subscriptionRecord = {
         id: localId,
         plan: plan.name,
         referenceId: userId,
         razorpayCustomerId: user.razorpayCustomerId ?? null,
         razorpaySubscriptionId: rpSubscription.id,
-        status: toLocalStatus(rpSubscription.status),
+        status: newStatus,
         trialStart: null,
         trialEnd: null,
-        periodStart: rpSubscription.current_start ? new Date(rpSubscription.current_start * 1e3) : null,
-        periodEnd: rpSubscription.current_end ? new Date(rpSubscription.current_end * 1e3) : null,
+        periodStart,
+        periodEnd,
         cancelAtPeriodEnd: false,
         seats: body.seats,
         groupId: null,
@@ -4377,7 +4452,8 @@ var createOrUpdateSubscription = (razorpay, options) => createAuthEndpoint2(
       };
       await ctx.context.adapter.create({
         model: "subscription",
-        data: subscriptionRecord
+        data: subscriptionRecord,
+        forceAllowId: true
       });
       if (subOpts.onSubscriptionCreated) {
         await subOpts.onSubscriptionCreated({
@@ -4386,15 +4462,14 @@ var createOrUpdateSubscription = (razorpay, options) => createAuthEndpoint2(
           plan
         });
       }
-      const checkoutUrl = body.disableRedirect ? rpSubscription.short_url : body.successUrl ? `${rpSubscription.short_url}?redirect=${encodeURIComponent(body.successUrl)}` : rpSubscription.short_url;
-      return {
-        success: true,
-        data: {
-          checkoutUrl,
-          subscriptionId: localId,
-          razorpaySubscriptionId: rpSubscription.id
-        }
+      const data = {
+        subscriptionId: localId,
+        razorpaySubscriptionId: rpSubscription.id
       };
+      if (!body.embed) {
+        data.checkoutUrl = body.disableRedirect ? rpSubscription.short_url : body.successUrl ? `${rpSubscription.short_url}?redirect=${encodeURIComponent(body.successUrl)}` : rpSubscription.short_url;
+      }
+      return { success: true, data };
     } catch (error) {
       return handleRazorpayError(error);
     }
@@ -4834,6 +4909,7 @@ var razorpayPlugin = (options) => {
     razorpayKeySecret,
     razorpayWebhookSecret,
     createCustomerOnSignUp = false,
+    trialOnSignUp,
     onCustomerCreate,
     getCustomerCreateParams,
     subscription: subOpts,
@@ -4930,6 +5006,34 @@ var razorpayPlugin = (options) => {
                   razorpayCustomer: { id: customer.id, ...customer }
                 });
               }
+              if (trialOnSignUp && typeof trialOnSignUp.days === "number" && trialOnSignUp.days > 0 && adapter.create) {
+                const now = /* @__PURE__ */ new Date();
+                const trialEnd = new Date(now.getTime() + trialOnSignUp.days * 24 * 60 * 60 * 1e3);
+                const planName = trialOnSignUp.planName ?? "Trial";
+                const localId = `sub_${Date.now()}_${Math.random().toString(36).slice(2, 9)}`;
+                const subscriptionRecord = {
+                  id: localId,
+                  plan: planName,
+                  referenceId: user.id,
+                  razorpayCustomerId: customer.id,
+                  razorpaySubscriptionId: null,
+                  status: "trialing",
+                  trialStart: now,
+                  trialEnd,
+                  periodStart: null,
+                  periodEnd: null,
+                  cancelAtPeriodEnd: false,
+                  seats: 1,
+                  groupId: null,
+                  createdAt: now,
+                  updatedAt: now
+                };
+                await adapter.create({
+                  model: "subscription",
+                  data: subscriptionRecord,
+                  forceAllowId: true
+                });
+              }
             } catch (err) {
               console.error("[better-auth-razorpay] Create customer on sign-up failed:", err);
             }