@unchainedshop/plugins 4.0.0-rc.15 → 4.0.0-rc.16

package/src/files/gridfs/handler-express.ts

@@ -34,8 +34,7 @@ const gridfsHandler = async (
     res.setHeader('Access-Control-Allow-Origin', '*');
 
     if (req.method === 'OPTIONS') {
-      res.statusCode = 200;
-      res.end();
+      res.status(200).end();
       return;
     }
 
@@ -46,8 +45,7 @@ const gridfsHandler = async (
       if ((await sign(directoryName, fileId, expiryDate.getTime())) === signature) {
         const file = await modules.files.findFile({ fileId });
         if (file.expires === null) {
-          res.statusCode = 400;
-          res.end('File already linked');
+          res.status(400).send('File already linked');
           return;
         }
         // If the type is octet-stream, prefer mimetype lookup from the filename
@@ -77,12 +75,10 @@ const gridfsHandler = async (
         const { length } = writeStream;
         await services.files.linkFile({ fileId, size: length, type });
 
-        res.statusCode = 200;
-        res.end();
+        res.status(200).end();
         return;
       }
-      res.statusCode = 403;
-      res.end();
+      res.status(403).end();
       return;
     }
 
@@ -94,8 +90,7 @@ const gridfsHandler = async (
       if (fileDocument?.meta?.isPrivate) {
         const expiry = parseInt(expiryTimestamp as string, 10);
         if (expiry <= Date.now()) {
-          res.statusCode = 403;
-          res.end('Access restricted: Expired.');
+          res.status(403).send('Access restricted: Expired.');
           return;
         }
 
@@ -103,13 +98,11 @@ const gridfsHandler = async (
         const signedUrl = await fileUploadAdapter.createDownloadURL(fileDocument, expiry);
 
         if (new URL(signedUrl, 'file://').searchParams.get('s') !== signature) {
-          res.statusCode = 403;
-          res.end('Access restricted: Invalid signature.');
+          res.status(403).send('Access restricted: Invalid signature.');
           return;
         }
       } else if (!fileDocument) {
-        res.statusCode = 404;
-        res.end();
+        res.status(404).end();
         return;
       }
       if (file?.metadata?.['content-type']) {
@@ -122,21 +115,17 @@ const gridfsHandler = async (
       const readStream = await modules.gridfsFileUploads.createReadStream(directoryName, fileId);
       readStream.pipe(res, { end: false });
       await finished(readStream);
-      res.statusCode = 200;
-      res.end();
+      res.status(200).end();
       return;
     }
-    res.statusCode = 404;
-    res.end();
+    res.status(404).end();
   } catch (e) {
     if (e.code === 'ENOENT') {
       logger.warn(e);
-      res.statusCode = 404;
-      res.end(e.message);
+      res.status(404).send();
     } else {
       logger.warn(e);
-      res.statusCode = 503;
-      res.end(JSON.stringify({ name: e.name, code: e.code, message: e.message }));
+      res.status(503).send({ name: e.name, code: e.code, message: e.message });
     }
   }
 };

package/src/files/gridfs/handler-fastify.ts

@@ -41,7 +41,12 @@ const gridfsHandler: RouteHandlerMethod = async (
         const file = await modules.files.findFile({ fileId });
         if (file.expires === null) {
           reply.status(400);
-          return reply.send('File already linked');
+          logger.error('File already linked', { fileId });
+          return reply.send({
+            success: false,
+            message: 'File already linked',
+            name: 'FILE_ALREADY_LINKED',
+          });
         }
         // If the type is octet-stream, prefer mimetype lookup from the filename
         // Else prefer the content-type header
@@ -72,11 +77,20 @@ const gridfsHandler: RouteHandlerMethod = async (
         await services.files.linkFile({ fileId, size: length, type });
 
         reply.status(200);
-        return reply.send();
+        return reply.send({
+          success: true,
+          fileId,
+          size: length,
+          type,
+        });
       }
-
+      logger.error('Invalid signature', { fileId, expiryDate });
       reply.status(403);
-      return reply.send();
+      return reply.send({
+        success: false,
+        message: 'Access restricted: Invalid signature.',
+        name: 'INVALID_SIGNATURE',
+      });
     }
 
     if (req.method === 'GET') {
@@ -87,8 +101,13 @@ const gridfsHandler: RouteHandlerMethod = async (
       if (fileDocument?.meta?.isPrivate) {
         const expiry = parseInt(expiryTimestamp as string, 10);
         if (expiry <= Date.now()) {
+          logger.error('URL Expired', { fileId, expiry });
           reply.status(403);
-          return reply.send('Access restricted: Expired.');
+          return reply.send({
+            success: false,
+            message: 'Access restricted: URL expired.',
+            name: 'URL_EXPIRED',
+          });
         }
 
         const fileUploadAdapter = getFileAdapter();
@@ -96,9 +115,15 @@ const gridfsHandler: RouteHandlerMethod = async (
 
         if (new URL(signedUrl, 'file://').searchParams.get('s') !== signature) {
           reply.status(403);
-          return reply.send('Access restricted: Invalid signature.');
+          logger.error('Invalid signature', { fileId, expiry });
+          return reply.send({
+            success: false,
+            message: 'Access restricted: Invalid signature.',
+            name: 'INVALID_SIGNATURE',
+          });
         }
       } else if (!fileDocument) {
+        logger.error('File not found', { fileId });
         reply.status(404);
         return reply.send();
       }
@@ -119,14 +144,14 @@ const gridfsHandler: RouteHandlerMethod = async (
     reply.status(404);
     return reply.send();
   } catch (e) {
+    logger.error(e);
+
     if (e.code === 'ENOENT') {
-      logger.warn(e);
       reply.status(404);
-      return reply.send({ name: e.name, code: e.code, message: e.message });
+      return reply.send();
     } else {
-      logger.warn(e);
       reply.status(504);
-      return reply.send({ name: e.name, code: e.code, message: e.message });
+      return reply.send({ success: false, name: e.name, code: e.code, message: e.message });
     }
   }
 };

package/src/files/minio/handler-express.ts

@@ -21,17 +21,14 @@ const minioHandler = async (req, res) => {
         const [fileId] = object.key.split('.');
         const { services } = req.unchainedContext;
         await services.files.linkFile({ fileId, type, size });
-        res.writeHead(200);
-        res.end();
+        res.status(200).end();
         return;
       }
     }
-    res.writeHead(404);
-    res.end();
+    res.status(404).end();
   } catch (e) {
     logger.error(e);
-    res.writeHead(503);
-    res.end(JSON.stringify({ name: e.name, code: e.code, message: e.message }));
+    res.status(503).send({ name: e.name, code: e.code, message: e.message });
   }
 };
 

package/src/files/minio/handler-fastify.ts

@@ -37,7 +37,7 @@ const minioHandler: RouteHandlerMethod = async (
   } catch (e) {
     logger.error(e);
     res.status(503);
-    return res.send(JSON.stringify({ name: e.name, code: e.code, message: e.message }));
+    return res.send({ name: e.name, code: e.code, message: e.message });
   }
 };
 

package/src/payment/apple-iap/handler-express.ts

@@ -117,18 +117,15 @@ export const appleIAPHandler = async (req, res) => {
         logger.info(`Apple IAP Webhook: Updated enrollment from Apple`);
       }
 
-      res.writeHead(200);
-      res.end();
+      res.status(200).end();
       return;
     } catch (e) {
       logger.warn(`Apple IAP Webhook: ${e.message}`, e);
-      res.writeHead(503);
-      res.end(JSON.stringify({ name: e.name, code: e.code, message: e.message }));
+      res.status(503).send({ name: e.name, code: e.code, message: e.message });
       return;
     }
   }
