node-paytmpg 8.0.2 → 8.0.4

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

@@ -50,6 +50,7 @@ const user_controller_1 = require("./user.controller");
 const utils_1 = require("../utils/utils");
 const loadingsvg_1 = require("./static/loadingsvg");
 const htmlhelper_1 = require("./htmlhelper");
+const subscription_webhook_1 = require("./subscription.webhook");
 const buildConfig_1 = require("../utils/buildConfig");
 const IDLEN = 14;
 function makeid(length) {
@@ -526,17 +527,19 @@ class PaymentController {
                 const sub = await this.db.getOne(this.tableNames.SUBSCRIPTION, { id: orderToFind }).catch(() => null);
                 if (sub) {
                     isSubscription = true;
+                    const plan = await this.db.getOne(this.tableNames.PLAN, { id: sub.planId }).catch(() => null);
+                    const user = await this.db.getOne(this.tableNames.USER, { id: sub.cusId }).catch(() => null);
                     objForUpdate = {
                         id: sub.id,
                         orderId: sub.id,
                         cusId: sub.cusId,
                         time: sub.createdAt || Date.now(),
                         status: 'INITIATED',
-                        name: '',
-                        email: '',
-                        phone: '',
-                        amount: 0,
-                        pname: 'Subscription',
+                        name: (user === null || user === void 0 ? void 0 : user.name) || '',
+                        email: (user === null || user === void 0 ? void 0 : user.email) || '',
+                        phone: (user === null || user === void 0 ? void 0 : user.phone) || '',
+                        amount: (plan === null || plan === void 0 ? void 0 : plan.amount) || 0,
+                        pname: (plan === null || plan === void 0 ? void 0 : plan.name) || 'Subscription',
                         extra: '',
                         clientId: sub.clientId,
                         returnUrl: sub.returnUrl || '',
@@ -692,12 +695,15 @@ class PaymentController {
         let result = false;
         let isCancelled = false;
         let objForUpdate = await this.getOrder(req);
+        let errorMessage = null;
         let isSubscriptionCallback = false;
         // Razorpay Subscription Callback Handling
         if (!objForUpdate && req.body.razorpay_subscription_id) {
             const sub = await this.db.getOne(this.tableNames.SUBSCRIPTION, { gateway_subscription_id: req.body.razorpay_subscription_id });
             if (sub) {
                 isSubscriptionCallback = true;
+                const plan = await this.db.getOne(this.tableNames.PLAN, { id: sub.planId }).catch(() => null);
+                const user = await this.db.getOne(this.tableNames.USER, { id: sub.cusId }).catch(() => null);
                 // Create a virtual transaction object for the callback processor
                 objForUpdate = {
                     id: sub.id,
@@ -705,15 +711,17 @@ class PaymentController {
                     cusId: sub.cusId,
                     time: Date.now(),
                     status: 'INITIATED',
-                    name: '',
-                    email: '',
-                    phone: '',
-                    amount: 0,
-                    pname: 'Subscription Authentication',
+                    name: (user === null || user === void 0 ? void 0 : user.name) || '',
+                    email: (user === null || user === void 0 ? void 0 : user.email) || '',
+                    phone: (user === null || user === void 0 ? void 0 : user.phone) || '',
+                    amount: (plan === null || plan === void 0 ? void 0 : plan.amount) || 0,
+                    pname: (plan === null || plan === void 0 ? void 0 : plan.name) || 'Subscription Authentication',
                     extra: '',
                     clientId: sub.clientId,
                     returnUrl: sub.returnUrl || '',
-                    webhookUrl: sub.webhookUrl || ''
+                    webhookUrl: sub.webhookUrl || '',
+                    isSubscription: true,
+                    subscriptionId: sub.id
                 };
             }
         }
@@ -749,6 +757,11 @@ class PaymentController {
                     // Update local subscription status
                     await this.db.update(this.tableNames.SUBSCRIPTION, { id: objForUpdate === null || objForUpdate === void 0 ? void 0 : objForUpdate.id }, { status: 'AUTHENTICATED', updatedAt: Date.now() });
                 }
+                else if (objForUpdate) {
+                    req.body.ORDERID = objForUpdate === null || objForUpdate === void 0 ? void 0 : objForUpdate.id;
+                    req.body.STATUS = 'TXN_FAILURE';
+                    errorMessage = 'Subscription signature verification failed';
+                }
             }
             else {
                 // Standard Order verification
@@ -765,6 +778,11 @@ class PaymentController {
                         req.body.ORDERID = req.body.razorpay_order_id;
                         req.body.TXNID = req.body.razorpay_payment_id;
                     }
+                    else if (objForUpdate) {
+                        req.body.ORDERID = objForUpdate === null || objForUpdate === void 0 ? void 0 : objForUpdate.id;
+                        req.body.STATUS = 'TXN_FAILURE';
+                        errorMessage = 'Subscription signature verification failed';
+                    }
                 }
                 else {
                     if (req.body.error && req.body.error.metadata && JSON.parse(req.body.error.metadata)) {
@@ -794,13 +812,8 @@ class PaymentController {
             req.body.ORDERID = openRest.ORDERID || req.query.order_id;
             req.body.extras = openRest.data;
         }
-        console.log("NodePayTMPG::Transaction => ", req.body.ORDERID, req.body.STATUS);
-        if (result || isCancelled) {
-            await this.updateTransaction(req, res);
-        }
-        else {
-            res.send({ message: "Something went wrong ! Please try again later .", ORDERID: req.body.ORDERID, TXNID: req.body.TXNID });
-        }
+        console.log("NodePayTMPG::Transaction => ", req.body.ORDERID, req.body.STATUS, errorMessage || '', 'isCancelled:', isCancelled, 'isSubscriptionCallback:', isSubscriptionCallback);
+        await this.updateTransaction(req, res);
     }
     getServiceUsed(req, baseConfig) {
         const config = (0, buildConfig_1.withClientConfigOverrides)(baseConfig, req);
@@ -825,7 +838,6 @@ class PaymentController {
         return serviceUsed;
     }
     async webhook(req, res) {
-        var _a;
         try {
             let config = (0, buildConfig_1.withClientConfigOverrides)(this.baseConfig, req);
             const payuInstance = this.getProviderInstance('PayU', config);
@@ -850,145 +862,8 @@ class PaymentController {
                     const event = req.body.event;
                     // Handle Subscription Events
                     if (event.startsWith("subscription.")) {
-                        if (req.body.payload && req.body.payload.subscription && req.body.payload.subscription.entity) {
-                            const subEntity = req.body.payload.subscription.entity;
-                            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 signature = req.headers["x-razorpay-signature"];
-                            if (signature === undefined) {
-                                res.status(200).send({ message: "Missing Razorpay signature" });
-                                return;
-                            }
-                            let signatureValid;
-                            try {
-                                signatureValid = razorpay_1.default.validateWebhookSignature(reqBody, signature, config.SECRET);
-                            }
-                            catch (e) {
-                                signatureValid = false;
-                            }
-                            if (!signatureValid) {
-                                res.status(200).send({ message: "Invalid Rzpay signature" });
-                                return;
-                            }
-                            // Find the local subscription
-                            const sub = await this.db.getOne(this.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)(this.baseConfig, req, { clientId: sub.clientId });
-                            let statusChanged = false;
-                            // Map Razorpay events to local subscription status
-                            switch (event) {
-                                case "subscription.authenticated":
-                                    sub.status = 'AUTHENTICATED';
-                                    statusChanged = true;
-                                    break;
-                                case "subscription.activated":
-                                case "subscription.resumed":
-                                case "subscription.updated": // An update might make it active again or just change metadata
-                                    if (subEntity.status === 'active') {
-                                        sub.status = 'ACTIVE';
-                                        statusChanged = true;
-                                    }
-                                    break;
-                                case "subscription.paused":
-                                    sub.status = 'PAUSED';
-                                    statusChanged = true;
-                                    break;
-                                case "subscription.pending":
-                                    sub.status = 'PENDING';
-                                    statusChanged = true;
-                                    break;
-                                case "subscription.halted":
-                                    sub.status = 'HALTED';
-                                    statusChanged = true;
-                                    break;
-                                case "subscription.cancelled":
-                                    sub.status = 'CANCELLED';
-                                    statusChanged = true;
-                                    break;
-                                case "subscription.completed":
-                                    sub.status = 'COMPLETED';
-                                    statusChanged = true;
-                                    break;
-                            }
-                            if (statusChanged) {
-                                sub.updatedAt = Date.now();
-                                await this.db.update(this.tableNames.TRANSACTION.replace('transactions', 'subscriptions'), { id: sub.id }, sub);
-                            }
-                            // Trigger client payment webhook ONLY on actual charges or definitive failures
-                            if (event === "subscription.charged" && paymentEntity) {
-                                sub.status = 'ACTIVE';
-                                await this.db.update(this.tableNames.TRANSACTION.replace('transactions', 'subscriptions'), { id: sub.id }, sub);
-                                // Create a new transaction record for this specific charge
-                                const txnId = 'txn_' + makeid(10);
-                                const newTxn = {
-                                    id: txnId,
-                                    orderId: txnId, // Use txnId as orderId for recurring payments since there is no explicit user-created order
-                                    cusId: sub.cusId,
-                                    time: Date.now(),
-                                    status: 'TXN_SUCCESS',
-                                    name: '', // We could fetch from user, but keeping minimal
-                                    email: paymentEntity.email || '',
-                                    phone: paymentEntity.contact || '',
-                                    amount: paymentEntity.amount / 100,
-                                    pname: 'Subscription Charge',
-                                    extra: JSON.stringify(paymentEntity),
-                                    txnId: paymentEntity.id,
-                                    clientId: sub.clientId,
-                                    returnUrl: sub.returnUrl,
-                                    webhookUrl: sub.webhookUrl,
-                                    isSubscription: true,
-                                    subscriptionId: sub.id
-                                };
-                                await this.db.insert(this.tableNames.TRANSACTION, newTxn);
-                                // Trigger client webhook
-                                if (sub.webhookUrl) {
-                                    try {
-                                        await axios_1.default.post(sub.webhookUrl, newTxn);
-                                        console.log("Sent subscription webhook to ", sub.webhookUrl, 'txnId:', paymentEntity.id);
-                                    }
-                                    catch (e) {
-                                        console.log("Error sending subscription webhook to ", sub.webhookUrl, (e === null || e === void 0 ? void 0 : e.message) || e);
-                                    }
-                                }
-                            }
-                            else if (event === "subscription.halted") {
-                                // Optional: Inform client of a failed recurring payment that led to a halt
-                                const txnId = 'txn_' + makeid(10);
-                                const newTxn = {
-                                    id: txnId,
-                                    orderId: txnId,
-                                    cusId: sub.cusId,
-                                    time: Date.now(),
-                                    status: 'TXN_FAILURE',
-                                    name: '',
-                                    email: '',
-                                    phone: '',
-                                    amount: 0, // Or fetch plan amount if needed
-                                    pname: 'Subscription Halted',
-                                    extra: JSON.stringify(subEntity),
-                                    txnId: '',
-                                    clientId: sub.clientId,
-                                    returnUrl: sub.returnUrl,
-                                    webhookUrl: sub.webhookUrl,
-                                    isSubscription: true,
-                                    subscriptionId: sub.id
-                                };
-                                await this.db.insert(this.tableNames.TRANSACTION, newTxn);
-                                if (sub.webhookUrl) {
-                                    try {
-                                        await axios_1.default.post(sub.webhookUrl, newTxn);
-                                    }
-                                    catch (e) { }
-                                }
-                            }
-                            res.status(200).send({ message: "Subscription webhook processed" });
-                            return;
-                        }
+                        await (0, subscription_webhook_1.handleSubscriptionWebhook)(req, res, this.db, this.baseConfig, this.tableNames, makeid);
+                        return;
                     }
                     // Handle One-time Payment Events
                     if (req.body.payload &&

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

@@ -135,12 +135,14 @@ class SubscriptionController {
                 res.status(404).send({ message: 'Plan not found' });
                 return;
             }
-            const { name, description, amount, interval, period } = req.body;
+            const { name, description, amount, interval, period, currency, trial_days } = req.body;
             // Check if Gateway immutable fields are changing
             let needsNewGatewayPlan = false;
             if ((amount !== undefined && parseFloat(amount) !== plan.amount) ||
                 (interval !== undefined && parseInt(interval, 10) !== plan.interval) ||
-                (period !== undefined && period !== plan.period)) {
+                (period !== undefined && period !== plan.period) ||
+                (currency !== undefined && currency !== plan.currency) ||
+                (trial_days !== undefined && parseInt(trial_days, 10) !== plan.trial_days)) {
                 needsNewGatewayPlan = true;
             }
             const updatedPlan = { ...plan, updatedAt: Date.now() };
@@ -154,6 +156,10 @@ class SubscriptionController {
                 updatedPlan.interval = parseInt(interval, 10);
             if (period !== undefined)
                 updatedPlan.period = period;
+            if (currency !== undefined)
+                updatedPlan.currency = currency;
+            if (trial_days !== undefined)
+                updatedPlan.trial_days = parseInt(trial_days, 10);
             if (needsNewGatewayPlan) {
                 const config = (0, buildConfig_1.withClientConfigOverrides)(this.baseConfig, req);
                 const provider = this.getProvider(config);

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

@@ -46,6 +46,39 @@ async function handleSubscriptionWebhook(req, res, db, baseConfig, tableNames, m
             case "subscription.authenticated":
                 sub.status = 'AUTHENTICATED';
                 statusChanged = true;
+                // Trigger Setup Success Webhook
+                const planAuth = await db.getOne(tableNames.PLAN, { id: sub.planId }).catch(() => null);
+                const userAuth = await db.getOne(tableNames.USER, { id: sub.cusId }).catch(() => null);
+                const authTxn = {
+                    id: sub.id,
+                    orderId: sub.id,
+                    cusId: sub.cusId,
+                    time: Date.now(),
+                    status: 'TXN_SUCCESS',
+                    name: (userAuth === null || userAuth === void 0 ? void 0 : userAuth.name) || '',
+                    email: (userAuth === null || userAuth === void 0 ? void 0 : userAuth.email) || '',
+                    phone: (userAuth === null || userAuth === void 0 ? void 0 : userAuth.phone) || '',
+                    amount: (planAuth === null || planAuth === void 0 ? void 0 : planAuth.amount) || 0,
+                    pname: (planAuth === null || planAuth === void 0 ? void 0 : planAuth.name) || 'Subscription Authentication',
+                    extra: JSON.stringify(subEntity),
+                    txnId: (paymentEntity === null || paymentEntity === void 0 ? void 0 : paymentEntity.id) || '',
+                    clientId: sub.clientId,
+                    returnUrl: sub.returnUrl || '',
+                    webhookUrl: sub.webhookUrl || '',
+                    isSubscription: true,
+                    subscriptionId: sub.id
+                };
+                // Persist if doesn't exist
+                const existingAuth = await db.getOne(tableNames.TRANSACTION, { orderId: sub.id }).catch(() => null);
+                if (!existingAuth) {
+                    await db.insert(tableNames.TRANSACTION, authTxn);
+                }
+                if (sub.webhookUrl) {
+                    try {
+                        await axios_1.default.post(sub.webhookUrl, authTxn);
+                    }
+                    catch (e) { }
+                }
                 break;
             case "subscription.activated":
             case "subscription.resumed":
@@ -84,6 +117,8 @@ async function handleSubscriptionWebhook(req, res, db, baseConfig, tableNames, m
         if (event === "subscription.charged" && paymentEntity) {
             sub.status = 'ACTIVE';
             await db.update(tableNames.TRANSACTION.replace('transactions', 'subscriptions'), { id: sub.id }, sub);
+            const plan = await db.getOne(tableNames.PLAN, { id: sub.planId }).catch(() => null);
+            const user = await db.getOne(tableNames.USER, { id: sub.cusId }).catch(() => null);
             // Create a new transaction record for this specific charge
             const txnId = 'txn_' + makeid(10);
             const newTxn = {
@@ -92,11 +127,11 @@ async function handleSubscriptionWebhook(req, res, db, baseConfig, tableNames, m
                 cusId: sub.cusId,
                 time: Date.now(),
                 status: 'TXN_SUCCESS',
-                name: '', // We could fetch from user, but keeping minimal
-                email: paymentEntity.email || '',
-                phone: paymentEntity.contact || '',
+                name: (user === null || user === void 0 ? void 0 : user.name) || '',
+                email: paymentEntity.email || (user === null || user === void 0 ? void 0 : user.email) || '',
+                phone: paymentEntity.contact || (user === null || user === void 0 ? void 0 : user.phone) || '',
                 amount: paymentEntity.amount / 100,
-                pname: 'Subscription Charge',
+                pname: (plan === null || plan === void 0 ? void 0 : plan.name) || 'Subscription Charge',
                 extra: JSON.stringify(paymentEntity),
                 txnId: paymentEntity.id,
                 clientId: sub.clientId,
@@ -118,6 +153,8 @@ async function handleSubscriptionWebhook(req, res, db, baseConfig, tableNames, m
             }
         }
         else if (event === "subscription.halted") {
+            const plan = await db.getOne(tableNames.PLAN, { id: sub.planId }).catch(() => null);
+            const user = await db.getOne(tableNames.USER, { id: sub.cusId }).catch(() => null);
             // Optional: Inform client of a failed recurring payment that led to a halt
             const txnId = 'txn_' + makeid(10);
             const newTxn = {
@@ -126,11 +163,11 @@ async function handleSubscriptionWebhook(req, res, db, baseConfig, tableNames, m
                 cusId: sub.cusId,
                 time: Date.now(),
                 status: 'TXN_FAILURE',
-                name: '',
-                email: '',
-                phone: '',
-                amount: 0, // Or fetch plan amount if needed
-                pname: 'Subscription Halted',
+                name: (user === null || user === void 0 ? void 0 : user.name) || '',
+                email: (user === null || user === void 0 ? void 0 : user.email) || '',
+                phone: (user === null || user === void 0 ? void 0 : user.phone) || '',
+                amount: (plan === null || plan === void 0 ? void 0 : plan.amount) || 0,
+                pname: (plan === null || plan === void 0 ? void 0 : plan.name) ? `${plan.name} (Halted)` : 'Subscription Halted',
                 extra: JSON.stringify(subEntity),
                 txnId: '',
                 clientId: sub.clientId,

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "node-paytmpg",
-    "version": "8.0.2",
+    "version": "8.0.4",
     "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.2",
+  "version": "8.0.4",
   "description": "Payment Gateway Integration using NodeJS",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",