@opengis/pay 2.0.4 → 2.0.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/pay",
-  "version": "2.0.4",
+  "version": "2.0.6",
   "type": "module",
   "description": "pay plugins for billing",
   "main": "plugin.js",

package/server/plugins/payment/createTransaction.js

@@ -17,7 +17,7 @@ export default async function createTransaction({
 }, pg = pgClients.client) {
     if (!service) throw new Error('not enough params: service');
     if (!controller[service]) { throw new Error('invalid params: service'); }
-    if (amount && !uid) throw new Error('not enough params: uid');
+    if (!amount || !uid || !referer) throw new Error('not enough params: uid / amount / referer');
 
     if (currency && !['uah', 'usd', 'eur'].includes(currency)) {
         throw new Error('invalid params: currency');

package/server/plugins/payment/liqpay.createTransaction.js

@@ -8,7 +8,7 @@ import dataUpdate from '../crud/dataUpdate.js';
 import createPayment from './createPayment.js';
 
 const { prefix = '/api' } = config;
-const { table = 'pay.transactions', backUrl: bUrl } = config.integrations?.pay || {};
+const { table = 'pay.transactions', backUrl } = config.integrations?.pay || {};
 
 const {
     host = 'https://www.liqpay.ua',
@@ -20,7 +20,11 @@ const liqpay = new LiqPay(publicKey, privateKey);
 export default async function liqpayCreateTransaction({
     id, orderId, amount, referer, uid, debug, expiredDate, description, paytypes, action = 'pay', currency = 'uah', language = 'uk', deliveryEmails,
 }, pg = pgClients.client) {
-    const backUrl = bUrl || referer?.slice?.(0, referer.indexOf('/', 7));
+    if (!referer) {
+        throw new Error('not enough params: referer required');
+    }
+
+    const rootUrl = referer.slice(0, referer.indexOf('/', 7));
 
     if (!publicKey || !privateKey) {
         throw new Error('invalid liqpay integration settings');
@@ -78,6 +82,8 @@ export default async function liqpayCreateTransaction({
         return paymentData.redirect_url;
     }
 
+    const resultUrl = `${rootUrl}${backUrl ? backUrl.replace(/{{service}}/, 'liqpay').replace(/{{id}}/, paymentData.id) : `${prefix}/liqpay/${paymentData.id}/success`}`;
+
     const paymentOptions = {
         action,
         amount: paymentAmount,
@@ -88,8 +94,8 @@ export default async function liqpayCreateTransaction({
         language,
         paytypes,
         expired_date: expiredDate && new Date(expiredDate) ? new Date(expiredDate).toISOString().split('.')[0].replace('T', ' ') : undefined,
-        // server_url: `${backUrl}${prefix}/liqpay/${paymentData.id}/success`, // update payment info - api url, does not work on sdk package out of the box
-        result_url: `${backUrl}${prefix}/liqpay/${paymentData.id}/success`, // redirect user after payment - page url
+        // server_url: resultUrl, // update payment info - api url, does not work on sdk package out of the box
+        result_url: resultUrl, // redirect user after payment - page url
         rro_info: Array.isArray(deliveryEmails) && deliveryEmails.length ? {
             delivery_emails: deliveryEmails,
         } : undefined,

package/server/plugins/payment/monopay.createTransaction.js

@@ -5,7 +5,7 @@ import dataUpdate from '../crud/dataUpdate.js';
 import createPayment from './createPayment.js';
 
 const { prefix = '/api' } = config;
-const { table = 'pay.transactions', backUrl: bUrl } = config.integrations?.pay || {};
+const { table = 'pay.transactions', backUrl } = config.integrations?.pay || {};
 
 const {
     host = 'https://api.monobank.ua',
@@ -24,9 +24,13 @@ const ccyObj = {
 export default async function monopayCreateTransaction({
     id, orderId, amount, referer, uid, debug, expiredDate, description, action, currency, language,
 }, pg = pgClients.client) {
-    const backUrl = bUrl || referer?.slice?.(0, referer.indexOf('/', 7));
+    if (!referer) {
+        throw new Error('not enough params: referer required');
+    }
+
+    const rootUrl = referer.slice(0, referer.indexOf('/', 7));
 
-    if (!host || !token || !backUrl) {
+    if (!host || !token) {
         throw new Error('invalid monopay integration settings');
     }
 
@@ -74,7 +78,7 @@ export default async function monopayCreateTransaction({
     }
 
     // redirect to api to check payment status and redirect user to page afterwards
-    const serverUrl = `${backUrl}${prefix}/monopay/${paymentData.id}/success`;
+    const resultUrl = `${rootUrl}${backUrl ? backUrl.replace(/{{service}}/, 'monopay').replace(/{{id}}/, paymentData.id) : `${prefix}/monopay/${paymentData.id}/success`}`;
 
     const validity = expiredDate && new Date(expiredDate) ? Math.max(((new Date(expiredDate).setHours(0, 0, 0, 0) - new Date().setHours(0, 0, 0, 0)) / 1000 || 0), 86400) : 86400;
 
@@ -82,9 +86,9 @@ export default async function monopayCreateTransaction({
         amount: paymentAmount * 100, // amount=1 === 0.01 uah
         ccy: ccyObj[currency] || 980, // ISO 4217, 980 = UAH
         merchantPaymInfo,
-        redirectUrl: serverUrl,
+        redirectUrl: resultUrl,
         // redirectUrl: (paymentRedirect ? `${rootPageUrl}${paymentRedirect.replace(/{{id}}/g, paymentData.id)}` : headers?.referer) || rootPageUrl,
-        webHookUrl: serverUrl,
+        webHookUrl: resultUrl,
         validity, // 1 day by default, then invalid
         paymentType: 'debit',
         // displayType: 'iframe', // default = null > url to mono

package/server/plugins/payment/portmone.createTransaction.js

@@ -8,15 +8,19 @@ import createPayment from './createPayment.js';
 
 const { prefix = '/api' } = config;
 
-const { table = 'pay.transactions', backUrl: bUrl } = config.integrations?.pay || {};
+const { table = 'pay.transactions', backUrl } = config.integrations?.pay || {};
 const { host = 'https://www.portmone.com.ua', payeeId } = config.integrations?.portmone || {};
 
 export default async function portmoneCreateTransaction({
     id, orderId, amount, referer, uid, debug, expiredDate, description, action, currency = 'uah', language = 'uk', paytypes,
 }, pg = pgClients.client) {
-    const backUrl = bUrl || referer?.slice?.(0, referer.indexOf('/', 7));
+    if (!referer) {
+        throw new Error('not enough params: referer required');
+    }
+
+    const rootUrl = referer.slice(0, referer.indexOf('/', 7));
 
-    if (!payeeId || !backUrl) {
+    if (!payeeId) {
         throw new Error('invalid portmone integration settings');
     }
 
@@ -64,6 +68,8 @@ export default async function portmoneCreateTransaction({
         throw new Error('Transaction date already expired');
     }
 
+    const resultUrl = `${rootUrl}${backUrl ? backUrl.replace(/{{service}}/, 'portmone').replace(/{{id}}/, paymentData.id) : `${prefix}/portmone/${paymentData.id}/success`}`;
+
     if (id && paymentData?.redirect_url) {
         return paymentData.redirect_url;
     }
@@ -74,8 +80,8 @@ export default async function portmoneCreateTransaction({
         shop_order_number: paymentData.id,
         bill_amount: paymentAmount,
         bill_currency: currency.toUpperCase(),
-        success_url: `${backUrl}${prefix}/portmone/${paymentData.id}/success`,
-        failure_url: `${backUrl}${prefix}/portmone/${paymentData.id}/error`,
+        success_url: resultUrl,
+        failure_url: resultUrl.replace(/\/success$/, '/error'),
         lang: language === 'uk' ? 'ua' : language,
     };
 

package/server/plugins/payment/processTransaction.js

@@ -37,7 +37,7 @@ export default async function processTransaction(id, { body, origin } = {}) {
     if (!service) throw new Error('invalid payment: service required');
     if (!controller[service]) { throw new Error('invalid params: service'); }
 
-    if (trxStatus === 'success') {
+    if (['error', 'success'].includes(trxStatus)) {
         throw new Error('Transaction was already processed');
     }
 
@@ -46,7 +46,7 @@ export default async function processTransaction(id, { body, origin } = {}) {
     const { status = 'error', err_description: err } = result || {};
 
     if (status !== 'success') {
-        throw new Error(err || 'Помилка перевірки статусу платежу');
+        // throw new Error(err || 'Помилка перевірки статусу платежу');
     }
 
     const balance = await pg.query(`select balance from ${table} 
@@ -55,6 +55,9 @@ export default async function processTransaction(id, { body, origin } = {}) {
         and balance is not null
         order by created_at desc limit 1`, [userId]).then(el => el.rows?.[0]?.balance || 0);
 
+    const newBalance = status === 'success' ? +result.amount + +balance : balance;
+    const successDate = status === 'success' ? newDate() : undefined;
+
     const row = await dataUpdate({
         table,
         data: {
@@ -64,16 +67,16 @@ export default async function processTransaction(id, { body, origin } = {}) {
             paytype: result?.paytype, // card, gpay etc
             receipt_url: result?.receipt_url,
             status,
-            balance: +result.amount + +balance,
-            success_date: newDate(),
+            balance: newBalance,
+            success_date: successDate,
         },
         id,
         uid: userId,
     });
 
     if (process.env.NODE_ENV === 'test') {
-        console.info(`id:${id}, status: ${result.status}, before: ${balance || 0}, sum: ${+result.amount}, after: ${+result.amount + +balance}`);
+        console.info(`id:${id}, status: ${result.status}, before: ${balance || 0}, sum: ${+result.amount}, after: ${newBalance}`);
     }
 
-    return { ...row, balance: +result.amount + +balance };
+    return { ...row, balance: newBalance };
 }