@unchainedshop/plugins 1.1.7 → 1.2.1

package/jest.config.js

@@ -0,0 +1,5 @@
+/** @type {import('ts-jest/dist/types').InitialOptionsTsJest} */
+export default {
+  preset: 'ts-jest',
+  testEnvironment: 'node',
+};

package/package.json

@@ -1,13 +1,16 @@
 {
   "name": "@unchainedshop/plugins",
-  "version": "1.1.7",
-  "main": "lib/index.js",
-  "types": "lib/index.d.ts",
+  "version": "1.2.1",
+  "exports": {
+    "./*": "./lib/*"
+  },
   "type": "module",
   "scripts": {
+    "prepublishOnly": "npm install && npm run build || :",
     "clean": "rm -rf lib",
-    "build": "npm run clean && tsc -p tsconfig.build.json",
-    "watch": "tsc -p tsconfig.build.json --watch"
+    "build": "npm run clean && tsc",
+    "watch": "tsc -w",
+    "test": "jest --watch"
   },
   "repository": {
     "type": "git",
@@ -25,37 +28,40 @@
   },
   "homepage": "https://github.com/unchainedshop/unchained#readme",
   "devDependencies": {
-    "@unchainedshop/api": "^1.1.7",
+    "@types/node": "^16.11.44",
+    "@unchainedshop/api": "^1.1.9",
     "@unchainedshop/client-oauth2": "^4.3.3",
-    "@unchainedshop/core-delivery": "^1.1.7",
-    "@unchainedshop/core-enrollments": "^1.1.7",
-    "@unchainedshop/core-filters": "^1.1.7",
-    "@unchainedshop/core-messaging": "^1.1.7",
-    "@unchainedshop/core-orders": "^1.1.7",
-    "@unchainedshop/core-payment": "^1.1.7",
-    "@unchainedshop/core-products": "^1.1.7",
-    "@unchainedshop/core-quotations": "^1.1.7",
-    "@unchainedshop/core-warehousing": "^1.1.7",
-    "@unchainedshop/core-worker": "^1.1.7",
-    "@unchainedshop/events": "^1.1.7",
-    "@unchainedshop/file-upload": "^1.1.7",
-    "@unchainedshop/logger": "^1.1.7",
-    "@unchainedshop/types": "^1.1.7",
-    "@unchainedshop/utils": "^1.1.7",
-    "JSONStream": "^1.3.5",
+    "@unchainedshop/core-delivery": "^1.1.9",
+    "@unchainedshop/core-enrollments": "^1.1.9",
+    "@unchainedshop/core-filters": "^1.1.9",
+    "@unchainedshop/core-messaging": "^1.1.9",
+    "@unchainedshop/core-orders": "^1.1.9",
+    "@unchainedshop/core-payment": "^1.1.9",
+    "@unchainedshop/core-products": "^1.1.9",
+    "@unchainedshop/core-quotations": "^1.1.9",
+    "@unchainedshop/core-warehousing": "^1.1.9",
+    "@unchainedshop/core-worker": "^1.1.9",
+    "@unchainedshop/events": "^1.1.9",
+    "@unchainedshop/file-upload": "^1.1.9",
+    "@unchainedshop/logger": "^1.1.9",
+    "@unchainedshop/types": "^1.1.9",
+    "@unchainedshop/utils": "^1.1.9",
     "bluebird": "^3.7.2",
     "body-parser": "^1.20.0",
     "event-iterator": "^2.0.0",
+    "jest": "^28.1.2",
+    "JSONStream": "^1.3.5",
     "minio": "^7.0.28",
     "moment": "^2.29.3",
     "mongodb": "^4.7.0",
-    "node-sheets": "^1.2.0",
+    "node-sheets": "^1.1.9",
     "nodemailer": "^6.7.5",
     "open": "^8.4.0",
     "redis": "^4.1.0",
     "request": "^2.88.2",
+    "ts-jest": "^28.0.5",
     "typescript": "^4.7.4",
+    "xml-js": "^1.6.11",
     "xml2js": "0.4.23"
-  },
-  "gitHead": "06cd41a39f57481555c743836481b9190b2ec2b5"
+  }
 }

package/src/files/gridfs/gridfs-adapter.ts

