@pinelab/vendure-plugin-sendcloud 1.2.3 → 1.2.4

package/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 1.2.4 (2024-06-13)
+
+- Check if incoming request is a Buffer or already parsed by other middleware
+
 # 1.2.3 (2024-06-13)
 
 - Log request body, instead of util.inspect

package/dist/vendure-plugin-sendcloud/src/api/sendcloud.controller.js

@@ -25,12 +25,19 @@ let SendcloudController = class SendcloudController {
     }
     async webhook(req, signature, channelToken) {
         let body;
-        try {
-            body = JSON.parse(req.body.toString());
+        if (!Buffer.isBuffer(req.body)) {
+            core_1.Logger.warn(`Incoming webhook body is not a Buffer. This means the body was already parsed by some other middleware. This might cause problems when validating the incoming webhook signature.`, constants_1.loggerCtx);
+            body = req.body;
         }
-        catch (e) {
-            core_1.Logger.error(`Error parsing incoming webhook body: ${e?.message ?? e}`, constants_1.loggerCtx, req.body.toString());
-            return;
+        else {
+            // Else we try and parse the body
+            try {
+                body = JSON.parse(req.body.toString());
+            }
+            catch (e) {
+                core_1.Logger.error(`Error parsing incoming webhook body: ${e?.message ?? e}`, constants_1.loggerCtx, req.body.toString());
+                return;
+            }
         }
         const rawBody = req.rawBody;
         const ctx = await this.sendcloudService.createContext(channelToken);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pinelab/vendure-plugin-sendcloud",
-  "version": "1.2.3",
+  "version": "1.2.4",
   "description": "Vendure plugin for syncing orders with SendCloud",
   "author": "Martijn van de Brug <martijn@pinelab.studio>",
   "homepage": "https://pinelab-plugins.com/",
@@ -23,5 +23,5 @@
     "start": "yarn ts-node test/dev-server.ts",
     "lint": "echo 'No linting configured'"
   },
-  "gitHead": "1a364f2738b44895e9f3eec133a66f4ac0df7678"
+  "gitHead": "55ad85256aabbf322470155a78c517111e8c754c"
 }