@unchainedshop/core-payment 2.0.0-beta7 → 2.0.0-beta9

package/src/module/configurePaymentModule.ts

@@ -15,8 +15,38 @@ export const configurePaymentModule = async ({
 
   paymentSettings.configureSettings(paymentOptions);
 
+  const paymentProviders = configurePaymentProvidersModule(PaymentProviders);
+  const paymentCredentials = configurePaymentCredentialsModule(PaymentCredentials);
+
+  const registerCredentials: PaymentModule['registerCredentials'] = async (
+    paymentProviderId,
+    paymentContext,
+    unchainedAPI,
+  ) => {
+    const registration = await paymentProviders.register(
+      paymentProviderId,
+      paymentContext,
+      unchainedAPI,
+    );
+
+    if (!registration) return null;
+
+    const paymentCredentialsId = await paymentCredentials.upsertCredentials({
+      userId: paymentContext.userId,
+      paymentProviderId,
+      ...registration,
+    });
+
+    return paymentCredentials.findPaymentCredential({
+      paymentCredentialsId,
+      userId: paymentContext.userId,
+      paymentProviderId,
+    });
+  };
+
   return {
-    paymentProviders: configurePaymentProvidersModule(PaymentProviders),
-    paymentCredentials: configurePaymentCredentialsModule(PaymentCredentials),
+    paymentProviders,
+    paymentCredentials,
+    registerCredentials,
   };
 };

package/src/module/configurePaymentProvidersModule.ts

@@ -1,6 +1,5 @@
-import { Context } from '@unchainedshop/types/api';
 import { Collection } from '@unchainedshop/types/common';
-import { ModuleMutations } from '@unchainedshop/types/core';
+import { ModuleMutations, UnchainedCore } from '@unchainedshop/types/core';
 import {
   PaymentContext,
   PaymentModule,
@@ -21,7 +20,7 @@ const PAYMENT_PROVIDER_EVENTS: string[] = [
   'PAYMENT_PROVIDER_REMOVE',
 ];
 
-const buildFindSelector = ({ type }: PaymentProviderQuery = {}) => {
+export const buildFindSelector = ({ type }: PaymentProviderQuery = {}) => {
   return { ...(type ? { type } : {}), deleted: null };
 };
 
@@ -44,11 +43,11 @@ export const configurePaymentProvidersModule = (
   const getPaymentAdapter = async (
     paymentProviderId: string,
     paymentContext: PaymentContext,
-    requestContext: Context,
+    unchainedAPI: UnchainedCore,
   ) => {
     const provider = await PaymentProviders.findOne(generateDbFilterById(paymentProviderId), {});
 
-    return PaymentDirector.actions(provider, paymentContext, requestContext);
+    return PaymentDirector.actions(provider, paymentContext, unchainedAPI);
   };
 
   return {
@@ -102,13 +101,13 @@ export const configurePaymentProvidersModule = (
         }));
     },
 
-    findSupported: async (paymentContext, requestContext) => {
+    findSupported: async (paymentContext, unchainedAPI) => {
       const allProviders = await PaymentProviders.find({ deleted: null }).toArray();
       const providers: PaymentProvider[] = await asyncFilter(
         allProviders,
         async (provider: PaymentProvider) => {
           try {
-            const director = await PaymentDirector.actions(provider, paymentContext, requestContext);
+            const director = await PaymentDirector.actions(provider, paymentContext, unchainedAPI);
             return director.isActive();
           } catch {
             return false;
@@ -121,110 +120,107 @@ export const configurePaymentProvidersModule = (
           providers,
           order: paymentContext.order,
         },
-        requestContext,
+        unchainedAPI,
       );
     },
 
-    determineDefault: async (paymentProviders, deliveryContext, requestContext) => {
+    determineDefault: async (paymentProviders, deliveryContext, unchainedAPI) => {
       return paymentSettings.determineDefaultProvider(
         {
           providers: paymentProviders,
           ...deliveryContext,
         },
-        requestContext,
+        unchainedAPI,
       );
     },
 
     // Payment Adapter
 
-    configurationError: async (paymentProvider, requestContext) => {
-      const actions = await PaymentDirector.actions(paymentProvider, {}, requestContext);
+    configurationError: async (paymentProvider, unchainedAPI) => {
+      const actions = await PaymentDirector.actions(paymentProvider, {}, unchainedAPI);
       return actions.configurationError();
     },
 
-    calculate: async (pricingContext, requestContext) => {
-      const pricing = await PaymentPricingDirector.actions(pricingContext, requestContext);
+    calculate: async (pricingContext, unchainedAPI) => {
+      const pricing = await PaymentPricingDirector.actions(pricingContext, unchainedAPI);
       return pricing.calculate();
     },
 
-    isActive: async (paymentProvider, requestContext) => {
-      const actions = await PaymentDirector.actions(paymentProvider, {}, requestContext);
+    isActive: async (paymentProvider, unchainedAPI) => {
+      const actions = await PaymentDirector.actions(paymentProvider, {}, unchainedAPI);
       return actions.isActive();
     },
 
-    isPayLaterAllowed: async (paymentProvider, requestContext) => {
-      const actions = await PaymentDirector.actions(paymentProvider, {}, requestContext);
+    isPayLaterAllowed: async (paymentProvider, unchainedAPI) => {
+      const actions = await PaymentDirector.actions(paymentProvider, {}, unchainedAPI);
       return actions.isPayLaterAllowed();
     },
 
-    charge: async (paymentProviderId, paymentContext, requestContext) => {
-      const adapter = await getPaymentAdapter(paymentProviderId, paymentContext, requestContext);
+    charge: async (paymentProviderId, paymentContext, unchainedAPI) => {
+      const adapter = await getPaymentAdapter(paymentProviderId, paymentContext, unchainedAPI);
       return adapter.charge();
     },
 
-    register: async (paymentProviderId, paymentContext, requestContext) => {
-      const adapter = await getPaymentAdapter(paymentProviderId, paymentContext, requestContext);
+    register: async (paymentProviderId, paymentContext, unchainedAPI) => {
+      const adapter = await getPaymentAdapter(paymentProviderId, paymentContext, unchainedAPI);
       return adapter.register();
     },
 
-    sign: async (paymentProviderId, paymentContext, requestContext) => {
-      const adapter = await getPaymentAdapter(paymentProviderId, paymentContext, requestContext);
+    sign: async (paymentProviderId, paymentContext, unchainedAPI) => {
+      const adapter = await getPaymentAdapter(paymentProviderId, paymentContext, unchainedAPI);
       return adapter.sign();
     },
 
-    validate: async (paymentProviderId, paymentContext, requestContext) => {
-      const adapter = await getPaymentAdapter(paymentProviderId, paymentContext, requestContext);
+    validate: async (paymentProviderId, paymentContext, unchainedAPI) => {
+      const adapter = await getPaymentAdapter(paymentProviderId, paymentContext, unchainedAPI);
       return adapter.validate();
     },
 
-    cancel: async (paymentProviderId, paymentContext, requestContext) => {
-      const adapter = await getPaymentAdapter(paymentProviderId, paymentContext, requestContext);
+    cancel: async (paymentProviderId, paymentContext, unchainedAPI) => {
+      const adapter = await getPaymentAdapter(paymentProviderId, paymentContext, unchainedAPI);
       return adapter.cancel();
     },
 
-    confirm: async (paymentProviderId, paymentContext, requestContext) => {
-      const adapter = await getPaymentAdapter(paymentProviderId, paymentContext, requestContext);
+    confirm: async (paymentProviderId, paymentContext, unchainedAPI) => {
+      const adapter = await getPaymentAdapter(paymentProviderId, paymentContext, unchainedAPI);
       return adapter.confirm();
     },
 
     // Mutations
-    create: async (doc, userId) => {
+    create: async (doc) => {
       const Adapter = PaymentDirector.getAdapter(doc.adapterKey);
       if (!Adapter) return null;
 
-      const paymentProviderId = await mutations.create(
-        {
-          configuration: Adapter.initialConfiguration,
-          ...doc,
-        },
-        userId,
-      );
+      const paymentProviderId = await mutations.create({
+        configuration: Adapter.initialConfiguration,
+        ...doc,
+      });
 
       const paymentProvider = await PaymentProviders.findOne(
         generateDbFilterById(paymentProviderId),
         {},
       );
-      emit('PAYMENT_PROVIDER_CREATE', { paymentProvider });
+      await emit('PAYMENT_PROVIDER_CREATE', { paymentProvider });
       return paymentProvider;
     },
 
-    update: async (_id: string, doc: PaymentProvider, userId: string) => {
-      await mutations.update(_id, doc, userId);
+    update: async (_id: string, doc: PaymentProvider) => {
+      await mutations.update(_id, doc);
       const paymentProvider = await PaymentProviders.findOne(generateDbFilterById(_id), {});
-      emit('PAYMENT_PROVIDER_UPDATE', { paymentProvider });
+      await emit('PAYMENT_PROVIDER_UPDATE', { paymentProvider });
       return paymentProvider;
     },
 
-    delete: async (_id, userId) => {
-      await mutations.delete(_id, userId);
+    delete: async (_id) => {
+      await mutations.delete(_id);
       const paymentProvider = await PaymentProviders.findOne(generateDbFilterById(_id), {});
-      emit('PAYMENT_PROVIDER_REMOVE', { paymentProvider });
+      await emit('PAYMENT_PROVIDER_REMOVE', { paymentProvider });
       return paymentProvider;
     },
 
-    deletePermanently: async (_id, userId) => {
+    deletePermanently: async (_id) => {
       const deliveryProvider = await PaymentProviders.findOne(generateDbFilterById(_id), {});
-      await mutations.deletePermanently(_id, userId);
+      await mutations.deletePermanently(_id);
       return deliveryProvider;
     },
   };

package/src/payment-index.ts

@@ -1,6 +1,5 @@
 export { configurePaymentModule } from './module/configurePaymentModule';
 
-export { paymentServices } from './service/paymentServices';
 export { paymentSettings } from './payment-settings';
 
 export { PaymentDirector } from './director/PaymentDirector';

package/src/payment-settings.ts

@@ -4,9 +4,6 @@ import {
   FilterProviders,
   DetermineDefaultProvider,
 } from '@unchainedshop/types/payments';
-import { createLogger } from '@unchainedshop/logger';
-
-const logger = createLogger('unchained:core-payment');
 
 const sortByCreationDate = (left: PaymentProvider, right: PaymentProvider) => {
   return new Date(left.created).getTime() - new Date(right.created).getTime();
@@ -26,27 +23,15 @@ const firstProviderIsDefault: DetermineDefaultProvider = async ({ providers, pay
   return providers?.length > 0 && providers[0];
 };
 
-const defaultFilterSupportedProviders =
-  (sortProviders) =>
-  async ({ providers }) => {
-    return providers.sort(sortProviders);
-  };
-
 export const paymentSettings: PaymentSettings = {
   filterSupportedProviders: null,
   determineDefaultProvider: null,
 
   configureSettings({
-    sortProviders = undefined,
     filterSupportedProviders = allProviders,
     determineDefaultProvider = firstProviderIsDefault,
   } = {}) {
-    if (sortProviders) {
-      logger.warn('sortProviders is deprecated, please specifc filterSupportedProviders instead');
-      paymentSettings.filterSupportedProviders = defaultFilterSupportedProviders(sortProviders);
-    } else {
-      paymentSettings.filterSupportedProviders = filterSupportedProviders;
-    }
+    paymentSettings.filterSupportedProviders = filterSupportedProviders;
     paymentSettings.determineDefaultProvider = determineDefaultProvider;
   },
 };

package/tests/payment-index.test.ts

@@ -1,47 +1,16 @@
-import { assert } from 'chai';
-import { initDb } from '@unchainedshop/mongodb';
-import { configurePaymentModule } from '@unchainedshop/core-payment';
+import { PaymentProviderType } from "../src/director/PaymentProviderType";
+import { buildFindSelector } from "../src/module/configurePaymentProvidersModule";
 
-describe('Test exports', () => {
-  let module;
 
-  before(async () => {
-    const db = await initDb();
-    module = await configurePaymentModule({ db });
-  });
+describe('Payment', () => {
+  describe('buildFindSelector', () => {
+    it('Return correct filter object when passed no argument', async () => {      
+      expect(buildFindSelector({})).toEqual({ deleted: null })
+    });
 
-  it('Check Bookmarks module', async () => {
-    assert.ok(module);
-    assert.isFunction(module.findCurrency);
-    assert.isFunction(module.findPayment);
-    assert.isFunction(module.currencyExists);
-    assert.isFunction(module.create);
-    assert.isFunction(module.update);
-    assert.isFunction(module.delete);
-  });
-
-  it('Mutate currency', async () => {
-    const currencyId = await module.create(
-      {
-        authorId: 'Test-User-1',
-        isoCode: 'CHF',
-      },
-      'Test-User-1'
-    );
-
-    assert.ok(currencyId);
-    const currency = await module.findCurrency(currencyId);
-
-    assert.ok(currency);
-    assert.equal(currency._id, currencyId);
-    assert.equal(currency.isoCode, 'CHF');
-    assert.equal(currency.userId, 'Test-User-1');
-    assert.isDefined(currency.created);
-    assert.isUndefined(currency.updated);
-    assert.isUndefined(currency.updatedBy);
-    assert.equal(currency.createdBy, 'Test-User-1');
-
-    const deletedCount = await module.delete(currencyId);
-    assert.equal(deletedCount, 1);
-  });
+    it('Return correct filter object when passed no argument', async () => {      
+      expect(buildFindSelector({type: PaymentProviderType.GENERIC})).toEqual({ type: "GENERIC", deleted: null })
+    });
+  })
+  
 });

package/lib/service/cancelService.d.ts

@@ -1,2 +0,0 @@
-import { CancelService } from '@unchainedshop/types/payments';
-export declare const cancelService: CancelService;

package/lib/service/cancelService.js

@@ -1,13 +0,0 @@
-export const cancelService = async ({ paymentContext, paymentProviderId }, requestContext) => {
-    const { modules, userId } = requestContext;
-    const normalizedContext = {
-        ...paymentContext,
-        userId,
-        paymentProviderId,
-    };
-    const result = await modules.payment.paymentProviders.cancel(paymentProviderId, normalizedContext, requestContext);
-    if (!result)
-        return false;
-    return result;
-};
-//# sourceMappingURL=cancelService.js.map

package/lib/service/cancelService.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"cancelService.js","sourceRoot":"","sources":["../../src/service/cancelService.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,aAAa,GAAkB,KAAK,EAC/C,EAAE,cAAc,EAAE,iBAAiB,EAAE,EACrC,cAAc,EACd,EAAE;IACF,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,cAAc,CAAC;IAE3C,MAAM,iBAAiB,GAAG;QACxB,GAAG,cAAc;QACjB,MAAM;QACN,iBAAiB;KAClB,CAAC;IAEF,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,gBAAgB,CAAC,MAAM,CAC1D,iBAAiB,EACjB,iBAAiB,EACjB,cAAc,CACf,CAAC;IAEF,IAAI,CAAC,MAAM;QAAE,OAAO,KAAK,CAAC;IAE1B,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC"}

package/lib/service/chargeService.d.ts

@@ -1,2 +0,0 @@
-import { ChargeService } from '@unchainedshop/types/payments';
-export declare const chargeService: ChargeService;

package/lib/service/chargeService.js

@@ -1,33 +0,0 @@
-export const chargeService = async ({ paymentContext, paymentProviderId }, requestContext) => {
-    const { modules, userId } = requestContext;
-    const paymentCredentials = paymentContext.transactionContext?.paymentCredentials ||
-        (await modules.payment.paymentCredentials.findPaymentCredential({
-            userId,
-            paymentProviderId,
-            isPreferred: true,
-        }));
-    const normalizedContext = {
-        ...paymentContext,
-        userId,
-        paymentProviderId,
-        transactionContext: {
-            ...paymentContext.transactionContext,
-            paymentCredentials,
-        },
-    };
-    const result = await modules.payment.paymentProviders.charge(paymentProviderId, normalizedContext, requestContext);
-    if (!result)
-        return false;
-    const { credentials, ...strippedResult } = result;
-    if (credentials) {
-        const { token, ...meta } = credentials;
-        await modules.payment.paymentCredentials.upsertCredentials({
-            userId,
-            paymentProviderId,
-            token,
-            ...meta,
-        });
-    }
-    return strippedResult;
-};
-//# sourceMappingURL=chargeService.js.map

package/lib/service/chargeService.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"chargeService.js","sourceRoot":"","sources":["../../src/service/chargeService.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,aAAa,GAAkB,KAAK,EAC/C,EAAE,cAAc,EAAE,iBAAiB,EAAE,EACrC,cAAc,EACd,EAAE;IACF,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,cAAc,CAAC;IAE3C,MAAM,kBAAkB,GACtB,cAAc,CAAC,kBAAkB,EAAE,kBAAkB;QACrD,CAAC,MAAM,OAAO,CAAC,OAAO,CAAC,kBAAkB,CAAC,qBAAqB,CAAC;YAC9D,MAAM;YACN,iBAAiB;YACjB,WAAW,EAAE,IAAI;SAClB,CAAC,CAAC,CAAC;IAEN,MAAM,iBAAiB,GAAG;QACxB,GAAG,cAAc;QACjB,MAAM;QACN,iBAAiB;QACjB,kBAAkB,EAAE;YAClB,GAAG,cAAc,CAAC,kBAAkB;YACpC,kBAAkB;SACnB;KACF,CAAC;IAEF,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,gBAAgB,CAAC,MAAM,CAC1D,iBAAiB,EACjB,iBAAiB,EACjB,cAAc,CACf,CAAC;IAEF,IAAI,CAAC,MAAM;QAAE,OAAO,KAAK,CAAC;IAE1B,MAAM,EAAE,WAAW,EAAE,GAAG,cAAc,EAAE,GAAG,MAAM,CAAC;IAElD,IAAI,WAAW,EAAE;QACf,MAAM,EAAE,KAAK,EAAE,GAAG,IAAI,EAAE,GAAG,WAAW,CAAC;QACvC,MAAM,OAAO,CAAC,OAAO,CAAC,kBAAkB,CAAC,iBAAiB,CAAC;YACzD,MAAM;YACN,iBAAiB;YACjB,KAAK;YACL,GAAG,IAAI;SACR,CAAC,CAAC;KACJ;IACD,OAAO,cAAc,CAAC;AACxB,CAAC,CAAC"}

package/lib/service/confirmService.d.ts

@@ -1,2 +0,0 @@
-import { ConfirmService } from '@unchainedshop/types/payments';
-export declare const confirmService: ConfirmService;

package/lib/service/confirmService.js

@@ -1,13 +0,0 @@
-export const confirmService = async ({ paymentContext, paymentProviderId }, requestContext) => {
-    const { modules, userId } = requestContext;
-    const normalizedContext = {
-        ...paymentContext,
-        userId,
-        paymentProviderId,
-    };
-    const result = await modules.payment.paymentProviders.confirm(paymentProviderId, normalizedContext, requestContext);
-    if (!result)
-        return false;
-    return result;
-};
-//# sourceMappingURL=confirmService.js.map

package/lib/service/confirmService.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"confirmService.js","sourceRoot":"","sources":["../../src/service/confirmService.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,cAAc,GAAmB,KAAK,EACjD,EAAE,cAAc,EAAE,iBAAiB,EAAE,EACrC,cAAc,EACd,EAAE;IACF,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,cAAc,CAAC;IAE3C,MAAM,iBAAiB,GAAG;QACxB,GAAG,cAAc;QACjB,MAAM;QACN,iBAAiB;KAClB,CAAC;IAEF,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,gBAAgB,CAAC,OAAO,CAC3D,iBAAiB,EACjB,iBAAiB,EACjB,cAAc,CACf,CAAC;IAEF,IAAI,CAAC,MAAM;QAAE,OAAO,KAAK,CAAC;IAE1B,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC"}

package/lib/service/paymentServices.d.ts

@@ -1,2 +0,0 @@
-import { PaymentServices } from '@unchainedshop/types/payments';
-export declare const paymentServices: PaymentServices;

package/lib/service/paymentServices.js

@@ -1,11 +0,0 @@
-import { chargeService } from './chargeService';
-import { cancelService } from './cancelService';
-import { confirmService } from './confirmService';
-import { registerPaymentCredentialsService } from './registerPaymentCredentialsService';
-export const paymentServices = {
-    charge: chargeService,
-    registerPaymentCredentials: registerPaymentCredentialsService,
-    cancel: cancelService,
-    confirm: confirmService,
-};
-//# sourceMappingURL=paymentServices.js.map

package/lib/service/paymentServices.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"paymentServices.js","sourceRoot":"","sources":["../../src/service/paymentServices.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,iCAAiC,EAAE,MAAM,qCAAqC,CAAC;AAExF,MAAM,CAAC,MAAM,eAAe,GAAoB;IAC9C,MAAM,EAAE,aAAa;IACrB,0BAA0B,EAAE,iCAAiC;IAC7D,MAAM,EAAE,aAAa;IACrB,OAAO,EAAE,cAAc;CACxB,CAAC"}

package/lib/service/registerPaymentCredentialsService.d.ts

@@ -1,2 +0,0 @@
-import { RegisterPaymentCredentialsService } from '@unchainedshop/types/payments';
-export declare const registerPaymentCredentialsService: RegisterPaymentCredentialsService;

package/lib/service/registerPaymentCredentialsService.js

@@ -1,17 +0,0 @@
-export const registerPaymentCredentialsService = async (paymentProviderId, paymentContext, requestContext) => {
-    const { modules, userId } = requestContext;
-    const registration = await modules.payment.paymentProviders.register(paymentProviderId, paymentContext, requestContext);
-    if (!registration)
-        return null;
-    const paymentCredentialsId = await modules.payment.paymentCredentials.upsertCredentials({
-        userId,
-        paymentProviderId,
-        ...registration,
-    });
-    return modules.payment.paymentCredentials.findPaymentCredential({
-        paymentCredentialsId,
-        userId,
-        paymentProviderId,
-    });
-};
-//# sourceMappingURL=registerPaymentCredentialsService.js.map

package/lib/service/registerPaymentCredentialsService.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"registerPaymentCredentialsService.js","sourceRoot":"","sources":["../../src/service/registerPaymentCredentialsService.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,iCAAiC,GAAsC,KAAK,EACvF,iBAAiB,EACjB,cAAc,EACd,cAAc,EACd,EAAE;IACF,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,cAAc,CAAC;IAC3C,MAAM,YAAY,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,gBAAgB,CAAC,QAAQ,CAClE,iBAAiB,EACjB,cAAc,EACd,cAAc,CACf,CAAC;IAEF,IAAI,CAAC,YAAY;QAAE,OAAO,IAAI,CAAC;IAE/B,MAAM,oBAAoB,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,kBAAkB,CAAC,iBAAiB,CAAC;QACtF,MAAM;QACN,iBAAiB;QACjB,GAAG,YAAY;KAChB,CAAC,CAAC;IAEH,OAAO,OAAO,CAAC,OAAO,CAAC,kBAAkB,CAAC,qBAAqB,CAAC;QAC9D,oBAAoB;QACpB,MAAM;QACN,iBAAiB;KAClB,CAAC,CAAC;AACL,CAAC,CAAC"}

package/src/service/cancelService.ts

@@ -1,24 +0,0 @@
-import { CancelService } from '@unchainedshop/types/payments';
-
-export const cancelService: CancelService = async (
-  { paymentContext, paymentProviderId },
-  requestContext,
-) => {
-  const { modules, userId } = requestContext;
-
-  const normalizedContext = {
-    ...paymentContext,
-    userId,
-    paymentProviderId,
-  };
-
-  const result = await modules.payment.paymentProviders.cancel(
-    paymentProviderId,
-    normalizedContext,
-    requestContext,
-  );
-
-  if (!result) return false;
-
-  return result;
-};

package/src/service/chargeService.ts

@@ -1,47 +0,0 @@
-import { ChargeService } from '@unchainedshop/types/payments';
-
-export const chargeService: ChargeService = async (
-  { paymentContext, paymentProviderId },
-  requestContext,
-) => {
-  const { modules, userId } = requestContext;
-
-  const paymentCredentials =
-    paymentContext.transactionContext?.paymentCredentials ||
-    (await modules.payment.paymentCredentials.findPaymentCredential({
-      userId,
-      paymentProviderId,
-      isPreferred: true,
-    }));
-
-  const normalizedContext = {
-    ...paymentContext,
-    userId,
-    paymentProviderId,
-    transactionContext: {
-      ...paymentContext.transactionContext,
-      paymentCredentials,
-    },
-  };
-
-  const result = await modules.payment.paymentProviders.charge(
-    paymentProviderId,
-    normalizedContext,
-    requestContext,
-  );
-
-  if (!result) return false;
-
-  const { credentials, ...strippedResult } = result;
-
-  if (credentials) {
-    const { token, ...meta } = credentials;
-    await modules.payment.paymentCredentials.upsertCredentials({
-      userId,
-      paymentProviderId,
-      token,
-      ...meta,
-    });
-  }
-  return strippedResult;
-};

package/src/service/confirmService.ts

@@ -1,24 +0,0 @@
-import { ConfirmService } from '@unchainedshop/types/payments';
-
-export const confirmService: ConfirmService = async (
-  { paymentContext, paymentProviderId },
-  requestContext,
-) => {
-  const { modules, userId } = requestContext;
-
-  const normalizedContext = {
-    ...paymentContext,
-    userId,
-    paymentProviderId,
-  };
-
-  const result = await modules.payment.paymentProviders.confirm(
-    paymentProviderId,
-    normalizedContext,
-    requestContext,
-  );
-
-  if (!result) return false;
-
-  return result;
-};

package/src/service/paymentServices.ts

@@ -1,12 +0,0 @@
-import { PaymentServices } from '@unchainedshop/types/payments';
-import { chargeService } from './chargeService';
-import { cancelService } from './cancelService';
-import { confirmService } from './confirmService';
-import { registerPaymentCredentialsService } from './registerPaymentCredentialsService';
-
-export const paymentServices: PaymentServices = {
-  charge: chargeService,
-  registerPaymentCredentials: registerPaymentCredentialsService,
-  cancel: cancelService,
-  confirm: confirmService,
-};

package/src/service/registerPaymentCredentialsService.ts

@@ -1,28 +0,0 @@
-import { RegisterPaymentCredentialsService } from '@unchainedshop/types/payments';
-
-export const registerPaymentCredentialsService: RegisterPaymentCredentialsService = async (
-  paymentProviderId,
-  paymentContext,
-  requestContext,
-) => {
-  const { modules, userId } = requestContext;
-  const registration = await modules.payment.paymentProviders.register(
-    paymentProviderId,
-    paymentContext,
-    requestContext,
-  );
-
-  if (!registration) return null;
-
-  const paymentCredentialsId = await modules.payment.paymentCredentials.upsertCredentials({
-    userId,
-    paymentProviderId,
-    ...registration,
-  });
-
-  return modules.payment.paymentCredentials.findPaymentCredential({
-    paymentCredentialsId,
-    userId,
-    paymentProviderId,
-  });
-};