@@ -5,7 +5,7 @@ import http, { OutgoingHttpHeaders } from 'http';
 import mimeType from 'mime-types';
 import { URL } from 'url';
 import { Readable } from 'stream';
-import buildHashedFilename from '@unchainedshop/file-upload/lib/buildHashedFilename';
+import { buildHashedFilename } from '@unchainedshop/file-upload';
 import sign from './sign';
 import promisePipe from './promisePipe';
 

package/src/files/gridfs/gridfs-webhook.ts

@@ -0,0 +1,62 @@
+import { useMiddlewareWithCurrentContext } from '@unchainedshop/api';
+import { log, LogLevel } from '@unchainedshop/logger';
+import { buildHashedFilename } from '@unchainedshop/file-upload';
+import sign from './sign';
+import promisePipe from './promisePipe';
+
+const { ROOT_URL } = process.env;
+
+/*
+curl -vvv -X PUT -T /Users/pozylon/Downloads/grafik.png http://localhost:4010/gridfs/user-avatars/hans.png?e=1653059591506&s=df8626a1c9b9006249d7f1928fd530579fed57216f1bdcb83c28a8322cdc90b1
+*/
+
+export default (app) =>
+  useMiddlewareWithCurrentContext(app, '/gridfs', async (req, res) => {
+    try {
+      const { services, modules } = req.unchainedContext;
+      const url = new URL(req.url, ROOT_URL);
+      const [, directoryName, fileName] = url.pathname.split('/');
+
+      if (req.method === 'PUT') {
+        const { s: signature, e: expiryTimestamp } = req.query;
+        const expiryDate = new Date(parseInt(expiryTimestamp, 10));
+        const fileId = buildHashedFilename(directoryName, fileName, expiryDate);
+        if (sign(directoryName, fileId, expiryDate.getTime()) === signature) {
+          const file = await modules.files.findFile({ fileId });
+          if (file.expires === null) {
+            res.writeHead(503);
+            res.end('File already linked');
+            return;
+          }
+          const writeStream = await modules.gridfsFileUploads.createWriteStream(
+            directoryName,
+            fileId,
+            fileName,
+          );
+          res.writeHead(200);
+          const { length } = await promisePipe(req, writeStream);
+          await services.files.linkFile({ fileId, size: length }, req.unchainedContext);
+          res.end();
+          return;
+        }
+        res.writeHead(403);
+        res.end();
+        return;
+      }
+      if (req.method === 'GET') {
+        const fileId = fileName;
+        const readStream = await modules.gridfsFileUploads.createReadStream(directoryName, fileId);
+        res.writeHead(200);
+        await promisePipe(readStream, res);
+        res.end();
+        return;
+      }
+      res.writeHead(404);
+      res.end();
+      return;
+    } catch (e) {
+      log(e.message, { level: LogLevel.Error });
+      res.writeHead(503);
+      res.end(JSON.stringify(e));
+    }
+  });

package/src/files/minio/minio-adapter.ts

@@ -1,5 +1,5 @@
 import { IFileAdapter } from '@unchainedshop/types/files';
-import { FileAdapter, FileDirector } from '@unchainedshop/file-upload';
+import { FileAdapter, FileDirector, buildHashedFilename } from '@unchainedshop/file-upload';
 
 import https from 'https';
 import http, { OutgoingHttpHeaders } from 'http';
@@ -8,7 +8,6 @@ import mimeType from 'mime-types';
 import Minio from 'minio';
 import { Readable } from 'stream';
 import { URL } from 'url';
