@opengis/pay 1.3.2 → 2.0.0

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

@@ -1,38 +1,26 @@
-import LiqPay from 'liqpayjs-sdk';
-import path from 'node:path';
-import { readFileSync } from 'node:fs';
-import { fileURLToPath } from 'url';
+/* eslint-disable no-console */
+// import path from 'node:path';
+// import { readFileSync } from 'node:fs';
+// import { fileURLToPath } from 'url';
 
-import config from '../../../../config.js';
+// import config from '../../../../config.js';
 import pgClients from '../../../plugins/pg/pgClients.js';
-import dataUpdate from '../../../plugins/crud/dataUpdate.js';
 
-import sendNotification from '../../../utils/sendNotification.js';
+import processTransaction from '../../../plugins/payment/processTransaction.js';
 
-import checkStatus from '../utils/check.status.js';
+// import sendNotification from '../../../utils/sendNotification.js';
 
-const dirname = path.dirname(fileURLToPath(import.meta.url));
-const ptBody = readFileSync(path.join(dirname, '../../../../module/pay/pt/marketplace-service-payment-client-template.html'), { encoding: 'utf8' });
-
-const newDate = () => {
-    const date = new Date();
-    const tzOffset = date.getTimezoneOffset();
-    const currentTimeWithTimezome = date - tzOffset * 60 * 1000;
-    return new Date(currentTimeWithTimezome).toISOString();
-};
-
-const { publicKey, privateKey } = config.integrations?.liqpay || {};
-const liqpay = new LiqPay(publicKey, privateKey);
+// const dirname = path.dirname(fileURLToPath(import.meta.url));
+// const ptBody = readFileSync(path.join(dirname, '../../../../module/pay/pt/marketplace-service-payment-client-template.html'), { encoding: 'utf8' });
 
 /**
- * Апі перенаправлює з liqpay назад на сторінку замовлення
+ * Апі перенаправлює з liqpay назад на сторінку транзакції
  *
  * @method POST
  * @alias liqpayStatus
- * @summary redirect з liqpay на сторінку замовлення
+ * @summary redirect з liqpay на сторінку транзакції
  * @type api
- * @param {String} paymentId - Ідентифікатор замовлення
- * @param {String} refillSum - Сума поповнення рахунку
+ * @param {String} params.id - Ідентифікатор транзакції
  * @returns {Number} status - номер помилки. Повертається, якщо була допущенна помилка в отриманих параметрах, або з бази. Це може бути 400 або 500
  * @returns {String} error - опис помилки
  * @returns {String} redirect - шлях до переадресації
@@ -43,146 +31,38 @@ const liqpay = new LiqPay(publicKey, privateKey);
 
 export default async function liqpayStatus(req, reply) {
     const {
-        pg = pgClients.client, params = {}, headers = {}, body = {}, user = {}, unittest,
+        pg = pgClients.client, headers = {}, params = {},
     } = req;
 
-    if (!publicKey || !privateKey) {
-        return reply.status(400).send('invalid liqpay integration settings');
-    }
-
-    const origin = headers?.origin || headers?.referer;
-    const { status: responseStatus, id: paymentId } = params;
+    const { origin = headers?.referer } = headers;
 
-    if (!paymentId) {
+    if (!params?.id) {
         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 (params.status !== 'success') {
+        return reply.status(400).send('transaction aborted');
     }
 
-    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) {
-            console.warn('payments/warn', JSON.stringify({
-                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])
-        .then(el => el.rows?.[0] || {});
-
-    const {
-        payment_id: trx,
-        payment_amount: refillSum = 0,
-        referer_url: redirectUrl,
-        payment_status: trxStatus,
-        payment_service: paymentService,
-        account_id: accountId,
-    } = data;
-
-    if (trxStatus === 'success') {
-        console.info('payments/skip', JSON.stringify({
-            type: 'status',
-            service: 'liqpay',
-            paymentId,
-            origin,
-            uid: user?.uid || '0',
-            message: 'Transaction was already processed',
-        }));
-        return reply.status(400).send('Transaction was already processed');
-    }
+    const trx = await processTransaction(params.id);
 
     if (!trx) {
         return reply.status(404).send('Transaction not found');
     }
 
-    if (paymentService !== 'liqpay') {
-        return reply.status(400).send('Payment not registered via liqpay service');
-    }
-
-    console.log('payments/info', JSON.stringify({
-        type: 'status',
-        service: 'liqpay',
-        paymentId,
-        origin,
-        uid: user?.uid || '0',
-        refill: refillSum,
-        body,
-        params,
-    }));
-
-    // last trx contains total balance
-    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] || {});
-
-    await dataUpdate({
-        table: 'billing.payments',
-        data: {
-            payment_data: body,
-            payment_status: body.status || responseStatus,
-            total_balance: +refillSum + +totalBalance,
-            success_date: newDate(),
-        },
-        id: paymentId,
-        uid: user?.uid || '0',
-    });
-
-    if (unittest) {
-        console.log(`id:${trx}, status: ${responseStatus}, before: ${totalBalance || 0}, after: ${+refillSum + +totalBalance} (${refillSum})`);
-    }
-
-    const { account_email: to } = await pg.query('select account_email from billing.accounts where account_id=$1', [accountId])
-        .then(el => el.rows?.[0] || {});
-
-    console.log('payments/info2', JSON.stringify({
-        type: 'status',
-        service: 'liqpay',
-        paymentId,
-        responseStatus,
-        to,
-        origin,
-        redirect: redirectUrl,
-        uid: user.uid || '0',
-    }));
-
-    Object.assign(data, {
-        domain: req.hostname,
-        total_balance: +refillSum + +totalBalance,
-    });
-
-    if (to) {
+    /* if (to) {
+        Object.assign(trx, {
+            domain: req.hostname,
+            total_balance: trx.balance,
+        });
         const pt = (ptBody || 'empty template')
             .replace(/{{domain}}/g, req.hostname)
-            .replace(/{{total_balance}}/g, +(refillSum || 0) + (+totalBalance || 0))
+            .replace(/{{balance}}/g, trx.balance || '0')
             .replace(/{{username}}/g, to)
-            .replace(/{{created_at}}/g, (data?.cdate || data?.created_at || new Date()).toLocaleString('uk-UA'))
-            .replace(/{{payment_status}}/g, responseStatus)
-            .replace(/{{payment_amount}}/g, refillSum || 0);
+            .replace(/{{created_at}}/g, (trx?.created_at || new Date()).toLocaleString('uk-UA'))
+            .replace(/{{status}}/g, trx.status)
+            .replace(/{{amount}}/g, trx.amount || 0);
+
         const options = {
             pg,
             to,
@@ -191,6 +71,7 @@ export default async function liqpayStatus(req, reply) {
             nocache: config?.local,
         };
         await sendNotification(options);
-    }
-    return reply.redirect(redirectUrl || '/');
+    } */
+
+    return reply.redirect(trx.referer_url || '/');
 }

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

