@unchainedshop/plugins 2.8.8 → 2.8.10

package/src/payment/payrexx/middleware.ts

@@ -22,17 +22,18 @@ 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 event state`, {
-      type: Object.keys(request.body).join(','),
-    });
+    logger.verbose(`unhandled transaction state: ${transaction.status}`);
     response.writeHead(200);
     response.end(
       JSON.stringify({
         ignored: true,
-        message: `Unhandled event state: transaction.confirmed`,
+        message: `Unhandled transaction state: ${transaction.status}`,
       }),
     );
     return;
@@ -42,37 +43,62 @@ export const payrexxHandler = async (request, response) => {
     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}`);
-    }
-    const order = await modules.orders.checkout(
-      orderPayment.orderId,
-      {
-        paymentContext: {
-          gatewayId: invoice.paymentRequestId,
+    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',
+        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, {
       transactionId: transaction.id,

package/src/payment/payrexx/payrexx.ts

@@ -1,12 +1,19 @@
-export const mapOrderDataToGatewayObject = ({ order, orderPayment, pricing }, options = {}) => {
+const getRedirects = () => {
   const {
-    EMAIL_WEBSITE_NAME = 'Unchained',
     EMAIL_WEBSITE_URL,
     DATATRANS_SUCCESS_PATH = '/payrexx/success',
     DATATRANS_ERROR_PATH = '/payrexx/error',
     DATATRANS_CANCEL_PATH = '/payrexx/cancel',
   } = process.env;
 
+  return {
+    successRedirectUrl: `${EMAIL_WEBSITE_URL}${DATATRANS_SUCCESS_PATH}`,
+    failedRedirectUrl: `${EMAIL_WEBSITE_URL}${DATATRANS_ERROR_PATH}`,
+    cancelRedirectUrl: `${EMAIL_WEBSITE_URL}${DATATRANS_CANCEL_PATH}`,
+  };
+};
+
+export const mapOrderDataToGatewayObject = ({ order, orderPayment, pricing }, options = {}) => {
   const { currency, amount } = pricing.total({ useNetPrice: false });
 
   const customerData = {};
@@ -23,16 +30,36 @@ export const mapOrderDataToGatewayObject = ({ order, orderPayment, pricing }, op
   const gatewayObject = {
     amount: Math.round(amount),
     currency: currency.toUpperCase(),
-    purpose: encodeURIComponent(`${EMAIL_WEBSITE_NAME} #${order._id}`),
-    // preAuthorization: true -> tokenization!
+    purpose: encodeURIComponent(`${process.env.EMAIL_WEBSITE_NAME || 'Unchained'} #${order._id}`),
     reservation: true,
     skipResultPage: true,
-    successRedirectUrl: `${EMAIL_WEBSITE_URL}${DATATRANS_SUCCESS_PATH}`,
-    failedRedirectUrl: `${EMAIL_WEBSITE_URL}${DATATRANS_ERROR_PATH}`,
-    cancelRedirectUrl: `${EMAIL_WEBSITE_URL}${DATATRANS_CANCEL_PATH}`,
+    ...getRedirects(),
     referenceId: orderPayment._id,
     ...customerData,
     ...options,
   };
   return gatewayObject;
 };
+
+export const mapUserToGatewayObject = ({ userId, emailAddress, currencyCode }, options = {}) => {
+  const customerData = {};
+
+  if (emailAddress) {
+    customerData['fields[email][value]'] = emailAddress;
+  }
+
+  customerData['fields[custom_field_1][name][0]'] = 'userId';
+  customerData['fields[custom_field_1][value]'] = userId;
+
+  const gatewayObject = {
+    amount: Math.round(0),
+    currency: currencyCode,
+    purpose: encodeURIComponent(`${process.env.EMAIL_WEBSITE_NAME || 'Unchained'} ${userId}`),
+    preAuthorization: true,
+    skipResultPage: true,
+    ...getRedirects(),
+    referenceId: userId,
+    ...options,
+  };
+  return gatewayObject;
+};