-import buildHashedFilename from '@unchainedshop/file-upload/lib/buildHashedFilename';
 
 const {
   MINIO_ACCESS_KEY,

package/src/files/minio/minio-webhook.js

@@ -9,39 +9,42 @@ const isAuthorized = ({ authorization = '' }) => {
   return type === 'Bearer' && token === MINIO_WEBHOOK_AUTH_TOKEN;
 };
 
-useMiddlewareWithCurrentContext(
-  '/minio/',
-  bodyParser.json({
-    strict: false,
-  }),
-);
+export default (app) => {
+  useMiddlewareWithCurrentContext(
+    app,
+    '/minio/',
+    bodyParser.json({
+      strict: false,
+    }),
+  );
 
-useMiddlewareWithCurrentContext('/minio/', async (req, res) => {
-  try {
-    if (req.method === 'POST' && req.body) {
-      const { headers } = req;
-      const { Records = [], EventName } = req.body;
-      if (EventName === 's3:ObjectCreated:Put' && isAuthorized(headers)) {
-        const [{ s3 }] = Records;
-        const { object } = s3;
-        const { size, contentType: type } = object;
-        const [fileId] = object.key.split('.');
-        const { services } = req.unchainedContext;
-        await services.files.linkFile({ fileId, type, size }, req.unchainedContext);
-        res.writeHead(200);
-        res.end();
-        return;
+  useMiddlewareWithCurrentContext(app, '/minio/', async (req, res) => {
+    try {
+      if (req.method === 'POST' && req.body) {
+        const { headers } = req;
+        const { Records = [], EventName } = req.body;
+        if (EventName === 's3:ObjectCreated:Put' && isAuthorized(headers)) {
+          const [{ s3 }] = Records;
+          const { object } = s3;
+          const { size, contentType: type } = object;
+          const [fileId] = object.key.split('.');
+          const { services } = req.unchainedContext;
+          await services.files.linkFile({ fileId, type, size }, req.unchainedContext);
+          res.writeHead(200);
+          res.end();
+          return;
+        }
       }
+      res.writeHead(404);
+      res.end();
+      return;
+    } catch (e) {
+      log(e.message, { level: LogLevel.Error });
+      res.writeHead(503);
+      res.end(JSON.stringify(e));
     }
-    res.writeHead(404);
-    res.end();
-    return;
-  } catch (e) {
-    log(e.message, { level: LogLevel.Error });
-    res.writeHead(503);
-    res.end(JSON.stringify(e));
-  }
-});
+  });
+};
 
 /*
 

package/src/payment/apple-iap/adapter.ts

@@ -13,7 +13,7 @@ const logger = createLogger('unchained:core-payment:iap');
 const {
   APPLE_IAP_SHARED_SECRET,
   APPLE_IAP_ENVIRONMENT = 'sandbox',
-  APPLE_IAP_WEBHOOK_PATH = '/graphql/apple-iap',
+  APPLE_IAP_WEBHOOK_PATH = '/payment/apple-iap',
 } = process.env;
 
 // https://developer.apple.com/documentation/storekit/in-app_purchase/validating_receipts_with_the_app_store
@@ -88,44 +88,89 @@ const fixPeriods = async (
   );
 };
 
-useMiddlewareWithCurrentContext(
-  APPLE_IAP_WEBHOOK_PATH,
-  bodyParser.json({
-    strict: false,
-  }),
-);
-
-useMiddlewareWithCurrentContext(APPLE_IAP_WEBHOOK_PATH, async (req, res) => {
-  if (req.method === 'POST') {
-    try {
-      const resolvedContext = req.unchainedContext as Context;
-      const { modules, services } = resolvedContext;
-      const responseBody = req.body || {};
-      if (responseBody.password !== APPLE_IAP_SHARED_SECRET) {
-        throw new Error('shared secret not valid');
-      }
+export default (app) => {
+  useMiddlewareWithCurrentContext(
+    app,
+    APPLE_IAP_WEBHOOK_PATH,
+    bodyParser.json({
+      strict: false,
+    }),
+  );
 
-      const transactions = responseBody?.unified_receipt?.latest_receipt_info; // eslint-disable-line
-      const latestTransaction = transactions[0];
+  useMiddlewareWithCurrentContext(app, APPLE_IAP_WEBHOOK_PATH, async (req, res) => {
+    if (req.method === 'POST') {
+      try {
+        const resolvedContext = req.unchainedContext as Context;
+        const { modules, services } = resolvedContext;
+        const responseBody = req.body || {};
+        if (responseBody.password !== APPLE_IAP_SHARED_SECRET) {
+          throw new Error('shared secret not valid');
+        }
 
-      if (responseBody.notification_type === AppleNotificationTypes.INITIAL_BUY) {
-        // Find the cart to checkout
-        const orderPayment = await modules.orders.payments.findOrderPaymentByContextData({
-          context: {
-            'meta.transactionIdentifier': latestTransaction.transaction_id,
-          },
-        });
+        const transactions = responseBody?.unified_receipt?.latest_receipt_info; // eslint-disable-line
+        const latestTransaction = transactions[0];
 
-        if (!orderPayment) throw new Error('Could not find any matching order payment');
-        const order = await modules.orders.findOrder({
-          orderId: orderPayment.orderId,
-        });
+        if (responseBody.notification_type === AppleNotificationTypes.INITIAL_BUY) {
+          // Find the cart to checkout
+          const orderPayment = await modules.orders.payments.findOrderPaymentByContextData({
+            context: {
+              'meta.transactionIdentifier': latestTransaction.transaction_id,
+            },
+          });
+
+          if (!orderPayment) throw new Error('Could not find any matching order payment');
+          const order = await modules.orders.findOrder({
+            orderId: orderPayment.orderId,
+          });
+
+          if (modules.orders.isCart(order)) {
+            // checkout if is cart, else just ignore because the cart is already checked out
+            // through submission of the receipt with GraphQL
+            const checkedOut = await modules.orders.checkout(
+              order._id,
+              {
+                paymentContext: {
+                  receiptData: responseBody?.unified_receipt?.latest_receipt, // eslint-disable-line
+                },
+              },
+              resolvedContext,
+            );
+            const orderId = checkedOut._id;
+            const enrollment = await modules.enrollments.findEnrollment({
+              orderId,
+            });
+            await fixPeriods(
+              {
+                transactionId: latestTransaction.original_transaction_id,
+                transactions,
+                enrollmentId: enrollment._id,
+                orderId,
+              },
+              resolvedContext,
+            );
 
-        if (modules.orders.isCart(order)) {
-          // checkout if is cart, else just ignore because the cart is already checked out
-          // through submission of the receipt with GraphQL
-          const checkedOut = await modules.orders.checkout(
-            order._id,
+            logger.info(`Apple IAP Webhook: Confirmed checkout for order ${checkedOut.orderNumber}`, {
+              orderId: checkedOut._id,
+            });
+          }
+        } else {
+          // Just store payment credentials, use the enrollments paymentProvider reference and
+          // let the job do the rest
+          const originalOrderPayment = await modules.orders.payments.findOrderPaymentByContextData({
+            context: {
+              'meta.transactionIdentifier': latestTransaction.original_transaction_id,
+            },
+          });
+          if (!originalOrderPayment) throw new Error('Could not find any matching order payment');
+          const originalOrder = await modules.orders.findOrder({
+            orderId: originalOrderPayment.orderId,
+          });
+          const enrollment = await modules.enrollments.findEnrollment({
+            orderId: originalOrder._id,
+          });
+
+          await services.payment.registerPaymentCredentials(
+            enrollment.payment.paymentProviderId,
             {
               transactionContext: {
                 receiptData: responseBody?.unified_receipt?.latest_receipt, // eslint-disable-line
@@ -133,97 +178,55 @@ useMiddlewareWithCurrentContext(APPLE_IAP_WEBHOOK_PATH, async (req, res) => {
             },
             resolvedContext,
           );
-          const orderId = checkedOut._id;
-          const enrollment = await modules.enrollments.findEnrollment({
-            orderId,
-          });
+
           await fixPeriods(
             {
               transactionId: latestTransaction.original_transaction_id,
               transactions,
               enrollmentId: enrollment._id,
-              orderId,
+              orderId: originalOrder._id,
             },
             resolvedContext,
           );
 
-          logger.info(`Apple IAP Webhook: Confirmed checkout for order ${checkedOut.orderNumber}`, {
-            orderId: checkedOut._id,
-          });
-        }
-      } else {
-        // Just store payment credentials, use the enrollments paymentProvider reference and
-        // let the job do the rest
-        const originalOrderPayment = await modules.orders.payments.findOrderPaymentByContextData({
-          context: {
-            'meta.transactionIdentifier': latestTransaction.original_transaction_id,
-          },
-        });
-        if (!originalOrderPayment) throw new Error('Could not find any matching order payment');
-        const originalOrder = await modules.orders.findOrder({
-          orderId: originalOrderPayment.orderId,
-        });
-        const enrollment = await modules.enrollments.findEnrollment({
-          orderId: originalOrder._id,
-        });
-
-        await services.payment.registerPaymentCredentials(
-          enrollment.payment.paymentProviderId,
-          {
-            transactionContext: {
-              receiptData: responseBody?.unified_receipt?.latest_receipt, // eslint-disable-line
-            },
-          },
-          resolvedContext,
-        );
-
-        await fixPeriods(
-          {
-            transactionId: latestTransaction.original_transaction_id,
-            transactions,
-            enrollmentId: enrollment._id,
-            orderId: originalOrder._id,
-          },
-          resolvedContext,
-        );
-
-        logger.info(
-          `Apple IAP Webhook: Processed notification for ${latestTransaction.original_transaction_id} and type ${responseBody.notification_type}`,
-        );
+          logger.info(
+            `Apple IAP Webhook: Processed notification for ${latestTransaction.original_transaction_id} and type ${responseBody.notification_type}`,
+          );
 
-        if (responseBody.notification_type === AppleNotificationTypes.DID_RECOVER) {
-          if (
-            enrollment.status !== EnrollmentStatus.TERMINATED &&
-            responseBody.auto_renew_status === 'false'
-          ) {
-            await modules.enrollments.terminateEnrollment(enrollment, {}, resolvedContext);
+          if (responseBody.notification_type === AppleNotificationTypes.DID_RECOVER) {
+            if (
+              enrollment.status !== EnrollmentStatus.TERMINATED &&
+              responseBody.auto_renew_status === 'false'
+            ) {
+              await modules.enrollments.terminateEnrollment(enrollment, {}, resolvedContext);
+            }
           }
-        }
 
-        if (responseBody.notification_type === AppleNotificationTypes.DID_CHANGE_RENEWAL_STATUS) {
-          if (
-            enrollment.status !== EnrollmentStatus.TERMINATED &&
-            responseBody.auto_renew_status === 'false'
-          ) {
-            await modules.enrollments.terminateEnrollment(enrollment, {}, resolvedContext);
+          if (responseBody.notification_type === AppleNotificationTypes.DID_CHANGE_RENEWAL_STATUS) {
+            if (
+              enrollment.status !== EnrollmentStatus.TERMINATED &&
+              responseBody.auto_renew_status === 'false'
+            ) {
+              await modules.enrollments.terminateEnrollment(enrollment, {}, resolvedContext);
+            }
           }
+          logger.info(`Apple IAP Webhook: Updated enrollment from Apple`);
         }
-        logger.info(`Apple IAP Webhook: Updated enrollment from Apple`);
-      }
 
-      res.writeHead(200);
-      res.end();
-      return;
-    } catch (e) {
-      logger.warn(`Apple IAP Webhook: ${e.message}`, e);
-      res.writeHead(503);
-      res.end(JSON.stringify(e));
-      return;
+        res.writeHead(200);
+        res.end();
+        return;
+      } catch (e) {
+        logger.warn(`Apple IAP Webhook: ${e.message}`, e);
+        res.writeHead(503);
+        res.end(JSON.stringify(e));
+        return;
+      }
     }
-  }
-  res.writeHead(404);
-  res.end();
-});
+    res.writeHead(404);
+    res.end();
+  });
+};
 
 const AppleIAP: IPaymentAdapter = {
   ...PaymentAdapter,

package/src/payment/apple-iap/index.ts

@@ -1,3 +1,4 @@
-import './adapter';
+import setupAppleIAP from './adapter';
 
+export default setupAppleIAP;
 export { configureAppleTransactionsModule } from './module/configureAppleTransactionsModule';

package/src/payment/bity/adapter.ts

@@ -29,10 +29,10 @@ const {
   BITY_BANK_ACCOUNT_NAME,
   BITY_BANK_ACCOUNT_ZIP,
   BITY_API_ENDPOINT = 'https://exchange.api.bity.com',
-  BITY_OAUTH_INIT_PATH = '/graphql/bity-auth',
-  BITY_OAUTH_REDIRECT_URI = 'http://localhost:4010/graphql/bity',
+  BITY_OAUTH_INIT_PATH = '/payment/bity-auth',
+  BITY_OAUTH_REDIRECT_URI = 'http://localhost:4010/payment/bity',
   BITY_OAUTH_STATE = 'unchained',
-  BITY_OAUTH_PATH = '/graphql/bity',
+  BITY_OAUTH_PATH = '/payment/bity',
 } = process.env;
 
 const createBityAuth = () => {
@@ -185,56 +185,58 @@ const estimateBityOrder = async (data: any, context: Context) => {
   return response.json();
 };
 
-useMiddlewareWithCurrentContext(BITY_OAUTH_INIT_PATH, async (req, res) => {
-  if (req.method === 'GET') {
-    try {
-      const resolvedContext = req.unchainedContext;
-      await checkAction(resolvedContext, actions.managePaymentProviders);
-
-      const bityAuthClient = createBityAuth();
-      const uri = bityAuthClient.code.getUri();
-      logger.info(`Bity Webhook: Login ${uri}`);
-      res.writeHead(302, {
-        Location: uri,
-      });
-      res.end();
-      return;
-    } catch (e) {
-      logger.warn(`Bity Webhook: Failed with ${e.message}`);
-      res.writeHead(503);
-      res.end(JSON.stringify(e));
-      return;
+export default (app) => {
+  useMiddlewareWithCurrentContext(app, BITY_OAUTH_INIT_PATH, async (req, res) => {
+    if (req.method === 'GET') {
+      try {
+        const resolvedContext = req.unchainedContext;
+        await checkAction(resolvedContext, actions.managePaymentProviders);
+
+        const bityAuthClient = createBityAuth();
+        const uri = bityAuthClient.code.getUri();
+        logger.info(`Bity Webhook: Login ${uri}`);
+        res.writeHead(302, {
+          Location: uri,
+        });
+        res.end();
+        return;
+      } catch (e) {
+        logger.warn(`Bity Webhook: Failed with ${e.message}`);
+        res.writeHead(503);
+        res.end(JSON.stringify(e));
+        return;
+      }
     }
-  }
-  res.writeHead(404);
-  res.end();
-});
-
-useMiddlewareWithCurrentContext(BITY_OAUTH_PATH, async (req, res, next) => {
-  bodyParser.urlencoded({ extended: false })(req, res, next);
-});
-
-useMiddlewareWithCurrentContext(BITY_OAUTH_PATH, async (req, res) => {
-  if (req.method === 'GET') {
-    try {
-      const resolvedContext = req.unchainedContext as Context;
-      await checkAction(resolvedContext, actions.managePaymentProviders);
-      const bityAuthClient = createBityAuth();
-      const user = await bityAuthClient.code.getToken(req.originalUrl);
-      await upsertBityCredentials(user, resolvedContext);
-      res.writeHead(200);
-      res.end('Bity Credentials Setup Complete');
-      return;
-    } catch (e) {
-      logger.warn(`Bity Webhook: Failed with ${e.message}`);
-      res.writeHead(503);
-      res.end(JSON.stringify(e));
-      return;
+    res.writeHead(404);
+    res.end();
+  });
+
+  useMiddlewareWithCurrentContext(app, BITY_OAUTH_PATH, async (req, res, next) => {
+    bodyParser.urlencoded({ extended: false })(req, res, next);
+  });
+
+  useMiddlewareWithCurrentContext(app, BITY_OAUTH_PATH, async (req, res) => {
+    if (req.method === 'GET') {
+      try {
+        const resolvedContext = req.unchainedContext as Context;
+        await checkAction(resolvedContext, actions.managePaymentProviders);
+        const bityAuthClient = createBityAuth();
+        const user = await bityAuthClient.code.getToken(req.originalUrl);
+        await upsertBityCredentials(user, resolvedContext);
+        res.writeHead(200);
+        res.end('Bity Credentials Setup Complete');
+        return;
+      } catch (e) {
+        logger.warn(`Bity Webhook: Failed with ${e.message}`);
+        res.writeHead(503);
+        res.end(JSON.stringify(e));
+        return;
+      }
     }
-  }
-  res.writeHead(404);
-  res.end();
-});
+    res.writeHead(404);
+    res.end();
+  });
+};
 
 let bityAuthClient;
 const loadToken = async (context: Context) => {

package/src/payment/bity/index.ts

@@ -1,3 +1,4 @@
-import './adapter';
+import setupBity from './adapter';
 
+export default setupBity;
 export { configureBityModule } from './module/configureBityModule';