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

package/lib/payment/stripe/handler-fastify.js.map

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

package/lib/pricing/product-catalog-price.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"product-catalog-price.d.ts","sourceRoot":"","sources":["../../src/pricing/product-catalog-price.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,sBAAsB,EACvB,MAAM,qBAAqB,CAAC;AAE7B,eAAO,MAAM,YAAY,EAAE,sBAuC1B,CAAC"}
+{"version":3,"file":"product-catalog-price.d.ts","sourceRoot":"","sources":["../../src/pricing/product-catalog-price.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,sBAAsB,EACvB,MAAM,qBAAqB,CAAC;AAG7B,eAAO,MAAM,YAAY,EAAE,sBA6D1B,CAAC"}

package/lib/pricing/product-catalog-price.js

@@ -1,4 +1,5 @@
 import { ProductPricingDirector, ProductPricingAdapter, } from '@unchainedshop/core';
+import { ProductTypes } from '@unchainedshop/core-products';
 export const ProductPrice = {
     ...ProductPricingAdapter,
     key: 'shop.unchained.pricing.product-price',
@@ -28,6 +29,29 @@ export const ProductPrice = {
                         meta: { adapter: ProductPrice.key },
                     });
                 }
+                else if (product.type === ProductTypes.BundleProduct) {
+                    for (const bundleItem of product.bundleItems || []) {
+                        const bundledProduct = await modules.products.findProduct({
+                            productId: bundleItem.productId,
+                        });
+                        if (bundledProduct) {
+                            const bundleItemPrice = await modules.products.prices.price(bundledProduct, {
+                                countryCode,
+                                currencyCode,
+                                quantity: bundleItem.quantity * quantity,
+                            });
+                            if (bundleItemPrice) {
+                                const bundleItemTotal = bundleItemPrice.amount * bundleItem.quantity * quantity;
+                                pricingAdapter.resultSheet().addItem({
+                                    amount: bundleItemTotal,
+                                    isTaxable: bundleItemPrice.isTaxable,
+                                    isNetPrice: bundleItemPrice.isNetPrice,
+                                    meta: { adapter: ProductPrice.key },
+                                });
+                            }
+                        }
+                    }
+                }
                 return pricingAdapter.calculate();
             },
         };

package/lib/pricing/product-catalog-price.js.map