-  res.writeHead(404);
-  res.end();
+  res.status(404).end();
 };
 
 export default appleIAPHandler;

package/src/payment/apple-iap/handler-fastify.ts

@@ -128,9 +128,9 @@ export const appleIAPHandler: RouteHandlerMethod = async (
     reply.status(200);
     return reply.send();
   } catch (e) {
-    logger.warn(`Apple IAP Webhook: ${e.message}`, e);
+    logger.error(e);
     reply.status(503);
-    return reply.send({ name: e.name, code: e.code, message: e.message });
+    return reply.send({ success: false, name: e.name, code: e.code, message: e.message });
   }
 };
 

package/src/payment/cryptopay/handler-express.ts

@@ -7,18 +7,15 @@ const cryptopayHandler = async (req, res) => {
   if (req.method === 'POST') {
     try {
       await handleWebhook(req.body, req.unchainedContext);
-      res.writeHead(200);
-      res.end(JSON.stringify({ success: true }));
+      res.status(200).send({ success: true });
       return;
     } catch (e) {
       logger.error(e);
-      res.writeHead(500);
-      res.end(JSON.stringify({ success: false, error: e.message }));
+      res.status(500).send({ success: false, error: e.message });
       return;
     }
   }
-  res.writeHead(404);
-  res.end(JSON.stringify({ success: false }));
+  res.status(404).send();
 };
 
 export default cryptopayHandler;