@@ -1,141 +1,49 @@
 import config from '../../../../config.js';
 import pgClients from '../../../plugins/pg/pgClients.js';
-import dataInsert from '../../../plugins/crud/dataInsert.js';
-import dataUpdate from '../../../plugins/crud/dataUpdate.js';
 
-const { prefix = '/api' } = config;
-const {
-    host = 'https://api.monobank.ua', token, paymentRedirect, merchantPaymInfo,
-} = config.integrations?.monopay || {};
+import paymentInfo from '../../../plugins/payment/paymentInfo.js';
+import createTransaction from '../../../plugins/payment/monopay.createTransaction.js';
 
 // http://billing.local.ua/api/monopay-redirect?price=50
 
 export default async function monopayRedirect(req, reply) {
     const {
-        pg = pgClients.client, query = {}, user = {}, headers = {},
+        hostname, headers, pg = pgClients.client, query = {}, user = {}, protocol,
     } = req;
 
-    if (!token) {
-        return reply.status(400).send('invalid monopay integration settings');
+    if (!user?.uid) {
+        return reply.status(401).send('unauthrized');
     }
 
-    const domain = req.hostname.split(':').shift();
+    const domain = hostname?.split?.(':')?.shift?.();
+    const rootUrl = `${protocol || 'https'}://${domain}`;
 
-    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] || {}) : {};
+    const paymentData = query.id ? await paymentInfo(query.id) : {
+        price: query.price, // price for new transtaction as is, else - preCreated
+        service: 'portmone',
+        referer: headers?.referer, // redirect user after finish of transaction
+        uid: user.uid, // user id
+    };
+
+    // redirect back from payment service to API endpoint, provide protocol + domain
+    Object.assign(paymentData, { rootUrl });
 
