node-paytmpg 8.0.8 → 8.0.12

package/dist/app/controllers/adapters/razorpay.d.ts

@@ -12,4 +12,6 @@ export declare class RazorpayAdapter implements ISubscriptionProvider {
     }>;
     getSubscription(gatewayId: string, config: NPConfig): Promise<any>;
     cancelSubscription(gatewayId: string, cancelAtCycleEnd: boolean, config: NPConfig): Promise<any>;
+    getOrder(orderId: string, config: NPConfig): Promise<any>;
+    validateWebhookSignature(reqBody: string, signature: string, secret: string, jsonBody: any, clientConfig: NPConfig): Promise<boolean>;
 }

package/dist/app/controllers/adapters/razorpay.js

@@ -57,5 +57,39 @@ class RazorpayAdapter {
         const instance = this.getInstance(config);
         return await instance.subscriptions.cancel(gatewayId, cancelAtCycleEnd);
     }
+    async getOrder(orderId, config) {
+        const instance = this.getInstance(config);
+        return await instance.orders.fetch(orderId);
+    }
+    async validateWebhookSignature(reqBody, signature, secret, jsonBody, clientConfig) {
+        var _a, _b, _c, _d, _e, _f;
+        try {
+            return razorpay_1.default.validateWebhookSignature(reqBody, signature, secret);
+        }
+        catch (e) {
+            if (clientConfig && jsonBody && jsonBody.payload && jsonBody.payload.payment && jsonBody.payload.payment.entity) {
+                let orderId = (_c = (_b = (_a = jsonBody === null || jsonBody === void 0 ? void 0 : jsonBody.payload) === null || _a === void 0 ? void 0 : _a.payment) === null || _b === void 0 ? void 0 : _b.entity) === null || _c === void 0 ? void 0 : _c.order_id;
+                let captureStatusClaimed = (_f = (_e = (_d = jsonBody === null || jsonBody === void 0 ? void 0 : jsonBody.payload) === null || _d === void 0 ? void 0 : _d.payment) === null || _e === void 0 ? void 0 : _e.entity) === null || _f === void 0 ? void 0 : _f.status;
+                console.log("Error validating Razorpay signature:", e);
+                if (orderId) {
+                    console.log("Attempting fallback validation method using GET Order", orderId);
+                    try {
+                        const orderDetails = await this.getOrder(orderId, { KEY: '', SECRET: secret });
+                        if (orderDetails && orderDetails.id === orderId && orderDetails.status === captureStatusClaimed) {
+                            console.log("Fallback validation successful for order:", orderId);
+                            return true;
+                        }
+                        else {
+                            console.log("Fallback validation failed: Order details do not match for order:", orderId, "Order details:", orderDetails);
+                        }
+                    }
+                    catch (e) {
+                        console.log("Error in fallback validation:", e);
+                    }
+                }
+            }
+            return false;
+        }
+    }
 }
 exports.RazorpayAdapter = RazorpayAdapter;

package/dist/app/controllers/payment.controller.js

@@ -881,16 +881,19 @@ class PaymentController {
                         const signature = req.headers["x-razorpay-signature"];
                         console.log("Razorpay webhook signature:", signature);
                         if (signature === undefined) {
+                            console.log("Razorpay webhook missing signature");
                             res.status(200).send({ message: "Missing Razorpay signature" });
                             return;
                         }
                         let signatureValid;
+                        const razorPayInstance = this.getProviderInstance(serviceUsed, config);
                         try {
-                            signatureValid = razorpay_1.default.validateWebhookSignature(reqBody, signature, config.SECRET);
+                            signatureValid = await razorPayInstance.validateWebhookSignature(reqBody, signature, config.SECRET, req.body, config);
                         }
                         catch (e) {
                             signatureValid = false;
                         }
+                        console.log("Razorpay webhook signature valid:", signatureValid);
                         if (signatureValid) {
                             if (event === events[0]) {
                                 req.body.STATUS = "TXN_SUCCESS";
@@ -908,10 +911,12 @@ class PaymentController {
                             }, 3000);
                         }
                         else {
+                            console.log("Razorpay webhook invalid signature");
                             res.status(200).send({ message: "Invalid Rzpay signature" });
                         }
                     }
                     else {
+                        console.log("Razorpay webhook invalid payload");
                         res.status(200).send({ message: "Invalid Payload" });
                     }
                 }

package/dist/app/controllers/subscription.webhook.js

@@ -4,9 +4,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.handleSubscriptionWebhook = handleSubscriptionWebhook;
-const razorpay_1 = __importDefault(require("razorpay"));
 const axios_1 = __importDefault(require("axios"));
 const buildConfig_1 = require("../utils/buildConfig");
+const razorpay_1 = require("./adapters/razorpay");
 async function handleSubscriptionWebhook(req, res, db, baseConfig, tableNames, makeid) {
     var _a;
     const event = req.body.event;
@@ -16,14 +16,24 @@ async function handleSubscriptionWebhook(req, res, db, baseConfig, tableNames, m
         const paymentEntity = (_a = req.body.payload.payment) === null || _a === void 0 ? void 0 : _a.entity;
         const gateway_subscription_id = subEntity.id;
         const reqBody = req.rawBody;
+        const jsonBody = req.body;
         const signature = req.headers["x-razorpay-signature"];
         if (signature === undefined) {
             res.status(200).send({ message: "Missing Razorpay signature" });
             return;
         }
+        // Find the local subscription
+        const sub = await db.getOne(tableNames.TRANSACTION.replace('transactions', 'subscriptions'), { gateway_subscription_id });
+        if (!sub) {
+            console.log("Subscription not found for webhook:", gateway_subscription_id);
+            res.status(200).send({ message: "Subscription not found locally" });
+            return;
+        }
+        const clientConf = (0, buildConfig_1.withClientConfigOverrides)(baseConfig, req, { clientId: sub.clientId });
+        const razorPayInstance = new razorpay_1.RazorpayAdapter();
         let signatureValid;
         try {
-            signatureValid = razorpay_1.default.validateWebhookSignature(reqBody, signature, config.SECRET);
+            signatureValid = await razorPayInstance.validateWebhookSignature(reqBody, signature, config.SECRET, jsonBody, clientConf);
         }
         catch (e) {
             signatureValid = false;
@@ -32,14 +42,6 @@ async function handleSubscriptionWebhook(req, res, db, baseConfig, tableNames, m
             res.status(200).send({ message: "Invalid Rzpay signature" });
             return;
         }
-        // Find the local subscription
-        const sub = await db.getOne(tableNames.TRANSACTION.replace('transactions', 'subscriptions'), { gateway_subscription_id });
-        if (!sub) {
-            console.log("Subscription not found for webhook:", gateway_subscription_id);
-            res.status(200).send({ message: "Subscription not found locally" });
-            return;
-        }
-        const clientConf = (0, buildConfig_1.withClientConfigOverrides)(baseConfig, req, { clientId: sub.clientId });
         let statusChanged = false;
         // Map Razorpay events to local subscription status
         switch (event) {

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "node-paytmpg",
-    "version": "8.0.8",
+    "version": "8.0.12",
     "description": "Payment Gateway Integration using NodeJS",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-paytmpg",
-  "version": "8.0.8",
+  "version": "8.0.12",
   "description": "Payment Gateway Integration using NodeJS",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",