package/src/payment/datatrans-v2/handler-express.ts

@@ -27,8 +27,7 @@ export const datatransHandler = async (req, res) => {
 
     if (hash !== comparableSignature) {
       logger.error(`hash mismatch: ${signature} / ${comparableSignature}`, req.body);
-      res.writeHead(403);
-      res.end('Hash mismatch');
+      res.status(403).send('Hash mismatch');
       return;
     }
 
@@ -52,8 +51,7 @@ export const datatransHandler = async (req, res) => {
           logger.info(`registered payment credentials for ${userId}`, {
             userId,
           });
-          res.writeHead(200);
-          res.end(JSON.stringify(paymentCredentials));
+          res.status(200).send(paymentCredentials);
           return;
         }
         if (transaction.type === 'payment') {
@@ -66,21 +64,18 @@ export const datatransHandler = async (req, res) => {
           const order = await services.orders.checkoutOrder(orderPayment.orderId, {
             paymentContext: { userId, transactionId: transaction.transactionId },
           });
-          res.writeHead(200);
           logger.info(`confirmed checkout for order ${order.orderNumber}`, {
             orderId: order._id,
           });
-          res.end(JSON.stringify(order));
+          res.status(200).send(order);
           return;
         }
       } catch (e) {
         logger.error(`rejected to checkout with message`, e);
-        res.writeHead(500);
-        res.end(JSON.stringify({ name: e.name, code: e.code, message: e.message }));
+        res.status(500).send({ name: e.name, code: e.code, message: e.message });
         return;
       }
     }
   }
-  res.writeHead(404);
-  res.end();
+  res.status(404).end();
 };

package/src/payment/datatrans-v2/handler-fastify.ts

@@ -32,9 +32,9 @@ export const datatransHandler: RouteHandlerMethod = async (
     })(timestamp, req.body as string);
 
     if (hash !== comparableSignature) {
-      logger.error(`hash mismatch: ${signature} / ${comparableSignature}`, req.body as string);
+      logger.error(`hash mismatch: ${signature} / ${comparableSignature}`);
       reply.status(403);
-      return reply.send('Hash mismatch');
+      return reply.send({ success: false, message: 'Invalid Signature', name: 'HASH_MISMATCH' });
     }
 
     const transaction: StatusResponseSuccess = JSON.parse(req.body as string) as StatusResponseSuccess;
@@ -77,9 +77,9 @@ export const datatransHandler: RouteHandlerMethod = async (
           return reply.send(order);
         }
       } catch (e) {
-        logger.error(`rejected to checkout with message`, e);
+        logger.error(e);
         reply.status(500);
-        return reply.send({ name: e.name, code: e.code, message: e.message });
+        return reply.send({ success: false, name: e.name, code: e.code, message: e.message });
       }
     }
   }

package/src/payment/payrexx/handler-express.ts

