@unchainedshop/plugins 3.0.0-alpha7 → 3.0.0-rc2

package/src/filters/local-search.ts

@@ -1,8 +1,7 @@
-import { FilterDirector, FilterAdapter } from '@unchainedshop/core-filters';
-import { IFilterAdapter } from '@unchainedshop/core-filters';
 import { mongodb } from '@unchainedshop/mongodb';
 import { ProductText } from '@unchainedshop/core-products';
 import { AssortmentText } from '@unchainedshop/core-assortments';
+import { FilterDirector, FilterAdapter, IFilterAdapter } from '@unchainedshop/core';
 
 function escapeStringRegexp(string) {
   if (typeof string !== 'string') {

package/src/filters/strict-equal.ts

@@ -1,5 +1,4 @@
-import { IFilterAdapter } from '@unchainedshop/core-filters';
-import { FilterDirector, FilterAdapter } from '@unchainedshop/core-filters';
+import { IFilterAdapter, FilterDirector, FilterAdapter } from '@unchainedshop/core';
 
 const StrictQualFilter: IFilterAdapter = {
   ...FilterAdapter,

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

@@ -1,8 +1,6 @@
-/// <reference lib="dom" />
 import { Context } from '@unchainedshop/api';
-import { IPaymentAdapter } from '@unchainedshop/core-payment';
 import { EnrollmentStatus } from '@unchainedshop/core-enrollments';
-import { PaymentAdapter, PaymentDirector, PaymentError } from '@unchainedshop/core-payment';
+import { IPaymentAdapter, PaymentAdapter, PaymentDirector, PaymentError } from '@unchainedshop/core';
 import { createLogger } from '@unchainedshop/logger';
 import { UnchainedCore } from '@unchainedshop/core';
 import { AppleTransactionsModule } from './module/configureAppleTransactionsModule.js';
@@ -82,7 +80,7 @@ export const appleIAPHandler = async (req, res) => {
   if (req.method === 'POST') {
     try {
       const resolvedContext = req.unchainedContext as Context;
-      const { modules } = resolvedContext;
+      const { modules, services } = resolvedContext;
       const responseBody = req.body || {};
       if (responseBody.password !== APPLE_IAP_SHARED_SECRET) {
         throw new Error('shared secret not valid');
@@ -101,15 +99,11 @@ export const appleIAPHandler = async (req, res) => {
 
         if (!orderPayment) throw new Error('Could not find any matching order payment');
 
-        const order = await modules.orders.checkout(
-          orderPayment.orderId,
-          {
-            paymentContext: {
+        const order = await services.orders.checkoutOrder(orderPayment.orderId, {
+          paymentContext: {
                 receiptData: responseBody?.unified_receipt?.latest_receipt, // eslint-disable-line
-            },
           },
-          resolvedContext,
-        );
+        });
         const orderId = order._id;
         const enrollment = await modules.enrollments.findEnrollment({
           orderId,
@@ -143,16 +137,12 @@ export const appleIAPHandler = async (req, res) => {
           orderId: originalOrder._id,
         });
 
-        await modules.payment.registerCredentials(
-          enrollment.payment.paymentProviderId,
-          {
-            transactionContext: {
+        await services.orders.registerPaymentCredentials(enrollment.payment.paymentProviderId, {
+          transactionContext: {
               receiptData: responseBody?.unified_receipt?.latest_receipt, // eslint-disable-line
-            },
-            userId: enrollment.userId,
           },
-          resolvedContext,
-        );
+          userId: enrollment.userId,
+        });
 
         await fixPeriods(
           {
@@ -173,7 +163,7 @@ export const appleIAPHandler = async (req, res) => {
             enrollment.status !== EnrollmentStatus.TERMINATED &&
             responseBody.auto_renew_status === 'false'
           ) {
-            await modules.enrollments.terminateEnrollment(enrollment, resolvedContext);
+            await services.enrollments.terminateEnrollment(enrollment);
           }
         }
 
@@ -182,7 +172,7 @@ export const appleIAPHandler = async (req, res) => {
             enrollment.status !== EnrollmentStatus.TERMINATED &&
             responseBody.auto_renew_status === 'false'
           ) {
-            await modules.enrollments.terminateEnrollment(enrollment, resolvedContext);
+            await services.enrollments.terminateEnrollment(enrollment);
           }
         }
         logger.info(`Apple IAP Webhook: Updated enrollment from Apple`);
@@ -214,11 +204,11 @@ const AppleIAP: IPaymentAdapter = {
     return type === 'GENERIC';
   },
 
-  actions: (params) => {
-    const { modules } = params.context;
+  actions: (params, context) => {
+    const { modules } = context;
 
     const adapterActions = {
-      ...PaymentAdapter.actions(params),
+      ...PaymentAdapter.actions(params, context),
 
       configurationError() {
         // eslint-disable-line
@@ -260,9 +250,7 @@ const AppleIAP: IPaymentAdapter = {
         const { status, latest_receipt_info: latestReceiptInfo } = response; // eslint-disable-line
 
         if (status === 0) {
-          logger.info('Apple IAP Plugin: Receipt validated and updated for the user', {
-            level: 'verbose',
-          });
+          logger.debug('Apple IAP Plugin: Receipt validated and updated for the user');
           const latestTransaction = latestReceiptInfo[latestReceiptInfo.length - 1]; // eslint-disable-line
           return {
             token: latestTransaction.web_order_line_item_id, // eslint-disable-line
@@ -271,7 +259,6 @@ const AppleIAP: IPaymentAdapter = {
         }
 
         logger.warn('Apple IAP Plugin: Receipt invalid', {
-          level: 'warn',
           status: response.status,
         });
         return null;
@@ -279,11 +266,10 @@ const AppleIAP: IPaymentAdapter = {
 
       // eslint-disable-next-line
       async charge(transactionContext) {
-        const { order } = params.paymentContext;
+        const { order } = context;
         const { meta, paymentCredentials, receiptData } = transactionContext || {};
         const { transactionIdentifier } = meta || {};
-        const appleTransactions = (params.context.modules as any)
-          .appleTransactions as AppleTransactionsModule;
+        const appleTransactions = (context.modules as any).appleTransactions as AppleTransactionsModule;
 
         if (!transactionIdentifier) {
           throw new Error('Apple IAP Plugin: You have to set the transaction id on the order payment');
@@ -344,15 +330,11 @@ const AppleIAP: IPaymentAdapter = {
           throw new Error('Apple IAP Plugin: Transaction already processed');
 
         // All good
-        const userId = order?.userId || params.paymentContext?.userId;
-        await appleTransactions.createTransaction(
-          {
-            _id: transactionIdentifier,
-            matchedTransaction,
-            orderId: order._id,
-          },
-          userId,
-        );
+        await appleTransactions.createTransaction({
+          _id: transactionIdentifier,
+          matchedTransaction,
+          orderId: order._id,
+        });
 
         return {
           transactionIdentifier,

package/src/payment/apple-iap/db/AppleTransactionsCollection.ts

@@ -1,5 +1,5 @@
 import { mongodb } from '@unchainedshop/mongodb';
-import type { TimestampFields } from '@unchainedshop/mongodb';
+import { TimestampFields } from '@unchainedshop/mongodb';
 
 export type AppleTransaction = {
   _id?: string;

package/src/payment/apple-iap/module/configureAppleTransactionsModule.ts

@@ -3,7 +3,7 @@ import { AppleTransaction, AppleTransactionsCollection } from '../db/AppleTransa
 export interface AppleTransactionsModule {
   findTransactionById: (transactionIdentifier: string) => Promise<AppleTransaction>;
 
-  createTransaction: (doc: AppleTransaction, userId: string) => Promise<string | null>;
+  createTransaction: (doc: AppleTransaction) => Promise<string | null>;
 }
 
 export const configureAppleTransactionsModule = async ({ db }): Promise<AppleTransactionsModule> => {

package/src/payment/braintree.ts

@@ -1,6 +1,11 @@
-import { IPaymentAdapter } from '@unchainedshop/core-payment';
-import { PaymentDirector, PaymentAdapter, PaymentError } from '@unchainedshop/core-payment';
 import { createLogger } from '@unchainedshop/logger';
+import {
+  IPaymentAdapter,
+  PaymentAdapter,
+  PaymentDirector,
+  PaymentError,
+  OrderPricingSheet,
+} from '@unchainedshop/core';
 
 const logger = createLogger('unchained:core-payment:braintree');
 
@@ -28,16 +33,16 @@ const BraintreeDirect: IPaymentAdapter = {
     return type === 'GENERIC';
   },
 
-  actions: (params) => {
+  actions: (config, context) => {
     const getPublicKey = () => {
-      return params.config.reduce((current, item) => {
+      return config.reduce((current, item) => {
         if (item.key === 'publicKey') return item.value;
         return current;
       }, null);
     };
 
     const getMerchantId = () => {
-      return params.config.reduce((current, item) => {
+      return config.reduce((current, item) => {
         if (item.key === 'merchantId') return item.value;
         return current;
       }, null);
@@ -69,7 +74,7 @@ const BraintreeDirect: IPaymentAdapter = {
     };
 
     const adapter = {
-      ...PaymentAdapter.actions(params),
+      ...PaymentAdapter.actions(config, context),
 
       configurationError: () => {
         const publicCredentialsValid =
@@ -103,8 +108,7 @@ const BraintreeDirect: IPaymentAdapter = {
       },
 
       charge: async ({ paypalPaymentMethodNonce }) => {
-        const { modules } = params.context;
-        const { order } = params.paymentContext;
+        const { order } = context;
         if (!paypalPaymentMethodNonce)
           throw new Error('You have to provide paypalPaymentMethodNonce in paymentContext');
 
@@ -113,7 +117,10 @@ const BraintreeDirect: IPaymentAdapter = {
         const braintree = (await import('braintree')).default; // eslint-disable-line
         const gateway = getGateway(braintree);
         const address = order.billingAddress;
-        const pricing = modules.orders.pricingSheet(order);
+        const pricing = OrderPricingSheet({
+          calculation: order.calculation,
+          currency: order.currency,
+        });
         const rounded = Math.round(pricing.total({ useNetPrice: false }).amount / 10 || 0) * 10;
         const saleRequest = {
           amount: rounded / 100,

package/src/payment/cryptopay/db/CryptopayTransactions.ts

@@ -1,5 +1,5 @@
 import { mongodb } from '@unchainedshop/mongodb';
-import type { TimestampFields } from '@unchainedshop/mongodb';
+import { TimestampFields } from '@unchainedshop/mongodb';
 
 export type CryptopayTransaction = {
   _id?: string;

package/src/payment/cryptopay/middleware.ts

@@ -1,9 +1,7 @@
 import { createLogger } from '@unchainedshop/logger';
 import { Context } from '@unchainedshop/api';
-
-import { UnchainedCore } from '@unchainedshop/core';
 import { OrderStatus } from '@unchainedshop/core-orders';
-import type { CryptopayModule } from './module/configureCryptopayModule.js';
+import { CryptopayModule } from './module/configureCryptopayModule.js';
 import { ProductPriceRate } from '@unchainedshop/core-products';
 
 const { CRYPTOPAY_SECRET, CRYPTOPAY_MAX_RATE_AGE = '360' } = process.env;
@@ -11,8 +9,13 @@ const { CRYPTOPAY_SECRET, CRYPTOPAY_MAX_RATE_AGE = '360' } = process.env;
 const logger = createLogger('unchained:core-payment:cryptopay');
 
 export const cryptopayHandler = async (req, res) => {
-  const resolvedContext = req.unchainedContext as Context;
-  const modules = resolvedContext.modules as UnchainedCore['modules'] & { cryptopay: CryptopayModule };
+  const resolvedContext = req.unchainedContext as Context & {
+    modules: {
+      cryptopay: CryptopayModule;
+    };
+  };
+  const { modules, services } = resolvedContext;
+
   if (req.method === 'POST') {
     try {
       const { secret, price, wallet, ping } = req.body;
@@ -42,9 +45,9 @@ export const cryptopayHandler = async (req, res) => {
           // TODO: Not sure if it's correct to use processOrder here if status is PENDING!
           const order = await modules.orders.findOrder({ orderId: orderPayment.orderId });
           if (order.status === null) {
-            await modules.orders.checkout(order._id, {}, resolvedContext);
+            await services.orders.checkoutOrder(order._id, {});
           } else if (order.status === OrderStatus.PENDING) {
-            await modules.orders.processOrder(order, {}, resolvedContext);
+            await services.orders.processOrder(order, {});
           } else {
             throw new Error('Already processed');
           }
@@ -64,7 +67,7 @@ export const cryptopayHandler = async (req, res) => {
           expiresAt,
           timestamp: timestampDate,
         };
-        logger.verbose(`update rate ${JSON.stringify(price)}, ${JSON.stringify(rateData)}`);
+        logger.info(`update rate ${JSON.stringify(price)}, ${JSON.stringify(rateData)}`);
         await resolvedContext.modules.products.prices.rates.updateRates([rateData]);
       }
 

package/src/payment/cryptopay/plugin.ts

@@ -1,12 +1,15 @@
-import { IPaymentAdapter } from '@unchainedshop/core-payment';
-import { PaymentAdapter, PaymentDirector, PaymentError } from '@unchainedshop/core-payment';
 import { ethers } from 'ethers';
 import { BIP32Factory } from 'bip32';
 import * as ecc from 'tiny-secp256k1';
 import { networks, payments } from 'bitcoinjs-lib';
 import { createLogger } from '@unchainedshop/logger';
-import { UnchainedCore } from '@unchainedshop/core';
-import { OrderPricingSheet } from '@unchainedshop/core-orders';
+import {
+  IPaymentAdapter,
+  PaymentAdapter,
+  PaymentDirector,
+  PaymentError,
+  OrderPricingSheet,
+} from '@unchainedshop/core';
 import { CryptopayModule } from './module/configureCryptopayModule.js';
 
 const logger = createLogger('unchained:core-payment:cryptopay');
@@ -55,8 +58,8 @@ const Cryptopay: IPaymentAdapter = {
     return type === 'GENERIC';
   },
 
-  actions: (params) => {
-    const modules = params.context.modules as UnchainedCore['modules'] & { cryptopay: CryptopayModule };
+  actions: (config, context) => {
+    const { modules } = context as typeof context & { modules: { cryptopay: CryptopayModule } };
 
     const setConversionRates = async (currencyCode: string, existingAddresses: any[]) => {
       const originCurrencyObj = await modules.currencies.findCurrency({ isoCode: currencyCode });
@@ -97,7 +100,7 @@ const Cryptopay: IPaymentAdapter = {
     };
 
     const adapterActions = {
-      ...PaymentAdapter.actions(params),
+      ...PaymentAdapter.actions(config, context),
 
       // eslint-disable-next-line
       configurationError() {
@@ -114,10 +117,10 @@ const Cryptopay: IPaymentAdapter = {
       isActive() {
         // Only support orders that have prices in BTC or ETH for the moment
         if (adapterActions.configurationError() !== null) return false;
-        if (!params.paymentContext.order) return true;
+        if (!context.order) return true;
         // if (
         //   !Object.values(CryptopayCurrencies).includes(
-        //     params.paymentContext.order.currency as CryptopayCurrencies,
+        //     context.order.currency as CryptopayCurrencies,
         //   )
         // )
         //   return false;
@@ -129,7 +132,7 @@ const Cryptopay: IPaymentAdapter = {
       },
 
       sign: async () => {
-        const { orderPayment, order } = params.paymentContext;
+        const { orderPayment, order } = context;
 
         const existingAddresses = await modules.cryptopay.getWalletAddressesByOrderPaymentId(
           orderPayment._id,
@@ -190,7 +193,7 @@ const Cryptopay: IPaymentAdapter = {
       },
 
       charge: async () => {
-        const { order, orderPayment } = params.paymentContext;
+        const { order, orderPayment } = context;
 
         const foundWalletsWithBalances = await modules.cryptopay.getWalletAddressesByOrderPaymentId(
           orderPayment._id,

package/src/payment/datatrans-v2/api/authorize.ts

@@ -1,6 +1,6 @@
 // https://api-reference.datatrans.ch/#operation/Authorize
 
-import type { FetchDatatransFn, AuthorizeRequestPayload, AuthorizeResponse } from './types.js';
+import { FetchDatatransFn, AuthorizeRequestPayload, AuthorizeResponse } from './types.js';
 
 export default async function authorize({
   ...payload

package/src/payment/datatrans-v2/api/authorizeAuthenticated.ts

@@ -1,4 +1,4 @@
-import type {
+import {
   FetchDatatransFn,
   AuthorizeAuthenticatedRequestPayload,
   AuthorizeAuthenticatedResponse,

package/src/payment/datatrans-v2/api/cancel.ts

@@ -1,4 +1,4 @@
-import type { FetchDatatransFn, CancelRequestPayload, CancelResponse } from './types.js';
+import { FetchDatatransFn, CancelRequestPayload, CancelResponse } from './types.js';
 
 export default async function cancel({
   transactionId,

package/src/payment/datatrans-v2/api/init.ts

@@ -1,7 +1,7 @@
 // https://api-reference.datatrans.ch/#operation/init
 import getPaths from '../getPaths.js';
 
-import type { FetchDatatransFn, InitRequestPayload, InitResponse } from './types.js';
+import { FetchDatatransFn, InitRequestPayload, InitResponse } from './types.js';
 
 const defaultRedirect = getPaths();
 

package/src/payment/datatrans-v2/api/makeFetcher.ts

@@ -1,4 +1,3 @@
-/// <reference lib="dom" />
 import fs from 'fs';
 import util from 'util';
 import { resolve } from 'path';

package/src/payment/datatrans-v2/api/secureFields.ts

@@ -1,7 +1,7 @@
 // https://api-reference.datatrans.ch/#operation/init
 import getPaths from '../getPaths.js';
 
-import type { FetchDatatransFn, SecureFieldsRequestPayload, SecureFieldsResponse } from './types.js';
+import { FetchDatatransFn, SecureFieldsRequestPayload, SecureFieldsResponse } from './types.js';
 
 const defaultRedirect = getPaths();
 

package/src/payment/datatrans-v2/api/settle.ts

@@ -1,4 +1,4 @@
-import type { FetchDatatransFn, SettleRequestPayload, SettleResponse } from './types.js';
+import { FetchDatatransFn, SettleRequestPayload, SettleResponse } from './types.js';
 
 export default async function settle({
   transactionId,

package/src/payment/datatrans-v2/api/status.ts

@@ -1,4 +1,4 @@
-import type { FetchDatatransFn, StatusRequestPayload, StatusResponse } from './types.js';
+import { FetchDatatransFn, StatusRequestPayload, StatusResponse } from './types.js';
 
 export default async function status({ transactionId }: StatusRequestPayload): Promise<StatusResponse> {
   const { fetchDatatrans }: { fetchDatatrans: FetchDatatransFn } = this;

package/src/payment/datatrans-v2/api/validate.ts

@@ -1,4 +1,4 @@
-import type { FetchDatatransFn, ValidateRequestPayload, ValidateResponse } from './types.js';
+import { FetchDatatransFn, ValidateRequestPayload, ValidateResponse } from './types.js';
 
 export default async function validate(payload: ValidateRequestPayload): Promise<ValidateResponse> {
   const { fetchDatatrans }: { fetchDatatrans: FetchDatatransFn } = this;

package/src/payment/datatrans-v2/generateSignature.test.ts

@@ -0,0 +1,15 @@
+import generateSignature from './generateSignature';
+
+describe('Datatrans Signature', () => {
+  it('Correct hashing applies', async () => {
+    const { security, signKey, timestamp, body } = {
+      security: 'dynamic-sign' as any,
+      signKey: '1337',
+      timestamp: '12424123412',
+      body: '{"card":{"3D":{"authenticationResponse":"D"},"alias":"70119122433810042","expiryMonth":"12","expiryYear":"21","info":{"brand":"VISA CREDIT","country":"GB","issuer":"DATATRANS","type":"credit","usage":"consumer"},"masked":"424242xxxxxx4242"},"currency":"CHF","detail":{"authorize":{"acquirerAuthorizationCode":"100055"}},"history":[{"action":"init","date":"2021-09-03T08:00:32Z","ip":"212.232.234.26","source":"api","success":true},{"action":"authorize","date":"2021-09-03T08:00:55Z","ip":"212.232.234.26","source":"redirect","success":true}],"language":"de","paymentMethod":"VIS","refno":"1NTU1NQ=","refno2":"user","status":"authorized","transactionId":"card_check_authorized","type":"card_check"}',
+    };
+    expect(await generateSignature({ security, signKey })(timestamp, body)).toEqual(
+      '5118c93025fdb16a110cdde3aa7669422da320cfe9478e35b531f45c4619d4db',
+    );
+  });
+});

package/src/payment/datatrans-v2/generateSignature.ts

@@ -1,5 +1,3 @@
-import crypto from 'crypto';
-
 export const Security = {
   NONE: '',
   STATIC_SIGN: 'static-sign',
@@ -8,17 +6,31 @@ export const Security = {
 
 const generateSignature =
   ({ security, signKey }: { security: '' | 'static-sign' | 'dynamic-sign'; signKey: string }) =>
-  (...parts) => {
+  async (...parts) => {
     // https://docs.datatrans.ch/docs/security-sign
     if (security.toLowerCase() === Security.STATIC_SIGN) return signKey;
     if (security.toLowerCase() === Security.NONE) return '';
 
     const resultString = parts.filter(Boolean).join('');
-    const signKeyInBytes = Buffer.from(signKey, 'hex');
 
-    const signedString = crypto.createHmac('sha256', signKeyInBytes).update(resultString).digest('hex');
+    const signKeyInBytes = Buffer.from(signKey, 'hex');
 
-    return signedString;
+    const key = await crypto.subtle.importKey(
+      'raw',
+      Uint8Array.from(signKeyInBytes),
+      { name: 'HMAC', hash: 'SHA-256' },
+      false,
+      ['sign'],
+    );
+    const signatureBinary = await crypto.subtle.sign(
+      'HMAC',
+      key,
+      new TextEncoder().encode(resultString),
+    );
+    const hmacSubtle = Array.from(new Uint8Array(signatureBinary))
+      .map((byte) => byte.toString(16).padStart(2, '0'))
+      .join('');
+    return hmacSubtle;
   };
 
 export default generateSignature;