@opengis/pay 1.1.0 → 1.1.2

package/server/routes/portmone.redirect.js

@@ -1,13 +1,13 @@
 import request from 'request-promise';
 
 import {
-  config, pgClients, logger, dataInsert,
+  config, pgClients, logger, dataInsert, dataUpdate,
 } from '@opengis/fastify-table/utils.js';
 
 /**
  * Апі перенаправлює до стороннього сервісу оплати карткою онлайн
  *
- * @method GET|POST
+ * @method GET
  * @alias PortmonePaymentRedirect
  * @summary redirect на сервіс оплати карткою
  * @type api
@@ -22,7 +22,7 @@ import {
 
 export default async function PortmoneRedirect(req, reply) {
   const {
-    pg = pgClients.client, user = {}, query = {}, headers = {}, params = {}, body = {}, unittest,
+    pg = pgClients.client, user = {}, query = {}, headers = {},
   } = req;
 
   if (!user?.uid) {
@@ -30,6 +30,7 @@ export default async function PortmoneRedirect(req, reply) {
   }
 
   const { host, payeeId } = config.integration?.portmone || {};
+  const domain = `${req.protocol}://${req.hostname}`;
 
   if (!host) {
     return { message: 'empty integration host', status: 400 };
@@ -39,25 +40,42 @@ export default async function PortmoneRedirect(req, reply) {
     return { message: 'empty integration payeeId', status: 400 };
   }
 
-  const data = params?.id ? await pg.query('select account_id, payment_amount from billing.payments where payment_id=$1', [params.id]).then(el => el.rows?.[0] || {}) : {};
+  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])
+    .then(el => el.rows?.[0] || {}) : {};
+
+  if (data.payment_status && data.payment_status === 'success') {
+    return { message: 'already processed', status: 400 };
+  }
 
-  const paymentAmount = data?.payment_amount || body?.price || query?.price;
+  const paymentAmount = data.payment_amount || query.price;
 
   if (!paymentAmount) {
     return { message: 'price is required', status: 400 };
   }
 
-  const { account_id: accountId } = params?.id
-    ? { account_id: data?.account_id }
-    : await pg.query('select account_id from billing.account_user where user_id=$1 limit 1', [user.uid])
-      .then(el => el.rows?.[0] || {});
+  const accountId = data.account_id
+    || 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);
 
   if (!accountId) {
     return { message: 'account_id is required', status: 400 };
   }
 
-  const { payment_id: paymentId } = params?.id
-    ? { payment_id: params?.id }
+  if (!headers?.referer || !headers.referer.includes(domain)) {
+    logger.file('payments/warn', { message: 'invalid referer', referer: headers?.referer, uid: user.uid });
+    return { message: 'access restricted', status: 403 };
+  }
+
+  const { payment_id: paymentId } = data.payment_id
+    ? await dataUpdate({
+      table: 'billing.payments',
+      id: data.payment_id,
+      data: {
+        referer_url: headers?.referer,
+        payment_status: 'inprogress',
+      },
+      uid: user.uid,
+    })
     : await dataInsert({
       table: 'billing.payments',
       data: {
@@ -70,10 +88,9 @@ export default async function PortmoneRedirect(req, reply) {
     }).then(el => el.rows?.[0] || {});
 
   if (!paymentId) {
-    return { message: 'Не вірне замовлення', status: 400 };
+    return { message: 'payment not found', status: 404 };
   }
 
-  const domain = `${req.protocol}://${req.hostname}`;
   const formData = {
     payee_id: payeeId,
     description: `Послуга - поповнення рахунку на суму ${paymentAmount} грн`,

package/server/routes/portmone.status.js

@@ -1,6 +1,5 @@
 import {
-  config, logger, pgClients, getSelectVal,
-  dataUpdate,
+  config, logger, pgClients, getSelectVal, dataUpdate, getTemplate,
 } from '@opengis/fastify-table/utils.js';
 
 import { sendNotification } from '@opengis/admin/utils.js';
@@ -68,14 +67,23 @@ export default async function portmoneStatus(req, reply) {
 
     // request portmone trx info to recheck request data is valid?
     if (!config.debug && !origin?.startsWith(host)) {
-      logger.file('integrations/portmone/status/warn', {
-        origin, uid: user.uid, refill, message: 'invalid referer',
+      logger.file('payments/warn', {
+        type: 'status',
+        origin,
+        uid: user.uid,
+        refill,
+        message: 'invalid referer',
       });
       return { message: 'access restricted', status: 403 };
     }
 
-    logger.file('integrations/portmone/status/debug', {
-      origin, uid: user.uid, refill, body, params,
+    logger.file('payments', {
+      type: 'status',
+      origin,
+      uid: user.uid,
+      refill,
+      body,
+      params,
     });
 
     // last trx contains total balance
@@ -111,16 +119,18 @@ export default async function portmoneStatus(req, reply) {
 
     Object.assign(data, {
       domain: req.hostname,
+      total_balance: +(refill || 0) + (+totalBalance || 0),
       account_id_text: accountId ? cls2?.[accountId] || accountId : 'Інформація відсутня',
       payment_status_text: trxStatus ? cls3?.[trxStatus] || trxStatus : 'Інформація відсутня',
     });
 
     if (to) {
+      const pt = await getTemplate('pt', 'marketplace-service-payment-client-template');
       const options = {
         pg,
         to,
         title: `Поповнення рахунку на порталі ${req.hostname}`,
-        template: 'marketplace-service-payment-client-template',
+        template: pt?.html || pt,
         data,
         nocache: config?.local,
       };