@unchainedshop/plugins 2.0.0-beta7 → 2.0.0-beta8

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 (24) hide show
  1. package/lib/payment/apple-iap/db/AppleTransactionsCollection.d.ts +1 -1
  2. package/lib/payment/braintree.js +14 -12
  3. package/lib/payment/braintree.js.map +1 -1
  4. package/lib/payment/cryptopay/db/CryptopayTransactions.d.ts +1 -1
  5. package/lib/payment/cryptopay/middleware.js +1 -1
  6. package/lib/payment/cryptopay/middleware.js.map +1 -1
  7. package/lib/payment/datatrans-v2/getPaths.d.ts +1 -1
  8. package/lib/payment/postfinance-checkout/types.d.ts +3 -3
  9. package/lib/payment/worldline-saferpay/worldline-saferpay-client/api/SaferpayConnection.js +3 -2
  10. package/lib/payment/worldline-saferpay/worldline-saferpay-client/api/SaferpayConnection.js.map +1 -1
  11. package/lib/payment/worldline-saferpay/worldline-saferpay-client/models/PaymentMethods.d.ts +1 -1
  12. package/lib/payment/worldline-saferpay/worldline-saferpay-client/models/Transaction.d.ts +2 -2
  13. package/lib/plugins-index.d.ts +4 -1
  14. package/lib/plugins-index.js +11 -11
  15. package/lib/plugins-index.js.map +1 -1
  16. package/lib/pricing/utils/cache.d.ts +2 -1
  17. package/lib/worker/zombie-killer.js +13 -28
  18. package/lib/worker/zombie-killer.js.map +1 -1
  19. package/package.json +24 -21
  20. package/src/payment/braintree.ts +14 -12
  21. package/src/payment/cryptopay/middleware.ts +1 -1
  22. package/src/payment/worldline-saferpay/worldline-saferpay-client/api/SaferpayConnection.ts +3 -2
  23. package/src/plugins-index.ts +15 -11
  24. package/src/worker/zombie-killer.ts +33 -30
package/lib/payment/apple-iap/db/AppleTransactionsCollection.d.ts CHANGED
@@ -1,5 +1,5 @@
1
1
  import { Db, TimestampFields, _ID } from '@unchainedshop/types/common';