-    if (paymentData.payment_status && paymentData.payment_status === 'success') {
+    if (query.id && paymentData.status === 'success') {
         return reply.status(400).send('already processed');
     }
 
-    const paymentAmount = paymentData.payment_amount || query.price;
-
-    if (!paymentAmount) {
+    if (!paymentData?.price) {
         return reply.status(400).send('price is required');
     }
 
-    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 reply.status(400).send('account_id is required');
-    }
-
-    const { payment_id: paymentId } = !paymentData.payment_id
-        ? await dataInsert({
-            table: 'billing.payments',
-            data: {
-                payment_amount: paymentAmount,
-                account_id: accountId,
-                payment_service: 'monopay',
-                payment_status: 'inprogress',
-            },
-            uid: user?.uid || '0',
-        }).then(el => el.rows?.[0] || {})
-        : { payment_id: paymentData.payment_id };
+    // create if not exists, then request to payment service
+    const result = await createTransaction(paymentData, pg);
 
-    if (!paymentId) {
-        return { message: 'payment not found', status: 404 };
+    // raw response from payment service
+    if (config.debug && query?.debug) {
+        return result;
     }
 
-    await dataUpdate({
-        table: 'billing.payments',
-        id: paymentId,
-        data: {
-            referer_url: paymentRedirect ? paymentRedirect.replace(/{{id}}/g, paymentId) : headers?.referer,
-            payment_status: 'inprogress',
-            payment_service: 'monopay',
-        },
-        uid: user?.uid || '0',
-    });
-
-    const protocol = headers?.referer?.split?.('://')?.shift?.() || req.protocol || 'https';
-    const rootPageUrl = `${protocol || 'https'}://${domain}`;
-
-    // redirect to api to check payment status and redirect user to page afterwards
-    const serverUrl = `${rootPageUrl}${prefix}/monopay/${paymentId}/success`;
-
-    const paymentOptions = {
-        amount: paymentAmount * 100, // price=1 === 0.01 uah
-        ccy: 980, // ISO 4217, 980 = UAH
-        merchantPaymInfo,
-        redirectUrl: serverUrl,
-        // redirectUrl: (paymentRedirect ? `${rootPageUrl}${paymentRedirect.replace(/{{id}}/g, paymentId)}` : headers?.referer) || rootPageUrl,
-        webHookUrl: serverUrl,
-        validity: 86400, // 1 day by default, then invalid
-        paymentType: 'debit',
-        // displayType: 'iframe', // default = null > url to mono
-    };
-
-    const logObj = {
-        type: 'redirect',
-        paymentId,
-        accountId,
-        price: paymentAmount,
-        service: 'monopay',
-        domain,
-        paymentRedirectUrl: serverUrl,
-        uid: user?.uid || '0',
-    };
-
-    try {
-        // create payment, get redirect url
-        const resp = await fetch(`${host}/api/merchant/invoice/create`, {
-            method: 'POST',
-            headers: { 'x-token': token },
-            body: JSON.stringify(paymentOptions),
-            signal: AbortSignal.timeout(5000),
-        });
-
-        const contentType = resp.headers.get('Content-Type');
-
-        const body = contentType.includes('application/json') && resp.status === 200
-            ? await resp.json()
-            : await resp.text();
-
-        if (query.debug) {
-            return body;
-        }
-
-        await dataUpdate({
-            table: 'billing.payments',
-            id: paymentId,
-            data: {
-                payment_data: resp.status === 200 ? body : { response: body },
-            },
-            uid: user?.uid || '0',
-        });
-
-        console.log('payments/info', JSON.stringify({ ...logObj, response: body }));
-
-        if (!body.pageUrl) {
-            return reply.status(501).send('monopay service temporary unavailable');
-        }
-
-        return reply.redirect(body.pageUrl);
-    }
-    catch (err) {
-        console.error('payments/error', JSON.stringify(logObj), err.toString(), err.stack);
-        return reply.status(500).send(err.toString());
-    }
+    // link to payment service
+    return reply.redirect(result);
 }

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

@@ -1,70 +1,22 @@
-import config from '../../../../config.js';
-import pgClients from '../../../plugins/pg/pgClients.js';
-import dataUpdate from '../../../plugins/crud/dataUpdate.js';
-
-const {
-    host = 'https://api.monobank.ua',
-    token,
-} = config.integrations?.monopay || {};
-
-const timeoutMs = 5000;
+import processTransaction from '../../../plugins/payment/processTransaction.js';
 
 export default async function monopayStatus({
-    pg = pgClients.client, params = {}, user = {},
+    params = {},
 }, reply) {
     const { id, status = 'success' } = params;
-
     if (!id) {
         return reply.status(400).send('not enough params: id');
     }
 
-    const {
-        paymentId, refererUrl, paymentStatus, invoiceId, accountId,
-    } = await pg.query('select payment_id as "paymentId", account_id as "accountId", payment_status as "paymentStatus", referer_url as "refererUrl", payment_data->>\'invoiceId\' as "invoiceId" from billing.payments where payment_id=$1', [id])
-        .then(el => el.rows?.[0] || {});
-
-    if (!paymentId) {
-        return reply.status(404).send('payment not found');
-    }
-    if (!invoiceId) {
-        return reply.status(404).send('invoice not found');
-    }
-
-    if (['success', 'error'].includes(paymentStatus)) {
-        return reply.status(404).send('payment already processed');
-    }
-
     if (status !== 'success') {
-        return reply.redirect(refererUrl);
+        return reply.status(400).send('transaction aborted');
     }
 
-    const resp = await fetch(`${host}/api/merchant/invoice/status?invoiceId=${invoiceId}`, {
-        method: 'GET',
-        headers: { 'x-token': token },
-        signal: AbortSignal.timeout(timeoutMs),
-    }).catch(err => reply.status(501).send('monopay request timeout'));
-
-    const contentType = resp.headers.get('Content-Type');
+    const trx = await processTransaction(id);
 
-    const body = contentType.includes('application/json') && resp.status === 200
-        ? await resp.json()
-        : await resp.text();
-
-    const totalBalanceBefore = 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]?.total_balance || 0);
-
-    await dataUpdate({
-        table: 'billing.payments',
-        id: paymentId,
-        data: {
-            total_balance: (body.amount / 100) + +totalBalanceBefore,
-            success_date: new Date(), // newDate(),
-            payment_status: body?.status || 'error',
-            payment_data: resp.status === 200 ? body : { response: body },
-        },
-        uid: user?.uid || '0',
-    });
+    if (!trx) {
+        return reply.status(404).send('Transaction not found');
+    }
 
