@deiondz/better-auth-razorpay 2.0.10 → 2.0.12

package/dist/index.js

@@ -2,6 +2,9 @@ import {
   __export
 } from "./chunk-PZ5AY32C.js";
 
+// index.ts
+import Razorpay from "razorpay";
+
 // api/cancel-subscription.ts
 import { createAuthEndpoint, sessionMiddleware } from "better-auth/api";
 
@@ -4114,12 +4117,14 @@ function handleRazorpayError(error) {
 
 // lib/schemas.ts
 var createOrUpdateSubscriptionSchema = external_exports.object({
-  plan: external_exports.string().min(1, "Plan name is required"),
+  plan: external_exports.string().min(1, "Plan name or Razorpay plan ID (plan_*) is required"),
   annual: external_exports.boolean().optional().default(false),
   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"),
@@ -4238,7 +4243,9 @@ var createOrUpdateSubscription = (razorpay, options) => createAuthEndpoint2(
         };
       }
       const plans = await resolvePlans(subOpts.plans);
-      const plan = plans.find((p) => p.name === body.plan);
+      const plan = body.plan.startsWith("plan_") ? plans.find(
+        (p) => p.monthlyPlanId === body.plan || p.annualPlanId === body.plan
+      ) : plans.find((p) => p.name === body.plan);
       if (!plan) {
         return {
           success: false,
@@ -4301,23 +4308,42 @@ 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 hasActiveSubscription = (existingSubs ?? []).filter((s) => activeStatuses.includes(s.status)).length > 0;
+      if (hasActiveSubscription) {
+        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,
@@ -4372,7 +4398,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({
@@ -4381,15 +4408,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);
     }
@@ -4825,18 +4851,31 @@ async function processWebhookEvent(adapter, rawBody, fallbackBody, onWebhookEven
 var razorpayPlugin = (options) => {
   const {
     razorpayClient,
-    razorpayWebhookSecret,
+    razorpayKeyId,
     razorpayKeySecret,
+    razorpayWebhookSecret,
     createCustomerOnSignUp = false,
     onCustomerCreate,
     getCustomerCreateParams,
     subscription: subOpts,
     onEvent
   } = options;
-  if (!razorpayClient) {
-    throw new Error("Razorpay plugin: razorpayClient is required");
-  }
-  const razorpay = razorpayClient;
+  const hasClient = Boolean(razorpayClient);
+  const hasCredentials = Boolean(razorpayKeyId && razorpayKeySecret);
+  if (!hasClient && !hasCredentials) {
+    throw new Error(
+      "Razorpay plugin: provide either razorpayClient or both razorpayKeyId and razorpayKeySecret"
+    );
+  }
+  if (hasClient && hasCredentials) {
+    throw new Error(
+      "Razorpay plugin: provide either razorpayClient or credentials (razorpayKeyId + razorpayKeySecret), not both"
+    );
+  }
+  if (!hasClient && (typeof razorpayKeyId !== "string" || typeof razorpayKeySecret !== "string")) {
+    throw new Error("Razorpay plugin: both razorpayKeyId and razorpayKeySecret are required when not providing razorpayClient");
+  }
+  const razorpay = razorpayClient ?? new Razorpay({ key_id: razorpayKeyId, key_secret: razorpayKeySecret });
   const plugin = {
     id: "razorpay-plugin",
     schema: {