2
- export declare type AppleTransaction = {
2
+ export type AppleTransaction = {
3
3
  _id?: _ID;
4
4
  matchedTransaction: any;
5
5
  orderId: string;
package/lib/payment/braintree.js CHANGED
@@ -94,7 +94,7 @@ const BraintreeDirect = {
94
94
  // @ts-ignore
95
95
  const braintree = (await import('braintree')).default; // eslint-disable-line
96
96
  const gateway = getGateway(braintree);
97
- const address = order.billingAddress || {};
97
+ const address = order.billingAddress;
98
98
  const pricing = modules.orders.pricingSheet(order);
99
99
  const rounded = Math.round(pricing.total({ useNetPrice: false }).amount / 10 || 0) * 10;
100
100
  const saleRequest = {
@@ -102,17 +102,19 @@ const BraintreeDirect = {
102
102
  merchantAccountId: order.currency,
103
103
  paymentMethodNonce: paypalPaymentMethodNonce,
104
104
  orderId: order.orderNumber || order._id,
105
- shipping: {
106
- firstName: address.firstName,
107
- lastName: address.lastName,
108
- company: address.company,
109
- streetAddress: address.addressLine,
110
- extendedAddress: address.addressLine2,
111
- locality: address.city,
112
- region: address.regionCode,
113
- postalCode: address.postalCode,
114
- countryCodeAlpha2: address.countryCode,
115
- },
105
+ shipping: address
106
+ ? {
107
+ firstName: address.firstName,
108
+ lastName: address.lastName,
109
+ company: address.company,
110
+ streetAddress: address.addressLine,
111
+ extendedAddress: address.addressLine2,
112
+ locality: address.city,
113
+ region: address.regionCode,
114
+ postalCode: address.postalCode,
115
+ countryCodeAlpha2: address.countryCode,
116
+ }
117
+ : undefined,
116
118
  options: {
117
119
  submitForSettlement: true,
118
120
  },
package/lib/payment/braintree.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"braintree.js","sourceRoot":"","sources":["../../src/payment/braintree.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"braintree.js","sourceRoot":"","sources":["../../src/payment/braintree.ts"],"names":[],"mappings":"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"}
package/lib/payment/cryptopay/db/CryptopayTransactions.d.ts CHANGED
@@ -1,6 +1,6 @@
1
1
  import { Db, TimestampFields, _ID } from '@unchainedshop/types/common';
2
2
  import { Decimal128 } from 'mongodb';
3
- export declare type CryptopayTransaction = {
3
+ export type CryptopayTransaction = {
4
4
  _id?: _ID;
5
5
  blockHeight: number;
6
6
  mostRecentBlockHeight: number;
package/lib/payment/cryptopay/middleware.js CHANGED
@@ -51,7 +51,7 @@ export const cryptopayHandler = async (req, res) => {
51
51
  expiresAt,
52
52
  timestamp: timestampDate,
53
53
  };
54
- console.log('update rate', price, rateData);
54
+ logger.verbose(`update rate ${JSON.stringify(price)}, ${JSON.stringify(rateData)}`);
55
55
  await resolvedContext.modules.products.prices.rates.updateRates([rateData]);
56
56
  }
57
57
  if (ping) {
package/lib/payment/cryptopay/middleware.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"middleware.js","sourceRoot":"","sources":["../../../src/payment/cryptopay/middleware.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"middleware.js","sourceRoot":"","sources":["../../../src/payment/cryptopay/middleware.ts"],"names":[],"mappings":"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"}
package/lib/payment/datatrans-v2/getPaths.d.ts CHANGED
@@ -1,4 +1,4 @@
1
- declare type Paths = {
1
+ type Paths = {
2
2
  postUrl: string;
3
3
  cancelUrl: string;
4
4
  successUrl: string;
package/lib/payment/postfinance-checkout/types.d.ts CHANGED
@@ -7,12 +7,12 @@ export declare enum CompletionModes {
7
7
  Immediate = "Immediate",
8
8
  Deferred = "Deferred"
9
9
  }
10
- export declare type SignResponse = {
10
+ export type SignResponse = {
11
11
  transactionId: number;
12
12
  location: string | null;
13
13
  };
14
- export declare type listenerEntityTechnicalNames = 'TransactionCompletion';
15
- export declare type WebhookData = {
14
+ export type listenerEntityTechnicalNames = 'TransactionCompletion';
15
+ export type WebhookData = {
16
16
  eventId: number;
17
17
  entityId: number;
18
18
  listenerEntityId: number;
package/lib/payment/worldline-saferpay/worldline-saferpay-client/api/SaferpayConnection.js CHANGED
@@ -18,11 +18,12 @@ export class SaferpayConnection {
18
18
  };
19
19
  }
20
20
  async post(uri, data) {
21
- return fetch(this.buildUrl(uri), {
21
+ const res = await fetch(this.buildUrl(uri), {
22
22
  method: 'POST',
23
23
  body: JSON.stringify(data),
24
24
  headers: this.getHeaders(),
25
- }).then((res) => res.json());
25
+ });
26
+ return res.json();
26
27
  }
27
28
  }
28
29
  //# sourceMappingURL=SaferpayConnection.js.map
package/lib/payment/worldline-saferpay/worldline-saferpay-client/api/SaferpayConnection.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"SaferpayConnection.js","sourceRoot":"","sources":["../../../../../src/payment/worldline-saferpay/worldline-saferpay-client/api/SaferpayConnection.ts"],"names":[],"mappings":"AAAA,2BAA2B;AAC3B,MAAM,OAAO,kBAAkB;IACrB,OAAO,CAAS;IAEhB,IAAI,CAAS;IAEb,QAAQ,CAAS;IAEzB,YAAmB,OAAe,EAAE,IAAY,EAAE,QAAgB;QAChE,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC3B,CAAC;IAEO,QAAQ,CAAC,GAAW;QAC1B,OAAO,IAAI,CAAC,OAAO,GAAG,GAAG,CAAC;IAC5B,CAAC;IAEO,UAAU;QAChB,OAAO;YACL,cAAc,EAAE,kBAAkB;YAClC,aAAa,EAAE,SAAS,MAAM,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,QAAQ,EAAE,EAAE,QAAQ,CAAC,CAAC,QAAQ,CACrF,QAAQ,CACT,EAAE;SACJ,CAAC;IACJ,CAAC;IAEM,KAAK,CAAC,IAAI,CAAC,GAAW,EAAE,IAAY;QACzC,OAAO,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;YAC/B,MAAM,EAAE,MAAM;YACd,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;YAC1B,OAAO,EAAE,IAAI,CAAC,UAAU,EAAE;SAC3B,CAAC,CAAC,IAAI,CAAC,CAAC,GAAQ,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC;IACpC,CAAC;CACF"}
1
+ {"version":3,"file":"SaferpayConnection.js","sourceRoot":"","sources":["../../../../../src/payment/worldline-saferpay/worldline-saferpay-client/api/SaferpayConnection.ts"],"names":[],"mappings":"AAAA,2BAA2B;AAC3B,MAAM,OAAO,kBAAkB;IACrB,OAAO,CAAS;IAEhB,IAAI,CAAS;IAEb,QAAQ,CAAS;IAEzB,YAAmB,OAAe,EAAE,IAAY,EAAE,QAAgB;QAChE,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC3B,CAAC;IAEO,QAAQ,CAAC,GAAW;QAC1B,OAAO,IAAI,CAAC,OAAO,GAAG,GAAG,CAAC;IAC5B,CAAC;IAEO,UAAU;QAChB,OAAO;YACL,cAAc,EAAE,kBAAkB;YAClC,aAAa,EAAE,SAAS,MAAM,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,QAAQ,EAAE,EAAE,QAAQ,CAAC,CAAC,QAAQ,CACrF,QAAQ,CACT,EAAE;SACJ,CAAC;IACJ,CAAC;IAEM,KAAK,CAAC,IAAI,CAAC,GAAW,EAAE,IAAY;QACzC,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;YAC1C,MAAM,EAAE,MAAM;YACd,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;YAC1B,OAAO,EAAE,IAAI,CAAC,UAAU,EAAE;SAC3B,CAAC,CAAC;QACH,OAAO,GAAG,CAAC,IAAI,EAAE,CAAC;IACpB,CAAC;CACF"}
package/lib/payment/worldline-saferpay/worldline-saferpay-client/models/PaymentMethods.d.ts CHANGED
@@ -1 +1 @@
1
- export declare type PaymentMethods = 'ALIPAY' | 'AMEX' | 'BANCONTACT' | 'BONUS' | 'DINERS' | 'DIRECTDEBIT' | 'EPRZELEWY' | 'EPS' | 'GIROPAY' | 'IDEAL' | 'INVOICE' | 'JCB' | 'KLARNA' | 'MAESTRO' | 'MASTERCARD' | 'MYONE' | 'PAYPAL' | 'PAYDIREKT' | 'POSTCARD' | 'POSTFINANCE' | 'SOFORT' | 'TWINT' | 'UNIONPAY' | 'VISA' | 'WLCRYPTOPAYMENTS';
1
+ export type PaymentMethods = 'ALIPAY' | 'AMEX' | 'BANCONTACT' | 'BONUS' | 'DINERS' | 'DIRECTDEBIT' | 'EPRZELEWY' | 'EPS' | 'GIROPAY' | 'IDEAL' | 'INVOICE' | 'JCB' | 'KLARNA' | 'MAESTRO' | 'MASTERCARD' | 'MYONE' | 'PAYPAL' | 'PAYDIREKT' | 'POSTCARD' | 'POSTFINANCE' | 'SOFORT' | 'TWINT' | 'UNIONPAY' | 'VISA' | 'WLCRYPTOPAYMENTS';
package/lib/payment/worldline-saferpay/worldline-saferpay-client/models/Transaction.d.ts CHANGED
@@ -1,5 +1,5 @@
1
- export declare type TransactionStatus = 'AUTHORIZED' | 'CANCELED' | 'CAPTURED' | 'PENDING';
2
- export declare type TransactionAmount = {
1
+ export type TransactionStatus = 'AUTHORIZED' | 'CANCELED' | 'CAPTURED' | 'PENDING';
2
+ export type TransactionAmount = {
3
3
  Value: string;
4
4
  CurrencyCode: string;
5
5
  };
package/lib/plugins-index.d.ts CHANGED
@@ -1,3 +1,4 @@
1
+ import { UnchainedCore } from '@unchainedshop/types/core';
1
2
  import './delivery/post';
2
3
  import './delivery/pick-mup';
3
4
  import './delivery/send-message';
@@ -58,4 +59,6 @@ export declare const defaultModules: {
58
59
  }) => import("./payment/cryptopay").CryptopayModule;
59
60
  };
60
61
  };
61
- export declare const useDefaultMiddlewares: (unchainedApi: any, app: any) => void;
62
+ export declare const connectDefaultPluginsToExpress4: (app: any, { unchainedAPI }: {
63
+ unchainedAPI: UnchainedCore;
64
+ }) => void;
package/lib/plugins-index.js CHANGED
@@ -1,5 +1,5 @@
1
- import { useMiddlewareWithCurrentContext } from '@unchainedshop/api';
2
- import bodyParser from 'body-parser';
1
+ import { useMiddlewareWithCurrentContext } from '@unchainedshop/api/express';
2
+ import express from 'express';
3
3
  // Delivery
4
4
  import './delivery/post';
5
5
  import './delivery/pick-mup';
@@ -75,27 +75,27 @@ export const defaultModules = {
75
75
  configure: configureCryptopayModule,
76
76
  },
77
77
  };
78
- export const useDefaultMiddlewares = (unchainedApi, app) => {
78
+ export const connectDefaultPluginsToExpress4 = (app, { unchainedAPI }) => {
79
79
  useMiddlewareWithCurrentContext(app, GRIDFS_PUT_SERVER_PATH, gridfsHandler);
80
- useMiddlewareWithCurrentContext(app, CRYPTOPAY_WEBHOOK_PATH, bodyParser.json(), cryptopayHandler);
81
- useMiddlewareWithCurrentContext(app, STRIPE_WEBHOOK_PATH, bodyParser.raw({ type: 'application/json' }), stripeHandler);
82
- useMiddlewareWithCurrentContext(app, PFCHECKOUT_WEBHOOK_PATH, bodyParser.json(), postfinanceCheckoutHandler);
83
- useMiddlewareWithCurrentContext(app, DATATRANS_WEBHOOK_PATH, bodyParser.text({
80
+ useMiddlewareWithCurrentContext(app, CRYPTOPAY_WEBHOOK_PATH, express.json(), cryptopayHandler);
81
+ useMiddlewareWithCurrentContext(app, STRIPE_WEBHOOK_PATH, express.raw({ type: 'application/json' }), stripeHandler);
82
+ useMiddlewareWithCurrentContext(app, PFCHECKOUT_WEBHOOK_PATH, express.json(), postfinanceCheckoutHandler);
83
+ useMiddlewareWithCurrentContext(app, DATATRANS_WEBHOOK_PATH, express.text({
84
84
  type: 'application/json',
85
85
  }), datatransHandler);
86
- useMiddlewareWithCurrentContext(app, APPLE_IAP_WEBHOOK_PATH, bodyParser.json({
86
+ useMiddlewareWithCurrentContext(app, APPLE_IAP_WEBHOOK_PATH, express.json({
87
87
  strict: false,
88
88
  }), appleIAPHandler);
89
89
  // useMiddlewareWithCurrentContext(
90
90
  // app,
91
91
  // MINIO_PUT_SERVER_PATH,
92
- // bodyParser.json({
92
+ // express.json({
93
93
  // strict: false,
94
94
  // }),
95
95
  // minioHandler
96
96
  // );
97
- configureExportToken(unchainedApi);
98
- configureUpdateTokenOwnership(unchainedApi);
97
+ configureExportToken(unchainedAPI);
98
+ configureUpdateTokenOwnership(unchainedAPI);
99
99
  configureGenerateOrderAutoscheduling();
100
100
  };
101
101
  //# sourceMappingURL=plugins-index.js.map
package/lib/plugins-index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"plugins-index.js","sourceRoot":"","sources":["../src/plugins-index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"plugins-index.js","sourceRoot":"","sources":["../src/plugins-index.ts"],"names":[],"mappings":"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"}
package/lib/pricing/utils/cache.d.ts CHANGED
@@ -1,8 +1,9 @@
1
1
  export default Cache;
2
2
  declare class Cache {
3
3
  constructor(ttlSeconds?: number);
4
- cache: any;
4
+ cache: LRUCache<any, any>;
5
5
  get(key: any, currentFuntion: any): any;
6
6
  del(keys: any): void;
7
7
  flushAll(): void;
8
8
  }
9
+ import LRUCache from "lru-cache";
package/lib/worker/zombie-killer.js CHANGED
@@ -1,8 +1,6 @@
1
1
  import { WorkerDirector, WorkerAdapter } from '@unchainedshop/core-worker';
2
2
  import { createLogger } from '@unchainedshop/logger';
3
3
  const logger = createLogger('unchained:platform:zombie-killer');
4
- const findId = { projection: { _id: 1 } };
5
- const findFileId = { projection: { mediaId: 1 } };
6
4
  const mapId = (a) => a._id;
7
5
  export const ZombieKillerWorker = {
8
6
  ...WorkerAdapter,
@@ -14,38 +12,25 @@ export const ZombieKillerWorker = {
14
12
  const { modules, services } = unchainedAPI;
15
13
  try {
16
14
  const error = false;
17
- // Remove unreferenced product media objects
18
- const products = await modules.products.findProducts({}, findId);
19
- const deletedProductMediaCount = await modules.products.media.deleteMediaFiles({
20
- excludedProductIds: products.map(mapId),
21
- });
22
15
  // Remove unreferenced assortment media objects
23
- const assortments = await modules.assortments.findAssortments({}, findId);
16
+ const assortments = await modules.assortments.findAssortments({ includeInactive: true, includeLeaves: true }, { projection: { _id: 1 } });
24
17
  const deletedAssortmentMediaCount = await modules.assortments.media.deleteMediaFiles({
25
18
  excludedAssortmentIds: assortments.map(mapId),
26
19
  });
27
- // Remove unreferenced files
28
- const fileIdsToRemove = [];
29
- const productMedia = await modules.products.media.findProductMedias({}, findFileId);
30
- const assortmentMedia = await modules.assortments.media.findAssortmentMedias({}, findFileId);
31
- const filesWithProductId = await modules.files.findFilesByMetaData({
32
- meta: {
33
- productId: { $exists: true },
34
- },
20
+ // Remove unreferenced product media objects
21
+ const products = await modules.products.findProducts({ includeDrafts: true }, { projection: { _id: 1 } });
22
+ const deletedProductMediaCount = await modules.products.media.deleteMediaFiles({
23
+ excludedProductIds: products.map(mapId),
35
24
  });
36
- const filesWithAssortmentId = await modules.files.findFilesByMetaData({
37
- meta: {
38
- assortmentId: { $exists: true },
39
- },
25
+ // Remove unreferenced files
26
+ const productMedia = await modules.products.media.findProductMedias({}, { projection: { mediaId: 1 } });
27
+ const assortmentMedia = await modules.assortments.media.findAssortmentMedias({}, { projection: { mediaId: 1 } });
28
+ const allFileIdsLinked = [...productMedia, ...assortmentMedia].map((l) => l?.mediaId);
29
+ const allFileIdsRelevant = (await modules.files.findFiles({ path: { $in: ['product-media', 'assortment-media'] } }, { projection: { _id: 1 } })).map(mapId);
30
+ const fileIdsToRemove = allFileIdsRelevant.filter((fileId) => {
31
+ return !allFileIdsLinked.includes(fileId);
40
32
  });
41
- filesWithProductId
42
- .concat(filesWithAssortmentId)
43
- .filter((file) => {
44
- const fileInProductMedia = productMedia.some((media) => media.mediaId === file._id);
45
- const fileInAssortmentMedia = assortmentMedia.some((media) => media.mediaId === file._id);
46
- return !fileInProductMedia && !fileInAssortmentMedia;
47
- })
48
- .forEach((m) => fileIdsToRemove.push(m._id));
33
+ logger.verbose(`File Id's to remove: ${fileIdsToRemove.join(', ')}`);
49
34
  const deletedFilesCount = fileIdsToRemove.length > 0
50
35
  ? await services.files.removeFiles({
51
36
  fileIds: fileIdsToRemove,
package/lib/worker/zombie-killer.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"zombie-killer.js","sourceRoot":"","sources":["../../src/worker/zombie-killer.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"zombie-killer.js","sourceRoot":"","sources":["../../src/worker/zombie-killer.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@unchainedshop/plugins",
3
- "version": "2.0.0-beta7",
3
+ "version": "2.0.0-beta8",
4
4
  "main": "lib/plugins-index.js",
5
5
  "types": "lib/plugins-index.d.ts",
6
6
  "exports": {
@@ -70,40 +70,43 @@
70
70
  "url": "https://github.com/unchainedshop/unchained/issues"
71
71
  },
72
72
  "homepage": "https://github.com/unchainedshop/unchained#readme",
73
+ "optionalDependencies": {
74
+ "express": "^4.18.2"
75
+ },
73
76
  "devDependencies": {
74
77
  "@types/node": "^18.11.9",
75
- "@unchainedshop/api": "^2.0.0-beta7",
78
+ "@unchainedshop/api": "^2.0.0-beta8",
76
79
  "@unchainedshop/client-oauth2": "^4.3.3",
77
- "@unchainedshop/core-delivery": "^2.0.0-beta7",
78
- "@unchainedshop/core-enrollments": "^2.0.0-beta7",
79
- "@unchainedshop/core-filters": "^2.0.0-beta7",
80
- "@unchainedshop/core-messaging": "^2.0.0-beta7",
81
- "@unchainedshop/core-orders": "^2.0.0-beta7",
82
- "@unchainedshop/core-payment": "^2.0.0-beta7",
83
- "@unchainedshop/core-products": "^2.0.0-beta7",
84
- "@unchainedshop/core-quotations": "^2.0.0-beta7",
85
- "@unchainedshop/core-warehousing": "^2.0.0-beta7",
86
- "@unchainedshop/core-worker": "^2.0.0-beta7",
87
- "@unchainedshop/events": "^2.0.0-beta7",
88
- "@unchainedshop/file-upload": "^2.0.0-beta7",
89
- "@unchainedshop/logger": "^2.0.0-beta7",
90
- "@unchainedshop/types": "^2.0.0-beta7",
91
- "@unchainedshop/utils": "^2.0.0-beta7",
80
+ "@unchainedshop/core-delivery": "^2.0.0-beta8",
81
+ "@unchainedshop/core-enrollments": "^2.0.0-beta8",
82
+ "@unchainedshop/core-filters": "^2.0.0-beta8",
83
+ "@unchainedshop/core-messaging": "^2.0.0-beta8",
84
+ "@unchainedshop/core-orders": "^2.0.0-beta8",
85
+ "@unchainedshop/core-payment": "^2.0.0-beta8",
86
+ "@unchainedshop/core-products": "^2.0.0-beta8",
87
+ "@unchainedshop/core-quotations": "^2.0.0-beta8",
88
+ "@unchainedshop/core-warehousing": "^2.0.0-beta8",
89
+ "@unchainedshop/core-worker": "^2.0.0-beta8",
90
+ "@unchainedshop/events": "^2.0.0-beta8",
91
+ "@unchainedshop/file-upload": "^2.0.0-beta8",
92
+ "@unchainedshop/logger": "^2.0.0-beta8",
93
+ "@unchainedshop/types": "^2.0.0-beta8",
94
+ "@unchainedshop/utils": "^2.0.0-beta8",
92
95
  "bluebird": "^3.7.2",
93
- "body-parser": "^1.20.0",
94
96
  "event-iterator": "^2.0.0",
97
+ "express": "^4.18.2",
95
98
  "jest": "^29.3.1",
96
99
  "JSONStream": "^1.3.5",
97
100
  "minio": "^7.0.32",
98
- "mongodb": "^4.11.0",
101
+ "mongodb": "^4.12.1",
99
102
  "node-sheets": "^1.2.0",
100
103
  "nodemailer": "^6.8.0",
101
104
  "open": "^8.4.0",
102
- "redis": "^4.5.0",
105
+ "redis": "^4.5.1",
103
106
  "request": "^2.88.2",
104
107
  "stripe": "^10.17.0",
105
108
  "ts-jest": "^29.0.3",
106
- "typescript": "^4.8.4",
109
+ "typescript": "^4.9.3",
107
110
  "xml-js": "^1.6.11",
108
111
  "xml2js": "0.4.23"
109
112
  }
package/src/payment/braintree.ts CHANGED
@@ -112,7 +112,7 @@ const BraintreeDirect: IPaymentAdapter = {
112
112
  // @ts-ignore
113
113
  const braintree = (await import('braintree')).default; // eslint-disable-line
114
114
  const gateway = getGateway(braintree);
115
- const address = order.billingAddress || {};
115
+ const address = order.billingAddress;
116
116
  const pricing = modules.orders.pricingSheet(order);
117
117
  const rounded = Math.round(pricing.total({ useNetPrice: false }).amount / 10 || 0) * 10;
118
118
  const saleRequest = {
@@ -120,17 +120,19 @@ const BraintreeDirect: IPaymentAdapter = {
120
120
  merchantAccountId: order.currency,
121
121
  paymentMethodNonce: paypalPaymentMethodNonce,
122
122
  orderId: order.orderNumber || order._id,
123
- shipping: {
124
- firstName: address.firstName,
125
- lastName: address.lastName,
126
- company: address.company,
127
- streetAddress: address.addressLine,
128
- extendedAddress: address.addressLine2,
129
- locality: address.city,
130
- region: address.regionCode,
131
- postalCode: address.postalCode,
132
- countryCodeAlpha2: address.countryCode,
133
- },
123
+ shipping: address
124
+ ? {
125
+ firstName: address.firstName,
126
+ lastName: address.lastName,
127
+ company: address.company,
128
+ streetAddress: address.addressLine,
129
+ extendedAddress: address.addressLine2,
130
+ locality: address.city,
131
+ region: address.regionCode,
132
+ postalCode: address.postalCode,
133
+ countryCodeAlpha2: address.countryCode,
134
+ }
135
+ : undefined,
134
136
  options: {
135
137
  submitForSettlement: true,
136
138
  },
package/src/payment/cryptopay/middleware.ts CHANGED
@@ -63,7 +63,7 @@ export const cryptopayHandler = async (req, res) => {
63
63
  expiresAt,
64
64
  timestamp: timestampDate,
65
65
  };
66
- console.log('update rate', price, rateData);
66
+ logger.verbose(`update rate ${JSON.stringify(price)}, ${JSON.stringify(rateData)}`);
67
67
  await resolvedContext.modules.products.prices.rates.updateRates([rateData]);
68
68
  }
69
69
 
package/src/payment/worldline-saferpay/worldline-saferpay-client/api/SaferpayConnection.ts CHANGED
@@ -26,10 +26,11 @@ export class SaferpayConnection {
26
26
  }
27
27
 
28
28
  public async post(uri: string, data: object): Promise<any> {
29
- return fetch(this.buildUrl(uri), {
29
+ const res = await fetch(this.buildUrl(uri), {
30
30
  method: 'POST',
31
31
  body: JSON.stringify(data),
32
32
  headers: this.getHeaders(),
33
- }).then((res: any) => res.json());
33
+ });
34
+ return res.json();
34
35
  }
35
36
  }
package/src/plugins-index.ts CHANGED
@@ -1,5 +1,6 @@
1
- import { useMiddlewareWithCurrentContext } from '@unchainedshop/api';
2
- import bodyParser from 'body-parser';
1
+ import { useMiddlewareWithCurrentContext } from '@unchainedshop/api/express';
2
+ import { UnchainedCore } from '@unchainedshop/types/core';
3
+ import express from 'express';
3
4
 
4
5
  // Delivery
5
6
  import './delivery/post';
@@ -95,29 +96,32 @@ export const defaultModules = {
95
96
  },
96
97
  };
97
98
 
98
- export const useDefaultMiddlewares = (unchainedApi, app) => {
99
+ export const connectDefaultPluginsToExpress4 = (
100
+ app,
101
+ { unchainedAPI }: { unchainedAPI: UnchainedCore },
102
+ ) => {
99
103
  useMiddlewareWithCurrentContext(app, GRIDFS_PUT_SERVER_PATH, gridfsHandler);
100
104
 
101
- useMiddlewareWithCurrentContext(app, CRYPTOPAY_WEBHOOK_PATH, bodyParser.json(), cryptopayHandler);
105
+ useMiddlewareWithCurrentContext(app, CRYPTOPAY_WEBHOOK_PATH, express.json(), cryptopayHandler);
102
106
 
103
107
  useMiddlewareWithCurrentContext(
104
108
  app,
105
109
  STRIPE_WEBHOOK_PATH,
106
- bodyParser.raw({ type: 'application/json' }),
110
+ express.raw({ type: 'application/json' }),
107
111
  stripeHandler,
108
112
  );
109
113
 
110
114
  useMiddlewareWithCurrentContext(
111
115
  app,
112
116
  PFCHECKOUT_WEBHOOK_PATH,
113
- bodyParser.json(),
117
+ express.json(),
114
118
  postfinanceCheckoutHandler,
115
119
  );
116
120
 
117
121
  useMiddlewareWithCurrentContext(
118
122
  app,
119
123
  DATATRANS_WEBHOOK_PATH,
120
- bodyParser.text({
124
+ express.text({
121
125
  type: 'application/json',
122
126
  }),
123
127
  datatransHandler,
@@ -126,7 +130,7 @@ export const useDefaultMiddlewares = (unchainedApi, app) => {
126
130
  useMiddlewareWithCurrentContext(
127
131
  app,
128
132
  APPLE_IAP_WEBHOOK_PATH,
129
- bodyParser.json({
133
+ express.json({
130
134
  strict: false,
131
135
  }),
132
136
  appleIAPHandler,
@@ -135,13 +139,13 @@ export const useDefaultMiddlewares = (unchainedApi, app) => {
135
139
  // useMiddlewareWithCurrentContext(
136
140
  // app,
137
141
  // MINIO_PUT_SERVER_PATH,
138
- // bodyParser.json({
142
+ // express.json({
139
143
  // strict: false,
140
144
  // }),
141
145
  // minioHandler
142
146
  // );
143
147
 
144
- configureExportToken(unchainedApi);
145
- configureUpdateTokenOwnership(unchainedApi);
148
+ configureExportToken(unchainedAPI);
149
+ configureUpdateTokenOwnership(unchainedAPI);
146
150
  configureGenerateOrderAutoscheduling();
147
151
  };
package/src/worker/zombie-killer.ts CHANGED
@@ -4,8 +4,6 @@ import { createLogger } from '@unchainedshop/logger';
4
4
 
5
5
  const logger = createLogger('unchained:platform:zombie-killer');
6
6
 
7
- const findId = { projection: { _id: 1 } };
8
- const findFileId = { projection: { mediaId: 1 } };
9
7
  const mapId = (a: any) => a._id;
10
8
 
11
9
  export const ZombieKillerWorker: IWorkerAdapter<
@@ -29,42 +27,47 @@ export const ZombieKillerWorker: IWorkerAdapter<
29
27
  try {
30
28
  const error = false;
31
29
 
32
- // Remove unreferenced product media objects
33
- const products = await modules.products.findProducts({}, findId);
34
- const deletedProductMediaCount = await modules.products.media.deleteMediaFiles({
35
- excludedProductIds: products.map(mapId),
36
- });
37
-
38
30
  // Remove unreferenced assortment media objects
39
- const assortments = await modules.assortments.findAssortments({}, findId);
31
+ const assortments = await modules.assortments.findAssortments(
32
+ { includeInactive: true, includeLeaves: true },
33
+ { projection: { _id: 1 } },
34
+ );
40
35
  const deletedAssortmentMediaCount = await modules.assortments.media.deleteMediaFiles({
41
36
  excludedAssortmentIds: assortments.map(mapId),
42
37
  });
43
38
 
44
- // Remove unreferenced files
45
- const fileIdsToRemove = [];
46
- const productMedia = await modules.products.media.findProductMedias({}, findFileId);
47
- const assortmentMedia = await modules.assortments.media.findAssortmentMedias({}, findFileId);
48
-
49
- const filesWithProductId = await modules.files.findFilesByMetaData({
50
- meta: {
51
- productId: { $exists: true },
52
- },
39
+ // Remove unreferenced product media objects
40
+ const products = await modules.products.findProducts(
41
+ { includeDrafts: true },
42
+ { projection: { _id: 1 } },
43
+ );
44
+ const deletedProductMediaCount = await modules.products.media.deleteMediaFiles({
45
+ excludedProductIds: products.map(mapId),
53
46
  });
54
- const filesWithAssortmentId = await modules.files.findFilesByMetaData({
55
- meta: {
56
- assortmentId: { $exists: true },
57
- },
47
+
48
+ // Remove unreferenced files
49
+ const productMedia = await modules.products.media.findProductMedias(
50
+ {},
51
+ { projection: { mediaId: 1 } },
52
+ );
53
+ const assortmentMedia = await modules.assortments.media.findAssortmentMedias(
54
+ {},
55
+ { projection: { mediaId: 1 } },
56
+ );
57
+
58
+ const allFileIdsLinked = [...productMedia, ...assortmentMedia].map((l) => l?.mediaId);
59
+ const allFileIdsRelevant = (
60
+ await modules.files.findFiles(
61
+ { path: { $in: ['product-media', 'assortment-media'] } },
62
+ { projection: { _id: 1 } },
63
+ )
64
+ ).map(mapId);
65
+
66
+ const fileIdsToRemove = allFileIdsRelevant.filter((fileId) => {
67
+ return !allFileIdsLinked.includes(fileId);
58
68
  });
59
69
 
60
- filesWithProductId
61
- .concat(filesWithAssortmentId)
62
- .filter((file) => {
63
- const fileInProductMedia = productMedia.some((media) => media.mediaId === file._id);
64
- const fileInAssortmentMedia = assortmentMedia.some((media) => media.mediaId === file._id);
65
- return !fileInProductMedia && !fileInAssortmentMedia;
66
- })
67
- .forEach((m) => fileIdsToRemove.push(m._id));
70
+ logger.verbose(`File Id's to remove: ${fileIdsToRemove.join(', ')}`);
68
71
 
69
72
  const deletedFilesCount =
70
73
  fileIdsToRemove.length > 0