@unchainedshop/plugins 2.0.0-beta6 → 2.0.0-beta7

package/src/payment/stripe.ts

@@ -1,7 +1,5 @@
 import { Context } from '@unchainedshop/types/api';
 import { IPaymentAdapter } from '@unchainedshop/types/payments';
-import bodyParser from 'body-parser';
-import { useMiddlewareWithCurrentContext } from '@unchainedshop/api';
 import { PaymentAdapter, PaymentDirector, PaymentError } from '@unchainedshop/core-payment';
 import { createLogger } from '@unchainedshop/logger';
 
@@ -18,96 +16,83 @@ import createStripeClient from 'stripe';
 
 const logger = createLogger('unchained:core-payment:stripe');
 
-const {
-  STRIPE_SECRET,
-  STRIPE_ENDPOINT_SECRET,
-  EMAIL_WEBSITE_NAME,
-  STRIPE_WEBHOOK_PATH = '/payment/stripe',
-} = process.env;
+const { STRIPE_SECRET, STRIPE_ENDPOINT_SECRET, EMAIL_WEBSITE_NAME } = process.env;
 
 // eslint-disable-next-line
 // @ts-ignore
 const stripe = createStripeClient(STRIPE_SECRET);
 
-export default (app) => {
-  useMiddlewareWithCurrentContext(
-    app,
-    STRIPE_WEBHOOK_PATH,
-    bodyParser.raw({ type: 'application/json' }),
-  );
-
-  useMiddlewareWithCurrentContext(app, STRIPE_WEBHOOK_PATH, async (request, response) => {
-    const sig = request.headers['stripe-signature'];
-    const resolvedContext = request.unchainedContext as Context;
-    const { modules, services } = resolvedContext;
-
-    let event;
-
-    try {
-      event = stripe.webhooks.constructEvent(request.body, sig, STRIPE_ENDPOINT_SECRET);
-    } catch (err) {
-      response.writeHead(400);
-      response.end(`Webhook Error: ${err.message}`);
-      return;
-    }
-
-    try {
-      if (event.type === 'payment_intent.succeeded') {
-        const paymentIntent = event.data.object;
-        const orderPaymentId = paymentIntent.metadata?.orderPaymentId;
-
-        await modules.orders.payments.logEvent(orderPaymentId, event, resolvedContext.userId);
-
-        const orderPayment = await modules.orders.payments.findOrderPayment({
-          orderPaymentId,
-        });
-
-        const order = await modules.orders.checkout(
-          orderPayment.orderId,
-          {
-            transactionContext: {
-              paymentIntentId: paymentIntent.id,
-            },
-            paymentContext: {
-              paymentIntentId: paymentIntent.id,
-            },
+export const stripeHandler = async (request, response) => {
+  const sig = request.headers['stripe-signature'];
+  const resolvedContext = request.unchainedContext as Context;
+  const { modules, services } = resolvedContext;
+
+  let event;
+
+  try {
+    event = stripe.webhooks.constructEvent(request.body, sig, STRIPE_ENDPOINT_SECRET);
+  } catch (err) {
+    response.writeHead(400);
+    response.end(`Webhook Error: ${err.message}`);
+    return;
+  }
+
+  try {
+    if (event.type === 'payment_intent.succeeded') {
+      const paymentIntent = event.data.object;
+      const orderPaymentId = paymentIntent.metadata?.orderPaymentId;
+
+      await modules.orders.payments.logEvent(orderPaymentId, event, resolvedContext.userId);
+
+      const orderPayment = await modules.orders.payments.findOrderPayment({
+        orderPaymentId,
+      });
+
+      const order = await modules.orders.checkout(
+        orderPayment.orderId,
+        {
+          transactionContext: {
+            paymentIntentId: paymentIntent.id,
           },
-          resolvedContext,
-        );
-
-        logger.info(`Stripe Webhook: Unchained confirmed checkout for order ${order.orderNumber}`, {
-          orderId: order._id,
-        });
-      } else if (event.type === 'setup_intent.succeeded') {
-        const setupIntent = event.data.object;
-        const { paymentProviderId, userId } = setupIntent.metadata;
-
-        await services.payment.registerPaymentCredentials(
-          paymentProviderId,
-          {
-            transactionContext: {
-              setupIntentId: setupIntent.id,
-            },
+          paymentContext: {
+            paymentIntentId: paymentIntent.id,
           },
-          resolvedContext,
-        );
-
-        logger.info(`Stripe Webhook: Unchained registered payment credentials for ${userId}`, {
-          userId,
-        });
-      } else {
-        response.writeHead(404);
-        response.end();
-        return;
-      }
-    } catch (err) {
-      response.writeHead(400);
-      response.end(`Webhook Error: ${err.message}`);
+        },
+        resolvedContext,
+      );
+
+      logger.info(`Stripe Webhook: Unchained confirmed checkout for order ${order.orderNumber}`, {
+        orderId: order._id,
+      });
+    } else if (event.type === 'setup_intent.succeeded') {
+      const setupIntent = event.data.object;
+      const { paymentProviderId, userId } = setupIntent.metadata;
+
+      await services.payment.registerPaymentCredentials(
+        paymentProviderId,
+        {
+          transactionContext: {
+            setupIntentId: setupIntent.id,
+          },
+        },
+        resolvedContext,
+      );
+
+      logger.info(`Stripe Webhook: Unchained registered payment credentials for ${userId}`, {
+        userId,
+      });
+    } else {
+      response.writeHead(404);
+      response.end();
       return;
     }
-    // Return a 200 response to acknowledge receipt of the event
-    response.end(JSON.stringify({ received: true }));
-  });
+  } catch (err) {
+    response.writeHead(400);
+    response.end(`Webhook Error: ${err.message}`);
+    return;
+  }
+  // Return a 200 response to acknowledge receipt of the event
+  response.end(JSON.stringify({ received: true }));
 };
 
 const createRegistrationIntent = async ({ userId, name, email, paymentProviderId }, options = {}) => {

package/src/payment/worldline-saferpay/worldline-saferpay-client/api/SaferpayConnection.ts

@@ -1,5 +1,4 @@
-import fetch from 'node-fetch';
-
+/// <reference lib="dom" />
 export class SaferpayConnection {
   private baseUrl: string;
 

package/src/plugins-index.ts

@@ -0,0 +1,147 @@
+import { useMiddlewareWithCurrentContext } from '@unchainedshop/api';
+import bodyParser from 'body-parser';
+
+// Delivery
+import './delivery/post';
+import './delivery/pick-mup';
+import './delivery/send-message';
+import './delivery/stores';
+
+// Payment
+import './payment/invoice';
+import './payment/invoice-prepaid';
+import './payment/paypal-checkout';
+import './payment/worldline-saferpay';
+import { datatransHandler } from './payment/datatrans-v2';
+import { configureCryptopayModule, cryptopayHandler } from './payment/cryptopay';
+import { appleIAPHandler, configureAppleTransactionsModule } from './payment/apple-iap';
+import { stripeHandler } from './payment/stripe';
+import { postfinanceCheckoutHandler } from './payment/postfinance-checkout';
+
+// Warehousing
+import './warehousing/store';
+import './warehousing/eth-minter';
+
+// Pricing
+import './pricing/discount-half-price-manual';
+import './pricing/discount-100-off';
+import './pricing/free-payment';
+import './pricing/free-delivery';
+import './pricing/order-items';
+import './pricing/order-discount';
+import './pricing/order-delivery';
+import './pricing/order-payment';
+import './pricing/product-catalog-price';
+import './pricing/product-price-rateconversion';
+import './pricing/product-discount';
+import './pricing/product-swiss-tax';
+import './pricing/delivery-swiss-tax';
+
+// Filter & Search
+import './filters/strict-equal';
+import './filters/local-search';
+
+// Quotations
+import './quotations/manual';
+
+// Enrollments
+import './enrollments/licensed';
+
+// Event Queue
+import './events/node-event-emitter';
+
+// Workers
+import './worker/bulk-import';
+import './worker/zombie-killer';
+import './worker/message';
+import './worker/external';
+import './worker/http-request';
+import './worker/heartbeat';
+import './worker/email';
+import './worker/sms';
+import './worker/update-ecb-rates';
+import './worker/update-coinbase-rates';
+import { configureExportToken } from './worker/export-token';
+import { configureGenerateOrderAutoscheduling } from './worker/enrollment-order-generator';
+import { configureUpdateTokenOwnership } from './worker/update-token-ownership';
+
+// Asset Management
+import './files/gridfs/gridfs-adapter';
+import { gridfsHandler } from './files/gridfs/gridfs-webhook';
+import { configureGridFSFileUploadModule } from './files/gridfs';
+
+const {
+  CRYPTOPAY_WEBHOOK_PATH = '/payment/cryptopay',
+  STRIPE_WEBHOOK_PATH = '/payment/stripe',
+  PFCHECKOUT_WEBHOOK_PATH = '/payment/postfinance-checkout',
+  DATATRANS_WEBHOOK_PATH = '/payment/datatrans/webhook',
+  APPLE_IAP_WEBHOOK_PATH = '/payment/apple-iap',
+  // MINIO_PUT_SERVER_PATH = '/minio',
+  GRIDFS_PUT_SERVER_PATH = '/gridfs',
+} = process.env;
+
+// import './files/minio/minio-adapter';
+// import { minioHandler } from './files/minio/minio-webhook';
+
+export const defaultModules = {
+  appleTransactions: {
+    configure: configureAppleTransactionsModule,
+  },
+  gridfsFileUploads: {
+    configure: configureGridFSFileUploadModule,
+  },
+  cryptopay: {
+    configure: configureCryptopayModule,
+  },
+};
+
+export const useDefaultMiddlewares = (unchainedApi, app) => {
+  useMiddlewareWithCurrentContext(app, GRIDFS_PUT_SERVER_PATH, gridfsHandler);
+
+  useMiddlewareWithCurrentContext(app, CRYPTOPAY_WEBHOOK_PATH, bodyParser.json(), cryptopayHandler);
+
+  useMiddlewareWithCurrentContext(
+    app,
+    STRIPE_WEBHOOK_PATH,
+    bodyParser.raw({ type: 'application/json' }),
+    stripeHandler,
+  );
+
+  useMiddlewareWithCurrentContext(
+    app,
+    PFCHECKOUT_WEBHOOK_PATH,
+    bodyParser.json(),
+    postfinanceCheckoutHandler,
+  );
+
+  useMiddlewareWithCurrentContext(
+    app,
+    DATATRANS_WEBHOOK_PATH,
+    bodyParser.text({
+      type: 'application/json',
+    }),
+    datatransHandler,
+  );
+
+  useMiddlewareWithCurrentContext(
+    app,
+    APPLE_IAP_WEBHOOK_PATH,
+    bodyParser.json({
+      strict: false,
+    }),
+    appleIAPHandler,
+  );
+
+  // useMiddlewareWithCurrentContext(
+  //   app,
+  //   MINIO_PUT_SERVER_PATH,
+  //   bodyParser.json({
+  //     strict: false,
+  //   }),
+  //   minioHandler
+  // );
+
+  configureExportToken(unchainedApi);
+  configureUpdateTokenOwnership(unchainedApi);
+  configureGenerateOrderAutoscheduling();
+};

package/src/warehousing/eth-minter.ts

@@ -25,6 +25,22 @@ const ETHMinter: IWarehousingAdapter = {
 
   actions: (configuration, context) => {
     const { product, orderPosition, token, modules, localeContext } = context;
+
+    const getTokensCreated = async () => {
+      const existingTokens = await modules.warehousing.findTokens(
+        product.tokenization.contractStandard === ProductContractStandard.ERC721
+          ? { contractAddress: product.tokenization.contractAddress }
+          : {
+              contractAddress: product.tokenization.contractAddress,
+              chainTokenId: product.tokenization.tokenId,
+            },
+      );
+      const tokensCreated = existingTokens.reduce((acc, curToken) => {
+        return acc + curToken.quantity;
+      }, 0);
+      return tokensCreated;
+    };
+
     return {
       ...WarehousingAdapter.actions(configuration, context),
 
@@ -37,18 +53,7 @@ const ETHMinter: IWarehousingAdapter = {
       },
 
       stock: async () => {
-        const existingTokens = await modules.warehousing.findTokens(
-          product.tokenization.contractStandard === 'ERC721'
-            ? { contractAddress: product.tokenization.contractAddress }
-            : {
-                contractAddress: product.tokenization.contractAddress,
-                chainTokenId: product.tokenization.tokenId,
-              },
-        );
-        const tokensCreated = existingTokens.reduce((acc, curToken) => {
-          return acc + curToken.quantity;
-        }, 0);
-
+        const tokensCreated = await getTokensCreated();
         return product?.tokenization?.supply ? product.tokenization.supply - tokensCreated : 0;
       },
 
@@ -61,18 +66,7 @@ const ETHMinter: IWarehousingAdapter = {
         const { contractAddress, contractStandard, tokenId } = product?.tokenization || {};
         const _id = generateDbObjectId();
         const meta = { contractStandard };
-
-        const existingTokens = await modules.warehousing.findTokens(
-          product.tokenization.contractStandard === 'ERC721'
-            ? { contractAddress: product.tokenization.contractAddress }
-            : {
-                contractAddress: product.tokenization.contractAddress,
-                chainTokenId: product.tokenization.tokenId,
-              },
-        );
-        const tokensCreated = existingTokens.reduce((acc, curToken) => {
-          return acc + curToken.quantity;
-        }, 0);
+        const tokensCreated = await getTokensCreated();
 
         if (contractStandard === 'ERC721') {
           // ERC721 is non-fungible, thus every _id unique!
@@ -99,12 +93,8 @@ const ETHMinter: IWarehousingAdapter = {
       },
 
       tokenMetadata: async (chainTokenId) => {
-        // if ERC721 -> tokenUri
-        // if ERC1155 -> uri
-        // -> use the contract to get the correct metadata uri from tokenId
-
-        // depending on the ERC, build the correct metadata json schema
-        // https://eips.ethereum.org/EIPS/eip-1155
+        // Metadata standards supported
+        // https://eips.ethereum.org/EIPS/eip-1155 (backward compatible with 721)
         // https://eips.ethereum.org/EIPS/eip-721
 
         const allLanguages = await modules.languages.findLanguages({
@@ -124,28 +114,22 @@ const ETHMinter: IWarehousingAdapter = {
 
         const name = `${text.title} #${chainTokenId}`;
 
-        if (product.tokenization.contractStandard === ProductContractStandard.ERC1155) {
-          const isDefaultLanguageActive = localeContext.language === systemLocale.language;
-          const localization = isDefaultLanguageActive
-            ? {
-                uri: `${process.env.ROOT_URL}/erc-metadata/${product._id}/{locale}/${product.tokenization.tokenId}.json`,
-                default: systemLocale.language,
-                locales: allLanguages.map((lang) => lang.isoCode),
-              }
-            : undefined;
-
-          return {
-            name,
-            description: text.description,
-            image: url,
-            properties: product.meta,
-            localization,
-          };
-        }
+        const isDefaultLanguageActive = localeContext.language === systemLocale.language;
+        const localization = isDefaultLanguageActive
+          ? {
+              uri: `${process.env.ROOT_URL}/erc-metadata/${product._id}/{locale}/${product.tokenization.tokenId}.json`,
+              default: systemLocale.language,
+              locales: allLanguages.map((lang) => lang.isoCode),
+            }
+          : undefined;
+
         return {
           name,
           description: text.description,
           image: url,
+          properties: product.tokenization.ercMetadataProperties,
+          localization,
+          ...(token?.meta || {}),
         };
       },
     };

package/src/worker/http-request.ts

@@ -1,5 +1,5 @@
+/// <reference lib="dom" />
 import { IWorkerAdapter } from '@unchainedshop/types/worker';
-import fetch from 'node-fetch';
 import { WorkerDirector, WorkerAdapter } from '@unchainedshop/core-worker';
 import { log, LogLevel } from '@unchainedshop/logger';
 

package/src/worker/update-coinbase-rates.ts

@@ -1,7 +1,7 @@
+/// <reference lib="dom" />
 import { IWorkerAdapter } from '@unchainedshop/types/worker';
 import { WorkerAdapter, WorkerDirector } from '@unchainedshop/core-worker';
 import later from '@breejs/later';
-import fetch from 'node-fetch';
 import { ProductPriceRate } from '@unchainedshop/types/products.pricing';
 import { systemLocale } from '@unchainedshop/utils';
 

package/src/worker/update-ecb-rates.ts

@@ -1,8 +1,8 @@
+/// <reference lib="dom" />
 import { IWorkerAdapter } from '@unchainedshop/types/worker';
 import { WorkerAdapter, WorkerDirector } from '@unchainedshop/core-worker';
 import later from '@breejs/later';
 import xmlJs from 'xml-js';
-import fetch from 'node-fetch';
 import { ProductPriceRate } from '@unchainedshop/types/products.pricing';
 
 const getExchangeRates = async () => {

package/src/worker/zombie-killer.ts

@@ -32,7 +32,7 @@ export const ZombieKillerWorker: IWorkerAdapter<
       // Remove unreferenced product media objects
       const products = await modules.products.findProducts({}, findId);
       const deletedProductMediaCount = await modules.products.media.deleteMediaFiles({
-        excludedProdcutIds: products.map(mapId),
+        excludedProductIds: products.map(mapId),
       });
 
       // Remove unreferenced assortment media objects

package/lib/payment/bity/adapter.d.ts

@@ -1,2 +0,0 @@
-declare const _default: (app: any) => void;
-export default _default;