-    return reply.redirect(refererUrl || '/');
+    return reply.redirect(trx.referer_url || '/');
 }

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

@@ -1,11 +1,8 @@
-import request from 'request-promise';
-
 import config from '../../../../config.js';
 import pgClients from '../../../plugins/pg/pgClients.js';
-import dataInsert from '../../../plugins/crud/dataInsert.js';
-import dataUpdate from '../../../plugins/crud/dataUpdate.js';
 
-const { host, payeeId, paymentRedirect = config.paymentRedirect } = config.integrations?.pay || {};
+import paymentInfo from '../../../plugins/payment/paymentInfo.js';
+import createTransaction from '../../../plugins/payment/portmone.createTransaction.js';
 
 /**
  * Апі перенаправлює до стороннього сервісу оплати карткою онлайн
@@ -23,129 +20,43 @@ const { host, payeeId, paymentRedirect = config.paymentRedirect } = config.integ
  * @returns {String} file - шлях файла або його назва
  */
 
-export default async function PortmoneRedirect(req, reply) {
+export default async function portmoneRedirect(req, reply) {
   const {
-    pg = pgClients.client, user = {}, query = {}, headers = {}, unittest,
+    hostname, headers, pg = pgClients.client, user = {}, query = {}, protocol,
   } = req;
-
-  if (!host) {
-    return reply.status(400).send('empty integration host');
-  }
-
-  if (!payeeId) {
-    return reply.status(400).send('empty integration payeeId');
+  if (!user?.uid) {
+    return reply.status(401).send('unauthrized');
   }
 
-  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])
-    .then(el => el.rows?.[0] || {}) : {};
+  const domain = hostname?.split?.(':')?.shift?.();
+  const rootUrl = `${protocol || 'https'}://${domain}`;
 
-  if (data.payment_status && data.payment_status === 'success') {
-    return { message: 'already processed', status: 400 };
-  }
-
-  const paymentAmount = data.payment_amount || query.price;
-
-  if (!paymentAmount) {
-    return { message: 'price is required', status: 400 };
-  }
+  const paymentData = query.id ? await paymentInfo(query.id) : {
+    price: query.price, // price for new transtaction as is, else - preCreated
+    service: 'portmone',
+    referer: headers?.referer, // redirect user after finish of transaction
+    uid: user.uid, // user id
+  };
 
-  const accountId = data.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);
+  // redirect back from payment service to API endpoint, provide protocol + domain
+  Object.assign(paymentData, { rootUrl });
 
