@unchainedshop/plugins 1.2.48 → 1.2.50
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.
- package/lib/files/minio/minio-adapter.d.ts +2 -1
- package/lib/files/minio/minio-adapter.js +13 -7
- package/lib/files/minio/minio-adapter.js.map +1 -1
- package/lib/payment/apple-iap/db/AppleTransactionsCollection.d.ts +1 -1
- package/lib/payment/bity/db/BityCredentialsCollection.d.ts +1 -1
- package/lib/payment/datatrans-v2/getPaths.d.ts +1 -1
- package/lib/payment/postfinance-checkout/types.d.ts +3 -3
- package/lib/payment/worldline-saferpay/worldline-saferpay-client/api/SaferpayConnection.js +3 -2
- package/lib/payment/worldline-saferpay/worldline-saferpay-client/api/SaferpayConnection.js.map +1 -1
- package/lib/payment/worldline-saferpay/worldline-saferpay-client/models/PaymentMethods.d.ts +1 -1
- package/lib/payment/worldline-saferpay/worldline-saferpay-client/models/Transaction.d.ts +2 -2
- package/lib/pricing/product-price-coinbase-exchange.js +6 -3
- package/lib/pricing/product-price-coinbase-exchange.js.map +1 -1
- package/lib/worker/ZombieKillerWorker.js +1 -1
- package/package.json +20 -20
- package/src/files/minio/minio-adapter.ts +13 -8
- package/src/payment/worldline-saferpay/worldline-saferpay-client/api/SaferpayConnection.ts +3 -2
- package/src/pricing/product-price-coinbase-exchange.ts +5 -4
- package/src/worker/ZombieKillerWorker.ts +1 -1
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { IFileAdapter } from '@unchainedshop/types/files';
|
|
2
|
-
|
|
2
|
+
import Minio from 'minio';
|
|
3
|
+
export declare function connectToMinio(): Promise<Minio.Client>;
|
|
3
4
|
export declare const MinioAdapter: IFileAdapter;
|
|
4
5
|
export default MinioAdapter;
|
|
@@ -4,9 +4,10 @@ import http from 'http';
|
|
|
4
4
|
import { log, LogLevel } from '@unchainedshop/logger';
|
|
5
5
|
import mimeType from 'mime-types';
|
|
6
6
|
import Minio from 'minio';
|
|
7
|
+
import AssumeRoleProvider from 'minio/dist/main/AssumeRoleProvider';
|
|
7
8
|
import { Readable } from 'stream';
|
|
8
9
|
import { URL } from 'url';
|
|
9
|
-
const { MINIO_ACCESS_KEY, MINIO_REGION, MINIO_SECRET_KEY, MINIO_ENDPOINT, MINIO_BUCKET_NAME, NODE_ENV, AMAZON_S3_SESSION_TOKEN, } = process.env;
|
|
10
|
+
const { MINIO_ACCESS_KEY, MINIO_REGION, MINIO_STS_ENDPOINT, MINIO_SECRET_KEY, MINIO_ENDPOINT, MINIO_BUCKET_NAME, NODE_ENV, AMAZON_S3_SESSION_TOKEN, } = process.env;
|
|
10
11
|
const PUT_URL_EXPIRY = 24 * 60 * 60;
|
|
11
12
|
let client;
|
|
12
13
|
export async function connectToMinio() {
|
|
@@ -29,10 +30,15 @@ export async function connectToMinio() {
|
|
|
29
30
|
// @ts-ignore
|
|
30
31
|
if (NODE_ENV === 'development')
|
|
31
32
|
minioClient?.traceOn(process.stdout);
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
33
|
+
if (MINIO_STS_ENDPOINT) {
|
|
34
|
+
const ap = new AssumeRoleProvider({
|
|
35
|
+
stsEndpoint: MINIO_STS_ENDPOINT,
|
|
36
|
+
});
|
|
37
|
+
// eslint-disable-next-line
|
|
38
|
+
// @ts-ignore
|
|
39
|
+
await minioClient.setCredentialsProvider(ap);
|
|
40
|
+
}
|
|
41
|
+
return minioClient;
|
|
36
42
|
}
|
|
37
43
|
catch (error) {
|
|
38
44
|
log(`Exception while creating Minio client: ${error.message}`, {
|
|
@@ -47,7 +53,7 @@ const generateMinioUrl = (directoryName, hashedFilename) => {
|
|
|
47
53
|
const getMimeType = (extension) => {
|
|
48
54
|
return mimeType.lookup(extension);
|
|
49
55
|
};
|
|
50
|
-
connectToMinio().then((c)
|
|
56
|
+
connectToMinio().then(function setClient(c) {
|
|
51
57
|
client = c;
|
|
52
58
|
});
|
|
53
59
|
const createDownloadStream = async (fileUrl, headers) => {
|
|
@@ -81,7 +87,7 @@ const getExpiryDate = () => new Date(new Date().getTime() + PUT_URL_EXPIRY);
|
|
|
81
87
|
export const MinioAdapter = {
|
|
82
88
|
key: 'shop.unchained.file-upload-plugin.minio',
|
|
83
89
|
label: 'Uploads files into an S3 bucket using minio',
|
|
84
|
-
version: '1.0',
|
|
90
|
+
version: '1.1.0',
|
|
85
91
|
...FileAdapter,
|
|
86
92
|
async createSignedURL(directoryName, fileName) {
|
|
87
93
|
if (!client)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"minio-adapter.js","sourceRoot":"","sources":["../../../src/files/minio/minio-adapter.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAE5F,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,IAA6B,MAAM,MAAM,CAAC;AACjD,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,QAAQ,MAAM,YAAY,CAAC;AAClC,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAClC,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAE1B,MAAM,EACJ,gBAAgB,EAChB,YAAY,EACZ,gBAAgB,EAChB,cAAc,EACd,iBAAiB,EACjB,QAAQ,EACR,uBAAuB,GACxB,GAAG,OAAO,CAAC,GAAG,CAAC;AAChB,MAAM,cAAc,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC;AAEpC,IAAI,MAAoB,CAAC;AAEzB,MAAM,CAAC,KAAK,UAAU,cAAc;IAClC,IAAI,CAAC,cAAc,IAAI,CAAC,iBAAiB,EAAE;QACzC,GAAG,CACD,kGAAkG,EAClG,EAAE,KAAK,EAAE,QAAQ,CAAC,KAAK,EAAE,CAC1B,CAAC;QACF,OAAO,IAAI,CAAC;KACb;IAED,IAAI;QACF,MAAM,WAAW,GAAG,IAAI,GAAG,CAAC,cAAc,CAAC,CAAC;QAC5C,MAAM,WAAW,GAAG,IAAI,KAAK,CAAC,MAAM,CAAC;YACnC,QAAQ,EAAE,WAAW,CAAC,QAAQ;YAC9B,MAAM,EAAE,WAAW,CAAC,QAAQ,KAAK,QAAQ;YACzC,IAAI,EAAE,QAAQ,CAAC,WAAW,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,SAAS;YACjD,MAAM,EAAE,YAAY;YACpB,YAAY,EAAE,uBAAuB;YACrC,SAAS,EAAE,gBAAgB;YAC3B,SAAS,EAAE,gBAAgB;SAC5B,CAAC,CAAC;QAEH,2BAA2B;QAC3B,aAAa;QACb,IAAI,QAAQ,KAAK,aAAa;YAAE,WAAW,EAAE,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"minio-adapter.js","sourceRoot":"","sources":["../../../src/files/minio/minio-adapter.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAE5F,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,IAA6B,MAAM,MAAM,CAAC;AACjD,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,QAAQ,MAAM,YAAY,CAAC;AAClC,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,kBAAkB,MAAM,oCAAoC,CAAC;AACpE,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAClC,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAE1B,MAAM,EACJ,gBAAgB,EAChB,YAAY,EACZ,kBAAkB,EAClB,gBAAgB,EAChB,cAAc,EACd,iBAAiB,EACjB,QAAQ,EACR,uBAAuB,GACxB,GAAG,OAAO,CAAC,GAAG,CAAC;AAChB,MAAM,cAAc,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC;AAEpC,IAAI,MAAoB,CAAC;AAEzB,MAAM,CAAC,KAAK,UAAU,cAAc;IAClC,IAAI,CAAC,cAAc,IAAI,CAAC,iBAAiB,EAAE;QACzC,GAAG,CACD,kGAAkG,EAClG,EAAE,KAAK,EAAE,QAAQ,CAAC,KAAK,EAAE,CAC1B,CAAC;QACF,OAAO,IAAI,CAAC;KACb;IAED,IAAI;QACF,MAAM,WAAW,GAAG,IAAI,GAAG,CAAC,cAAc,CAAC,CAAC;QAC5C,MAAM,WAAW,GAAG,IAAI,KAAK,CAAC,MAAM,CAAC;YACnC,QAAQ,EAAE,WAAW,CAAC,QAAQ;YAC9B,MAAM,EAAE,WAAW,CAAC,QAAQ,KAAK,QAAQ;YACzC,IAAI,EAAE,QAAQ,CAAC,WAAW,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,SAAS;YACjD,MAAM,EAAE,YAAY;YACpB,YAAY,EAAE,uBAAuB;YACrC,SAAS,EAAE,gBAAgB;YAC3B,SAAS,EAAE,gBAAgB;SAC5B,CAAC,CAAC;QAEH,2BAA2B;QAC3B,aAAa;QACb,IAAI,QAAQ,KAAK,aAAa;YAAE,WAAW,EAAE,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QACrE,IAAI,kBAAkB,EAAE;YACtB,MAAM,EAAE,GAAG,IAAI,kBAAkB,CAAC;gBAChC,WAAW,EAAE,kBAAkB;aAChC,CAAC,CAAC;YACH,2BAA2B;YAC3B,aAAa;YACb,MAAM,WAAW,CAAC,sBAAsB,CAAC,EAAE,CAAC,CAAC;SAC9C;QACD,OAAO,WAAW,CAAC;KACpB;IAAC,OAAO,KAAK,EAAE;QACd,GAAG,CAAC,0CAA0C,KAAK,CAAC,OAAO,EAAE,EAAE;YAC7D,KAAK,EAAE,QAAQ,CAAC,KAAK;SACtB,CAAC,CAAC;KACJ;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,gBAAgB,GAAG,CAAC,aAAqB,EAAE,cAAsB,EAAE,EAAE;IACzE,OAAO,GAAG,cAAc,IAAI,iBAAiB,IAAI,aAAa,IAAI,cAAc,EAAE,CAAC;AACrF,CAAC,CAAC;AAEF,MAAM,WAAW,GAAG,CAAC,SAAS,EAAE,EAAE;IAChC,OAAO,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;AACpC,CAAC,CAAC;AAEF,cAAc,EAAE,CAAC,IAAI,CAAC,SAAS,SAAS,CAAC,CAAC;IACxC,MAAM,GAAG,CAAC,CAAC;AACb,CAAC,CAAC,CAAC;AAEH,MAAM,oBAAoB,GAAG,KAAK,EAChC,OAAe,EACf,OAA4B,EACG,EAAE;IACjC,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,CAAC;IAC5C,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,IAAI;YACF,IAAI,QAAQ,KAAK,OAAO,EAAE;gBACxB,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,EAAE,OAAO,CAAC,CAAC;aACtC;iBAAM;gBACL,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,EAAE,OAAO,CAAC,CAAC;aACvC;SACF;QAAC,OAAO,CAAC,EAAE;YACV,MAAM,CAAC,CAAC,CAAC,CAAC;SACX;IACH,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AAEF,MAAM,cAAc,GAAG,KAAK,EAAE,QAAgB,EAAE,EAAE;IAChD,IAAI,CAAC,MAAM;QAAE,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAC;IAEzE,OAAO,MAAM,CAAC,UAAU,CAAC,iBAAiB,EAAE,QAAQ,CAAC,CAAC;AACxD,CAAC,CAAC;AAEF,MAAM,cAAc,GAAG,CAAC,MAAW,EAAE,EAAE;IACrC,MAAM,MAAM,GAAG,IAAI,QAAQ,EAAE,CAAC;IAC9B,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACpB,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAElB,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAEF,MAAM,aAAa,GAAG,GAAG,EAAE,CAAC,IAAI,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,GAAG,cAAc,CAAC,CAAC;AAE5E,MAAM,CAAC,MAAM,YAAY,GAAiB;IACxC,GAAG,EAAE,yCAAyC;IAC9C,KAAK,EAAE,6CAA6C;IACpD,OAAO,EAAE,OAAO;IAEhB,GAAG,WAAW;IAEd,KAAK,CAAC,eAAe,CAAC,aAAa,EAAE,QAAQ;QAC3C,IAAI,CAAC,MAAM;YAAE,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAC;QAEzE,MAAM,UAAU,GAAG,aAAa,EAAE,CAAC;QACnC,MAAM,GAAG,GAAG,mBAAmB,CAAC,aAAa,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAC;QAErE,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,kBAAkB,CACzC,iBAAiB,EACjB,GAAG,aAAa,IAAI,GAAG,EAAE,EACzB,cAAc,CACf,CAAC;QAEF,OAAO;YACL,GAAG;YACH,aAAa;YACb,UAAU;YACV,QAAQ;YACR,IAAI,EAAE,WAAW,CAAC,QAAQ,CAAC;YAC3B,MAAM,EAAE,GAAG;YACX,GAAG,EAAE,gBAAgB,CAAC,aAAa,EAAE,GAAG,CAAC;SACH,CAAC;IAC3C,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,KAAK;QACrB,IAAI,CAAC,MAAM;YAAE,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAC;QAEzE,MAAM,OAAO,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE,EAAE;YAC1C,OAAO,GAAG,IAAI,IAAI,GAAG,EAAE,CAAC;QAC1B,CAAC,CAAC,CAAC;QAEH,MAAM,MAAM,CAAC,aAAa,CAAC,iBAAiB,EAAE,OAAO,CAAC,CAAC;IACzD,CAAC;IAED,KAAK,CAAC,oBAAoB,CAAC,aAAqB,EAAE,OAAY;QAC5D,IAAI,CAAC,MAAM;YAAE,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAC;QAEzE,IAAI,MAAM,CAAC;QACX,IAAI,QAAQ,CAAC;QACb,IAAI,OAAO,YAAY,OAAO,EAAE;YAC9B,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,gBAAgB,EAAE,GAAG,MAAM,OAAO,CAAC;YAC5D,QAAQ,GAAG,KAAK,CAAC;YACjB,MAAM,GAAG,gBAAgB,EAAE,CAAC;SAC7B;aAAM;YACL,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;YAC5B,MAAM,GAAG,cAAc,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC;SAChE;QAED,MAAM,GAAG,GAAG,mBAAmB,CAAC,aAAa,EAAE,QAAQ,EAAE,IAAI,IAAI,EAAE,CAAC,CAAC;QACrE,MAAM,IAAI,GAAG,OAAO,EAAE,QAAQ,IAAI,WAAW,CAAC,QAAQ,CAAC,CAAC;QAExD,MAAM,QAAQ,GAAG;YACf,cAAc,EAAE,IAAI;SACrB,CAAC;QAEF,MAAM,MAAM,CAAC,SAAS,CAAC,iBAAiB,EAAE,GAAG,aAAa,IAAI,GAAG,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC;QAElG,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,cAAc,CAAC,GAAG,aAAa,IAAI,GAAG,EAAE,CAAC,CAAC;QAEjE,OAAO;YACL,GAAG;YACH,aAAa;YACb,UAAU,EAAE,IAAI;YAChB,QAAQ;YACR,IAAI;YACJ,IAAI;YACJ,GAAG,EAAE,gBAAgB,CAAC,aAAa,EAAE,GAAG,CAAC;SACxB,CAAC;IACtB,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,aAAqB,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,OAAO,EAAO;QACxF,IAAI,CAAC,MAAM;YAAE,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAC;QAEzE,MAAM,EAAE,IAAI,EAAE,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,CAAC;QACnC,MAAM,QAAQ,GAAG,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;QAChD,MAAM,GAAG,GAAG,mBAAmB,CAAC,aAAa,EAAE,QAAQ,EAAE,IAAI,IAAI,EAAE,CAAC,CAAC;QAErE,MAAM,MAAM,GAAG,MAAM,oBAAoB,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QAC7D,MAAM,IAAI,GAAG,MAAM,EAAE,OAAO,EAAE,CAAC,cAAc,CAAC,IAAI,WAAW,CAAC,QAAQ,CAAC,CAAC;QAExE,MAAM,QAAQ,GAAG;YACf,cAAc,EAAE,IAAI;SACrB,CAAC;QAEF,MAAM,MAAM,CAAC,SAAS,CAAC,iBAAiB,EAAE,GAAG,aAAa,IAAI,GAAG,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC;QAClG,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,cAAc,CAAC,GAAG,aAAa,IAAI,GAAG,EAAE,CAAC,CAAC;QAEjE,OAAO;YACL,GAAG;YACH,aAAa;YACb,UAAU,EAAE,IAAI;YAChB,QAAQ;YACR,IAAI;YACJ,IAAI;YACJ,GAAG,EAAE,gBAAgB,CAAC,aAAa,EAAE,GAAG,CAAC;SACxB,CAAC;IACtB,CAAC;CACF,CAAC;AAEF,YAAY,CAAC,eAAe,CAAC,YAAY,CAAC,CAAC;AAE3C,eAAe,YAAY,CAAC"}
|
|
@@ -7,12 +7,12 @@ export declare enum CompletionModes {
|
|
|
7
7
|
Immediate = "Immediate",
|
|
8
8
|
Deferred = "Deferred"
|
|
9
9
|
}
|
|
10
|
-
export
|
|
10
|
+
export type SignResponse = {
|
|
11
11
|
transactionId: number;
|
|
12
12
|
location: string | null;
|
|
13
13
|
};
|
|
14
|
-
export
|
|
15
|
-
export
|
|
14
|
+
export type listenerEntityTechnicalNames = 'TransactionCompletion';
|
|
15
|
+
export type WebhookData = {
|
|
16
16
|
eventId: number;
|
|
17
17
|
entityId: number;
|
|
18
18
|
listenerEntityId: number;
|
|
@@ -18,11 +18,12 @@ export class SaferpayConnection {
|
|
|
18
18
|
};
|
|
19
19
|
}
|
|
20
20
|
async post(uri, data) {
|
|
21
|
-
|
|
21
|
+
const res = await fetch(this.buildUrl(uri), {
|
|
22
22
|
method: 'POST',
|
|
23
23
|
body: JSON.stringify(data),
|
|
24
24
|
headers: this.getHeaders(),
|
|
25
|
-
})
|
|
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,OAAO,KAAK,MAAM,YAAY,CAAC;AAE/B,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,
|
|
1
|
+
{"version":3,"file":"SaferpayConnection.js","sourceRoot":"","sources":["../../../../../src/payment/worldline-saferpay/worldline-saferpay-client/api/SaferpayConnection.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,YAAY,CAAC;AAE/B,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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
export
|
|
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';
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
export
|
|
2
|
-
export
|
|
1
|
+
export type TransactionStatus = 'AUTHORIZED' | 'CANCELED' | 'CAPTURED' | 'PENDING';
|
|
2
|
+
export type TransactionAmount = {
|
|
3
3
|
Value: string;
|
|
4
4
|
CurrencyCode: string;
|
|
5
5
|
};
|
|
@@ -5,9 +5,12 @@ const CACHE_PERIOD = 60 * 60 * 0.1; // 10 minutes
|
|
|
5
5
|
const SUPPORTED_CURRENCIES = ['BTC', 'ETH', 'XRP', 'USDT', 'BCH', 'BSV', 'LTC', 'EOS', 'BNB', 'XTZ'];
|
|
6
6
|
const cache = new Cache(CACHE_PERIOD);
|
|
7
7
|
const getFiatexchangeRateForCrypto = async (base, target) => {
|
|
8
|
-
const { data } = await cache.get(`${base}-${target}`, () =>
|
|
9
|
-
|
|
10
|
-
|
|
8
|
+
const { data } = await cache.get(`${base}-${target}`, async () => {
|
|
9
|
+
const res = await fetch(`https://api.coinbase.com/v2/exchange-rates?currency=${base}`, {
|
|
10
|
+
method: 'GET',
|
|
11
|
+
});
|
|
12
|
+
return res.json();
|
|
13
|
+
});
|
|
11
14
|
return data?.rates?.[target];
|
|
12
15
|
};
|
|
13
16
|
const ProductPriceCoinbaseExchange = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"product-price-coinbase-exchange.js","sourceRoot":"","sources":["../../src/pricing/product-price-coinbase-exchange.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,YAAY,CAAC;AAC/B,OAAO,EAAE,sBAAsB,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AAE7F,OAAO,KAAK,MAAM,eAAe,CAAC;AAElC,MAAM,YAAY,GAAG,EAAE,GAAG,EAAE,GAAG,GAAG,CAAC,CAAC,aAAa;AACjD,MAAM,oBAAoB,GAAG,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;AACrG,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,YAAY,CAAC,CAAC;AAEtC,MAAM,4BAA4B,GAAG,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE;IAC1D,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,KAAK,CAAC,GAAG,CAAC,GAAG,IAAI,IAAI,MAAM,EAAE,EAAE,
|
|
1
|
+
{"version":3,"file":"product-price-coinbase-exchange.js","sourceRoot":"","sources":["../../src/pricing/product-price-coinbase-exchange.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,7 +18,7 @@ export const ZombieKillerWorker = {
|
|
|
18
18
|
// Remove unreferenced product media objects
|
|
19
19
|
const products = await modules.products.findProducts({}, findId);
|
|
20
20
|
const deletedProductMediaCount = await modules.products.media.deleteMediaFiles({
|
|
21
|
-
|
|
21
|
+
excludedProductIds: products.map(mapId),
|
|
22
22
|
});
|
|
23
23
|
// Remove unreferenced assortment media objects
|
|
24
24
|
const assortments = await modules.assortments.findAssortments({}, findId);
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@unchainedshop/plugins",
|
|
3
|
-
"version": "1.2.
|
|
3
|
+
"version": "1.2.50",
|
|
4
4
|
"main": "lib/plugins-index.js",
|
|
5
5
|
"types": "lib/plugins-index.d.ts",
|
|
6
6
|
"exports": {
|
|
@@ -65,37 +65,37 @@
|
|
|
65
65
|
"homepage": "https://github.com/unchainedshop/unchained#readme",
|
|
66
66
|
"devDependencies": {
|
|
67
67
|
"@types/node": "^16.18.3",
|
|
68
|
-
"@unchainedshop/api": "^1.2.
|
|
68
|
+
"@unchainedshop/api": "^1.2.50",
|
|
69
69
|
"@unchainedshop/client-oauth2": "^4.3.3",
|
|
70
|
-
"@unchainedshop/core-delivery": "^1.2.
|
|
71
|
-
"@unchainedshop/core-enrollments": "^1.2.
|
|
72
|
-
"@unchainedshop/core-filters": "^1.2.
|
|
73
|
-
"@unchainedshop/core-messaging": "^1.2.
|
|
74
|
-
"@unchainedshop/core-orders": "^1.2.
|
|
75
|
-
"@unchainedshop/core-payment": "^1.2.
|
|
76
|
-
"@unchainedshop/core-products": "^1.2.
|
|
77
|
-
"@unchainedshop/core-quotations": "^1.2.
|
|
78
|
-
"@unchainedshop/core-warehousing": "^1.2.
|
|
79
|
-
"@unchainedshop/core-worker": "^1.2.
|
|
80
|
-
"@unchainedshop/events": "^1.2.
|
|
81
|
-
"@unchainedshop/file-upload": "^1.2.
|
|
82
|
-
"@unchainedshop/logger": "^1.2.
|
|
83
|
-
"@unchainedshop/types": "^1.2.
|
|
84
|
-
"@unchainedshop/utils": "^1.2.
|
|
70
|
+
"@unchainedshop/core-delivery": "^1.2.50",
|
|
71
|
+
"@unchainedshop/core-enrollments": "^1.2.50",
|
|
72
|
+
"@unchainedshop/core-filters": "^1.2.50",
|
|
73
|
+
"@unchainedshop/core-messaging": "^1.2.50",
|
|
74
|
+
"@unchainedshop/core-orders": "^1.2.50",
|
|
75
|
+
"@unchainedshop/core-payment": "^1.2.50",
|
|
76
|
+
"@unchainedshop/core-products": "^1.2.50",
|
|
77
|
+
"@unchainedshop/core-quotations": "^1.2.50",
|
|
78
|
+
"@unchainedshop/core-warehousing": "^1.2.50",
|
|
79
|
+
"@unchainedshop/core-worker": "^1.2.50",
|
|
80
|
+
"@unchainedshop/events": "^1.2.50",
|
|
81
|
+
"@unchainedshop/file-upload": "^1.2.50",
|
|
82
|
+
"@unchainedshop/logger": "^1.2.50",
|
|
83
|
+
"@unchainedshop/types": "^1.2.50",
|
|
84
|
+
"@unchainedshop/utils": "^1.2.50",
|
|
85
85
|
"bluebird": "^3.7.2",
|
|
86
86
|
"body-parser": "^1.20.0",
|
|
87
87
|
"event-iterator": "^2.0.0",
|
|
88
88
|
"jest": "^29.3.1",
|
|
89
89
|
"JSONStream": "^1.3.5",
|
|
90
90
|
"minio": "^7.0.32",
|
|
91
|
-
"mongodb": "^4.
|
|
91
|
+
"mongodb": "^4.12.1",
|
|
92
92
|
"node-sheets": "^1.2.0",
|
|
93
93
|
"nodemailer": "^6.8.0",
|
|
94
94
|
"open": "^8.4.0",
|
|
95
|
-
"redis": "^4.5.
|
|
95
|
+
"redis": "^4.5.1",
|
|
96
96
|
"request": "^2.88.2",
|
|
97
97
|
"ts-jest": "^29.0.3",
|
|
98
|
-
"typescript": "^4.
|
|
98
|
+
"typescript": "^4.9.3",
|
|
99
99
|
"xml-js": "^1.6.11",
|
|
100
100
|
"xml2js": "0.4.23"
|
|
101
101
|
}
|
|
@@ -6,12 +6,14 @@ import http, { OutgoingHttpHeaders } from 'http';
|
|
|
6
6
|
import { log, LogLevel } from '@unchainedshop/logger';
|
|
7
7
|
import mimeType from 'mime-types';
|
|
8
8
|
import Minio from 'minio';
|
|
9
|
+
import AssumeRoleProvider from 'minio/dist/main/AssumeRoleProvider';
|
|
9
10
|
import { Readable } from 'stream';
|
|
10
11
|
import { URL } from 'url';
|
|
11
12
|
|
|
12
13
|
const {
|
|
13
14
|
MINIO_ACCESS_KEY,
|
|
14
15
|
MINIO_REGION,
|
|
16
|
+
MINIO_STS_ENDPOINT,
|
|
15
17
|
MINIO_SECRET_KEY,
|
|
16
18
|
MINIO_ENDPOINT,
|
|
17
19
|
MINIO_BUCKET_NAME,
|
|
@@ -46,12 +48,15 @@ export async function connectToMinio() {
|
|
|
46
48
|
// eslint-disable-next-line
|
|
47
49
|
// @ts-ignore
|
|
48
50
|
if (NODE_ENV === 'development') minioClient?.traceOn(process.stdout);
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
51
|
+
if (MINIO_STS_ENDPOINT) {
|
|
52
|
+
const ap = new AssumeRoleProvider({
|
|
53
|
+
stsEndpoint: MINIO_STS_ENDPOINT,
|
|
54
|
+
});
|
|
55
|
+
// eslint-disable-next-line
|
|
56
|
+
// @ts-ignore
|
|
57
|
+
await minioClient.setCredentialsProvider(ap);
|
|
58
|
+
}
|
|
59
|
+
return minioClient;
|
|
55
60
|
} catch (error) {
|
|
56
61
|
log(`Exception while creating Minio client: ${error.message}`, {
|
|
57
62
|
level: LogLevel.Error,
|
|
@@ -68,7 +73,7 @@ const getMimeType = (extension) => {
|
|
|
68
73
|
return mimeType.lookup(extension);
|
|
69
74
|
};
|
|
70
75
|
|
|
71
|
-
connectToMinio().then((c)
|
|
76
|
+
connectToMinio().then(function setClient(c) {
|
|
72
77
|
client = c;
|
|
73
78
|
});
|
|
74
79
|
|
|
@@ -109,7 +114,7 @@ const getExpiryDate = () => new Date(new Date().getTime() + PUT_URL_EXPIRY);
|
|
|
109
114
|
export const MinioAdapter: IFileAdapter = {
|
|
110
115
|
key: 'shop.unchained.file-upload-plugin.minio',
|
|
111
116
|
label: 'Uploads files into an S3 bucket using minio',
|
|
112
|
-
version: '1.0',
|
|
117
|
+
version: '1.1.0',
|
|
113
118
|
|
|
114
119
|
...FileAdapter,
|
|
115
120
|
|
|
@@ -27,10 +27,11 @@ export class SaferpayConnection {
|
|
|
27
27
|
}
|
|
28
28
|
|
|
29
29
|
public async post(uri: string, data: object): Promise<any> {
|
|
30
|
-
|
|
30
|
+
const res = await fetch(this.buildUrl(uri), {
|
|
31
31
|
method: 'POST',
|
|
32
32
|
body: JSON.stringify(data),
|
|
33
33
|
headers: this.getHeaders(),
|
|
34
|
-
})
|
|
34
|
+
});
|
|
35
|
+
return res.json();
|
|
35
36
|
}
|
|
36
37
|
}
|
|
@@ -9,11 +9,12 @@ const SUPPORTED_CURRENCIES = ['BTC', 'ETH', 'XRP', 'USDT', 'BCH', 'BSV', 'LTC',
|
|
|
9
9
|
const cache = new Cache(CACHE_PERIOD);
|
|
10
10
|
|
|
11
11
|
const getFiatexchangeRateForCrypto = async (base, target) => {
|
|
12
|
-
const { data } = await cache.get(`${base}-${target}`, () =>
|
|
13
|
-
fetch(`https://api.coinbase.com/v2/exchange-rates?currency=${base}`, {
|
|
12
|
+
const { data } = await cache.get(`${base}-${target}`, async () => {
|
|
13
|
+
const res = await fetch(`https://api.coinbase.com/v2/exchange-rates?currency=${base}`, {
|
|
14
14
|
method: 'GET',
|
|
15
|
-
})
|
|
16
|
-
|
|
15
|
+
});
|
|
16
|
+
return res.json();
|
|
17
|
+
});
|
|
17
18
|
return data?.rates?.[target];
|
|
18
19
|
};
|
|
19
20
|
|
|
@@ -33,7 +33,7 @@ export const ZombieKillerWorker: IWorkerAdapter<
|
|
|
33
33
|
// Remove unreferenced product media objects
|
|
34
34
|
const products = await modules.products.findProducts({}, findId);
|
|
35
35
|
const deletedProductMediaCount = await modules.products.media.deleteMediaFiles({
|
|
36
|
-
|
|
36
|
+
excludedProductIds: products.map(mapId),
|
|
37
37
|
});
|
|
38
38
|
|
|
39
39
|
// Remove unreferenced assortment media objects
|