@@ -13,26 +13,20 @@ export const payrexxHandler = async (request, response) => {
     logger.info(`unhandled event type`, {
       type: Object.keys(request.body).join(','),
     });
-    response.writeHead(200);
-    response.end(
-      JSON.stringify({
-        ignored: true,
-        message: `Unhandled event type: ${Object.keys(request.body).join(',')}. Supported type: transaction`,
-      }),
-    );
+    response.status(200).send({
+      ignored: true,
+      message: `Unhandled event type: ${Object.keys(request.body).join(',')}. Supported type: transaction`,
+    });
     return;
   }
   if (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.info(`unhandled transaction state: ${transaction.status}`);
-    response.writeHead(200);
-    response.end(
-      JSON.stringify({
-        ignored: true,
-        message: `Unhandled transaction state: ${transaction.status}`,
-      }),
-    );
+    response.status(200).send({
+      ignored: true,
+      message: `Unhandled transaction state: ${transaction.status}`,
+    });
     return;
   }
 
@@ -53,14 +47,11 @@ export const payrexxHandler = async (request, response) => {
         paymentProviderId,
         userId,
       });
-      response.writeHead(200);
-      response.end(
-        JSON.stringify({
-          message: 'registration successful',
-          paymentProviderId,
-          userId,
-        }),
-      );
+      response.status(200).send({
+        message: 'registration successful',
+        paymentProviderId,
+        userId,
+      });
     } else {
       const { referenceId: orderPaymentId, invoice } = transaction;
       logger.info(`checkout with orderPaymentId: ${orderPaymentId}`);
@@ -83,19 +74,18 @@ export const payrexxHandler = async (request, response) => {
         orderPaymentId,
         orderId: order._id,
       });
-      response.writeHead(200);
-      response.end(
-        JSON.stringify({
-          message: 'checkout successful',
-          orderId: order._id,
-        }),
-      );
+      response.status(200).send({
+        message: 'checkout successful',
+        orderId: order._id,
+      });
     }
   } catch (error) {
     logger.error(error, {
       transactionId: transaction.id,
     });
-    response.writeHead(500);
-    response.end(error.message);
+    response.status(500).send({
+      message: error.message,
+      name: error.name,
+    });
   }
 };

package/src/payment/payrexx/handler-fastify.ts

@@ -20,24 +20,22 @@ export const payrexxHandler: RouteHandlerMethod = async (
       type: Object.keys(request.body).join(','),
     });
     reply.status(200);
-    return reply.send(
-      JSON.stringify({
-        ignored: true,
-        message: `Unhandled event type: ${Object.keys(request.body).join(',')}. Supported type: transaction`,
-      }),
-    );
+    return reply.send({
+      success: false,
+      ignored: true,
+      message: `Unhandled event type: ${Object.keys(request.body).join(',')}. Supported type: transaction`,
+    });
   }
   if (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.info(`unhandled transaction state: ${transaction.status}`);
     reply.status(200);
-    return reply.send(
-      JSON.stringify({
-        ignored: true,
-        message: `Unhandled transaction state: ${transaction.status}`,
-      }),
-    );
+    return reply.send({
+      success: false,
+      ignored: true,
+      message: `Unhandled transaction state: ${transaction.status}`,
+    });
   }
 
   logger.info(`Processing event`, {
@@ -58,19 +56,14 @@ export const payrexxHandler: RouteHandlerMethod = async (
         userId,
       });
       reply.status(200);
-      return reply.send(
-        JSON.stringify({
-          message: 'registration successful',
-          paymentProviderId,
-          userId,
-        }),
-      );
+      return reply.send({
+        success: true,
+        paymentProviderId,
+        userId,
+      });
     } else {
       const { referenceId: orderPaymentId, invoice } = transaction;
       logger.info(`checkout with orderPaymentId: ${orderPaymentId}`);
-      await modules.orders.payments.logEvent(orderPaymentId, {
-        transactionId: transaction.id,
-      });
       const orderPayment = await modules.orders.payments.findOrderPayment({
         orderPaymentId,
       });
@@ -78,6 +71,10 @@ export const payrexxHandler: RouteHandlerMethod = async (
         throw new Error(`order payment not found with orderPaymentId: ${orderPaymentId}`);
       }
 
+      await modules.orders.payments.logEvent(orderPaymentId, {
+        transactionId: transaction.id,
+      });
+
       const order = await services.orders.checkoutOrder(orderPayment.orderId, {
         paymentContext: {
           gatewayId: invoice.paymentRequestId,
@@ -88,18 +85,20 @@ export const payrexxHandler: RouteHandlerMethod = async (
         orderId: order._id,
       });
       reply.status(200);
-      return reply.send(
-        JSON.stringify({
-          message: 'checkout successful',
-          orderId: order._id,
-        }),
-      );
+      return reply.send({
+        success: true,
+        orderId: order._id,
+      });
     }
   } catch (error) {
     logger.error(error, {
       transactionId: transaction.id,
     });
     reply.status(500);
-    return reply.send(error.message);
+    return reply.send({
+      success: false,
+      message: error.message,
+      name: error.name,
+    });
   }
 };

