@pinelab/vendure-plugin-sendcloud 1.0.2 → 1.1.0

package/CHANGELOG.md

@@ -0,0 +1,3 @@
+# 1.1.0 (2023-10-24)
+
+- Updated vendure to 2.1.1

package/dist/util/src/order-state-util.d.ts

@@ -14,6 +14,6 @@ export declare function transitionToShipped(orderService: OrderService, ctx: Req
  */
 export declare function transitionToDelivered(orderService: OrderService, ctx: RequestContext, order: Order, handler: ConfigurableOperationInput): Promise<Fulfillment>;
 /**
- * Throw an error if the transition failed
+ * Throws the error result if the transition failed
  */
 export declare function throwIfTransitionFailed(result: FulfillmentStateTransitionError | Fulfillment | AddFulfillmentToOrderResult): void;

package/dist/util/src/order-state-util.js

@@ -43,20 +43,18 @@ async function transitionToDelivered(orderService, ctx, order, handler) {
 }
 exports.transitionToDelivered = transitionToDelivered;
 /**
- * Throw an error if the transition failed
+ * Throws the error result if the transition failed
  */
 function throwIfTransitionFailed(result) {
     const stateError = result;
-    if (stateError.transitionError) {
-        if (stateError.fromState === stateError.toState) {
-            return; // If already 'Shipped', don't count this as an error
-        }
-        throw Error(`${stateError.message} - from ${stateError.fromState} to ${stateError.toState} - ${stateError.transitionError}`);
+    if (stateError.transitionError &&
+        stateError.fromState === stateError.toState) {
+        return; // If already 'Shipped', don't count this as an error
     }
     // It's not a stateTransition error
     const error = result;
     if (error.errorCode) {
-        throw Error(`${error.errorCode}: ${error.message}`);
+        throw error;
     }
 }
 exports.throwIfTransitionFailed = throwIfTransitionFailed;

package/dist/util/src/raw-body.middleware.d.ts

@@ -0,0 +1,10 @@
+/// <reference types="node" />
+import type { Request } from 'express';
+export interface RequestWithRawBody extends Request {
+    rawBody: Buffer;
+}
+/**
+ * Middleware which adds the raw request body to the incoming message object. This is needed by
+ * Stripe to properly verify webhook events.
+ */
+export declare const rawBodyMiddleware: import("connect").NextHandleFunction;

package/dist/util/src/raw-body.middleware.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.rawBodyMiddleware = void 0;
+const body_parser_1 = require("body-parser");
+/**
+ * Middleware which adds the raw request body to the incoming message object. This is needed by
+ * Stripe to properly verify webhook events.
+ */
+exports.rawBodyMiddleware = (0, body_parser_1.raw)({
+    type: '*/*',
+    verify(req, res, buf, encoding) {
+        if (Buffer.isBuffer(buf)) {
+            req.rawBody = Buffer.from(buf);
+        }
+        return true;
+    },
+});

package/dist/vendure-plugin-sendcloud/src/api/sendcloud.controller.d.ts

@@ -1,8 +1,7 @@
 import { Request } from 'express';
 import { SendcloudService } from './sendcloud.service';
-import { IncomingWebhookBody } from './types/sendcloud-api.types';
 export declare class SendcloudController {
     private sendcloudService;
     constructor(sendcloudService: SendcloudService);
-    webhook(req: Request, body: IncomingWebhookBody, signature: string, channelToken: string): Promise<unknown>;
+    webhook(req: Request, signature: string, channelToken: string): Promise<unknown>;
 }

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

@@ -23,8 +23,9 @@ let SendcloudController = class SendcloudController {
     constructor(sendcloudService) {
         this.sendcloudService = sendcloudService;
     }
-    async webhook(req, body, signature, channelToken) {
-        const rawBody = req.rawBody || JSON.stringify(body); // TestEnvironment doesnt have middleware applied, so no rawBody available
+    async webhook(req, signature, channelToken) {
+        const body = JSON.parse(req.body.toString());
+        const rawBody = req.rawBody;
         const ctx = await this.sendcloudService.createContext(channelToken);
         const { client } = await this.sendcloudService.getClient(ctx);
         if (!client.isValidWebhook(rawBody, signature)) {
@@ -51,11 +52,10 @@ let SendcloudController = class SendcloudController {
 __decorate([
     (0, common_1.Post)('webhook/:channelToken'),
     __param(0, (0, common_1.Req)()),
-    __param(1, (0, common_1.Body)()),
-    __param(2, (0, common_1.Headers)(sendcloud_client_1.SendcloudClient.signatureHeader)),
-    __param(3, (0, common_1.Param)('channelToken')),
+    __param(1, (0, common_1.Headers)(sendcloud_client_1.SendcloudClient.signatureHeader)),
+    __param(2, (0, common_1.Param)('channelToken')),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Object, Object, String, String]),
+    __metadata("design:paramtypes", [Object, String, String]),
     __metadata("design:returntype", Promise)
 ], SendcloudController.prototype, "webhook", null);
 SendcloudController = __decorate([

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

@@ -12,7 +12,7 @@ var SendcloudPlugin_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SendcloudPlugin = void 0;
 const core_1 = require("@vendure/core");
-const apollo_server_core_1 = require("apollo-server-core");
+const graphql_tag_1 = require("graphql-tag");
 const path_1 = __importDefault(require("path"));
 const sendcloud_resolver_1 = require("./api/sendcloud.resolver");
 const sendcloud_service_1 = require("./api/sendcloud.service");
@@ -20,7 +20,7 @@ const constants_1 = require("./api/constants");
 const sendcloud_controller_1 = require("./api/sendcloud.controller");
 const sendcloud_config_entity_1 = require("./api/sendcloud-config.entity");
 const sendcloud_handler_1 = require("./api/sendcloud.handler");
-const raw_body_1 = require("../../util/src/raw-body");
+const raw_body_middleware_1 = require("../../util/src/raw-body.middleware");
 let SendcloudPlugin = SendcloudPlugin_1 = class SendcloudPlugin {
     static init(options) {
         this.options = options;
@@ -46,7 +46,7 @@ SendcloudPlugin.ui = {
 SendcloudPlugin = SendcloudPlugin_1 = __decorate([
     (0, core_1.VendurePlugin)({
         adminApiExtensions: {
-            schema: (0, apollo_server_core_1.gql) `
+            schema: (0, graphql_tag_1.gql) `
       extend enum HistoryEntryType {
         SENDCLOUD_NOTIFICATION
       }
@@ -82,10 +82,13 @@ SendcloudPlugin = SendcloudPlugin_1 = __decorate([
         controllers: [sendcloud_controller_1.SendcloudController],
         entities: [sendcloud_config_entity_1.SendcloudConfigEntity],
         configuration: (config) => {
+            config.apiOptions.middleware.push({
+                route: '/sendcloud/webhook*',
+                handler: raw_body_middleware_1.rawBodyMiddleware,
+                beforeListen: true,
+            });
             config.shippingOptions.fulfillmentHandlers.push(sendcloud_handler_1.sendcloudHandler);
             config.authOptions.customPermissions.push(sendcloud_resolver_1.sendcloudPermission);
-            // save rawBody for signature verification
-            config.apiOptions.middleware.push((0, raw_body_1.createRawBodyMiddleWare)('/sendcloud/webhook*'));
             return config;
         },
         compatibility: '^2.0.0',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pinelab/vendure-plugin-sendcloud",
-  "version": "1.0.2",
+  "version": "1.1.0",
   "description": "Vendure plugin for syncing orders with SendCloud",
   "author": "Martijn van de Brug <martijn@pinelab.studio>",
   "homepage": "https://pinelab-plugins.com/",
@@ -14,12 +14,13 @@
   "types": "dist/vendure-plugin-sendcloud/src/index.d.ts",
   "files": [
     "dist",
-    "README.md"
+    "README.md",
+    "CHANGELOG.md"
   ],
   "scripts": {
     "build": "rimraf dist && tsc && copyfiles -u 1 'src/ui/**/*' dist/vendure-plugin-sendcloud/src/",
     "test": "vitest run",
     "start": "yarn ts-node test/dev-server.ts"
   },
-  "gitHead": "8f332e7c6bd03bc5fc410ee5a614a6edad36f221"
+  "gitHead": "985a9e6ffd5cec67d1a3a4d924c9bd4bf7faa982"
 }

package/dist/util/src/raw-body.d.ts

@@ -1,6 +0,0 @@
-import { Middleware } from '@vendure/core';
-/**
- * Set req.rawBody before any other middleware changes the body. Used to verify incoming request signatures for example.
- * @param route
- */
-export declare function createRawBodyMiddleWare(route: string): Middleware;

package/dist/util/src/raw-body.js

@@ -1,26 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createRawBodyMiddleWare = void 0;
-const body_parser_1 = __importDefault(require("body-parser"));
-/**
- * Set req.rawBody before any other middleware changes the body. Used to verify incoming request signatures for example.
- * @param route
- */
-function createRawBodyMiddleWare(route) {
-    return {
-        route,
-        beforeListen: true,
-        handler: body_parser_1.default.json({
-            verify(req, _, buf) {
-                if (Buffer.isBuffer(buf)) {
-                    req.rawBody = Buffer.from(buf);
-                }
-                return true;
-            },
-        }),
-    };
-}
-exports.createRawBodyMiddleWare = createRawBodyMiddleWare;