@deiondz/better-auth-razorpay 2.0.14 → 2.0.16

package/README.md

@@ -328,7 +328,8 @@ The plugin automatically creates the following database models via Better Auth's
 - `razorpayCustomerId` (string, optional) — Razorpay customer ID when customer creation is enabled.
 
 **`subscription`**
-- `id`, `plan`, `referenceId`, `razorpayCustomerId`, `razorpaySubscriptionId`, `status`, `trialStart`, `trialEnd`, `periodStart`, `periodEnd`, `cancelAtPeriodEnd`, `seats`, `groupId`, `createdAt`, `updatedAt`
+- Primary key: **`id`** (generated by the adapter/database when not provided; the plugin does not pass `id` on create, so the adapter uses its `generateId` or the DB’s default, e.g. UUID or MongoDB `_id`). MongoDB adapters should map `id` ↔ `_id` per the [create-a-db-adapter](https://better-auth.com/docs/guides/create-a-db-adapter) guide.
+- Fields: `id`, `plan`, `planId`, `referenceId`, `razorpayCustomerId`, `razorpaySubscriptionId`, `status`, `trialStart`, `trialEnd`, `periodStart`, `periodEnd`, `cancelAtPeriodEnd`, `seats`, `groupId`, `createdAt`, `updatedAt`
 - `status` values: `created`, `active`, `pending`, `halted`, `cancelled`, `completed`, `expired`, `trialing`
 
 ### Database Adapters
@@ -342,6 +343,17 @@ The plugin works with all Better Auth database adapters:
 
 **Important:** Better Auth uses adapter model names, NOT underlying table names. If your Prisma model is `User` mapping to table `users`, use the model name in configuration.
 
+### Primary key and MongoDB
+
+Following [Better Auth’s adapter guide](https://better-auth.com/docs/guides/create-a-db-adapter): the plugin always uses the field name **`id`** for the subscription primary key. The subscription **id is generated by the adapter/database** (the plugin does not pass `id` on create and does not use `forceAllowId`), so the adapter uses its `generateId` or the DB’s default (e.g. PostgreSQL `gen_random_uuid()`, MongoDB `_id`).
+
+- **SQL / Prisma / Drizzle:** The adapter or DB generates the id; no extra config.
+- **MongoDB:** Better Auth recommends mapping `id` ↔ `_id` so that:
+  - On **input** (create/update), `id` is stored as `_id`.
+  - On **output** (findOne/findMany), `_id` is returned as `id`.
+
+  The official `mongodbAdapter` from `better-auth/adapters/mongodb` applies this mapping for all models (including plugin models). If you use a custom MongoDB adapter, configure it with the same mapping (e.g. `mapKeysTransformInput: { id: "_id" }` and `mapKeysTransformOutput: { _id: "id" }` per the [create-a-db-adapter](https://better-auth.com/docs/guides/create-a-db-adapter) guide) so subscription create/update/webhook work correctly.
+
 ## API Endpoints
 
 All endpoints are prefixed with `/api/auth/razorpay/` (or your configured `basePath`).

package/dist/client/hooks.d.ts

@@ -1,10 +1,10 @@
-import { S as SubscriptionRecord } from '../types-3dNrA0qB.js';
+import { S as SubscriptionRecord } from '../types-CpjgfbVJ.js';
 import * as _tanstack_react_query from '@tanstack/react-query';
 import { UseMutationOptions, UseQueryOptions } from '@tanstack/react-query';
 import * as react from 'react';
 import { ReactNode } from 'react';
-import { c as RazorpayAuthClient, d as CancelSubscriptionResponse, a as CancelSubscriptionInput, e as CreateOrUpdateSubscriptionResponse, C as CreateOrUpdateSubscriptionInput, P as PlanSummary, f as RestoreSubscriptionResponse, b as RestoreSubscriptionInput, g as ListSubscriptionsResponse, h as VerifyPaymentResponse, V as VerifyPaymentInput, L as ListSubscriptionsInput } from '../types-CKR2ILS1.js';
-export { G as GetPlansResponse, i as RazorpayApiError, R as RazorpayApiResult, j as RazorpayClientActions } from '../types-CKR2ILS1.js';
+import { c as RazorpayAuthClient, d as CancelSubscriptionResponse, a as CancelSubscriptionInput, e as CreateOrUpdateSubscriptionResponse, C as CreateOrUpdateSubscriptionInput, P as PlanSummary, f as RestoreSubscriptionResponse, b as RestoreSubscriptionInput, g as ListSubscriptionsResponse, h as VerifyPaymentResponse, V as VerifyPaymentInput, L as ListSubscriptionsInput } from '../types-I97EgC8r.js';
+export { G as GetPlansResponse, i as RazorpayApiError, R as RazorpayApiResult, j as RazorpayClientActions } from '../types-I97EgC8r.js';
 import 'razorpay';
 
 /**

package/dist/client.d.ts

@@ -1,6 +1,6 @@
-import { S as SubscriptionRecord } from './types-3dNrA0qB.js';
+import { S as SubscriptionRecord } from './types-CpjgfbVJ.js';
 import { razorpayPlugin } from './index.js';
-import { R as RazorpayApiResult, P as PlanSummary, L as ListSubscriptionsInput, C as CreateOrUpdateSubscriptionInput, a as CancelSubscriptionInput, b as RestoreSubscriptionInput, V as VerifyPaymentInput } from './types-CKR2ILS1.js';
+import { R as RazorpayApiResult, P as PlanSummary, L as ListSubscriptionsInput, C as CreateOrUpdateSubscriptionInput, a as CancelSubscriptionInput, b as RestoreSubscriptionInput, V as VerifyPaymentInput } from './types-I97EgC8r.js';
 import 'razorpay';
 import 'better-auth';
 

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import { BetterAuthPlugin } from 'better-auth';
-import { R as RazorpayPluginOptions } from './types-3dNrA0qB.js';
-export { O as OnWebhookEventCallback, a as RazorpayApiResponse, b as RazorpayErrorResponse, c as RazorpayPlan, d as RazorpaySubscription, e as RazorpaySuccessResponse, f as RazorpayUserRecord, g as RazorpayWebhookContext, h as RazorpayWebhookEvent, i as RazorpayWebhookPayload, S as SubscriptionRecord, j as SubscriptionStatus } from './types-3dNrA0qB.js';
+import { R as RazorpayPluginOptions } from './types-CpjgfbVJ.js';
+export { O as OnWebhookEventCallback, a as RazorpayApiResponse, b as RazorpayErrorResponse, c as RazorpayPlan, d as RazorpaySubscription, e as RazorpaySuccessResponse, f as RazorpayUserRecord, g as RazorpayWebhookContext, h as RazorpayWebhookEvent, i as RazorpayWebhookPayload, S as SubscriptionRecord, j as SubscriptionStatus } from './types-CpjgfbVJ.js';
 import 'razorpay';
 
 interface WebhookResult {

package/dist/index.js

@@ -4229,6 +4229,11 @@ function toLocalStatus(razorpayStatus) {
   };
   return map[razorpayStatus] ?? "pending";
 }
+function getPrimaryKey(record) {
+  if (record.id != null && record.id !== "") return { value: record.id, field: "id" };
+  if (record._id != null && record._id !== "") return { value: record._id, field: "_id" };
+  return { value: "", field: "id" };
+}
 var createOrUpdateSubscription = (razorpay, options) => createAuthEndpoint2(
   "/razorpay/subscription/create-or-update",
   { method: "POST", use: [sessionMiddleware2] },
@@ -4286,9 +4291,6 @@ var createOrUpdateSubscription = (razorpay, options) => createAuthEndpoint2(
         }
       }
       const now = /* @__PURE__ */ new Date();
-      const generateId = ctx.context.generateId;
-      const generated = typeof generateId === "function" ? generateId({ model: "subscription" }) : void 0;
-      const localId = (typeof generated === "string" ? generated : void 0) ?? `sub_${Date.now()}_${Math.random().toString(36).slice(2, 9)}`;
       if (body.subscriptionId) {
         const existing = await ctx.context.adapter.findOne({
           model: "subscription",
@@ -4312,6 +4314,7 @@ var createOrUpdateSubscription = (razorpay, options) => createAuthEndpoint2(
             subscription: {
               id: existing.id,
               plan: existing.plan,
+              planId: existing.planId ?? null,
               status: existing.status,
               razorpaySubscriptionId: existing.razorpaySubscriptionId ?? null,
               cancelAtPeriodEnd: existing.cancelAtPeriodEnd ?? false,
@@ -4360,9 +4363,11 @@ var createOrUpdateSubscription = (razorpay, options) => createAuthEndpoint2(
         notes: { referenceId: userId, planName: plan.name }
       };
       if (subOpts.getSubscriptionCreateParams) {
+        const tempSubPk = appTrialSub ? getPrimaryKey(appTrialSub) : null;
         const tempSub = {
-          id: appTrialSub?.id ?? "",
+          id: tempSubPk?.value ?? "",
           plan: plan.name,
+          planId,
           referenceId: userId,
           status: "created",
           cancelAtPeriodEnd: false,
@@ -4390,12 +4395,20 @@ var createOrUpdateSubscription = (razorpay, options) => createAuthEndpoint2(
       const periodEnd = rpSubscription.current_end ? new Date(rpSubscription.current_end * 1e3) : null;
       const newStatus = toLocalStatus(rpSubscription.status);
       if (appTrialSub) {
+        const trialPk = getPrimaryKey(appTrialSub);
+        if (!trialPk.value) {
+          return {
+            success: false,
+            error: { code: "INVALID_TRIAL", description: "Trial subscription has no primary key" }
+          };
+        }
         await ctx.context.adapter.update({
           model: "subscription",
-          where: [{ field: "id", value: appTrialSub.id }],
+          where: [{ field: trialPk.field, value: trialPk.value }],
           update: {
             data: {
               plan: plan.name,
+              planId,
               razorpaySubscriptionId: rpSubscription.id,
               status: newStatus,
               trialEnd: now,
@@ -4409,7 +4422,9 @@ var createOrUpdateSubscription = (razorpay, options) => createAuthEndpoint2(
         if (subOpts.onSubscriptionCreated) {
           const updatedRecord = {
             ...appTrialSub,
+            id: trialPk.value,
             plan: plan.name,
+            planId,
             razorpaySubscriptionId: rpSubscription.id,
             status: newStatus,
             trialEnd: now,
@@ -4425,7 +4440,7 @@ var createOrUpdateSubscription = (razorpay, options) => createAuthEndpoint2(
           });
         }
         const data2 = {
-          subscriptionId: appTrialSub.id,
+          subscriptionId: trialPk.value,
           razorpaySubscriptionId: rpSubscription.id
         };
         if (!body.embed) {
@@ -4433,9 +4448,9 @@ var createOrUpdateSubscription = (razorpay, options) => createAuthEndpoint2(
         }
         return { success: true, data: data2 };
       }
-      const subscriptionRecord = {
-        id: localId,
+      const subscriptionData = {
         plan: plan.name,
+        planId,
         referenceId: userId,
         razorpayCustomerId: user.razorpayCustomerId ?? null,
         razorpaySubscriptionId: rpSubscription.id,
@@ -4450,11 +4465,28 @@ var createOrUpdateSubscription = (razorpay, options) => createAuthEndpoint2(
         createdAt: now,
         updatedAt: now
       };
-      await ctx.context.adapter.create({
+      const createdRaw = await ctx.context.adapter.create({
         model: "subscription",
-        data: subscriptionRecord,
-        forceAllowId: true
+        data: subscriptionData
       });
+      const created = createdRaw;
+      let createdId;
+      if (created != null) {
+        if (typeof created.id === "string" && created.id !== "") {
+          createdId = created.id;
+        } else if (typeof created._id === "string" && created._id !== "") {
+          createdId = created._id;
+        } else if (created._id != null) {
+          createdId = String(created._id);
+        }
+      }
+      if (createdId == null || createdId === "") {
+        return {
+          success: false,
+          error: { code: "CREATE_FAILED", description: "Subscription record was created but no id was returned" }
+        };
+      }
+      const subscriptionRecord = { ...subscriptionData, id: createdId };
       if (subOpts.onSubscriptionCreated) {
         await subOpts.onSubscriptionCreated({
           razorpaySubscription: rpSubscription,
@@ -4463,7 +4495,7 @@ var createOrUpdateSubscription = (razorpay, options) => createAuthEndpoint2(
         });
       }
       const data = {
-        subscriptionId: localId,
+        subscriptionId: createdId,
         razorpaySubscriptionId: rpSubscription.id
       };
       if (!body.embed) {
@@ -4735,18 +4767,61 @@ function toLocalStatus2(razorpayStatus) {
   };
   return map[razorpayStatus] ?? "pending";
 }
-var updateSubscriptionRecord = async (adapter, razorpaySubscriptionId, data) => {
-  await adapter.update({
+var WEBHOOK_DEBUG = process.env.NODE_ENV === "development" || process.env.RAZORPAY_WEBHOOK_DEBUG === "true";
+var log = (msg, data) => {
+  if (WEBHOOK_DEBUG) {
+    const payload = data ? ` ${JSON.stringify(data)}` : "";
+    console.log(`[razorpay-webhook]${payload ? ` ${msg}` : msg}`, payload || "");
+  }
+};
+var updateSubscriptionRecord = async (adapter, subscriptionRecordId, whereField, data) => {
+  const updateData = { ...data, updatedAt: /* @__PURE__ */ new Date() };
+  const params = {
     model: "subscription",
-    where: [{ field: "razorpaySubscriptionId", value: razorpaySubscriptionId }],
-    update: { data: { ...data, updatedAt: /* @__PURE__ */ new Date() } }
+    where: [{ field: whereField, value: subscriptionRecordId }],
+    update: { data: updateData }
+  };
+  log("updateSubscriptionRecord call", {
+    subscriptionRecordId,
+    whereField,
+    dataKeys: Object.keys(updateData)
   });
+  try {
+    await adapter.update(params);
+    log("updateSubscriptionRecord success", { subscriptionRecordId, whereField });
+  } catch (err) {
+    console.error("[razorpay-webhook] updateSubscriptionRecord failed", {
+      subscriptionRecordId,
+      whereField,
+      error: err instanceof Error ? err.message : String(err),
+      stack: err instanceof Error ? err.stack : void 0
+    });
+    throw err;
+  }
 };
-var createStatusHandler = (status, extraFields) => async (adapter, razorpaySubscriptionId, record, subscription) => {
+function getSubscriptionPrimaryKey(record) {
+  if (record.id != null && record.id !== "") {
+    return { value: record.id, field: "id" };
+  }
+  if (record._id != null && record._id !== "") {
+    return { value: record._id, field: "_id" };
+  }
+  return { value: "", field: "id" };
+}
+var createStatusHandler = (status, extraFields) => async (adapter, _razorpaySubscriptionId, record, subscription) => {
+  const primaryKey = getSubscriptionPrimaryKey(record);
+  if (!primaryKey.value) {
+    console.error("[razorpay-webhook] record has no id or _id", {
+      recordKeys: Object.keys(record),
+      razorpaySubscriptionId: record.razorpaySubscriptionId
+    });
+    throw new Error("Subscription record has no primary key (id or _id)");
+  }
   const periodStart = subscription.current_start ? new Date(subscription.current_start * 1e3) : null;
   const periodEnd = subscription.current_end ? new Date(subscription.current_end * 1e3) : null;
-  await updateSubscriptionRecord(adapter, razorpaySubscriptionId, {
+  await updateSubscriptionRecord(adapter, primaryKey.value, primaryKey.field, {
     status,
+    planId: subscription.plan_id,
     ...periodStart !== null && { periodStart },
     ...periodEnd !== null && { periodEnd },
     ...extraFields?.(subscription) ?? {}
@@ -4847,11 +4922,22 @@ async function processWebhookEvent(adapter, rawBody, fallbackBody, onWebhookEven
       where: [{ field: "razorpaySubscriptionId", value: subscriptionEntity.id }]
     });
     if (!record) {
+      log("record not found", { razorpaySubscriptionId: subscriptionEntity.id });
       return {
         success: false,
         message: isDev ? `Subscription record not found for ${subscriptionEntity.id}` : "Subscription record not found"
       };
     }
+    const primaryKey = getSubscriptionPrimaryKey(record);
+    log("record found", {
+      event,
+      razorpaySubscriptionId: subscriptionEntity.id,
+      recordId: primaryKey.value,
+      whereField: primaryKey.field,
+      hasId: "id" in record && record.id != null,
+      has_id: "_id" in record && record._id != null,
+      status: record.status
+    });
     const userId = record.referenceId;
     if (!userId) {
       return {
@@ -4866,7 +4952,17 @@ async function processWebhookEvent(adapter, rawBody, fallbackBody, onWebhookEven
         message: isDev ? `Unhandled event: ${event}` : "Unhandled webhook event"
       };
     }
-    await handler(adapter, subscriptionEntity.id, record, subscriptionEntity);
+    log("calling handler", { event, recordId: primaryKey.value });
+    try {
+      await handler(adapter, subscriptionEntity.id, record, subscriptionEntity);
+    } catch (handlerError) {
+      console.error("[razorpay-webhook] handler failed", {
+        event,
+        recordId: primaryKey.value,
+        error: handlerError instanceof Error ? handlerError.message : String(handlerError)
+      });
+      throw handlerError;
+    }
     if (pluginOptions?.onEvent) {
       try {
         await pluginOptions.onEvent({ event, ...payload });
@@ -5034,9 +5130,7 @@ var razorpayPlugin = (options) => {
                 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,
@@ -5054,8 +5148,7 @@ var razorpayPlugin = (options) => {
                 };
                 await adapter.create({
                   model: "subscription",
-                  data: subscriptionRecord,
-                  forceAllowId: true
+                  data: subscriptionRecord
                 });
               }
             } catch (err) {