-  if (!accountId) {
-    return { message: 'account_id is required', status: 400 };
+  if (query.id && paymentData.status === 'success') {
+    return reply.status(400).send('already processed');
   }
 
-  if ((!headers?.referer || !headers.referer.includes(domain))) {
-    console.warn(
-      'payments/warn',
-      'invalid referer',
-      'portmone',
-      domain,
-      headers?.referer,
-      user?.uid,
-    );
-    if (!config.auth?.disableRestricted && !unittest) {
-      return reply.status(403).send('access restricted: referer');
-    }
+  if (!paymentData?.price) {
+    return reply.status(400).send('price is required');
   }
 
-  const { payment_id: paymentId } = !data.payment_id
-    ? await dataInsert({
-      table: 'billing.payments',
-      data: {
-        payment_amount: paymentAmount,
-        account_id: accountId,
-        payment_service: 'portmone',
-        payment_status: 'inprogress',
-      },
-      uid: user?.uid || '0',
-    }).then(el => el.rows?.[0] || {})
-    : { payment_id: data.payment_id };
+  // create if not exists, then request to payment service
+  const result = await createTransaction(paymentData, pg);
 
-  if (!paymentId) {
-    return reply.status(404).send('payment not found');
+  // raw response from payment service
+  if (config.debug && query.debug) {
+    return result;
   }
 
-  await dataUpdate({
-    table: 'billing.payments',
-    id: paymentId,
-    data: {
-      referer_url: paymentRedirect ? paymentRedirect.replace(/{{id}}/g, paymentId) : headers?.referer,
-      payment_status: 'inprogress',
-    },
-    uid: user?.uid || '0',
-  });
-
-  const protocol = headers?.referer.split('://').shift();
-
-  const formData = {
-    payee_id: payeeId,
-    description: `Послуга - поповнення рахунку на суму ${paymentAmount} грн`,
-    shop_order_number: paymentId,
-    bill_amount: paymentAmount,
-    success_url: `${protocol || 'https'}://${domain}${config?.prefix || '/api'}/portmone/${paymentId}/success`,
-    failure_url: `${protocol || 'https'}://${domain}${config?.prefix || '/api'}/portmone/${paymentId}/error`,
-    lang: 'ua',
-  };
-
-  const logObj = {
-    type: 'redirect',
-    service: 'portmone',
-    payeeId,
-    paymentId,
-    accountId,
-    price: paymentAmount,
-    domain,
-    paymentRedirectUrl: paymentRedirect ? paymentRedirect.replace(/{{id}}/g, paymentId) : headers?.referer,
-    uid: user?.uid || '0',
-  };
-
-  try {
-    // portmone always returns error...
-    const response = await request({
-      url: `${host}/gateway/`,
-      method: 'POST',
-      formData,
-      followAllRedirects: false,
-      jar: true,
-      timeout: 6000,
-      simple: false, // prevent not 2xx code trigger catch
-      resolveWithFullResponse: true,
-    });
-
-    // unusable code, just in case
-    if (response.statusCode !== 302 || !response.headers?.location) {
-      throw new Error(response);
-    }
-
-    console.log('payments/redirect', paymentId, response.headers?.location);
-    return reply.redirect(response.headers.location);
-  }
-  catch (err) {
-    console.error('payments/error', JSON.stringify(logObj), err.toString(), err.stack);
-    return { error: err.toString(), status: 500 };
-  }
+  // link to payment service
+  return reply.redirect(result);
 }