@opengis/pay 1.1.3 → 1.1.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/pay",
-  "version": "1.1.3",
+  "version": "1.1.5",
   "type": "module",
   "description": "pay plugins for billing",
   "main": "plugin.js",
@@ -12,6 +12,8 @@
   ],
   "scripts": {
     "docs:dev": "vitepress dev docs",
+    "docs:build": "vitepress build docs",
+    "docs:preview": "vitepress preview docs",
     "test": "node --test test/**/*.test.js",
     "start": "node --watch-path=server server",
     "admin": "cross-env NODE_ENV=admin npm run start",

package/server/routes/portmone.redirect.js

@@ -30,7 +30,7 @@ export default async function PortmoneRedirect(req, reply) {
   }
 
   const { host, payeeId } = config.integrations?.pay || {};
-  const domain = `${req.protocol}://${req.hostname}`;
+  const domain = `${req.protocol}://${req.hostname.split(':').shift()}`;
 
   if (!host) {
     return { message: 'empty integration host', status: 400 };
@@ -62,7 +62,9 @@ export default async function PortmoneRedirect(req, reply) {
   }
 
   if (!headers?.referer || !headers.referer.includes(domain)) {
-    logger.file('payments/warn', { message: 'invalid referer', referer: headers?.referer, uid: user.uid });
+    logger.file('payments/warn', {
+      message: 'invalid referer', domain, referer: headers?.referer, uid: user.uid,
+    });
     return { message: 'access restricted', status: 403 };
   }
 

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,
+        message: 'Transaction was already processed',
       });
       return { message: 'Transaction was already processed', status: 400 };
     }
@@ -69,6 +68,7 @@ export default async function portmoneStatus(req, reply) {
     if (!config.debug && !origin?.startsWith(host)) {
       logger.file('payments/warn', {
         type: 'status',
+        paymentId,
         origin,
         uid: user.uid,
         refill,
@@ -79,6 +79,7 @@ export default async function portmoneStatus(req, reply) {
 
     logger.file('payments', {
       type: 'status',
+      paymentId,
       origin,
       uid: user.uid,
       refill,
@@ -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,
     });
 
-    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,
+      error: err.toString(),
     });
     return { error: err.toString(), status: 500 };
   }