@unchainedshop/plugins 2.8.7 → 2.8.10

package/lib/payment/datatrans-v2/api/makeFetcher.d.ts

@@ -1,3 +1,3 @@
 /// <reference lib="dom" />
-declare const _default: (endpoint: string, merchantId: string, secret: string) => (path: string, body: unknown) => Promise<Response>;
+declare const _default: (endpoint: string, merchantId: string, secret: string) => ((path: string, body: unknown) => Promise<Response>);
 export default _default;

package/lib/payment/datatrans-v2/middleware.js

@@ -30,7 +30,7 @@ export const datatransHandler = async (req, res) => {
             try {
                 if (transaction.type === 'card_check') {
                     const paymentProviderId = referenceId;
-                    const paymentCredentials = await modules.payment.registerCredentials(paymentProviderId, { userId, transactionContext: { transactionId: transaction.transactionId } }, { ...resolvedContext });
+                    const paymentCredentials = await modules.payment.registerCredentials(paymentProviderId, { userId, transactionContext: { transactionId: transaction.transactionId } }, resolvedContext);
                     logger.info(`registered payment credentials for ${userId}`, {
                         userId,
                     });

package/lib/payment/datatrans-v2/middleware.js.map

@@ -1 +1 @@
-{"version":3,"file":"middleware.js","sourceRoot":"","sources":["../../../src/payment/datatrans-v2/middleware.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"middleware.js","sourceRoot":"","sources":["../../../src/payment/datatrans-v2/middleware.ts"],"names":[],"mappings":"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"}

package/lib/payment/payrexx/api/index.d.ts

@@ -25,8 +25,6 @@ export type GatewayObject = {
 };
 export type TransactionObject = any;
 declare const createPayrexxAPI: (instance: string, secret: string) => {
-    buildSignature(query?: string): Promise<string>;
-    buildUrl(path: any, params?: {}): string;
     chargePreAuthorized(id: any, params: any): Promise<any>;
     deleteReservation(id: any): Promise<any>;
     getGateway(id: any): Promise<GatewayObject>;

package/lib/payment/payrexx/api/index.js

@@ -1,3 +1,4 @@
+import makeFetcher from './makeFetcher.js';
 const baseUrl = 'https://api.payrexx.com/v1.0/';
 export var GatewayObjectStatus;
 (function (GatewayObjectStatus) {
@@ -14,78 +15,41 @@ export var GatewayObjectStatus;
     GatewayObjectStatus["error"] = "error";
     GatewayObjectStatus["uncaptured"] = "_";
 })(GatewayObjectStatus || (GatewayObjectStatus = {}));
-const createPayrexxAPI = (instance, secret) => ({
-    async buildSignature(query = '') {
-        const key = await crypto.subtle.importKey('raw', new TextEncoder().encode(secret), { name: 'HMAC', hash: 'SHA-256' }, false, ['sign', 'verify']);
-        const signature = await crypto.subtle.sign('HMAC', key, new TextEncoder().encode(query));
-        return btoa(String.fromCharCode(...new Uint8Array(signature)));
-    },
-    buildUrl(path, params = {}) {
-        const url = new URL(path, baseUrl);
-        url.search = new URLSearchParams({ instance, ...params }).toString();
-        return url.href;
-    },
-    async chargePreAuthorized(id, params) {
-        const queryParams = { ...params };
-        const signature = await this.buildSignature(new URLSearchParams(queryParams).toString());
-        queryParams.ApiSignature = signature;
-        const url = this.buildUrl(`Transaction/${id}/`);
-        const result = await fetch(url, {
-            method: 'POST',
-            body: new URLSearchParams(queryParams).toString(),
-            headers: {
-                accept: 'application/json',
-                'content-type': 'application/x-www-form-urlencoded',
-            },
-        });
-        if (result.ok) {
-            return result.json();
-        }
-        throw new Error(await result.text());
-    },
-    async deleteReservation(id) {
-        const url = this.buildUrl(`Transaction/${id}/`, { ApiSignature: await this.buildSignature() });
-        const result = await fetch(url, {
-            method: 'DELETE',
-            headers: {
-                accept: 'application/json',
-                'content-type': 'application/x-www-form-urlencoded',
-            },
-        });
-        if (result.ok) {
-            return result.json();
-        }
-        throw new Error(await result.text());
-    },
-    async getGateway(id) {
-        const url = this.buildUrl(`Gateway/${id}/`, { ApiSignature: await this.buildSignature() });
-        const result = await fetch(url);
-        if (!result.ok)
+const createPayrexxAPI = (instance, secret) => {
+    const fetchPayrexx = makeFetcher(baseUrl, instance, secret);
+    return {
+        async chargePreAuthorized(id, params) {
+            const result = await fetchPayrexx(`Transaction/${id}`, 'POST', params);
+            if (result.ok) {
+                return result.json();
+            }
             throw new Error(await result.text());
-        const { status, data } = await result.json();
-        if (status !== 'success')
-            return null;
-        return data?.[0];
-    },
-    async createGateway(params) {
-        const queryParams = { ...params };
-        const signature = await this.buildSignature(new URLSearchParams(queryParams).toString());
-        queryParams.ApiSignature = signature;
-        const url = this.buildUrl('Gateway/');
-        const result = await fetch(url, {
-            method: 'POST',
-            body: new URLSearchParams(queryParams).toString(),
-            headers: {
-                accept: 'application/json',
-                'content-type': 'application/x-www-form-urlencoded',
-            },
-        });
-        if (result.ok) {
-            return result.json();
-        }
-        throw new Error(await result.text());
-    },
-});
+        },
+        async deleteReservation(id) {
+            const result = await fetchPayrexx(`Transaction/${id}`, 'DELETE');
+            if (result.ok) {
+                return result.json();
+            }
+            throw new Error(await result.text());
+        },
+        async getGateway(id) {
+            const result = await fetchPayrexx(`Gateway/${id}`, 'GET');
+            if (!result.ok)
+                throw new Error(await result.text());
+            const { status, data } = await result.json();
+            if (status !== 'success')
+                return null;
+            return data?.[0];
+        },
+        async createGateway(params) {
+            const result = await fetchPayrexx('Gateway', 'POST', params);
+            if (result.ok) {
+                return result.json();
+            }
+            throw new Error(await result.text());
+        },
+    };
+};
 export default createPayrexxAPI;
 // where you want to consume the payrexx module:
 // const payrexx = payrexx.init(instance, api_secret);

package/lib/payment/payrexx/api/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/payment/payrexx/api/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/payment/payrexx/api/index.ts"],"names":[],"mappings":"AAAA,OAAO,WAAW,MAAM,kBAAkB,CAAC;AAE3C,MAAM,OAAO,GAAG,+BAA+B,CAAC;AAEhD,MAAM,CAAN,IAAY,mBAaX;AAbD,WAAY,mBAAmB;IAC7B,0CAAmB,CAAA;IACnB,8CAAuB,CAAA;IACvB,8CAAuB,CAAA;IACvB,4CAAqB,CAAA;IACrB,gDAAyB,CAAA;IACzB,4CAAqB,CAAA;IACrB,4CAAqB,CAAA;IACrB,sDAA+B,CAAA;IAC/B,gEAA2C,CAAA;IAC3C,gDAAyB,CAAA;IACzB,sCAAe,CAAA;IACf,uCAAgB,CAAA;AAClB,CAAC,EAbW,mBAAmB,KAAnB,mBAAmB,QAa9B;AAgBD,MAAM,gBAAgB,GAAG,CAAC,QAAgB,EAAE,MAAc,EAAE,EAAE;IAC5D,MAAM,YAAY,GAAG,WAAW,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;IAE5D,OAAO;QACL,KAAK,CAAC,mBAAmB,CAAC,EAAE,EAAE,MAAM;YAClC,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,eAAe,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;YACvE,IAAI,MAAM,CAAC,EAAE,EAAE,CAAC;gBACd,OAAO,MAAM,CAAC,IAAI,EAAE,CAAC;YACvB,CAAC;YACD,MAAM,IAAI,KAAK,CAAC,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;QACvC,CAAC;QAED,KAAK,CAAC,iBAAiB,CAAC,EAAE;YACxB,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,eAAe,EAAE,EAAE,EAAE,QAAQ,CAAC,CAAC;YACjE,IAAI,MAAM,CAAC,EAAE,EAAE,CAAC;gBACd,OAAO,MAAM,CAAC,IAAI,EAAE,CAAC;YACvB,CAAC;YACD,MAAM,IAAI,KAAK,CAAC,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;QACvC,CAAC;QAED,KAAK,CAAC,UAAU,CAAC,EAAE;YACjB,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,WAAW,EAAE,EAAE,EAAE,KAAK,CAAC,CAAC;YAC1D,IAAI,CAAC,MAAM,CAAC,EAAE;gBAAE,MAAM,IAAI,KAAK,CAAC,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;YACrD,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC;YAC7C,IAAI,MAAM,KAAK,SAAS;gBAAE,OAAO,IAAI,CAAC;YACtC,OAAO,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QACnB,CAAC;QAED,KAAK,CAAC,aAAa,CAAC,MAAM;YACxB,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;YAC7D,IAAI,MAAM,CAAC,EAAE,EAAE,CAAC;gBACd,OAAO,MAAM,CAAC,IAAI,EAAE,CAAC;YACvB,CAAC;YACD,MAAM,IAAI,KAAK,CAAC,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;QACvC,CAAC;KACF,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,gBAAgB,CAAC;AAEhC,gDAAgD;AAChD,sDAAsD;AACtD,iDAAiD;AACjD,iBAAiB;AACjB,4BAA4B;AAC5B,MAAM;AAEN,iCAAiC;AACjC,2CAA2C;AAC3C,qCAAqC;AACrC,IAAI"}

package/lib/payment/payrexx/api/makeFetcher.d.ts

@@ -0,0 +1,3 @@
+/// <reference lib="dom" />
+declare const _default: (baseUrl?: string, instance?: string, secret?: string) => ((path: string, method: 'GET' | 'DELETE' | 'PUT' | 'POST', data?: any) => Promise<Response>);
+export default _default;

package/lib/payment/payrexx/api/makeFetcher.js

@@ -0,0 +1,72 @@
+/// <reference lib="dom" />
+import fs from 'fs';
+import util from 'util';
+import { resolve } from 'path';
+import { createLogger } from '@unchainedshop/logger';
+const readFile = util.promisify(fs.readFile);
+const { PAYREXX_API_MOCKS_PATH } = process.env;
+const logger = createLogger('unchained:payrexx');
+export default (baseUrl = 'https://api.payrexx.com/v1.0/', instance = null, secret = null) => {
+    if (PAYREXX_API_MOCKS_PATH) {
+        return async (path) => {
+            try {
+                const filePath = resolve(process.env.PWD, PAYREXX_API_MOCKS_PATH, `${path}.json`);
+                const content = await readFile(filePath);
+                const textData = content.toString();
+                const jsonData = JSON.parse(textData);
+                return {
+                    json: async () => jsonData,
+                    text: async () => textData,
+                    ok: !jsonData?.error,
+                    status: jsonData?.error ? 500 : 204,
+                };
+            }
+            catch (error) {
+                logger.error('Mock: Error while trying reading and parsing file', {
+                    ...error,
+                });
+                return {
+                    json: async () => ({ error: { code: 'MOCK', message: 'MOCK' } }),
+                    text: async () => 'MOCK',
+                    ok: false,
+                    status: 500,
+                };
+            }
+        };
+    }
+    const buildSignature = async (query = '') => {
+        const key = await crypto.subtle.importKey('raw', new TextEncoder().encode(secret), { name: 'HMAC', hash: 'SHA-256' }, false, ['sign', 'verify']);
+        const signature = await crypto.subtle.sign('HMAC', key, new TextEncoder().encode(query));
+        return btoa(String.fromCharCode(...new Uint8Array(signature)));
+    };
+    const buildUrl = (path, params = {}) => {
+        const url = new URL(`${path}/`, baseUrl);
+        url.search = new URLSearchParams({ instance, ...params }).toString();
+        return url.href;
+    };
+    return async (path, method, data) => {
+        logger.verbose(`${method} ${path}`);
+        if (method === 'POST') {
+            const queryParams = { ...data };
+            const signature = await buildSignature(new URLSearchParams(queryParams).toString());
+            queryParams.ApiSignature = signature;
+            const url = buildUrl(path);
+            return fetch(url, {
+                method,
+                body: new URLSearchParams(queryParams).toString(),
+                headers: {
+                    accept: 'application/json',
+                    'content-type': 'application/x-www-form-urlencoded',
+                },
+            });
+        }
+        if (method === 'DELETE' || method === 'GET') {
+            const url = buildUrl(path, { ApiSignature: await buildSignature() });
+            return fetch(url, {
+                method,
+            });
+        }
+        throw new Error('Method not supported');
+    };
+};
+//# sourceMappingURL=makeFetcher.js.map

package/lib/payment/payrexx/api/makeFetcher.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"makeFetcher.js","sourceRoot":"","sources":["../../../../src/payment/payrexx/api/makeFetcher.ts"],"names":[],"mappings":"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"}

package/lib/payment/payrexx/index.js

@@ -1,6 +1,6 @@
 import { PaymentAdapter, PaymentDirector, PaymentError } from '@unchainedshop/core-payment';
 import { createLogger } from '@unchainedshop/logger';
-import { mapOrderDataToGatewayObject } from './payrexx.js';
+import { mapOrderDataToGatewayObject, mapUserToGatewayObject } from './payrexx.js';
 import createPayrexxAPI, { GatewayObjectStatus } from './api/index.js';
 export * from './middleware.js';
 const logger = createLogger('unchained:core-payment:payrexx');
@@ -37,21 +37,46 @@ const Payrexx = {
             isPayLaterAllowed() {
                 return false;
             },
-            validate: async () => {
-                throw new Error('Token Registration Flow not implemented yet');
-            },
-            register: async () => {
-                throw new Error('Token Registration Flow not implemented yet');
-            },
             sign: async (transactionContext = {}) => {
-                const { orderPayment, order } = params.paymentContext;
+                const { orderPayment, userId, order } = params.paymentContext;
                 if (orderPayment) {
+                    // Order Checkout signing (One-time payment)
                     const pricing = await modules.orders.pricingSheet(order);
                     const gatewayObject = mapOrderDataToGatewayObject({ order, orderPayment, pricing }, transactionContext);
                     const gateway = await api.createGateway(gatewayObject);
                     return JSON.stringify(gateway);
                 }
-                throw new Error('Token Registration Flow not implemented yet');
+                // Payment Credential Registration signing
+                const user = await modules.users.findUserById(userId);
+                const emailAddress = modules.users.primaryEmail(user)?.address;
+                const gateway = await api.createGateway(mapUserToGatewayObject({
+                    userId,
+                    emailAddress,
+                    currencyCode: 'CHF',
+                }));
+                return JSON.stringify(gateway);
+            },
+            // async validate(credentials) {
+            //   if (!credentials.meta) return false;
+            //   const { objectKey, currency } = credentials.meta;
+            //   const result = await api().validate({
+            //     refno: Buffer.from(`valid-${new Date().getTime()}`, 'hex').toString('base64'),
+            //     currency,
+            //     [objectKey]: JSON.parse(credentials.token),
+            //   });
+            //   return Boolean((result as ValidateResponseSuccess)?.transactionId);
+            // },
+            async register(transactionResponse) {
+                // const { transactionId } = transactionResponse;
+                console.log({ transactionResponse });
+                throw new Error('Not implemented');
+                // const result = (await api().status({
+                //   transactionId,
+                // })) as StatusResponseSuccess;
+                // if (result.transactionId) {
+                //   return parseRegistrationData(result);
+                // }
+                return null;
             },
             async confirm() {
                 const { orderPayment } = params.paymentContext;
@@ -63,13 +88,17 @@ const Payrexx = {
                 if (!gatewayObject) {
                     return false;
                 }
-                if (gatewayObject.status === GatewayObjectStatus.authorized ||
-                    gatewayObject.status === GatewayObjectStatus.reserved) {
+                if (
+                // gatewayObject.status === GatewayObjectStatus.authorized || // authorized is only used for tokenization!
+                gatewayObject.status === GatewayObjectStatus.reserved) {
                     const allTransactions = gatewayObject.invoices?.flatMap((invoice) => invoice.transactions);
-                    await Promise.all(allTransactions.map(async (transaction) => api.chargePreAuthorized(transaction.id, {})));
+                    await Promise.all(allTransactions.map(async (transaction) => api.chargePreAuthorized(transaction.id, { referenceId: '__IGNORE_WEBHOOK__' })));
                     return true;
                 }
-                return false;
+                if (gatewayObject.status === GatewayObjectStatus.confirmed) {
+                    return true; // already confirmed, no need to confirm
+                }
+                return false; // some other status with refund or anything, can't confirm!
             },
             async cancel() {
                 const { orderPayment } = params.paymentContext;
@@ -86,7 +115,10 @@ const Payrexx = {
                     await Promise.all(allTransactions.map(async (transaction) => api.deleteReservation(transaction.id)));
                     return true;
                 }
-                return false;
+                if (gatewayObject.status === GatewayObjectStatus.confirmed) {
+                    return false; // already confirmed, can't cancel anymore
+                }
+                return true; // some other status with refund or anything, no need to cancel
             },
             charge: async ({ gatewayId, paymentCredentials }) => {
                 if (!gatewayId && !paymentCredentials) {
@@ -102,22 +134,18 @@ const Payrexx = {
                 }
                 const pricing = await modules.orders.pricingSheet(order);
                 const { currency, amount } = pricing.total({ useNetPrice: false });
-                if (gatewayObject.currency !== currency.toUpperCase() ||
-                    gatewayObject.amount !== Math.round(amount)) {
-                    throw new Error('The price has changed since the intent has been created');
-                }
-                if (gatewayObject.referenceId !== orderPayment?._id) {
-                    throw new Error('The order payment is different from the initiating intent');
-                }
-                switch (gatewayObject.status) {
-                    case GatewayObjectStatus.waiting:
-                        logger.verbose('Charge postponed because Gateway is pending', {
-                            orderPaymentId: gatewayObject.referenceId,
-                        });
-                        return false;
-                    case GatewayObjectStatus.authorized:
-                    case GatewayObjectStatus.reserved:
-                    case GatewayObjectStatus.confirmed:
+                if (
+                // gatewayObject.status === 'authorized' || // authorized is only used for tokenization!
+                gatewayObject.status === 'reserved' ||
+                    gatewayObject.status === 'confirmed') {
+                    try {
+                        if (gatewayObject.currency !== currency.toUpperCase() ||
+                            gatewayObject.amount !== Math.round(amount)) {
+                            throw new Error('The price has changed since the intent has been created');
+                        }
+                        if (gatewayObject.referenceId !== orderPayment?._id) {
+                            throw new Error('The order payment is different from the initiating intent');
+                        }
                         // confirm will do the transition, to do a checkout those stati above are fine
                         logger.verbose(`Mark as charged, status is ${gatewayObject.status}`, {
                             orderPaymentId: gatewayObject.referenceId,
@@ -126,13 +154,21 @@ const Payrexx = {
                             transactionId: gatewayId,
                             gatewayObject,
                         };
-                    default:
-                        logger.verbose('Charge not possible', {
-                            orderPaymentId: gatewayObject.referenceId,
-                            status: gatewayObject.status,
-                        });
-                        throw new Error(`Gateway Status ${gatewayObject.status} does not allow checkout`);
+                    }
+                    catch (e) {
+                        if (gatewayObject.status === GatewayObjectStatus.reserved) {
+                            // Cancel the reservation if it's reserved and the order has been manipulated
+                            const allTransactions = gatewayObject.invoices?.flatMap((invoice) => invoice.transactions);
+                            await Promise.all(allTransactions.map(async (transaction) => api.deleteReservation(transaction.id)));
+                        }
+                        throw e;
+                    }
                 }
+                logger.verbose('Charge not possible', {
+                    orderPaymentId: gatewayObject.referenceId,
+                    status: gatewayObject.status,
+                });
+                throw new Error(`Gateway Status ${gatewayObject.status} does not allow checkout`);
             },
         };
         return adapterActions;

package/lib/payment/payrexx/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/payment/payrexx/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/payment/payrexx/index.ts"],"names":[],"mappings":"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"}

package/lib/payment/payrexx/middleware.js

@@ -15,39 +15,66 @@ export const payrexxHandler = async (request, response) => {
         }));
         return;
     }
-    if (transaction.status === 'confirmed') {
+    if ((transaction.status === 'confirmed' && transaction.referenceId === '__IGNORE_WEBHOOK__') ||
+        transaction.status === 'waiting') {
         // Ignore confirmed transactions, because those hooks are generated through calling the confirm()
         // method in the payment adapter and could lead to double bookings.
+        logger.verbose(`unhandled transaction state: ${transaction.status}`);
+        response.writeHead(200);
+        response.end(JSON.stringify({
+            ignored: true,
+            message: `Unhandled transaction state: ${transaction.status}`,
+        }));
+        return;
     }
     logger.verbose(`Processing event`, {
         transactionId: transaction.id,
     });
     try {
-        const { referenceId: orderPaymentId, invoice } = transaction;
-        logger.verbose(`checkout with orderPaymentId: ${orderPaymentId}`);
-        await modules.orders.payments.logEvent(orderPaymentId, {
-            transactionId: transaction.id,
-        });
-        const orderPayment = await modules.orders.payments.findOrderPayment({
-            orderPaymentId,
-        });
-        if (!orderPayment) {
-            throw new Error(`order payment not found with orderPaymentId: ${orderPaymentId}`);
+        if (transaction.preAuthorizationId) {
+            // Pre-Authorization Flow, referenceId is a userId
+            const { referenceId: paymentProviderId, invoice } = transaction;
+            const userId = '';
+            logger.verbose(`register credentials for: ${userId}`);
+            await modules.payment.registerCredentials(paymentProviderId, { userId, transactionContext: { gatewayId: invoice.paymentRequestId } }, resolvedContext);
+            logger.info(`registration successful`, {
+                paymentProviderId,
+                userId,
+            });
+            response.writeHead(200);
+            response.end(JSON.stringify({
+                message: 'registration successful',
+                paymentProviderId,
+                userId,
+            }));
+        }
+        else {
+            const { referenceId: orderPaymentId, invoice } = transaction;
+            logger.verbose(`checkout with orderPaymentId: ${orderPaymentId}`);
+            await modules.orders.payments.logEvent(orderPaymentId, {
+                transactionId: transaction.id,
+            });
+            const orderPayment = await modules.orders.payments.findOrderPayment({
+                orderPaymentId,
+            });
+            if (!orderPayment) {
+                throw new Error(`order payment not found with orderPaymentId: ${orderPaymentId}`);
+            }
+            const order = await modules.orders.checkout(orderPayment.orderId, {
+                paymentContext: {
+                    gatewayId: invoice.paymentRequestId,
+                },
+            }, resolvedContext);
+            logger.info(`checkout successful`, {
+                orderPaymentId,
+                orderId: order._id,
+            });
+            response.writeHead(200);
+            response.end(JSON.stringify({
+                message: 'checkout successful',
+                orderId: order._id,
+            }));
         }
-        const order = await modules.orders.checkout(orderPayment.orderId, {
-            paymentContext: {
-                gatewayId: invoice.paymentRequestId,
-            },
-        }, resolvedContext);
-        logger.info(`checkout successful`, {
-            orderPaymentId,
-            orderId: order._id,
-        });
-        response.writeHead(200);
-        response.end(JSON.stringify({
-            message: 'checkout successful',
-            orderId: order._id,
-        }));
     }
     catch (error) {
         logger.error(error, {

package/lib/payment/payrexx/middleware.js.map

@@ -1 +1 @@
-{"version":3,"file":"middleware.js","sourceRoot":"","sources":["../../../src/payment/payrexx/middleware.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD,MAAM,MAAM,GAAG,YAAY,CAAC,wCAAwC,CAAC,CAAC;AAEtE,MAAM,CAAC,MAAM,cAAc,GAAG,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE;IACxD,MAAM,eAAe,GAAG,OAAO,CAAC,gBAA2B,CAAC;IAC5D,MAAM,EAAE,OAAO,EAAE,GAAG,eAAe,CAAC;IAEpC,MAAM,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAErC,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,MAAM,CAAC,OAAO,CAAC,sBAAsB,EAAE;YACrC,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;SAC1C,CAAC,CAAC;QACH,QAAQ,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;QACxB,QAAQ,CAAC,GAAG,CACV,IAAI,CAAC,SAAS,CAAC;YACb,OAAO,EAAE,IAAI;YACb,OAAO,EAAE,yBAAyB,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,+BAA+B;SACrG,CAAC,CACH,CAAC;QACF,OAAO;IACT,CAAC;IACD,IAAI,WAAW,CAAC,MAAM,KAAK,WAAW,EAAE,CAAC;QACvC,iGAAiG;QACjG,mEAAmE;IACrE,CAAC;IAED,MAAM,CAAC,OAAO,CAAC,kBAAkB,EAAE;QACjC,aAAa,EAAE,WAAW,CAAC,EAAE;KAC9B,CAAC,CAAC;IACH,IAAI,CAAC;QACH,MAAM,EAAE,WAAW,EAAE,cAAc,EAAE,OAAO,EAAE,GAAG,WAAW,CAAC;QAC7D,MAAM,CAAC,OAAO,CAAC,iCAAiC,cAAc,EAAE,CAAC,CAAC;QAClE,MAAM,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,cAAc,EAAE;YACrD,aAAa,EAAE,WAAW,CAAC,EAAE;SAC9B,CAAC,CAAC;QACH,MAAM,YAAY,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAAC;YAClE,cAAc;SACf,CAAC,CAAC;QACH,IAAI,CAAC,YAAY,EAAE,CAAC;YAClB,MAAM,IAAI,KAAK,CAAC,gDAAgD,cAAc,EAAE,CAAC,CAAC;QACpF,CAAC;QACD,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,QAAQ,CACzC,YAAY,CAAC,OAAO,EACpB;YACE,cAAc,EAAE;gBACd,SAAS,EAAE,OAAO,CAAC,gBAAgB;aACpC;SACF,EACD,eAAe,CAChB,CAAC;QACF,MAAM,CAAC,IAAI,CAAC,qBAAqB,EAAE;YACjC,cAAc;YACd,OAAO,EAAE,KAAK,CAAC,GAAG;SACnB,CAAC,CAAC;QACH,QAAQ,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;QACxB,QAAQ,CAAC,GAAG,CACV,IAAI,CAAC,SAAS,CAAC;YACb,OAAO,EAAE,qBAAqB;YAC9B,OAAO,EAAE,KAAK,CAAC,GAAG;SACnB,CAAC,CACH,CAAC;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,CAAC,KAAK,CAAC,KAAK,EAAE;YAClB,aAAa,EAAE,WAAW,CAAC,EAAE;SAC9B,CAAC,CAAC;QACH,QAAQ,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;QACxB,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IAC9B,CAAC;AACH,CAAC,CAAC"}
+{"version":3,"file":"middleware.js","sourceRoot":"","sources":["../../../src/payment/payrexx/middleware.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD,MAAM,MAAM,GAAG,YAAY,CAAC,wCAAwC,CAAC,CAAC;AAEtE,MAAM,CAAC,MAAM,cAAc,GAAG,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE;IACxD,MAAM,eAAe,GAAG,OAAO,CAAC,gBAA2B,CAAC;IAC5D,MAAM,EAAE,OAAO,EAAE,GAAG,eAAe,CAAC;IAEpC,MAAM,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAErC,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,MAAM,CAAC,OAAO,CAAC,sBAAsB,EAAE;YACrC,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;SAC1C,CAAC,CAAC;QACH,QAAQ,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;QACxB,QAAQ,CAAC,GAAG,CACV,IAAI,CAAC,SAAS,CAAC;YACb,OAAO,EAAE,IAAI;YACb,OAAO,EAAE,yBAAyB,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,+BAA+B;SACrG,CAAC,CACH,CAAC;QACF,OAAO;IACT,CAAC;IACD,IACE,CAAC,WAAW,CAAC,MAAM,KAAK,WAAW,IAAI,WAAW,CAAC,WAAW,KAAK,oBAAoB,CAAC;QACxF,WAAW,CAAC,MAAM,KAAK,SAAS,EAChC,CAAC;QACD,iGAAiG;QACjG,mEAAmE;QACnE,MAAM,CAAC,OAAO,CAAC,gCAAgC,WAAW,CAAC,MAAM,EAAE,CAAC,CAAC;QACrE,QAAQ,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;QACxB,QAAQ,CAAC,GAAG,CACV,IAAI,CAAC,SAAS,CAAC;YACb,OAAO,EAAE,IAAI;YACb,OAAO,EAAE,gCAAgC,WAAW,CAAC,MAAM,EAAE;SAC9D,CAAC,CACH,CAAC;QACF,OAAO;IACT,CAAC;IAED,MAAM,CAAC,OAAO,CAAC,kBAAkB,EAAE;QACjC,aAAa,EAAE,WAAW,CAAC,EAAE;KAC9B,CAAC,CAAC;IACH,IAAI,CAAC;QACH,IAAI,WAAW,CAAC,kBAAkB,EAAE,CAAC;YACnC,kDAAkD;YAClD,MAAM,EAAE,WAAW,EAAE,iBAAiB,EAAE,OAAO,EAAE,GAAG,WAAW,CAAC;YAChE,MAAM,MAAM,GAAG,EAAE,CAAC;YAClB,MAAM,CAAC,OAAO,CAAC,6BAA6B,MAAM,EAAE,CAAC,CAAC;YACtD,MAAM,OAAO,CAAC,OAAO,CAAC,mBAAmB,CACvC,iBAAiB,EACjB,EAAE,MAAM,EAAE,kBAAkB,EAAE,EAAE,SAAS,EAAE,OAAO,CAAC,gBAAgB,EAAE,EAAE,EACvE,eAAe,CAChB,CAAC;YACF,MAAM,CAAC,IAAI,CAAC,yBAAyB,EAAE;gBACrC,iBAAiB;gBACjB,MAAM;aACP,CAAC,CAAC;YACH,QAAQ,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;YACxB,QAAQ,CAAC,GAAG,CACV,IAAI,CAAC,SAAS,CAAC;gBACb,OAAO,EAAE,yBAAyB;gBAClC,iBAAiB;gBACjB,MAAM;aACP,CAAC,CACH,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,MAAM,EAAE,WAAW,EAAE,cAAc,EAAE,OAAO,EAAE,GAAG,WAAW,CAAC;YAC7D,MAAM,CAAC,OAAO,CAAC,iCAAiC,cAAc,EAAE,CAAC,CAAC;YAClE,MAAM,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,cAAc,EAAE;gBACrD,aAAa,EAAE,WAAW,CAAC,EAAE;aAC9B,CAAC,CAAC;YACH,MAAM,YAAY,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAAC;gBAClE,cAAc;aACf,CAAC,CAAC;YACH,IAAI,CAAC,YAAY,EAAE,CAAC;gBAClB,MAAM,IAAI,KAAK,CAAC,gDAAgD,cAAc,EAAE,CAAC,CAAC;YACpF,CAAC;YAED,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,QAAQ,CACzC,YAAY,CAAC,OAAO,EACpB;gBACE,cAAc,EAAE;oBACd,SAAS,EAAE,OAAO,CAAC,gBAAgB;iBACpC;aACF,EACD,eAAe,CAChB,CAAC;YACF,MAAM,CAAC,IAAI,CAAC,qBAAqB,EAAE;gBACjC,cAAc;gBACd,OAAO,EAAE,KAAK,CAAC,GAAG;aACnB,CAAC,CAAC;YACH,QAAQ,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;YACxB,QAAQ,CAAC,GAAG,CACV,IAAI,CAAC,SAAS,CAAC;gBACb,OAAO,EAAE,qBAAqB;gBAC9B,OAAO,EAAE,KAAK,CAAC,GAAG;aACnB,CAAC,CACH,CAAC;QACJ,CAAC;IACH,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,CAAC,KAAK,CAAC,KAAK,EAAE;YAClB,aAAa,EAAE,WAAW,CAAC,EAAE;SAC9B,CAAC,CAAC;QACH,QAAQ,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;QACxB,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IAC9B,CAAC;AACH,CAAC,CAAC"}

package/lib/payment/payrexx/payrexx.d.ts

@@ -3,13 +3,28 @@ export declare const mapOrderDataToGatewayObject: ({ order, orderPayment, pricin
     orderPayment: any;
     pricing: any;
 }, options?: {}) => {
+    referenceId: any;
+    successRedirectUrl: string;
+    failedRedirectUrl: string;
+    cancelRedirectUrl: string;
     amount: number;
     currency: any;
     purpose: string;
     reservation: boolean;
     skipResultPage: boolean;
+};
+export declare const mapUserToGatewayObject: ({ userId, emailAddress, currencyCode }: {
+    userId: any;
+    emailAddress: any;
+    currencyCode: any;
+}, options?: {}) => {
+    referenceId: any;
     successRedirectUrl: string;
     failedRedirectUrl: string;
     cancelRedirectUrl: string;
-    referenceId: any;
+    amount: number;
+    currency: any;
+    purpose: string;
+    preAuthorization: boolean;
+    skipResultPage: boolean;
 };