@unchainedshop/plugins 1.2.30 → 1.2.32

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (10) hide show
  1. package/lib/payment/datatrans-v2/api/init.js +1 -1
  2. package/lib/payment/datatrans-v2/api/init.js.map +1 -1
  3. package/lib/payment/datatrans-v2/api/makeFetcher.js +4 -3
  4. package/lib/payment/datatrans-v2/api/makeFetcher.js.map +1 -1
  5. package/lib/payment/datatrans-v2/index.js +13 -12
  6. package/lib/payment/datatrans-v2/index.js.map +1 -1
  7. package/package.json +1 -1
  8. package/src/payment/datatrans-v2/api/init.ts +1 -1
  9. package/src/payment/datatrans-v2/api/makeFetcher.ts +5 -3
  10. package/src/payment/datatrans-v2/index.ts +20 -12
package/lib/payment/datatrans-v2/api/init.js CHANGED
@@ -12,9 +12,9 @@ export default async function init({ option, redirect: userRedirect, ...payload
12
12
  ...payload,
13
13
  autoSettle: false,
14
14
  option: {
15
- ...(option || {}),
16
15
  createAlias: true,
17
16
  returnCustomerCountry: true,
17
+ ...(option || {}),
18
18
  authenticationOnly: false,
19
19
  },
20
20
  redirect,
package/lib/payment/datatrans-v2/api/init.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../src/payment/datatrans-v2/api/init.ts"],"names":[],"mappings":"AAAA,qDAAqD;AACrD,OAAO,QAAQ,MAAM,aAAa,CAAC;AAInC,MAAM,eAAe,GAAG,QAAQ,EAAE,CAAC;AAEnC,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,IAAI,CAAC,EACjC,MAAM,EACN,QAAQ,EAAE,YAAY,EACtB,GAAG,OAAO,EACS;IACnB,MAAM,QAAQ,GAAG;QACf,GAAG,eAAe;QAClB,GAAG,CAAC,YAAY,IAAI,EAAE,CAAC;KACW,CAAC;IACrC,OAAO,QAAQ,EAAE,OAAO,CAAC;IACzB,OAAO,QAAQ,EAAE,SAAS,CAAC;IAE3B,MAAM,OAAO,GAAG;QACd,GAAG,OAAO;QACV,UAAU,EAAE,KAAK;QACjB,MAAM,EAAE;YACN,GAAG,CAAC,MAAM,IAAI,EAAE,CAAC;YACjB,WAAW,EAAE,IAAI;YACjB,qBAAqB,EAAE,IAAI;YAC3B,kBAAkB,EAAE,KAAK;SAC1B;QACD,QAAQ;KACT,CAAC;IAEF,MAAM,EAAE,cAAc,EAAE,GAAyC,IAAI,CAAC;IACtE,MAAM,MAAM,GAAG,MAAM,cAAc,CAAC,kBAAkB,EAAE,OAAO,CAAC,CAAC;IACjE,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC;IACjC,MAAM,QAAQ,GAAG,MAAM,CAAC,OAAO,EAAE,GAAG,CAAC,UAAU,CAAC,CAAC;IACjD,OAAO;QACL,QAAQ;QACR,GAAG,IAAI;KACR,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../src/payment/datatrans-v2/api/init.ts"],"names":[],"mappings":"AAAA,qDAAqD;AACrD,OAAO,QAAQ,MAAM,aAAa,CAAC;AAInC,MAAM,eAAe,GAAG,QAAQ,EAAE,CAAC;AAEnC,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,IAAI,CAAC,EACjC,MAAM,EACN,QAAQ,EAAE,YAAY,EACtB,GAAG,OAAO,EACS;IACnB,MAAM,QAAQ,GAAG;QACf,GAAG,eAAe;QAClB,GAAG,CAAC,YAAY,IAAI,EAAE,CAAC;KACW,CAAC;IACrC,OAAO,QAAQ,EAAE,OAAO,CAAC;IACzB,OAAO,QAAQ,EAAE,SAAS,CAAC;IAE3B,MAAM,OAAO,GAAG;QACd,GAAG,OAAO;QACV,UAAU,EAAE,KAAK;QACjB,MAAM,EAAE;YACN,WAAW,EAAE,IAAI;YACjB,qBAAqB,EAAE,IAAI;YAC3B,GAAG,CAAC,MAAM,IAAI,EAAE,CAAC;YACjB,kBAAkB,EAAE,KAAK;SAC1B;QACD,QAAQ;KACT,CAAC;IAEF,MAAM,EAAE,cAAc,EAAE,GAAyC,IAAI,CAAC;IACtE,MAAM,MAAM,GAAG,MAAM,cAAc,CAAC,kBAAkB,EAAE,OAAO,CAAC,CAAC;IACjE,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC;IACjC,MAAM,QAAQ,GAAG,MAAM,CAAC,OAAO,EAAE,GAAG,CAAC,UAAU,CAAC,CAAC;IACjD,OAAO;QACL,QAAQ;QACR,GAAG,IAAI;KACR,CAAC;AACJ,CAAC"}
package/lib/payment/datatrans-v2/api/makeFetcher.js CHANGED
@@ -1,10 +1,11 @@
1
1
  import fs from 'fs';
2
2
  import util from 'util';
3
3
  import { resolve } from 'path';
4
- import { log, LogLevel } from '@unchainedshop/logger';
4
+ import { createLogger } from '@unchainedshop/logger';
5
5
  import fetch from 'node-fetch';
6
6
  const readFile = util.promisify(fs.readFile);
7
7
  const { DATATRANS_API_MOCKS_PATH } = process.env;
8
+ const logger = createLogger('unchained:datatrans');
8
9
  export default (endpoint, merchantId, secret) => {
9
10
  if (DATATRANS_API_MOCKS_PATH) {
10
11
  return async (path) => {
@@ -18,8 +19,7 @@ export default (endpoint, merchantId, secret) => {
18
19
  };
19
20
  }
20
21
  catch (error) {
21
- log('DataTrans V2 (makeFetcher) -> Error while trying reading and parsing file', {
22
- level: LogLevel.Error,
22
+ logger.error('Mock: Error while trying reading and parsing file', {
23
23
  ...error,
24
24
  });
25
25
  return {
@@ -31,6 +31,7 @@ export default (endpoint, merchantId, secret) => {
31
31
  }
32
32
  const token = `${merchantId}:${secret}`;
33
33
  return async (path, body) => {
34
+ logger.debug(`Fetch ${endpoint}${path}: ${JSON.stringify(body)}`);
34
35
  return fetch(`${endpoint}${path}`, {
35
36
  method: body ? 'POST' : 'GET',
36
37
  body: body ? JSON.stringify(body) : undefined,
package/lib/payment/datatrans-v2/api/makeFetcher.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"makeFetcher.js","sourceRoot":"","sources":["../../../../src/payment/datatrans-v2/api/makeFetcher.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAC/B,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,KAAmB,MAAM,YAAY,CAAC;AAE7C,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC;AAE7C,MAAM,EAAE,wBAAwB,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC;AAEjD,eAAe,CACb,QAAgB,EAChB,UAAkB,EAClB,MAAc,EACwC,EAAE;IACxD,IAAI,wBAAwB,EAAE;QAC5B,OAAO,KAAK,EAAE,IAAI,EAAqB,EAAE;YACvC,IAAI;gBACF,MAAM,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,wBAAwB,EAAE,IAAI,IAAI,OAAO,CAAC,CAAC;gBACrF,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,QAAQ,CAAC,CAAC;gBACzC,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;gBAC5C,OAAO;oBACL,IAAI,EAAE,KAAK,IAAI,EAAE,CAAC,IAAI;oBACtB,MAAM,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG;iBACzB,CAAC;aACV;YAAC,OAAO,KAAK,EAAE;gBACd,GAAG,CAAC,2EAA2E,EAAE;oBAC/E,KAAK,EAAE,QAAQ,CAAC,KAAK;oBACrB,GAAG,KAAK;iBACT,CAAC,CAAC;gBACH,OAAO;oBACL,IAAI,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,CAAC;oBAChE,MAAM,EAAE,GAAG;iBACL,CAAC;aACV;QACH,CAAC,CAAC;KACH;IAED,MAAM,KAAK,GAAG,GAAG,UAAU,IAAI,MAAM,EAAE,CAAC;IAExC,OAAO,KAAK,EAAE,IAAY,EAAE,IAAS,EAAqB,EAAE;QAC1D,OAAO,KAAK,CAAC,GAAG,QAAQ,GAAG,IAAI,EAAE,EAAE;YACjC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK;YAC7B,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS;YAC7C,OAAO,EAAE;gBACP,cAAc,EAAE,kBAAkB;gBAClC,aAAa,EAAE,SAAS,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE;aACzE;SACF,CAAC,CAAC;IACL,CAAC,CAAC;AACJ,CAAC,CAAC"}
1
+ {"version":3,"file":"makeFetcher.js","sourceRoot":"","sources":["../../../../src/payment/datatrans-v2/api/makeFetcher.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAC/B,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,KAAmB,MAAM,YAAY,CAAC;AAE7C,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC;AAE7C,MAAM,EAAE,wBAAwB,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC;AAEjD,MAAM,MAAM,GAAG,YAAY,CAAC,qBAAqB,CAAC,CAAC;AAEnD,eAAe,CACb,QAAgB,EAChB,UAAkB,EAClB,MAAc,EACwC,EAAE;IACxD,IAAI,wBAAwB,EAAE;QAC5B,OAAO,KAAK,EAAE,IAAI,EAAqB,EAAE;YACvC,IAAI;gBACF,MAAM,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,wBAAwB,EAAE,IAAI,IAAI,OAAO,CAAC,CAAC;gBACrF,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,QAAQ,CAAC,CAAC;gBACzC,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;gBAC5C,OAAO;oBACL,IAAI,EAAE,KAAK,IAAI,EAAE,CAAC,IAAI;oBACtB,MAAM,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG;iBACzB,CAAC;aACV;YAAC,OAAO,KAAK,EAAE;gBACd,MAAM,CAAC,KAAK,CAAC,mDAAmD,EAAE;oBAChE,GAAG,KAAK;iBACT,CAAC,CAAC;gBACH,OAAO;oBACL,IAAI,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,CAAC;oBAChE,MAAM,EAAE,GAAG;iBACL,CAAC;aACV;QACH,CAAC,CAAC;KACH;IAED,MAAM,KAAK,GAAG,GAAG,UAAU,IAAI,MAAM,EAAE,CAAC;IAExC,OAAO,KAAK,EAAE,IAAY,EAAE,IAAS,EAAqB,EAAE;QAC1D,MAAM,CAAC,KAAK,CAAC,SAAS,QAAQ,GAAG,IAAI,KAAK,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAClE,OAAO,KAAK,CAAC,GAAG,QAAQ,GAAG,IAAI,EAAE,EAAE;YACjC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK;YAC7B,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS;YAC7C,OAAO,EAAE;gBACP,cAAc,EAAE,kBAAkB;gBAClC,aAAa,EAAE,SAAS,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE;aACzE;SACF,CAAC,CAAC;IACL,CAAC,CAAC;AACJ,CAAC,CAAC"}
package/lib/payment/datatrans-v2/index.js CHANGED
@@ -72,7 +72,7 @@ const Datatrans = {
72
72
  };
73
73
  }));
74
74
  };
75
- const authorize = async ({ paymentCredentials, extensions }) => {
75
+ const authorize = async ({ paymentCredentials, ...arbitraryFields }) => {
76
76
  const { order, orderPayment } = params.paymentContext;
77
77
  const userId = order?.userId || params.context.userId;
78
78
  const refno = Buffer.from(orderPayment._id, 'hex').toString('base64');
@@ -80,7 +80,7 @@ const Datatrans = {
80
80
  const { currency, amount } = roundedAmountFromOrder(order, params.context);
81
81
  const splits = await getMarketplaceSplits();
82
82
  const result = await api().authorize({
83
- ...extensions,
83
+ ...arbitraryFields,
84
84
  amount,
85
85
  currency,
86
86
  refno,
@@ -99,11 +99,11 @@ const Datatrans = {
99
99
  throwIfResponseError(result);
100
100
  return result.transactionId;
101
101
  };
102
- const authorizeAuth = async ({ transactionId, refno, refno2, extensions }) => {
102
+ const authorizeAuth = async ({ transactionId, refno, refno2, ...arbitraryFields }) => {
103
103
  const { order } = params.paymentContext;
104
104
  const { currency, amount } = roundedAmountFromOrder(order, params.context);
105
105
  const result = await api().authorizeAuthenticated({
106
- ...extensions,
106
+ ...arbitraryFields,
107
107
  transactionId,
108
108
  amount,
109
109
  currency,
@@ -178,7 +178,7 @@ const Datatrans = {
178
178
  return false;
179
179
  },
180
180
  async sign(transactionContext = {}) {
181
- const { useSecureFields = false, ...additionalInitPayload } = transactionContext || {};
181
+ const { useSecureFields = false, ...arbitraryFields } = transactionContext || {};
182
182
  const { orderPayment, paymentProviderId, order } = params.paymentContext;
183
183
  const userId = order?.userId || params.context?.userId;
184
184
  const refno = Buffer.from(orderPayment ? orderPayment._id : paymentProviderId, 'hex').toString('base64');
@@ -188,7 +188,7 @@ const Datatrans = {
188
188
  : {};
189
189
  if (useSecureFields) {
190
190
  const result = await api().secureFields({
191
- ...additionalInitPayload,
191
+ ...arbitraryFields,
192
192
  currency: price.currency || 'CHF',
193
193
  refno,
194
194
  refno2,
@@ -201,7 +201,7 @@ const Datatrans = {
201
201
  return JSON.stringify(result);
202
202
  }
203
203
  const result = await api().init({
204
- ...additionalInitPayload,
204
+ ...arbitraryFields,
205
205
  currency: price.currency || 'CHF',
206
206
  refno,
207
207
  refno2,
@@ -239,6 +239,7 @@ const Datatrans = {
239
239
  return false;
240
240
  const { orderPayment, transactionContext } = params.paymentContext;
241
241
  const { transactionId } = orderPayment;
242
+ const { extensions } = transactionContext || {};
242
243
  if (!transactionId) {
243
244
  return false;
244
245
  }
@@ -255,7 +256,7 @@ const Datatrans = {
255
256
  transactionId,
256
257
  refno: transaction.refno,
257
258
  refno2: transaction.refno2,
258
- extensions: transactionContext,
259
+ extensions,
259
260
  });
260
261
  }
261
262
  return true;
@@ -284,15 +285,15 @@ const Datatrans = {
284
285
  }
285
286
  return true;
286
287
  },
287
- async charge({ transactionId: rawTransactionId, paymentCredentials, authorizeAuthenticated, ...extensions }) {
288
+ async charge({ transactionId: rawTransactionId, paymentCredentials, authorizeAuthenticated, ...arbitraryFields }) {
288
289
  if (!rawTransactionId && !paymentCredentials) {
289
290
  logger.warn('Not trying to charge because of missing payment authorization response, return false to provide later');
290
291
  return false;
291
292
  }
292
293
  const transactionId = rawTransactionId ||
293
294
  (await authorize({
295
+ ...arbitraryFields,
294
296
  paymentCredentials,
295
- extensions,
296
297
  }));
297
298
  const transaction = (await api().status({
298
299
  transactionId,
@@ -316,10 +317,10 @@ const Datatrans = {
316
317
  if (authorizeAuthenticated) {
317
318
  checkIfTransactionAmountValid(transactionId, transaction);
318
319
  await authorizeAuth({
320
+ ...(authorizeAuthenticated || {}),
319
321
  transactionId,
320
322
  refno: transaction.refno,
321
323
  refno2: transaction.refno2,
322
- extensions: authorizeAuthenticated,
323
324
  });
324
325
  status = 'authorized';
325
326
  }
@@ -361,7 +362,7 @@ const Datatrans = {
361
362
  return {
362
363
  transactionId,
363
364
  settledTransaction,
364
- extensions,
365
+ arbitraryFields,
365
366
  credentials,
366
367
  };
367
368
  }
package/lib/payment/datatrans-v2/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/payment/datatrans-v2/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/payment/datatrans-v2/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAC5F,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,kBAAkB,MAAM,OAAO,CAAC;AASvC,OAAO,cAAc,MAAM,cAAc,CAAC;AAC1C,OAAO,qBAAqB,MAAM,yBAAyB,CAAC;AAC5D,OAAO,sBAAsB,MAAM,0BAA0B,CAAC;AAE9D,MAAM,MAAM,GAAG,YAAY,CAAC,kCAAkC,CAAC,CAAC;AAEhE,eAAe,cAAc,CAAC;AAE9B,KAAK;AACL,MAAM,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,sBAAsB,EAAE,qBAAqB,EAAE,GAC3F,OAAO,CAAC,GAAG,CAAC;AAEd,MAAM,iBAAiB,GAAG,CAAC,EAAE,IAAI,EAAE,OAAO,EAAqC,EAAE,EAAE;IACjF,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC;IACjC,KAAK,CAAC,IAAI,GAAG,aAAa,IAAI,EAAE,CAAC;IACjC,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AAEF,MAAM,oBAAoB,GAAG,CAAC,MAAM,EAAE,EAAE;IACtC,IAAK,MAAwB,CAAC,KAAK,EAAE;QACnC,MAAM,QAAQ,GAAI,MAAwB,CAAC,KAAK,CAAC;QACjD,MAAM,iBAAiB,CAAC,QAAQ,CAAC,CAAC;KACnC;AACH,CAAC,CAAC;AAEF,MAAM,SAAS,GAAoB;IACjC,GAAG,cAAc;IAEjB,GAAG,EAAE,0BAA0B;IAC/B,KAAK,EAAE,uCAAuC;IAC9C,OAAO,EAAE,OAAO;IAEhB,oBAAoB,EAAE;QACpB;YACE,GAAG,EAAE,YAAY;YACjB,KAAK,EAAE,IAAI;SACZ;KACF;IAED,aAAa,CAAC,IAAI;QAChB,OAAO,IAAI,KAAK,SAAS,CAAC;IAC5B,CAAC;IAED,OAAO,EAAE,CAAC,MAAM,EAAE,EAAE;QAClB,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC,OAAO,CAAC;QAEnC,MAAM,aAAa,GAAG,GAAuB,EAAE;YAC7C,OAAO,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,KAAK,YAAY,CAAC,EAAE,KAAK,IAAI,qBAAqB,CAAC;QACjG,CAAC,CAAC;QAEF,MAAM,GAAG,GAAG,GAAG,EAAE;YACf,IAAI,CAAC,gBAAgB;gBAAE,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC;YAC9D,OAAO,kBAAkB,CACvB,sBAAsB,IAAI,mCAAmC,EAC7D,aAAa,EAAE,EACf,gBAAgB,CACjB,CAAC;QACJ,CAAC,CAAC;QAEF,MAAM,uBAAuB,GAAG,GAAG,EAAE;YACnC,OAAO,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,IAAI,EAAE,EAAE;gBAC5C,IAAI,IAAI,CAAC,GAAG,KAAK,mBAAmB;oBAAE,OAAO,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBACjE,OAAO,OAAO,CAAC;YACjB,CAAC,EAAE,IAAI,CAAC,CAAC;QACX,CAAC,CAAC;QAEF,MAAM,oBAAoB,GAAG,KAAK,IAMhC,EAAE;YACF,MAAM,EAAE,KAAK,EAAE,YAAY,EAAE,GAAG,MAAM,CAAC,cAAc,CAAC;YAEtD,MAAM,sBAAsB,GAAG,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,YAAY,CACjE,YAAY,EACZ,KAAK,CAAC,QAAQ,EACd,MAAM,CAAC,OAAO,CACf,CAAC;YACF,MAAM,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;YACnD,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,KAAK,CAAC,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC,CAAC;YAEhE,OAAO,OAAO,CAAC,GAAG,CAChB,MAAM,CAAC,MAAM;iBACV,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,KAAK,kBAAkB,CAAC;iBACjD,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;gBACZ,MAAM,CAAC,aAAa,EAAE,gBAAgB,EAAE,eAAe,CAAC,GAAG,IAAI,CAAC,KAAK;qBAClE,KAAK,CAAC,GAAG,CAAC;qBACV,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;gBAExB,MAAM,WAAW,GAAG,sBAAsB,CAAC,WAAW,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC;gBAC9E,MAAM,WAAW,GAAG,eAAe,CAAC,CAAC,CAAC,QAAQ,CAAC,eAAe,EAAE,EAAE,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;gBAC9E,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,GAAG,WAAW,CAAC,CAAC;gBAC/C,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,GAAG,WAAW,CAAC,CAAC;gBAEzD,OAAO;oBACL,aAAa;oBACb,MAAM;oBACN,UAAU;iBACX,CAAC;YACJ,CAAC,CAAC,CACL,CAAC;QACJ,CAAC,CAAC;QAEF,MAAM,SAAS,GAAG,KAAK,EAAE,EAAE,kBAAkB,EAAE,GAAG,eAAe,EAAE,EAAmB,EAAE;YACtF,MAAM,EAAE,KAAK,EAAE,YAAY,EAAE,GAAG,MAAM,CAAC,cAAc,CAAC;YACtD,MAAM,MAAM,GAAG,KAAK,EAAE,MAAM,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC;YACtD,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;YACtE,MAAM,MAAM,GAAG,MAAM,CAAC;YACtB,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,sBAAsB,CAAC,KAAK,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;YAC3E,MAAM,MAAM,GAAG,MAAM,oBAAoB,EAAE,CAAC;YAC5C,MAAM,MAAM,GAAG,MAAM,GAAG,EAAE,CAAC,SAAS,CAAC;gBACnC,GAAG,eAAe;gBAClB,MAAM;gBACN,QAAQ;gBACR,KAAK;gBACL,MAAM;gBACN,UAAU,EAAE,KAAK;gBACjB,QAAQ,EAAE;oBACR,EAAE,EAAE,MAAM;iBACX;gBACD,WAAW,EAAE,MAAM,CAAC,MAAM;oBACxB,CAAC,CAAC;wBACE,MAAM;qBACP;oBACH,CAAC,CAAC,SAAS;gBACb,CAAC,kBAAkB,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,KAAK,CAAC;aAC1E,CAAC,CAAC;YACH,oBAAoB,CAAC,MAAM,CAAC,CAAC;YAC7B,OAAQ,MAAmC,CAAC,aAAa,CAAC;QAC5D,CAAC,CAAC;QAEF,MAAM,aAAa,GAAG,KAAK,EAAE,EAC3B,aAAa,EACb,KAAK,EACL,MAAM,EACN,GAAG,eAAe,EACnB,EAAmB,EAAE;YACpB,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,CAAC,cAAc,CAAC;YACxC,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,sBAAsB,CAAC,KAAK,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;YAC3E,MAAM,MAAM,GAAG,MAAM,GAAG,EAAE,CAAC,sBAAsB,CAAC;gBAChD,GAAG,eAAe;gBAClB,aAAa;gBACb,MAAM;gBACN,QAAQ;gBACR,KAAK;gBACL,MAAM;gBACN,UAAU,EAAE,KAAK;aAClB,CAAC,CAAC;YACH,oBAAoB,CAAC,MAAM,CAAC,CAAC;YAC7B,OAAQ,MAAgD,CAAC,yBAAyB,CAAC;QACrF,CAAC,CAAC;QAEF,MAAM,wBAAwB,GAAG,CAAC,WAAkC,EAAW,EAAE;YAC/E,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,CAAC,cAAc,CAAC;YACxC,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,sBAAsB,CAAC,KAAK,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;YAC3E,IACE,WAAW,CAAC,QAAQ,KAAK,QAAQ;gBAChC,WAAW,CAAC,MAAM,CAAC,SAAiB,EAAE,MAAM,KAAK,MAAM,EACxD;gBACA,MAAM,CAAC,OAAO,CACZ,aAAa,WAAW,CAAC,QAAQ,QAAQ,QAAQ,OAC/C,WAAW,CAAC,QAAQ,KAAK,QAC3B,aAAc,WAAW,CAAC,MAAM,CAAC,SAAiB,EAAE,MAAM,QAAQ,MAAM,OACrE,WAAW,CAAC,MAAM,CAAC,SAAiB,EAAE,MAAM,KAAK,MACpD,EAAE,CACH,CAAC;gBACF,OAAO,KAAK,CAAC;aACd;YACD,OAAO,IAAI,CAAC;QACd,CAAC,CAAC;QAEF,MAAM,6BAA6B,GAAG,CACpC,aAAqB,EACrB,WAAkC,EAC5B,EAAE;YACR,IAAI,CAAC,wBAAwB,CAAC,WAAW,CAAC,EAAE;gBAC1C,MAAM,CAAC,KAAK,CACV,yCAAyC,aAAa,sCAAsC,CAC7F,CAAC;gBACF,MAAM,iBAAiB,CAAC;oBACtB,IAAI,EAAE,sCAAsC;oBAC5C,OAAO,EAAE,sCAAsC;iBAChD,CAAC,CAAC;aACJ;QACH,CAAC,CAAC;QAEF,MAAM,MAAM,GAAG,KAAK,EAAE,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,EAAoB,EAAE;YACtF,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,CAAC,cAAc,CAAC;YACxC,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,sBAAsB,CAAC,KAAK,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;YAC3E,MAAM,MAAM,GAAG,MAAM,oBAAoB,EAAE,CAAC;YAC5C,MAAM,MAAM,GAAG,MAAM,GAAG,EAAE,CAAC,MAAM,CAAC;gBAChC,aAAa;gBACb,MAAM;gBACN,KAAK;gBACL,MAAM;gBACN,QAAQ;gBACR,WAAW,EAAE,MAAM,CAAC,MAAM;oBACxB,CAAC,CAAC;wBACE,MAAM;qBACP;oBACH,CAAC,CAAC,SAAS;gBACb,UAAU;aACX,CAAC,CAAC;YACH,oBAAoB,CAAC,MAAM,CAAC,CAAC;YAC7B,OAAO,MAAiB,CAAC;QAC3B,CAAC,CAAC;QAEF,MAAM,MAAM,GAAG,KAAK,EAAE,EAAE,aAAa,EAAE,KAAK,EAAE,EAAoB,EAAE;YAClE,MAAM,MAAM,GAAG,MAAM,GAAG,EAAE,CAAC,MAAM,CAAC;gBAChC,aAAa;gBACb,KAAK;aACN,CAAC,CAAC;YACH,oBAAoB,CAAC,MAAM,CAAC,CAAC;YAC7B,OAAO,MAAiB,CAAC;QAC3B,CAAC,CAAC;QAEF,MAAM,cAAc,GAAG;YACrB,GAAG,cAAc,CAAC,OAAO,CAAC,MAAM,CAAC;YAEjC,kBAAkB;gBAChB,IAAI,CAAC,aAAa,EAAE,IAAI,CAAC,gBAAgB,IAAI,CAAC,kBAAkB,EAAE;oBAChE,OAAO,YAAY,CAAC,wBAAwB,CAAC;iBAC9C;gBACD,OAAO,IAAI,CAAC;YACd,CAAC;YAED,QAAQ;gBACN,IAAI,cAAc,CAAC,kBAAkB,EAAE,KAAK,IAAI;oBAAE,OAAO,IAAI,CAAC;gBAC9D,OAAO,KAAK,CAAC;YACf,CAAC;YAED,iBAAiB;gBACf,OAAO,KAAK,CAAC;YACf,CAAC;YAED,KAAK,CAAC,IAAI,CAAC,qBAA0B,EAAE;gBACrC,MAAM,EAAE,eAAe,GAAG,KAAK,EAAE,GAAG,eAAe,EAAE,GAAG,kBAAkB,IAAI,EAAE,CAAC;gBACjF,MAAM,EAAE,YAAY,EAAE,iBAAiB,EAAE,KAAK,EAAE,GAAG,MAAM,CAAC,cAAc,CAAC;gBAEzE,MAAM,MAAM,GAAG,KAAK,EAAE,MAAM,IAAI,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC;gBAEvD,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,iBAAiB,EAAE,KAAK,CAAC,CAAC,QAAQ,CAC5F,QAAQ,CACT,CAAC;gBACF,MAAM,MAAM,GAAG,MAAM,CAAC;gBACtB,MAAM,KAAK,GAA2C,KAAK;oBACzD,CAAC,CAAC,sBAAsB,CAAC,KAAK,EAAE,MAAM,CAAC,OAAO,CAAC;oBAC/C,CAAC,CAAC,EAAE,CAAC;gBAEP,IAAI,eAAe,EAAE;oBACnB,MAAM,MAAM,GAAG,MAAM,GAAG,EAAE,CAAC,YAAY,CAAC;wBACtC,GAAG,eAAe;wBAClB,QAAQ,EAAE,KAAK,CAAC,QAAQ,IAAI,KAAK;wBACjC,KAAK;wBACL,MAAM;wBACN,QAAQ,EAAE;4BACR,EAAE,EAAE,MAAM;yBACX;wBACD,MAAM,EAAE,KAAK,CAAC,MAAM;qBACrB,CAAC,CAAC;oBACH,oBAAoB,CAAC,MAAM,CAAC,CAAC;oBAC7B,OAAO,IAAI,CAAC,SAAS,CAAC,MAA6B,CAAC,CAAC;iBACtD;gBACD,MAAM,MAAM,GAAG,MAAM,GAAG,EAAE,CAAC,IAAI,CAAC;oBAC9B,GAAG,eAAe;oBAClB,QAAQ,EAAE,KAAK,CAAC,QAAQ,IAAI,KAAK;oBACjC,KAAK;oBACL,MAAM;oBACN,QAAQ,EAAE;wBACR,EAAE,EAAE,MAAM;qBACX;oBACD,MAAM,EAAE,KAAK,CAAC,MAAM;iBACrB,CAAC,CAAC;gBACH,oBAAoB,CAAC,MAAM,CAAC,CAAC;gBAC7B,OAAO,IAAI,CAAC,SAAS,CAAC,MAA6B,CAAC,CAAC;YACvD,CAAC;YAED,KAAK,CAAC,QAAQ,CAAC,WAAW;gBACxB,IAAI,CAAC,WAAW,CAAC,IAAI;oBAAE,OAAO,KAAK,CAAC;gBACpC,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,GAAG,WAAW,CAAC,IAAI,CAAC;gBACjD,MAAM,MAAM,GAAG,MAAM,GAAG,EAAE,CAAC,QAAQ,CAAC;oBAClC,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,SAAS,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,EAAE,EAAE,KAAK,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC;oBAC7E,QAAQ;oBACR,CAAC,SAAS,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,KAAK,CAAC;iBAC3C,CAAC,CAAC;gBACH,OAAO,OAAO,CAAE,MAAkC,EAAE,aAAa,CAAC,CAAC;YACrE,CAAC;YAED,KAAK,CAAC,QAAQ,CAAC,mBAAmB;gBAChC,MAAM,EAAE,aAAa,EAAE,GAAG,mBAAmB,CAAC;gBAC9C,MAAM,MAAM,GAAG,CAAC,MAAM,GAAG,EAAE,CAAC,MAAM,CAAC;oBACjC,aAAa;iBACd,CAAC,CAA0B,CAAC;gBAC7B,IAAI,MAAM,CAAC,aAAa,EAAE;oBACxB,OAAO,qBAAqB,CAAC,MAAM,CAAC,CAAC;iBACtC;gBACD,OAAO,IAAI,CAAC;YACd,CAAC;YAED,KAAK,CAAC,OAAO;gBACX,IAAI,CAAC,uBAAuB,EAAE;oBAAE,OAAO,KAAK,CAAC;gBAC7C,MAAM,EAAE,YAAY,EAAE,kBAAkB,EAAE,GAAG,MAAM,CAAC,cAAc,CAAC;gBACnE,MAAM,EAAE,aAAa,EAAE,GAAG,YAAY,CAAC;gBAEvC,MAAM,EAAE,UAAU,EAAE,GAAG,kBAAkB,IAAI,EAAE,CAAC;gBAEhD,IAAI,CAAC,aAAa,EAAE;oBAClB,OAAO,KAAK,CAAC;iBACd;gBACD,MAAM,WAAW,GAA0B,CAAC,MAAM,GAAG,EAAE,CAAC,MAAM,CAAC;oBAC7D,aAAa;iBACd,CAAC,CAA0B,CAAC;gBAC7B,oBAAoB,CAAC,WAAW,CAAC,CAAC;gBAClC,MAAM,EAAE,MAAM,EAAE,GAAG,WAAW,CAAC;gBAE/B,IAAI,MAAM,KAAK,YAAY,EAAE;oBAC3B,0BAA0B;oBAC1B,mFAAmF;oBACnF,8BAA8B;oBAC9B,MAAM,MAAM,CAAC;wBACX,aAAa;wBACb,KAAK,EAAE,WAAW,CAAC,KAAK;wBACxB,MAAM,EAAE,WAAW,CAAC,MAAM;wBAC1B,UAAU;qBACX,CAAC,CAAC;iBACJ;gBACD,OAAO,IAAI,CAAC;YACd,CAAC;YAED,KAAK,CAAC,MAAM;gBACV,IAAI,CAAC,uBAAuB,EAAE;oBAAE,OAAO,KAAK,CAAC;gBAC7C,MAAM,EAAE,YAAY,EAAE,GAAG,MAAM,CAAC,cAAc,CAAC;gBAC/C,MAAM,EAAE,aAAa,EAAE,GAAG,YAAY,CAAC;gBACvC,IAAI,CAAC,aAAa,EAAE;oBAClB,OAAO,KAAK,CAAC;iBACd;gBACD,MAAM,WAAW,GAA0B,CAAC,MAAM,GAAG,EAAE,CAAC,MAAM,CAAC;oBAC7D,aAAa;iBACd,CAAC,CAA0B,CAAC;gBAC7B,oBAAoB,CAAC,WAAW,CAAC,CAAC;gBAClC,MAAM,EAAE,MAAM,EAAE,GAAG,WAAW,CAAC;gBAE/B,IAAI,MAAM,KAAK,YAAY,EAAE;oBAC3B,0BAA0B;oBAC1B,mFAAmF;oBACnF,8BAA8B;oBAC9B,MAAM,MAAM,CAAC;wBACX,aAAa;wBACb,KAAK,EAAE,WAAW,CAAC,KAAK;qBACzB,CAAC,CAAC;iBACJ;gBACD,OAAO,IAAI,CAAC;YACd,CAAC;YAED,KAAK,CAAC,MAAM,CAAC,EACX,aAAa,EAAE,gBAAgB,EAC/B,kBAAkB,EAClB,sBAAsB,EACtB,GAAG,eAAe,EACnB;gBACC,IAAI,CAAC,gBAAgB,IAAI,CAAC,kBAAkB,EAAE;oBAC5C,MAAM,CAAC,IAAI,CACT,uGAAuG,CACxG,CAAC;oBACF,OAAO,KAAK,CAAC;iBACd;gBAED,MAAM,aAAa,GACjB,gBAAgB;oBAChB,CAAC,MAAM,SAAS,CAAC;wBACf,GAAG,eAAe;wBAClB,kBAAkB;qBACnB,CAAC,CAAC,CAAC;gBAEN,MAAM,WAAW,GAA0B,CAAC,MAAM,GAAG,EAAE,CAAC,MAAM,CAAC;oBAC7D,aAAa;iBACd,CAAC,CAA0B,CAAC;gBAC7B,oBAAoB,CAAC,WAAW,CAAC,CAAC;gBAElC,IAAI,CAAC,WAAW,EAAE;oBAChB,MAAM,iBAAiB,CAAC;wBACtB,IAAI,EAAE,uBAAuB;wBAC7B,OAAO,EAAE,sCAAsC;qBAChD,CAAC,CAAC;iBACJ;gBACD,IAAI,EAAE,MAAM,EAAE,GAAG,WAAW,CAAC;gBAE7B,IAAI,MAAM,KAAK,UAAU,IAAI,MAAM,KAAK,QAAQ,EAAE;oBAChD,MAAM,CAAC,KAAK,CACV,oDAAoD,aAAa,eAAe,MAAM,EAAE,CACzF,CAAC;oBACF,MAAM,iBAAiB,CAAC;wBACtB,IAAI,EAAE,UAAU,MAAM,CAAC,WAAW,EAAE,EAAE;wBACtC,OAAO,EAAE,8BAA8B;qBACxC,CAAC,CAAC;iBACJ;gBAED,IAAI,MAAM,KAAK,eAAe,EAAE;oBAC9B,IAAI,sBAAsB,EAAE;wBAC1B,6BAA6B,CAAC,aAAa,EAAE,WAAW,CAAC,CAAC;wBAC1D,MAAM,aAAa,CAAC;4BAClB,GAAG,CAAC,sBAAsB,IAAI,EAAE,CAAC;4BACjC,aAAa;4BACb,KAAK,EAAE,WAAW,CAAC,KAAK;4BACxB,MAAM,EAAE,WAAW,CAAC,MAAM;yBAC3B,CAAC,CAAC;wBACH,MAAM,GAAG,YAAY,CAAC;qBACvB;yBAAM;wBACL,MAAM,CAAC,KAAK,CAAC,yCAAyC,aAAa,qBAAqB,CAAC,CAAC;wBAC1F,MAAM,iBAAiB,CAAC;4BACtB,IAAI,EAAE,UAAU,MAAM,CAAC,WAAW,EAAE,EAAE;4BACtC,OAAO,EAAE,0CAA0C;yBACpD,CAAC,CAAC;qBACJ;iBACF;gBAED,IAAI,MAAM,KAAK,YAAY,IAAI,MAAM,KAAK,SAAS,EAAE;oBACnD,IAAI,kBAAkB,GAAG,WAAW,CAAC;oBACrC,IAAI,WAAW,CAAC;oBAChB,8CAA8C;oBAC9C,mDAAmD;oBACnD,iCAAiC;oBACjC,IAAI;wBACF,6BAA6B,CAAC,aAAa,EAAE,kBAAkB,CAAC,CAAC;wBACjE,WAAW,GAAG,qBAAqB,CAAC,kBAAkB,CAAC,CAAC;wBACxD,MAAM,MAAM,GAAG,MAAM,GAAG,EAAE,CAAC,MAAM,CAAC;4BAChC,aAAa;yBACd,CAAC,CAAC;wBACH,IAAK,MAAwB,EAAE,KAAK,EAAE;4BACpC,kBAAkB,GAAG,WAAW,CAAC;yBAClC;6BAAM;4BACL,kBAAkB,GAAG,MAA+B,CAAC;yBACtD;qBACF;oBAAC,OAAO,CAAC,EAAE;wBACV,MAAM,MAAM,CAAC,EAAE,aAAa,EAAE,KAAK,EAAE,kBAAkB,CAAC,KAAK,EAAE,CAAC,CAAC;wBACjE,MAAM,CAAC,KAAK,CACV,yCAAyC,aAAa,0BAA0B,CACjF,CAAC;wBACF,MAAM,iBAAiB,CAAC;4BACtB,IAAI,EAAE,UAAU,MAAM,CAAC,WAAW,EAAE,EAAE;4BACtC,OAAO,EAAE,2DAA2D;yBACrE,CAAC,CAAC;qBACJ;oBACD,OAAO;wBACL,aAAa;wBACb,kBAAkB;wBAClB,eAAe;wBACf,WAAW;qBACZ,CAAC;iBACH;gBAED,IACE,MAAM,KAAK,aAAa;oBACxB,MAAM,KAAK,oBAAoB;oBAC/B,MAAM,KAAK,mBAAmB;oBAC9B,MAAM,KAAK,aAAa,EACxB;oBACA,MAAM,CAAC,KAAK,CAAC,kBAAkB,aAAa,2BAA2B,MAAM,EAAE,CAAC,CAAC;oBACjF,MAAM,iBAAiB,CAAC;wBACtB,IAAI,EAAE,UAAU,MAAM,CAAC,WAAW,EAAE,EAAE;wBACtC,OAAO,EAAE,yCAAyC;qBACnD,CAAC,CAAC;iBACJ;gBACD,OAAO,KAAK,CAAC;YACf,CAAC;SACF,CAAC;QAEF,OAAO,cAAc,CAAC;IACxB,CAAC;CACF,CAAC;AAEF,eAAe,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@unchainedshop/plugins",
3
- "version": "1.2.30",
3
+ "version": "1.2.32",
4
4
  "main": "lib/plugins-index.js",
5
5
  "types": "lib/plugins-index.d.ts",
6
6
  "exports": {
package/src/payment/datatrans-v2/api/init.ts CHANGED
@@ -21,9 +21,9 @@ export default async function init({
21
21
  ...payload,
22
22
  autoSettle: false,
23
23
  option: {
24
- ...(option || {}),
25
24
  createAlias: true,
26
25
  returnCustomerCountry: true,
26
+ ...(option || {}), // allow to overturn the options above
27
27
  authenticationOnly: false,
28
28
  },
29
29
  redirect,
package/src/payment/datatrans-v2/api/makeFetcher.ts CHANGED
@@ -1,13 +1,15 @@
1
1
  import fs from 'fs';
2
2
  import util from 'util';
3
3
  import { resolve } from 'path';
4
- import { log, LogLevel } from '@unchainedshop/logger';
4
+ import { createLogger } from '@unchainedshop/logger';
5
5
  import fetch, { Response } from 'node-fetch';
6
6
 
7
7
  const readFile = util.promisify(fs.readFile);
8
8
 
9
9
  const { DATATRANS_API_MOCKS_PATH } = process.env;
10
10
 
11
+ const logger = createLogger('unchained:datatrans');
12
+
11
13
  export default (
12
14
  endpoint: string,
13
15
  merchantId: string,
@@ -24,8 +26,7 @@ export default (
24
26
  status: json?.error ? 500 : 204,
25
27
  } as any;
26
28
  } catch (error) {
27
- log('DataTrans V2 (makeFetcher) -> Error while trying reading and parsing file', {
28
- level: LogLevel.Error,
29
+ logger.error('Mock: Error while trying reading and parsing file', {
29
30
  ...error,
30
31
  });
31
32
  return {
@@ -39,6 +40,7 @@ export default (
39
40
  const token = `${merchantId}:${secret}`;
40
41
 
41
42
  return async (path: string, body: any): Promise<Response> => {
43
+ logger.debug(`Fetch ${endpoint}${path}: ${JSON.stringify(body)}`);
42
44
  return fetch(`${endpoint}${path}`, {
43
45
  method: body ? 'POST' : 'GET',
44
46
  body: body ? JSON.stringify(body) : undefined,
package/src/payment/datatrans-v2/index.ts CHANGED
@@ -115,7 +115,7 @@ const Datatrans: IPaymentAdapter = {
115
115
  );
116
116
  };
117
117
 
118
- const authorize = async ({ paymentCredentials, extensions }): Promise<string> => {
118
+ const authorize = async ({ paymentCredentials, ...arbitraryFields }): Promise<string> => {
119
119
  const { order, orderPayment } = params.paymentContext;
120
120
  const userId = order?.userId || params.context.userId;
121
121
  const refno = Buffer.from(orderPayment._id, 'hex').toString('base64');
@@ -123,7 +123,7 @@ const Datatrans: IPaymentAdapter = {
123
123
  const { currency, amount } = roundedAmountFromOrder(order, params.context);
124
124
  const splits = await getMarketplaceSplits();
125
125
  const result = await api().authorize({
126
- ...extensions,
126
+ ...arbitraryFields,
127
127
  amount,
128
128
  currency,
129
129
  refno,
@@ -143,11 +143,16 @@ const Datatrans: IPaymentAdapter = {
143
143
  return (result as AuthorizeResponseSuccess).transactionId;
144
144
  };
145
145
 
146
- const authorizeAuth = async ({ transactionId, refno, refno2, extensions }): Promise<string> => {
146
+ const authorizeAuth = async ({
147
+ transactionId,
148
+ refno,
149
+ refno2,
150
+ ...arbitraryFields
151
+ }): Promise<string> => {
147
152
  const { order } = params.paymentContext;
148
153
  const { currency, amount } = roundedAmountFromOrder(order, params.context);
149
154
  const result = await api().authorizeAuthenticated({
150
- ...extensions,
155
+ ...arbitraryFields,
151
156
  transactionId,
152
157
  amount,
153
158
  currency,
@@ -243,7 +248,7 @@ const Datatrans: IPaymentAdapter = {
243
248
  },
244
249
 
245
250
  async sign(transactionContext: any = {}) {
246
- const { useSecureFields = false, ...additionalInitPayload } = transactionContext || {};
251
+ const { useSecureFields = false, ...arbitraryFields } = transactionContext || {};
247
252
  const { orderPayment, paymentProviderId, order } = params.paymentContext;
248
253
 
249
254
  const userId = order?.userId || params.context?.userId;
@@ -258,7 +263,7 @@ const Datatrans: IPaymentAdapter = {
258
263
 
259
264
  if (useSecureFields) {
260
265
  const result = await api().secureFields({
261
- ...additionalInitPayload,
266
+ ...arbitraryFields,
262
267
  currency: price.currency || 'CHF',
263
268
  refno,
264
269
  refno2,
@@ -271,7 +276,7 @@ const Datatrans: IPaymentAdapter = {
271
276
  return JSON.stringify(result as InitResponseSuccess);
272
277
  }
273
278
  const result = await api().init({
274
- ...additionalInitPayload,
279
+ ...arbitraryFields,
275
280
  currency: price.currency || 'CHF',
276
281
  refno,
277
282
  refno2,
@@ -310,6 +315,9 @@ const Datatrans: IPaymentAdapter = {
310
315
  if (!shouldSettleInUnchained()) return false;
311
316
  const { orderPayment, transactionContext } = params.paymentContext;
312
317
  const { transactionId } = orderPayment;
318
+
319
+ const { extensions } = transactionContext || {};
320
+
313
321
  if (!transactionId) {
314
322
  return false;
315
323
  }
@@ -327,7 +335,7 @@ const Datatrans: IPaymentAdapter = {
327
335
  transactionId,
328
336
  refno: transaction.refno,
329
337
  refno2: transaction.refno2,
330
- extensions: transactionContext,
338
+ extensions,
331
339
  });
332
340
  }
333
341
  return true;
@@ -362,7 +370,7 @@ const Datatrans: IPaymentAdapter = {
362
370
  transactionId: rawTransactionId,
363
371
  paymentCredentials,
364
372
  authorizeAuthenticated,
365
- ...extensions
373
+ ...arbitraryFields
366
374
  }) {
367
375
  if (!rawTransactionId && !paymentCredentials) {
368
376
  logger.warn(
@@ -374,8 +382,8 @@ const Datatrans: IPaymentAdapter = {
374
382
  const transactionId =
375
383
  rawTransactionId ||
376
384
  (await authorize({
385
+ ...arbitraryFields,
377
386
  paymentCredentials,
378
- extensions,
379
387
  }));
380
388
 
381
389
  const transaction: StatusResponseSuccess = (await api().status({
@@ -405,10 +413,10 @@ const Datatrans: IPaymentAdapter = {
405
413
  if (authorizeAuthenticated) {
406
414
  checkIfTransactionAmountValid(transactionId, transaction);
407
415
  await authorizeAuth({
416
+ ...(authorizeAuthenticated || {}),
408
417
  transactionId,
409
418
  refno: transaction.refno,
410
419
  refno2: transaction.refno2,
411
- extensions: authorizeAuthenticated,
412
420
  });
413
421
  status = 'authorized';
414
422
  } else {
@@ -450,7 +458,7 @@ const Datatrans: IPaymentAdapter = {
450
458
  return {
451
459
  transactionId,
452
460
  settledTransaction,
453
- extensions,
461
+ arbitraryFields,
454
462
  credentials,
455
463
  };
456
464
  }