package/src/payment/postfinance-checkout/handler-express.ts

@@ -29,16 +29,13 @@ export const postfinanceCheckoutHandler = async (req, res) => {
       logger.info(
         `Transaction ${transactionCompletion.linkedTransaction} marked order payment ID ${transaction.metaData.orderPaymentId} as paid`,
       );
-      res.writeHead(200);
-      res.end(`Order marked as paid: ${order.orderNumber}`);
+      res.status(200).send(`Order marked as paid: ${order.orderNumber}`);
     } catch (e) {
       logger.error(e);
-      res.writeHead(500);
-      res.end(JSON.stringify({ name: e.name, code: e.code, message: e.message }));
+      res.status(500).send({ name: e.name, code: e.code, message: e.message });
     }
   } else {
     logger.error(`Received unknown listenerEntityTechnicalName ${data.listenerEntityTechnicalName}`);
-    res.writeHead(404);
-    res.end();
+    res.status(404).end();
   }
 };

package/src/payment/postfinance-checkout/handler-fastify.ts

@@ -36,11 +36,11 @@ export const postfinanceCheckoutHandler: RouteHandlerMethod = async (
         `Transaction ${transaction.id} marked order payment ID ${transaction.metaData.orderPaymentId} as paid`,
       );
       reply.status(200);
-      return reply.send(`Order marked as paid: ${order.orderNumber}`);
+      return reply.send({ success: true, orderNumber: order.orderNumber });
     } catch (e) {
       logger.error(e);
       reply.status(500);
-      return reply.send({ name: e.name, code: e.code, message: e.message });
+      return reply.send({ success: false, name: e.name, code: e.code, message: e.message });
     }
   } else {
     logger.error(`Received unknown listenerEntityTechnicalName ${data.listenerEntityTechnicalName}`);

package/src/payment/saferpay/handler-express.ts

@@ -22,8 +22,7 @@ export const saferpayHandler = async (request, response) => {
 
   if ((request.method !== 'GET' && request.method !== 'HEAD') || !isValidRequest) {
     logger.warn(`unhandled http method ${request.method} or orderPaymentId missing in query`);
-    response.writeHead(404);
-    response.end();
+    response.status(404).end();
     return;
   }
 
@@ -51,20 +50,19 @@ export const saferpayHandler = async (request, response) => {
       orderPaymentId,
       orderId: order._id,
     });
-    response.writeHead(200);
-    response.end(
-      JSON.stringify({
-        message: 'checkout successful',
-        orderPaymentId,
-        orderId: order._id,
-      }),
-    );
+    response.status(200).send({
+      message: 'checkout successful',
+      orderPaymentId,
+      orderId: order._id,
+    });
   } catch (error) {
     logger.error(error, {
       orderPaymentId,
       transactionId,
     });
-    response.writeHead(500);
-    response.end(error.message);
+    response.status(500).send({
+      message: error.message,
+      name: error.name,
+    });
   }
 };

package/src/payment/saferpay/handler-fastify.ts

@@ -57,19 +57,21 @@ export const saferpayHandler: RouteHandlerMethod = async (
       orderId: order._id,
     });
     reply.status(200);
-    return reply.send(
-      JSON.stringify({
-        message: 'checkout successful',
-        orderPaymentId,
-        orderId: order._id,
-      }),
-    );
+    return reply.send({
+      success: true,
+      orderPaymentId,
+      orderId: order._id,
+    });
   } catch (error) {
     logger.error(error, {
       orderPaymentId,
       transactionId,
     });
     reply.status(500);
-    return reply.send(error.message);
+    return reply.send({
+      success: false,
+      message: error.message,
+      name: error.name,
+    });
   }
 };