@opengis/pay 1.1.4 → 1.1.6

package/package.json

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

package/server/routes/portmone.redirect.js

@@ -25,10 +25,6 @@ export default async function PortmoneRedirect(req, reply) {
     pg = pgClients.client, user = {}, query = {}, headers = {},
   } = req;
 
-  if (!user?.uid) {
-    return { message: 'access restricted', status: 403 };
-  }
-
   const { host, payeeId } = config.integrations?.pay || {};
   const domain = `${req.protocol}://${req.hostname.split(':').shift()}`;
 
@@ -54,8 +50,7 @@ export default async function PortmoneRedirect(req, reply) {
   }
 
   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);
+    || (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 };
@@ -63,7 +58,7 @@ export default async function PortmoneRedirect(req, reply) {
 
   if (!headers?.referer || !headers.referer.includes(domain)) {
     logger.file('payments/warn', {
-      message: 'invalid referer', domain, referer: headers?.referer, uid: user.uid,
+      message: 'invalid referer', domain, referer: headers?.referer, uid: user?.uid,
     });
     return { message: 'access restricted', status: 403 };
   }
@@ -76,7 +71,7 @@ export default async function PortmoneRedirect(req, reply) {
         referer_url: headers?.referer,
         payment_status: 'inprogress',
       },
-      uid: user.uid,
+      uid: user?.uid || '0',
     })
     : await dataInsert({
       table: 'billing.payments',
@@ -86,7 +81,7 @@ export default async function PortmoneRedirect(req, reply) {
         referer_url: headers?.referer,
         payment_status: 'inprogress',
       },
-      uid: user.uid,
+      uid: user?.uid || '0',
     }).then(el => el.rows?.[0] || {});
 
   if (!paymentId) {
@@ -110,7 +105,7 @@ export default async function PortmoneRedirect(req, reply) {
     accountId,
     price: paymentAmount,
     domain,
-    uid: user.uid,
+    uid: user?.uid || '0',
   };
 
   try {

package/server/routes/portmone.status.js

@@ -1,5 +1,5 @@
 import {
-  config, logger, pgClients, getSelectVal, dataUpdate, getTemplate,
+  config, logger, pgClients, dataUpdate, getTemplate,
 } from '@opengis/fastify-table/utils.js';
 
 import { sendNotification } from '@opengis/admin/utils.js';
@@ -23,13 +23,8 @@ import { sendNotification } from '@opengis/admin/utils.js';
 
 export default async function portmoneStatus(req, reply) {
   const {
-    pg = pgClients.client, params = {}, headers = {}, body = {}, user,
+    pg = pgClients.client, params = {}, headers = {}, body = {}, user = {},
   } = req;
-
-  if (!user?.uid) {
-    return { message: 'access restricted', status: 403 };
-  }
-
   const { host } = config.integrations?.pay || {};
 
   if (!host) {
@@ -53,8 +48,12 @@ export default async function portmoneStatus(req, reply) {
     } = data;
 
     if (trxStatus === 'success') {
-      logger.file('integrations/portmone/status/skip', {
-        origin, uid: user.uid, message: 'Transaction was already processed',
+      logger.file('payments/skip', {
+        type: 'status',
+        paymentId,
+        origin,
+        uid: user?.uid || '0',
+        message: 'Transaction was already processed',
       });
       return { message: 'Transaction was already processed', status: 400 };
     }
@@ -66,11 +65,12 @@ export default async function portmoneStatus(req, reply) {
     const refill = body?.billAmount || refillSum || 0;
 
     // request portmone trx info to recheck request data is valid?
-    if (!config.debug && !origin?.startsWith(host)) {
+    if (!config.debug && !origin?.startsWith(host) && !config.disableRestricted) {
       logger.file('payments/warn', {
         type: 'status',
+        paymentId,
         origin,
-        uid: user.uid,
+        uid: user?.uid || '0',
         refill,
         message: 'invalid referer',
       });
@@ -79,8 +79,9 @@ export default async function portmoneStatus(req, reply) {
 
     logger.file('payments', {
       type: 'status',
+      paymentId,
       origin,
-      uid: user.uid,
+      uid: user?.uid || '0',
       refill,
       body,
       params,
@@ -100,7 +101,7 @@ export default async function portmoneStatus(req, reply) {
         success_date: new Date(),
       },
       id: paymentId,
-      uid: user.uid,
+      uid: user?.uid || '0',
     });
 
     const { account_email: to } = await pg.query('select account_email from billing.accounts where account_id=$1', [accountId])
@@ -108,20 +109,17 @@ export default async function portmoneStatus(req, reply) {
 
     logger.file('payments', {
       type: 'status',
+      paymentId,
+      responseStatus,
       to,
+      origin,
       redirect: redirectUrl,
-      paymentId,
-      uid: user.uid,
+      uid: user.uid || '0',
     });
 
-    const cls2 = await getSelectVal({ pg, name: 'billing.account_id', values: [accountId] });
-    const cls3 = await getSelectVal({ pg, name: 'billing.payment_status', values: [trxStatus] });
-
     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) {
@@ -136,23 +134,16 @@ export default async function portmoneStatus(req, reply) {
       };
       await sendNotification(options);
     }
-    logger.file('payments', {
-      type: 'status',
-      to,
-      redirect: redirectUrl,
-      paymentId,
-      responseStatus,
-      uid: user.uid,
-    });
     return reply.redirect(redirectUrl || '/');
   }
   catch (err) {
     logger.file('payments/error', {
       type: 'status',
-      error: err.toString(),
-      uid: user.uid,
       paymentId,
+      origin,
       responseStatus,
+      uid: user?.uid || '0',
+      error: err.toString(),
     });
     return { error: err.toString(), status: 500 };
   }