@opengis/pay 1.2.0 → 1.2.2

package/package.json

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

package/server/routes/liqpay/controllers/liqpay.redirect.js

@@ -23,27 +23,27 @@ export default async function liqpayRedirect(req, reply) {
 
     const domain = req.hostname.split(':').shift();
 
-    const data = query.id ? await pg.query('select payment_id, account_id, payment_amount, payment_status from billing.payments where payment_id=$1', [query.id])
+    const paymentData = query.id ? await pg.query('select payment_id, account_id, payment_amount, payment_status from billing.payments where payment_id=$1', [query.id])
         .then(el => el.rows?.[0] || {}) : {};
 
-    if (data.payment_status && data.payment_status === 'success') {
+    if (paymentData.payment_status && paymentData.payment_status === 'success') {
         return { message: 'already processed', status: 400 };
     }
 
-    const paymentAmount = data.payment_amount || query.price;
+    const paymentAmount = paymentData.payment_amount || query.price;
 
     if (!paymentAmount) {
         return { message: 'price is required', status: 400 };
     }
 
-    const accountId = data.account_id
+    const accountId = paymentData.account_id
         || (user?.uid ? await pg.query('select account_id from billing.account_user where user_id=$1 limit 1', [user?.uid]).then(el => el.rows?.[0]?.account_id) : null);
 
     if (!accountId) {
         return { message: 'account_id is required', status: 400 };
     }
 
-    const { payment_id: paymentId } = !data.payment_id
+    const { payment_id: paymentId } = !paymentData.payment_id
         ? await dataInsert({
             table: 'billing.payments',
             data: {
@@ -54,7 +54,7 @@ export default async function liqpayRedirect(req, reply) {
             },
             uid: user?.uid || '0',
         }).then(el => el.rows?.[0] || {})
-        : { payment_id: data.payment_id };
+        : { payment_id: paymentData.payment_id };
 
     if (!paymentId) {
         return { message: 'payment not found', status: 404 };
@@ -71,23 +71,26 @@ export default async function liqpayRedirect(req, reply) {
     });
 
     const protocol = headers?.referer?.split?.('://')?.shift?.() || req.protocol || 'https';
-    const rootPageUrl = `${protocol || 'https'}://${domain}${config.port ? `:${config.port}` : ''}`;
+    const rootPageUrl = `${protocol || 'https'}://${domain}`;
 
-    const resultUrl = paymentRedirect
+    /* const resultUrl = paymentRedirect
         ? `${rootPageUrl}${handlebarsSync.compile(paymentRedirect)({ id: paymentId })}`
-        : headers?.referer || `${rootPageUrl}`;
+        : headers?.referer || `${rootPageUrl}`; */
+
+    // redirect to api to check payment status and redirect user to page afterwards
     const serverUrl = `${rootPageUrl}${prefix}/liqpay/${paymentId}/success`;
 
-    const html = liqpay.cnb_form({
+    const paymentOptions = {
         action: 'pay',
         amount: paymentAmount,
         currency: 'UAH',
         description: 'regular payment',
         order_id: paymentId,
         version: '3',
-        server_url: serverUrl, // update payment info - api url
-        result_url: resultUrl, // redirect user after payment - page url
-    });
+        // server_url: serverUrl, // update payment info - api url, does not work on sdk package out of the box
+        result_url: serverUrl, // redirect user after payment - page url
+    };
+    const { data, signature } = liqpay.cnb_object(paymentOptions) || {};
 
     const logObj = {
         type: 'redirect',
@@ -96,25 +99,21 @@ export default async function liqpayRedirect(req, reply) {
         price: paymentAmount,
         service: 'liqpay',
         domain,
-        paymentRedirectUrl: resultUrl,
+        paymentRedirectUrl: serverUrl,
         serverUrl,
         uid: user?.uid || '0',
     };
 
     if (config.debug && query?.debug) {
+        const html = liqpay.cnb_form(paymentOptions);
         return reply.status(302).headers({ 'Content-Type': 'text/html' }).send(html);
     }
 
-    const body = {
-        data: html.match(/<input type="hidden" name="data" value="([^"]+)"/)?.[1],
-        signature: html.match(/<input type="hidden" name="signature" value="([^"]+)"/)?.[1],
-    };
-
     try {
         const response = await request({
             url: `${host}/api/3/checkout`,
             method: 'POST',
-            form: body,
+            form: { data, signature },
             followAllRedirects: false,
             jar: true,
             timeout: 6000,

package/server/routes/liqpay/controllers/liqpay.status.js

@@ -6,6 +6,8 @@ import {
 
 import { sendNotification } from '@opengis/admin/utils.js';
 
+import checkStatus from '../utils/check.status.js';
+
 const newDate = () => {
     const date = new Date();
     const tzOffset = date.getTimezoneOffset();
@@ -42,29 +44,44 @@ export default async function liqpayStatus(req, reply) {
         return reply.status(400).send('invalid liqpay integration settings');
     }
 
-    if (!body?.data || !body?.signature) {
-        return reply.status(400).send('not enough body params: data, signature');
-    }
-
-    const sign = liqpay.str_to_sign(
-        privateKey
-        + body.data
-        + privateKey,
-    );
-
     const origin = headers?.origin || headers?.referer;
     const { status: responseStatus, id: paymentId } = params;
 
-    if (body.signature !== sign) {
-        logger.file('payments/warn', {
-            type: 'status',
-            service: 'liqpay',
-            paymentId,
-            origin,
-            uid: user?.uid || '0',
-            message: 'Transaction signature does not match',
-        });
-        return reply.status(403).send('access restricted: signature mismatch');
+    if (!paymentId) {
+        return reply.status(400).send('not enough params: id');
+    }
+
+    if (req.method === 'GET') {
+        const result = await checkStatus(params.id) || {};
+        const { status, err_description: err } = result;
+        if (status !== 'success' && !unittest) {
+            return reply.status(400).send(err || 'Помилка перевірки статусу платежу');
+        }
+        Object.assign(body, result);
+    }
+
+    if (req.method === 'POST') {
+        if (!body?.data || !body?.signature) {
+            return reply.status(400).send('not enough body params: data, signature');
+        }
+
+        const sign = liqpay.str_to_sign(
+            privateKey
+            + body.data
+            + privateKey,
+        );
+
+        if (body.signature !== sign) {
+            logger.file('payments/warn', {
+                type: 'status',
+                service: 'liqpay',
+                paymentId,
+                origin,
+                uid: user?.uid || '0',
+                message: 'Transaction signature does not match',
+            });
+            return reply.status(403).send('access restricted: signature mismatch');
+        }
     }
 
     const data = await pg.query('select * from billing.payments where payment_id=$1', [paymentId])
@@ -121,7 +138,7 @@ export default async function liqpayStatus(req, reply) {
         table: 'billing.payments',
         data: {
             payment_data: body,
-            payment_status: responseStatus,
+            payment_status: body.status || responseStatus,
             total_balance: +refillSum + +totalBalance,
             success_date: newDate(),
         },

package/server/routes/liqpay/index.mjs

@@ -19,4 +19,12 @@ export default async function plugin(app, opts) {
         },
         handler: liqpayStatus,
     });
+    app.route({
+        method: 'GET',
+        url: '/liqpay/:id/:status',
+        config: {
+            policy: ['public'],
+        },
+        handler: liqpayStatus,
+    });
 }

package/server/routes/liqpay/utils/check.status.js

@@ -0,0 +1,34 @@
+import LiqPay from 'liqpayjs-sdk';
+import request from 'request-promise';
+
+import { config } from '@opengis/fastify-table/utils.js';
+
+const { publicKey, privateKey } = config.integrations?.liqpay || {};
+
+const liqpay = new LiqPay(publicKey, privateKey);
+const host = 'https://www.liqpay.ua';
+
+export default async function liqpayCheckStatus(id) {
+    if (!publicKey || !privateKey) return {};
+
+    const options = {
+        public_key: publicKey, // in case of liqpay.api is auto-assigned
+        action: 'status',
+        version: '3',
+        order_id: id,
+    };
+    /* const result = liqpay.api('request', options); */
+
+    const data = Buffer.from(JSON.stringify(options)).toString('base64');
+    const signature = liqpay.str_to_sign(privateKey + data + privateKey);
+
+    const response = await request(`${host}/api/request`, {
+        method: 'POST',
+        form: { data, signature },
+        headers: {
+            'Content-Type': 'application/x-www-form-urlencoded',
+        },
+    });
+    const result = response?.startsWith?.('{') ? JSON.parse(response) : response;
+    return result;
+}

package/server/routes/portmone/controllers/payment.info.js

@@ -1,4 +1,13 @@
-import { metaFormat, pgClients } from '@opengis/fastify-table/utils.js';
+import { dataUpdate, metaFormat, pgClients } from '@opengis/fastify-table/utils.js';
+
+import liqpayCheckStatus from '../../liqpay/utils/check.status.js';
+
+const newDate = (dateNum) => {
+  const date = dateNum ? new Date(dateNum) : new Date();
+  const tzOffset = date.getTimezoneOffset();
+  const currentTimeWithTimezome = date - tzOffset * 60 * 1000;
+  return new Date(currentTimeWithTimezome).toISOString();
+};
 
 /**
  * Апі для отримання інформації за ID
@@ -30,6 +39,8 @@ export default async function paymentInfo({
     payment_status,
     total_balance,
     payment_num,
+    payment_service,
+    payment_data,
     subscription_id
   from billing.payments
   where payment_id = $1
@@ -39,6 +50,40 @@ export default async function paymentInfo({
     return { message: 'payment not found', status: 404 };
   }
 
+  const {
+    account_id: accountId,
+    payment_service: service,
+    payment_status: status,
+
+  } = rows[0];
+
+  if (status !== 'success' && service === 'liqpay') {
+    const result = await liqpayCheckStatus(params.id);
+    const { amount = 0 } = result;
+
+    const { total_balance: totalBalance = 0 } = await pg.query(`select total_balance from billing.payments 
+      where account_id=$1
+      and payment_status in ('success', 'error')
+      and total_balance is not null
+      order by cdate desc limit 1`, [accountId]).then(el => el.rows?.[0] || {});
+
+    const res = await dataUpdate({
+      pg,
+      table: 'billing.payments',
+      id: params.id,
+      data: {
+        payment_data: result,
+        payment_status: 'success',
+        total_balance: +amount + +totalBalance,
+        success_date: newDate(result.end_date),
+      },
+      uid: user?.uid,
+    });
+
+    const res1 = await metaFormat({ rows: [res].filter(el => el), cls: { account_id: 'billing.account_id', payment_status: 'billing.payment_status', subscription_id: 'billing.subscription_id' } });
+    return res1;
+  }
+
   await metaFormat({ rows, cls: { account_id: 'billing.account_id', payment_status: 'billing.payment_status', subscription_id: 'billing.subscription_id' } });
 
   return rows[0];