@@ -1 +1 @@
-{"version":3,"file":"product-catalog-price.js","sourceRoot":"","sources":["../../src/pricing/product-catalog-price.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,sBAAsB,EACtB,qBAAqB,GAEtB,MAAM,qBAAqB,CAAC;AAE7B,MAAM,CAAC,MAAM,YAAY,GAA2B;IAClD,GAAG,qBAAqB;IAExB,GAAG,EAAE,sCAAsC;IAC3C,OAAO,EAAE,OAAO;IAChB,KAAK,EAAE,4BAA4B;IACnC,UAAU,EAAE,CAAC;IAEb,cAAc,EAAE,GAAG,EAAE;QACnB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO,EAAE,CAAC,MAAM,EAAE,EAAE;QAClB,MAAM,cAAc,GAAG,qBAAqB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAE7D,OAAO;YACL,GAAG,cAAc;YAEjB,SAAS,EAAE,KAAK,IAAI,EAAE;gBACpB,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC,OAAO,CAAC;gBACjF,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE;oBACzD,WAAW;oBACX,YAAY;oBACZ,QAAQ;iBACT,CAAC,CAAC;gBACH,IAAI,KAAK,EAAE,CAAC;oBACV,MAAM,SAAS,GAAG,KAAK,CAAC,MAAM,GAAG,QAAQ,CAAC;oBAC1C,cAAc,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC;wBACnC,MAAM,EAAE,SAAS;wBACjB,SAAS,EAAE,KAAK,CAAC,SAAS;wBAC1B,UAAU,EAAE,KAAK,CAAC,UAAU;wBAC5B,IAAI,EAAE,EAAE,OAAO,EAAE,YAAY,CAAC,GAAG,EAAE;qBACpC,CAAC,CAAC;gBACL,CAAC;gBAED,OAAO,cAAc,CAAC,SAAS,EAAE,CAAC;YACpC,CAAC;SACF,CAAC;IACJ,CAAC;CACF,CAAC;AAEF,sBAAsB,CAAC,eAAe,CAAC,YAAY,CAAC,CAAC"}
+{"version":3,"file":"product-catalog-price.js","sourceRoot":"","sources":["../../src/pricing/product-catalog-price.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,sBAAsB,EACtB,qBAAqB,GAEtB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAE5D,MAAM,CAAC,MAAM,YAAY,GAA2B;IAClD,GAAG,qBAAqB;IAExB,GAAG,EAAE,sCAAsC;IAC3C,OAAO,EAAE,OAAO;IAChB,KAAK,EAAE,4BAA4B;IACnC,UAAU,EAAE,CAAC;IAEb,cAAc,EAAE,GAAG,EAAE;QACnB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO,EAAE,CAAC,MAAM,EAAE,EAAE;QAClB,MAAM,cAAc,GAAG,qBAAqB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAE7D,OAAO;YACL,GAAG,cAAc;YAEjB,SAAS,EAAE,KAAK,IAAI,EAAE;gBACpB,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC,OAAO,CAAC;gBACjF,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE;oBACzD,WAAW;oBACX,YAAY;oBACZ,QAAQ;iBACT,CAAC,CAAC;gBACH,IAAI,KAAK,EAAE,CAAC;oBACV,MAAM,SAAS,GAAG,KAAK,CAAC,MAAM,GAAG,QAAQ,CAAC;oBAC1C,cAAc,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC;wBACnC,MAAM,EAAE,SAAS;wBACjB,SAAS,EAAE,KAAK,CAAC,SAAS;wBAC1B,UAAU,EAAE,KAAK,CAAC,UAAU;wBAC5B,IAAI,EAAE,EAAE,OAAO,EAAE,YAAY,CAAC,GAAG,EAAE;qBACpC,CAAC,CAAC;gBACL,CAAC;qBAAM,IAAI,OAAO,CAAC,IAAI,KAAK,YAAY,CAAC,aAAa,EAAE,CAAC;oBACvD,KAAK,MAAM,UAAU,IAAI,OAAO,CAAC,WAAW,IAAI,EAAE,EAAE,CAAC;wBACnD,MAAM,cAAc,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC;4BACxD,SAAS,EAAE,UAAU,CAAC,SAAS;yBAChC,CAAC,CAAC;wBACH,IAAI,cAAc,EAAE,CAAC;4BACnB,MAAM,eAAe,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,cAAc,EAAE;gCAC1E,WAAW;gCACX,YAAY;gCACZ,QAAQ,EAAE,UAAU,CAAC,QAAQ,GAAG,QAAQ;6BACzC,CAAC,CAAC;4BACH,IAAI,eAAe,EAAE,CAAC;gCACpB,MAAM,eAAe,GAAG,eAAe,CAAC,MAAM,GAAG,UAAU,CAAC,QAAQ,GAAG,QAAQ,CAAC;gCAChF,cAAc,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC;oCACnC,MAAM,EAAE,eAAe;oCACvB,SAAS,EAAE,eAAe,CAAC,SAAS;oCACpC,UAAU,EAAE,eAAe,CAAC,UAAU;oCACtC,IAAI,EAAE,EAAE,OAAO,EAAE,YAAY,CAAC,GAAG,EAAE;iCACpC,CAAC,CAAC;4BACL,CAAC;wBACH,CAAC;oBACH,CAAC;gBACH,CAAC;gBAED,OAAO,cAAc,CAAC,SAAS,EAAE,CAAC;YACpC,CAAC;SACF,CAAC;IACJ,CAAC;CACF,CAAC;AAEF,sBAAsB,CAAC,eAAe,CAAC,YAAY,CAAC,CAAC"}

package/lib/worker/bulk-import.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bulk-import.d.ts","sourceRoot":"","sources":["../../src/worker/bulk-import.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiC,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAqDpF,eAAO,MAAM,gBAAgB,EAAE,cAAc,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CA8DzE,CAAC"}
+{"version":3,"file":"bulk-import.d.ts","sourceRoot":"","sources":["../../src/worker/bulk-import.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiC,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAKpF,eAAO,MAAM,gBAAgB,EAAE,cAAc,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAsEzE,CAAC"}

package/lib/worker/bulk-import.js

@@ -1,35 +1,6 @@
 import { WorkerDirector, WorkerAdapter } from '@unchainedshop/core';
 import { createLogger } from '@unchainedshop/logger';
-import JSONStream from 'JSONStream';
-import { EventIterator } from 'event-iterator';
 const logger = createLogger('unchained:worker:bulk-import');
-const streamPayloadToBulkImporter = async (bulkImporter, payloadId, unchainedAPI) => {
-    logger.trace(`parseAsync start`);
-    const readStream = await unchainedAPI.services.files.createDownloadStream({ fileId: payloadId });
-    if (!readStream) {
-        throw new Error('The current file adapter does not support streams when downloading required for streamed events. Please use a different file adapter.');
-    }
-    const eventIterator = new EventIterator((queue) => {
-        const jsonStream = JSONStream.parse('events.*'); // rows, ANYTHING, doc
-        jsonStream.on('data', queue.push);
-        jsonStream.on('close', queue.stop);
-        jsonStream.on('error', queue.fail);
-        queue.on('highWater', () => readStream.pause());
-        queue.on('lowWater', () => readStream.resume());
-        readStream.pipe(jsonStream);
-        readStream.on('error', queue.fail);
-        return () => {
-            jsonStream.removeListener('data', queue.push);
-            jsonStream.removeListener('close', queue.stop);
-            jsonStream.removeListener('error', queue.fail);
-            jsonStream.destroy();
-        };
-    }, { highWaterMark: 100, lowWaterMark: 5 });
-    for await (const event of eventIterator) {
-        await bulkImporter.prepare(event, unchainedAPI);
-    }
-    logger.trace(`parseAsync done`);
-};
 export const BulkImportWorker = {
     ...WorkerAdapter,
     key: 'shop.unchained.worker-plugin.bulk-import',
@@ -47,7 +18,13 @@ export const BulkImportWorker = {
             });
             if (rawPayload.payloadId) {
                 // stream payload from gridfs
-                await streamPayloadToBulkImporter(bulkImporter, rawPayload.payloadId, unchainedAPI);
+                const readStream = await unchainedAPI.services.files.createDownloadStream({
+                    fileId: rawPayload.payloadId,
+                });
+                if (!readStream) {
+                    throw new Error('The current file adapter does not support streams when downloading required for streamed events. Please use a different file adapter.');
+                }
+                await unchainedAPI.bulkImporter.pipeEventStream(readStream, bulkImporter, unchainedAPI);
             }
             else {
                 const { events } = rawPayload;

package/lib/worker/bulk-import.js.map

@@ -1 +1 @@
-{"version":3,"file":"bulk-import.js","sourceRoot":"","sources":["../../src/worker/bulk-import.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"bulk-import.js","sourceRoot":"","sources":["../../src/worker/bulk-import.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,aAAa,EAAkB,MAAM,qBAAqB,CAAC;AACpF,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD,MAAM,MAAM,GAAG,YAAY,CAAC,8BAA8B,CAAC,CAAC;AAE5D,MAAM,CAAC,MAAM,gBAAgB,GAAiD;IAC5E,GAAG,aAAa;IAEhB,GAAG,EAAE,0CAA0C;IAC/C,KAAK,EAAE,aAAa;IACpB,OAAO,EAAE,OAAO;IAChB,IAAI,EAAE,aAAa;IACnB,sBAAsB,EAAE,CAAC,EAAE,6CAA6C;IAExE,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,YAAY,EAAE,EAAE;QACzC,IAAI,CAAC;YACH,MAAM,EACJ,4BAA4B,GAAG,KAAK,EACpC,qBAAqB,GAAG,KAAK,EAC7B,+BAA+B,GAAG,KAAK,GACxC,GAAG,UAAU,CAAC;YAEf,MAAM,YAAY,GAAG,YAAY,CAAC,YAAY,CAAC,kBAAkB,CAAC;gBAChE,4BAA4B;gBAC5B,+BAA+B;gBAC/B,qBAAqB;aACtB,CAAC,CAAC;YAEH,IAAI,UAAU,CAAC,SAAS,EAAE,CAAC;gBACzB,6BAA6B;gBAC7B,MAAM,UAAU,GAAG,MAAM,YAAY,CAAC,QAAQ,CAAC,KAAK,CAAC,oBAAoB,CAAC;oBACxE,MAAM,EAAE,UAAU,CAAC,SAAS;iBAC7B,CAAC,CAAC;gBACH,IAAI,CAAC,UAAU,EAAE,CAAC;oBAChB,MAAM,IAAI,KAAK,CACb,uIAAuI,CACxI,CAAC;gBACJ,CAAC;gBACD,MAAM,YAAY,CAAC,YAAY,CAAC,eAAe,CAAC,UAAU,EAAE,YAAY,EAAE,YAAY,CAAC,CAAC;YAC1F,CAAC;iBAAM,CAAC;gBACN,MAAM,EAAE,MAAM,EAAE,GAAG,UAAU,CAAC;gBAC9B,IAAI,CAAC,MAAM,EAAE,MAAM;oBAAE,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC;gBAE5D,MAAM,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,mBAAmB,EAAE,SAAS,EAAE,EAAE;oBAC3D,MAAM,mBAAmB,CAAC;oBAC1B,OAAO,YAAY,CAAC,OAAO,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC;gBACvD,CAAC,EAAE,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;YACxB,CAAC;YAED,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,GAAG,MAAM,YAAY,CAAC,OAAO,EAAE,CAAC;YACrD,MAAM,YAAY,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAC;YAElD,IAAI,KAAK,EAAE,CAAC;gBACV,OAAO;oBACL,OAAO,EAAE,KAAK;oBACd,MAAM;oBACN,KAAK;iBACN,CAAC;YACJ,CAAC;YACD,OAAO;gBACL,OAAO,EAAE,IAAI;gBACb,MAAM;aACP,CAAC;QACJ,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAClB,OAAO;gBACL,OAAO,EAAE,KAAK;gBACd,KAAK,EAAE;oBACL,IAAI,EAAE,GAAG,CAAC,IAAI;oBACd,OAAO,EAAE,GAAG,CAAC,OAAO;oBACpB,KAAK,EAAE,GAAG,CAAC,KAAK;iBACjB;aACF,CAAC;QACJ,CAAC;IACH,CAAC;CACF,CAAC;AAEF,cAAc,CAAC,eAAe,CAAC,gBAAgB,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unchainedshop/plugins",
-  "version": "4.0.0-rc.14",
+  "version": "4.0.0-rc.16",
   "main": "lib/plugins-index.js",
   "types": "lib/plugins-index.d.ts",
   "exports": {
@@ -34,20 +34,18 @@
   },
   "homepage": "https://github.com/unchainedshop/unchained#readme",
   "dependencies": {
-    "@unchainedshop/api": "^4.0.0-rc.14",
-    "@unchainedshop/core-delivery": "^4.0.0-rc.14",
-    "@unchainedshop/core-enrollments": "^4.0.0-rc.14",
-    "@unchainedshop/core-orders": "^4.0.0-rc.14",
-    "@unchainedshop/core-payment": "^4.0.0-rc.14",
-    "@unchainedshop/core-products": "^4.0.0-rc.14",
-    "@unchainedshop/core-warehousing": "^4.0.0-rc.14",
-    "@unchainedshop/core-worker": "^4.0.0-rc.14",
-    "@unchainedshop/events": "^4.0.0-rc.14",
-    "@unchainedshop/file-upload": "^4.0.0-rc.14",
-    "@unchainedshop/logger": "^4.0.0-rc.14",
-    "@unchainedshop/utils": "^4.0.0-rc.14",
-    "event-iterator": "^2.0.0",
-    "JSONStream": "^1.3.5"
+    "@unchainedshop/api": "^4.0.0-rc.15",
+    "@unchainedshop/core-delivery": "^4.0.0-rc.15",
+    "@unchainedshop/core-enrollments": "^4.0.0-rc.15",
+    "@unchainedshop/core-orders": "^4.0.0-rc.15",
+    "@unchainedshop/core-payment": "^4.0.0-rc.15",
+    "@unchainedshop/core-products": "^4.0.0-rc.15",
+    "@unchainedshop/core-warehousing": "^4.0.0-rc.15",
+    "@unchainedshop/core-worker": "^4.0.0-rc.15",
+    "@unchainedshop/events": "^4.0.0-rc.15",
+    "@unchainedshop/file-upload": "^4.0.0-rc.15",
+    "@unchainedshop/logger": "^4.0.0-rc.15",
+    "@unchainedshop/utils": "^4.0.0-rc.15"
   },
   "peerDependencies": {
     "@aws-sdk/client-eventbridge": ">= 3.714 < 4",

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/filters/strict-equal.ts

@@ -12,27 +12,6 @@ const StrictQualFilter: IFilterAdapter = {
     return {
       ...FilterAdapter.actions(params),
 
-      searchProducts: async ({ productIds }) => {
-        // Search Products
-        const { queryString } = params.searchQuery;
-
-        if (!queryString && !productIds) {
-          // If no query string is provided, return all product IDs
-          return params.modules.products.findProductIds({});
-        }
-        return productIds;
-      },
-
-      searchAssortments: async ({ assortmentIds }) => {
-        // Search Assortments
-        const { queryString } = params.searchQuery;
-        if (!queryString && !assortmentIds) {
-          // If no query string is provided, return all assortment IDs
-          return params.modules.assortments.findAssortmentIds({});
-        }
-        return assortmentIds;
-      },
-
       transformProductSelector: async (lastSelector, options) => {
         const { key, value } = options || {};
 

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,
+    });
   }
 };