@unchainedshop/plugins 2.0.0-beta8 → 2.0.0-beta9
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/delivery/send-message.js +2 -2
- package/lib/delivery/send-message.js.map +1 -1
- package/lib/payment/apple-iap/adapter.js +10 -8
- package/lib/payment/apple-iap/adapter.js.map +1 -1
- package/lib/payment/apple-iap/module/configureAppleTransactionsModule.js +1 -2
- package/lib/payment/apple-iap/module/configureAppleTransactionsModule.js.map +1 -1
- package/lib/payment/datatrans-v2/index.js +2 -2
- package/lib/payment/datatrans-v2/index.js.map +1 -1
- package/lib/payment/datatrans-v2/middleware.js +3 -3
- package/lib/payment/datatrans-v2/middleware.js.map +1 -1
- package/lib/payment/datatrans-v2/roundedAmountFromOrder.d.ts +2 -2
- package/lib/payment/datatrans-v2/roundedAmountFromOrder.js.map +1 -1
- package/lib/payment/postfinance-checkout/index.js +4 -9
- package/lib/payment/postfinance-checkout/index.js.map +1 -1
- package/lib/payment/stripe.js +6 -6
- package/lib/payment/stripe.js.map +1 -1
- package/lib/payment/worldline-saferpay/index.js +2 -6
- package/lib/payment/worldline-saferpay/index.js.map +1 -1
- package/lib/warehousing/eth-minter.js +3 -3
- package/lib/warehousing/eth-minter.js.map +1 -1
- package/lib/worker/bulk-import.js +1 -2
- package/lib/worker/bulk-import.js.map +1 -1
- package/lib/worker/enrollment-order-generator.js +13 -12
- package/lib/worker/enrollment-order-generator.js.map +1 -1
- package/lib/worker/message.js +4 -4
- package/lib/worker/message.js.map +1 -1
- package/lib/worker/update-coinbase-rates.js +3 -3
- package/lib/worker/update-coinbase-rates.js.map +1 -1
- package/lib/worker/update-ecb-rates.js +2 -2
- package/lib/worker/update-ecb-rates.js.map +1 -1
- package/lib/worker/update-token-ownership.js +3 -3
- package/lib/worker/update-token-ownership.js.map +1 -1
- package/lib/worker/zombie-killer.js +26 -6
- package/lib/worker/zombie-killer.js.map +1 -1
- package/package.json +21 -20
- package/src/delivery/send-message.ts +10 -13
- package/src/payment/apple-iap/adapter.ts +11 -16
- package/src/payment/apple-iap/module/configureAppleTransactionsModule.ts +1 -2
- package/src/payment/datatrans-v2/index.ts +2 -4
- package/src/payment/datatrans-v2/middleware.ts +6 -6
- package/src/payment/datatrans-v2/roundedAmountFromOrder.ts +2 -2
- package/src/payment/postfinance-checkout/index.ts +5 -9
- package/src/payment/stripe.ts +6 -6
- package/src/payment/worldline-saferpay/index.ts +2 -6
- package/src/warehousing/eth-minter.ts +3 -3
- package/src/worker/bulk-import.ts +1 -6
- package/src/worker/enrollment-order-generator.ts +21 -23
- package/src/worker/message.ts +6 -10
- package/src/worker/update-coinbase-rates.ts +3 -3
- package/src/worker/update-ecb-rates.ts +2 -2
- package/src/worker/update-token-ownership.ts +10 -13
- package/src/worker/zombie-killer.ts +30 -7
- package/tests/plugins-index.test.js +3 -0
|
@@ -22,7 +22,7 @@ const SendMessage = {
|
|
|
22
22
|
return null;
|
|
23
23
|
},
|
|
24
24
|
send: async () => {
|
|
25
|
-
const { modules, order
|
|
25
|
+
const { modules, order } = context;
|
|
26
26
|
return modules.worker.addWork({
|
|
27
27
|
type: 'MESSAGE',
|
|
28
28
|
retries: 0,
|
|
@@ -31,7 +31,7 @@ const SendMessage = {
|
|
|
31
31
|
orderId: order._id,
|
|
32
32
|
config,
|
|
33
33
|
},
|
|
34
|
-
}
|
|
34
|
+
});
|
|
35
35
|
},
|
|
36
36
|
};
|
|
37
37
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"send-message.js","sourceRoot":"","sources":["../../src/delivery/send-message.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AAEvG,MAAM,WAAW,GAAqB;IACpC,GAAG,eAAe;IAElB,GAAG,EAAE,sCAAsC;IAC3C,KAAK,EAAE,uBAAuB;IAC9B,OAAO,EAAE,OAAO;IAEhB,oBAAoB,EAAE;QACpB,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,EAAE;QAC1B,EAAE,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,EAAE;QACxB,EAAE,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,EAAE;KACzB;IAED,aAAa,EAAE,CAAC,IAAI,EAAE,EAAE;QACtB,OAAO,IAAI,KAAK,oBAAoB,CAAC,QAAQ,CAAC;IAChD,CAAC;IAED,OAAO,EAAE,CAAC,MAAM,EAAE,OAAO,EAAE,EAAE;QAC3B,OAAO;YACL,GAAG,eAAe,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC;YAE3C,QAAQ,EAAE,GAAG,EAAE;gBACb,OAAO,IAAI,CAAC;YACd,CAAC;YAED,kBAAkB,EAAE,GAAG,EAAE;gBACvB,OAAO,IAAI,CAAC;YACd,CAAC;YAED,IAAI,EAAE,KAAK,IAAI,EAAE;gBACf,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"send-message.js","sourceRoot":"","sources":["../../src/delivery/send-message.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AAEvG,MAAM,WAAW,GAAqB;IACpC,GAAG,eAAe;IAElB,GAAG,EAAE,sCAAsC;IAC3C,KAAK,EAAE,uBAAuB;IAC9B,OAAO,EAAE,OAAO;IAEhB,oBAAoB,EAAE;QACpB,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,EAAE;QAC1B,EAAE,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,EAAE;QACxB,EAAE,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,EAAE;KACzB;IAED,aAAa,EAAE,CAAC,IAAI,EAAE,EAAE;QACtB,OAAO,IAAI,KAAK,oBAAoB,CAAC,QAAQ,CAAC;IAChD,CAAC;IAED,OAAO,EAAE,CAAC,MAAM,EAAE,OAAO,EAAE,EAAE;QAC3B,OAAO;YACL,GAAG,eAAe,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC;YAE3C,QAAQ,EAAE,GAAG,EAAE;gBACb,OAAO,IAAI,CAAC;YACd,CAAC;YAED,kBAAkB,EAAE,GAAG,EAAE;gBACvB,OAAO,IAAI,CAAC;YACd,CAAC;YAED,IAAI,EAAE,KAAK,IAAI,EAAE;gBACf,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC;gBAEnC,OAAO,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC;oBAC5B,IAAI,EAAE,SAAS;oBACf,OAAO,EAAE,CAAC;oBACV,KAAK,EAAE;wBACL,QAAQ,EAAE,UAAU;wBACpB,OAAO,EAAE,KAAK,CAAC,GAAG;wBAClB,MAAM;qBACP;iBACF,CAAC,CAAC;YACL,CAAC;SACF,CAAC;IACJ,CAAC;CACF,CAAC;AAEF,gBAAgB,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC"}
|
|
@@ -31,7 +31,7 @@ const AppleNotificationTypes = {
|
|
|
31
31
|
DID_FAIL_TO_RENEW: 'DID_FAIL_TO_RENEW',
|
|
32
32
|
DID_CHANGE_RENEWAL_PREF: 'DID_CHANGE_RENEWAL_PREF',
|
|
33
33
|
};
|
|
34
|
-
const fixPeriods = async ({ transactionId, enrollmentId, orderId, transactions },
|
|
34
|
+
const fixPeriods = async ({ transactionId, enrollmentId, orderId, transactions }, unchainedAPI) => {
|
|
35
35
|
const relevantTransactions = transactions.filter(
|
|
36
36
|
// eslint-disable-next-line
|
|
37
37
|
({ original_transaction_id }) => {
|
|
@@ -49,14 +49,14 @@ const fixPeriods = async ({ transactionId, enrollmentId, orderId, transactions }
|
|
|
49
49
|
.sort((left, right) => {
|
|
50
50
|
return left.end.getTime() - right.end.getTime();
|
|
51
51
|
});
|
|
52
|
-
await
|
|
53
|
-
return Promise.all(adjustedEnrollmentPeriods.map((period) =>
|
|
52
|
+
await unchainedAPI.modules.enrollments.removeEnrollmentPeriodByOrderId(enrollmentId, orderId);
|
|
53
|
+
return Promise.all(adjustedEnrollmentPeriods.map((period) => unchainedAPI.modules.enrollments.addEnrollmentPeriod(enrollmentId, period)));
|
|
54
54
|
};
|
|
55
55
|
export const appleIAPHandler = async (req, res) => {
|
|
56
56
|
if (req.method === 'POST') {
|
|
57
57
|
try {
|
|
58
58
|
const resolvedContext = req.unchainedContext;
|
|
59
|
-
const { modules
|
|
59
|
+
const { modules } = resolvedContext;
|
|
60
60
|
const responseBody = req.body || {};
|
|
61
61
|
if (responseBody.password !== APPLE_IAP_SHARED_SECRET) {
|
|
62
62
|
throw new Error('shared secret not valid');
|
|
@@ -114,10 +114,11 @@ export const appleIAPHandler = async (req, res) => {
|
|
|
114
114
|
const enrollment = await modules.enrollments.findEnrollment({
|
|
115
115
|
orderId: originalOrder._id,
|
|
116
116
|
});
|
|
117
|
-
await
|
|
117
|
+
await modules.payment.registerCredentials(enrollment.payment.paymentProviderId, {
|
|
118
118
|
transactionContext: {
|
|
119
119
|
receiptData: responseBody?.unified_receipt?.latest_receipt, // eslint-disable-line
|
|
120
120
|
},
|
|
121
|
+
userId: enrollment.userId,
|
|
121
122
|
}, resolvedContext);
|
|
122
123
|
await fixPeriods({
|
|
123
124
|
transactionId: latestTransaction.original_transaction_id,
|
|
@@ -129,13 +130,13 @@ export const appleIAPHandler = async (req, res) => {
|
|
|
129
130
|
if (responseBody.notification_type === AppleNotificationTypes.DID_RECOVER) {
|
|
130
131
|
if (enrollment.status !== EnrollmentStatus.TERMINATED &&
|
|
131
132
|
responseBody.auto_renew_status === 'false') {
|
|
132
|
-
await modules.enrollments.terminateEnrollment(enrollment,
|
|
133
|
+
await modules.enrollments.terminateEnrollment(enrollment, resolvedContext);
|
|
133
134
|
}
|
|
134
135
|
}
|
|
135
136
|
if (responseBody.notification_type === AppleNotificationTypes.DID_CHANGE_RENEWAL_STATUS) {
|
|
136
137
|
if (enrollment.status !== EnrollmentStatus.TERMINATED &&
|
|
137
138
|
responseBody.auto_renew_status === 'false') {
|
|
138
|
-
await modules.enrollments.terminateEnrollment(enrollment,
|
|
139
|
+
await modules.enrollments.terminateEnrollment(enrollment, resolvedContext);
|
|
139
140
|
}
|
|
140
141
|
}
|
|
141
142
|
logger.info(`Apple IAP Webhook: Updated enrollment from Apple`);
|
|
@@ -164,7 +165,7 @@ const AppleIAP = {
|
|
|
164
165
|
return type === 'GENERIC';
|
|
165
166
|
},
|
|
166
167
|
actions: (params) => {
|
|
167
|
-
const { modules
|
|
168
|
+
const { modules } = params.context;
|
|
168
169
|
const adapterActions = {
|
|
169
170
|
...PaymentAdapter.actions(params),
|
|
170
171
|
configurationError() {
|
|
@@ -261,6 +262,7 @@ const AppleIAP = {
|
|
|
261
262
|
if (alreadyProcessedTransaction)
|
|
262
263
|
throw new Error('Apple IAP Plugin: Transaction already processed');
|
|
263
264
|
// All good
|
|
265
|
+
const userId = order?.userId || params.paymentContext?.userId;
|
|
264
266
|
await appleTransactions.createTransaction({
|
|
265
267
|
_id: transactionIdentifier,
|
|
266
268
|
matchedTransaction,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"adapter.js","sourceRoot":"","sources":["../../../src/payment/apple-iap/adapter.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AACnE,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC5F,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"adapter.js","sourceRoot":"","sources":["../../../src/payment/apple-iap/adapter.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,11 +5,10 @@ export const configureAppleTransactionsModule = async ({ db, }) => {
|
|
|
5
5
|
findTransactionById: async (transactionIdentifier) => {
|
|
6
6
|
return AppleTransactions.findOne({ _id: transactionIdentifier });
|
|
7
7
|
},
|
|
8
|
-
createTransaction: async (doc
|
|
8
|
+
createTransaction: async (doc) => {
|
|
9
9
|
await AppleTransactions.insertOne({
|
|
10
10
|
...doc,
|
|
11
11
|
created: new Date(),
|
|
12
|
-
createdBy: userId,
|
|
13
12
|
});
|
|
14
13
|
return doc._id;
|
|
15
14
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configureAppleTransactionsModule.js","sourceRoot":"","sources":["../../../../src/payment/apple-iap/module/configureAppleTransactionsModule.ts"],"names":[],"mappings":"AACA,OAAO,EAAoB,2BAA2B,EAAE,MAAM,mCAAmC,CAAC;AAQlG,MAAM,CAAC,MAAM,gCAAgC,GAAG,KAAK,EAAE,EACrD,EAAE,GAGH,EAAoC,EAAE;IACrC,MAAM,iBAAiB,GAAG,MAAM,2BAA2B,CAAC,EAAE,CAAC,CAAC;IAEhE,OAAO;QACL,mBAAmB,EAAE,KAAK,EAAE,qBAAqB,EAAE,EAAE;YACnD,OAAO,iBAAiB,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,qBAAqB,EAAE,CAAC,CAAC;QACnE,CAAC;QAED,iBAAiB,EAAE,KAAK,EAAE,GAAG,EAAE,
|
|
1
|
+
{"version":3,"file":"configureAppleTransactionsModule.js","sourceRoot":"","sources":["../../../../src/payment/apple-iap/module/configureAppleTransactionsModule.ts"],"names":[],"mappings":"AACA,OAAO,EAAoB,2BAA2B,EAAE,MAAM,mCAAmC,CAAC;AAQlG,MAAM,CAAC,MAAM,gCAAgC,GAAG,KAAK,EAAE,EACrD,EAAE,GAGH,EAAoC,EAAE;IACrC,MAAM,iBAAiB,GAAG,MAAM,2BAA2B,CAAC,EAAE,CAAC,CAAC;IAEhE,OAAO;QACL,mBAAmB,EAAE,KAAK,EAAE,qBAAqB,EAAE,EAAE;YACnD,OAAO,iBAAiB,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,qBAAqB,EAAE,CAAC,CAAC;QACnE,CAAC;QAED,iBAAiB,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE;YAC/B,MAAM,iBAAiB,CAAC,SAAS,CAAC;gBAChC,GAAG,GAAG;gBACN,OAAO,EAAE,IAAI,IAAI,EAAE;aACpB,CAAC,CAAC;YACH,OAAO,GAAG,CAAC,GAAG,CAAC;QACjB,CAAC;KACF,CAAC;AACJ,CAAC,CAAC"}
|
|
@@ -73,8 +73,8 @@ const Datatrans = {
|
|
|
73
73
|
};
|
|
74
74
|
const authorize = async ({ paymentCredentials, ...arbitraryFields }) => {
|
|
75
75
|
const { order, orderPayment } = params.paymentContext;
|
|
76
|
-
const userId = order?.userId || params.context.userId;
|
|
77
76
|
const refno = Buffer.from(orderPayment._id, 'hex').toString('base64');
|
|
77
|
+
const userId = order?.userId || params.paymentContext?.userId;
|
|
78
78
|
const refno2 = userId;
|
|
79
79
|
const { currency, amount } = roundedAmountFromOrder(order, params.context);
|
|
80
80
|
const splits = await getMarketplaceSplits();
|
|
@@ -179,8 +179,8 @@ const Datatrans = {
|
|
|
179
179
|
async sign(transactionContext = {}) {
|
|
180
180
|
const { useSecureFields = false, ...arbitraryFields } = transactionContext || {};
|
|
181
181
|
const { orderPayment, paymentProviderId, order } = params.paymentContext;
|
|
182
|
-
const userId = order?.userId || params.context?.userId;
|
|
183
182
|
const refno = Buffer.from(orderPayment ? orderPayment._id : paymentProviderId, 'hex').toString('base64');
|
|
183
|
+
const userId = order?.userId || params.paymentContext?.userId;
|
|
184
184
|
const refno2 = userId;
|
|
185
185
|
const price = order
|
|
186
186
|
? roundedAmountFromOrder(order, params.context)
|
|
@@ -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":"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"}
|
|
@@ -4,7 +4,7 @@ const { DATATRANS_SIGN_KEY, DATATRANS_SIGN2_KEY, DATATRANS_SECURITY = Security.D
|
|
|
4
4
|
const logger = createLogger('unchained:core-payment:datatrans');
|
|
5
5
|
export const datatransHandler = async (req, res) => {
|
|
6
6
|
const resolvedContext = req.unchainedContext;
|
|
7
|
-
const {
|
|
7
|
+
const { modules } = resolvedContext;
|
|
8
8
|
const signature = req.headers['datatrans-signature'];
|
|
9
9
|
if (req.method === 'POST' && signature) {
|
|
10
10
|
const [rawTimestamp, rawHash] = signature.split(',');
|
|
@@ -27,7 +27,7 @@ export const datatransHandler = async (req, res) => {
|
|
|
27
27
|
try {
|
|
28
28
|
if (transaction.type === 'card_check') {
|
|
29
29
|
const paymentProviderId = referenceId;
|
|
30
|
-
const paymentCredentials = await
|
|
30
|
+
const paymentCredentials = await modules.payment.registerCredentials(paymentProviderId, { userId, transactionContext: { transactionId: transaction.transactionId } }, { ...resolvedContext });
|
|
31
31
|
logger.info(`Datatrans Webhook: Unchained registered payment credentials for ${userId}`, {
|
|
32
32
|
userId,
|
|
33
33
|
});
|
|
@@ -42,7 +42,7 @@ export const datatransHandler = async (req, res) => {
|
|
|
42
42
|
});
|
|
43
43
|
if (!orderPayment)
|
|
44
44
|
throw new Error(`Order Payment with id ${orderPaymentId} not found`);
|
|
45
|
-
const order = await modules.orders.checkout(orderPayment.orderId, { paymentContext: { transactionId: transaction.transactionId } },
|
|
45
|
+
const order = await modules.orders.checkout(orderPayment.orderId, { paymentContext: { userId, transactionId: transaction.transactionId } }, resolvedContext);
|
|
46
46
|
res.writeHead(200);
|
|
47
47
|
logger.info(`Datatrans Webhook: Unchained confirmed checkout for order ${order.orderNumber}`, {
|
|
48
48
|
orderId: order._id,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"middleware.js","sourceRoot":"","sources":["../../../src/payment/datatrans-v2/middleware.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD,OAAO,iBAAiB,EAAE,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAIlE,MAAM,EACJ,kBAAkB,EAClB,mBAAmB,EACnB,kBAAkB,GAAG,QAAQ,CAAC,YAAY,GAC3C,GAAG,OAAO,CAAC,GAAG,CAAC;AAEhB,MAAM,MAAM,GAAG,YAAY,CAAC,kCAAkC,CAAC,CAAC;AAEhE,MAAM,CAAC,MAAM,gBAAgB,GAAG,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;IACjD,MAAM,eAAe,GAAG,GAAG,CAAC,gBAA2B,CAAC;IACxD,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"middleware.js","sourceRoot":"","sources":["../../../src/payment/datatrans-v2/middleware.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { UnchainedCore } from '@unchainedshop/types/core';
|
|
2
2
|
import { Order } from '@unchainedshop/types/orders';
|
|
3
|
-
declare const roundedAmountFromOrder: (order: Order, context:
|
|
3
|
+
declare const roundedAmountFromOrder: (order: Order, context: UnchainedCore) => {
|
|
4
4
|
currency: string;
|
|
5
5
|
amount: number;
|
|
6
6
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"roundedAmountFromOrder.js","sourceRoot":"","sources":["../../../src/payment/datatrans-v2/roundedAmountFromOrder.ts"],"names":[],"mappings":"AAGA,MAAM,sBAAsB,GAAG,CAC7B,KAAY,EACZ,
|
|
1
|
+
{"version":3,"file":"roundedAmountFromOrder.js","sourceRoot":"","sources":["../../../src/payment/datatrans-v2/roundedAmountFromOrder.ts"],"names":[],"mappings":"AAGA,MAAM,sBAAsB,GAAG,CAC7B,KAAY,EACZ,OAAsB,EACgB,EAAE;IACxC,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;IAC3D,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,KAAK,CAAC,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC,CAAC;IACnE,OAAO;QACL,QAAQ;QACR,MAAM,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC;KAC3B,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,sBAAsB,CAAC"}
|
|
@@ -57,22 +57,20 @@ const PostfinanceCheckout = {
|
|
|
57
57
|
return tokenData.state === PostFinanceCheckout.model.CreationEntityState.ACTIVE;
|
|
58
58
|
},
|
|
59
59
|
sign: async (transactionContext = {}) => {
|
|
60
|
+
const { orderPayment, order } = params.paymentContext;
|
|
60
61
|
const { integrationMode = IntegrationModes.PaymentPage } = transactionContext;
|
|
61
62
|
const completionMode = adapter.getCompletionMode();
|
|
62
|
-
const { orderPayment } = params.paymentContext;
|
|
63
|
-
const order = await modules.orders.findOrder({
|
|
64
|
-
orderId: orderPayment.orderId,
|
|
65
|
-
});
|
|
66
63
|
const pricing = modules.orders.pricingSheet(order);
|
|
67
64
|
const totalAmount = pricing?.total({ useNetPrice: false }).amount;
|
|
68
65
|
const transaction = new PostFinanceCheckout.model.TransactionCreate();
|
|
66
|
+
const userId = order?.userId || params.paymentContext?.userId;
|
|
69
67
|
transaction.currency = order.currency;
|
|
70
68
|
transaction.metaData = {
|
|
71
69
|
orderPaymentId: orderPayment._id,
|
|
72
70
|
};
|
|
73
71
|
transaction.successUrl = `${transactionContext?.successUrl || PFCHECKOUT_SUCCESS_URL}?order_id=${orderPayment.orderId}`;
|
|
74
72
|
transaction.failedUrl = `${transactionContext?.failedUrl || PFCHECKOUT_FAILED_URL}?order_id=${orderPayment.orderId}`;
|
|
75
|
-
transaction.customerId =
|
|
73
|
+
transaction.customerId = userId;
|
|
76
74
|
transaction.tokenizationMode =
|
|
77
75
|
PostFinanceCheckout.model.TokenizationMode.ALLOW_ONE_CLICK_PAYMENT;
|
|
78
76
|
if (completionMode === CompletionModes.Immediate) {
|
|
@@ -150,16 +148,13 @@ const PostfinanceCheckout = {
|
|
|
150
148
|
};
|
|
151
149
|
},
|
|
152
150
|
cancel: async () => {
|
|
153
|
-
const { orderPayment } = params.paymentContext;
|
|
151
|
+
const { orderPayment, order } = params.paymentContext;
|
|
154
152
|
const { transactionId } = orderPayment;
|
|
155
153
|
if (!transactionId) {
|
|
156
154
|
return false;
|
|
157
155
|
}
|
|
158
156
|
const transaction = await getTransaction(transactionId);
|
|
159
157
|
const refund = transaction.state === PostFinanceCheckout.model.TransactionState.FULFILL;
|
|
160
|
-
const order = await modules.orders.findOrder({
|
|
161
|
-
orderId: orderPayment.orderId,
|
|
162
|
-
});
|
|
163
158
|
const pricing = modules.orders.pricingSheet(order);
|
|
164
159
|
const totalAmount = pricing?.total({ useNetPrice: false }).amount;
|
|
165
160
|
// For immediate settlements, try refunding. For deferred settlements, void the transaction.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/payment/postfinance-checkout/index.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC5F,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD,OAAO,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAC1C,OAAO,EACL,0BAA0B,EAC1B,iBAAiB,EACjB,sBAAsB,EACtB,wBAAwB,EACxB,iBAAiB,EACjB,QAAQ,EACR,cAAc,EACd,iBAAiB,EACjB,eAAe,GAChB,MAAM,OAAO,CAAC;AACf,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AACtC,OAAO,EAAE,eAAe,EAAE,gBAAgB,EAAgB,MAAM,SAAS,CAAC;AAE1E,cAAc,cAAc,CAAC;AAE7B,MAAM,EAAE,mBAAmB,EAAE,GAAG,EAAE,CAAC;AAEnC,MAAM,EACJ,mBAAmB,EACnB,kBAAkB,EAClB,iBAAiB,EACjB,sBAAsB,EACtB,qBAAqB,GACtB,GAAG,OAAO,CAAC,GAAG,CAAC;AAEhB,MAAM,MAAM,GAAG,YAAY,CAAC,oCAAoC,CAAC,CAAC;AAElE,MAAM,QAAQ,GAAG,CAAC,EAAE,IAAI,EAAE,OAAO,EAAqC,EAAE,EAAE;IACxE,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC;IACjC,KAAK,CAAC,IAAI,GAAG,eAAe,IAAI,EAAE,CAAC;IACnC,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AAEF,MAAM,mBAAmB,GAAoB;IAC3C,GAAG,cAAc;IAEjB,GAAG,EAAE,6CAA6C;IAClD,KAAK,EAAE,sBAAsB;IAC7B,OAAO,EAAE,OAAO;IAEhB,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,OAAO,GAET;YACF,GAAG,cAAc,CAAC,OAAO,CAAC,MAAM,CAAC;YAEjC,iBAAiB;gBACf,OAAO,CACJ,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,KAAK,gBAAgB,CAAC,EAAE,KAAyB;oBACvF,eAAe,CAAC,QAAQ,CACzB,CAAC;YACJ,CAAC;YAED,2BAA2B;YAC3B,kBAAkB;gBAChB,sBAAsB;gBACtB,IACE,CAAC,mBAAmB;oBACpB,CAAC,kBAAkB;oBACnB,CAAC,iBAAiB;oBAClB,CAAC,sBAAsB;oBACvB,CAAC,qBAAqB,EACtB;oBACA,OAAO,YAAY,CAAC,wBAAwB,CAAC;iBAC9C;gBACD,OAAO,IAAI,CAAC;YACd,CAAC;YAED,QAAQ;gBACN,IAAI,OAAO,CAAC,kBAAkB,EAAE,KAAK,IAAI;oBAAE,OAAO,IAAI,CAAC;gBACvD,OAAO,KAAK,CAAC;YACf,CAAC;YAED,iBAAiB;gBACf,OAAO,KAAK,CAAC;YACf,CAAC;YAED,KAAK,CAAC,QAAQ,CAAC,WAAW;gBACxB,IAAI,CAAC,WAAW,CAAC,IAAI;oBAAE,OAAO,KAAK,CAAC;gBACpC,MAAM,EAAE,aAAa,EAAE,GAAG,WAAW,CAAC,IAAI,CAAC;gBAC3C,MAAM,SAAS,GAAG,MAAM,QAAQ,CAAC,aAAa,EAAE,WAAW,CAAC,KAAK,CAAC,CAAC;gBACnE,OAAO,SAAS,CAAC,KAAK,KAAK,mBAAmB,CAAC,KAAK,CAAC,mBAAmB,CAAC,MAAM,CAAC;YAClF,CAAC;YAED,IAAI,EAAE,KAAK,EAAE,qBAA0B,EAAE,EAAE,EAAE;gBAC3C,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/payment/postfinance-checkout/index.ts"],"names":[],"mappings":"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"}
|
package/lib/payment/stripe.js
CHANGED
|
@@ -17,7 +17,7 @@ const stripe = createStripeClient(STRIPE_SECRET);
|
|
|
17
17
|
export const stripeHandler = async (request, response) => {
|
|
18
18
|
const sig = request.headers['stripe-signature'];
|
|
19
19
|
const resolvedContext = request.unchainedContext;
|
|
20
|
-
const { modules
|
|
20
|
+
const { modules } = resolvedContext;
|
|
21
21
|
let event;
|
|
22
22
|
try {
|
|
23
23
|
event = stripe.webhooks.constructEvent(request.body, sig, STRIPE_ENDPOINT_SECRET);
|
|
@@ -31,7 +31,7 @@ export const stripeHandler = async (request, response) => {
|
|
|
31
31
|
if (event.type === 'payment_intent.succeeded') {
|
|
32
32
|
const paymentIntent = event.data.object;
|
|
33
33
|
const orderPaymentId = paymentIntent.metadata?.orderPaymentId;
|
|
34
|
-
await modules.orders.payments.logEvent(orderPaymentId, event
|
|
34
|
+
await modules.orders.payments.logEvent(orderPaymentId, event);
|
|
35
35
|
const orderPayment = await modules.orders.payments.findOrderPayment({
|
|
36
36
|
orderPaymentId,
|
|
37
37
|
});
|
|
@@ -50,10 +50,11 @@ export const stripeHandler = async (request, response) => {
|
|
|
50
50
|
else if (event.type === 'setup_intent.succeeded') {
|
|
51
51
|
const setupIntent = event.data.object;
|
|
52
52
|
const { paymentProviderId, userId } = setupIntent.metadata;
|
|
53
|
-
await
|
|
53
|
+
await modules.payment.registerCredentials(paymentProviderId, {
|
|
54
54
|
transactionContext: {
|
|
55
55
|
setupIntentId: setupIntent.id,
|
|
56
56
|
},
|
|
57
|
+
userId,
|
|
57
58
|
}, resolvedContext);
|
|
58
59
|
logger.info(`Stripe Webhook: Unchained registered payment credentials for ${userId}`, {
|
|
59
60
|
userId,
|
|
@@ -161,14 +162,13 @@ const Stripe = {
|
|
|
161
162
|
},
|
|
162
163
|
sign: async (transactionContext = {}) => {
|
|
163
164
|
// eslint-disable-line
|
|
164
|
-
const { orderPayment, paymentProviderId } = params.paymentContext;
|
|
165
|
-
const { userId } = params.context;
|
|
165
|
+
const { orderPayment, order, paymentProviderId } = params.paymentContext;
|
|
166
166
|
if (orderPayment) {
|
|
167
|
-
const order = await modules.orders.findOrder({ orderId: orderPayment.orderId });
|
|
168
167
|
const pricing = await modules.orders.pricingSheet(order);
|
|
169
168
|
const paymentIntent = await createOrderPaymentIntent({ order, orderPayment, pricing }, transactionContext);
|
|
170
169
|
return paymentIntent.client_secret;
|
|
171
170
|
}
|
|
171
|
+
const userId = order?.userId || params.paymentContext?.userId;
|
|
172
172
|
const user = await modules.users.findUserById(userId);
|
|
173
173
|
const email = modules.users.primaryEmail(user)?.address;
|
|
174
174
|
const name = user.profile.displayName || user.username || email;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stripe.js","sourceRoot":"","sources":["../../src/payment/stripe.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC5F,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD;;;;;;;EAOE;AAEF,OAAO,kBAAkB,MAAM,QAAQ,CAAC;AAExC,MAAM,MAAM,GAAG,YAAY,CAAC,+BAA+B,CAAC,CAAC;AAE7D,MAAM,EAAE,aAAa,EAAE,sBAAsB,EAAE,kBAAkB,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC;AAElF,2BAA2B;AAC3B,aAAa;AACb,MAAM,MAAM,GAAG,kBAAkB,CAAC,aAAa,CAAC,CAAC;AAEjD,MAAM,CAAC,MAAM,aAAa,GAAG,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE;IACvD,MAAM,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC;IAChD,MAAM,eAAe,GAAG,OAAO,CAAC,gBAA2B,CAAC;IAC5D,MAAM,EAAE,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"stripe.js","sourceRoot":"","sources":["../../src/payment/stripe.ts"],"names":[],"mappings":"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"}
|
|
@@ -38,10 +38,7 @@ const WordlineSaferpay = {
|
|
|
38
38
|
return false;
|
|
39
39
|
},
|
|
40
40
|
sign: async (transactionContext = {}) => {
|
|
41
|
-
const { orderPayment } = params.paymentContext;
|
|
42
|
-
const order = await modules.orders.findOrder({
|
|
43
|
-
orderId: orderPayment.orderId,
|
|
44
|
-
});
|
|
41
|
+
const { orderPayment, order } = params.paymentContext;
|
|
45
42
|
const pricing = modules.orders.pricingSheet(order);
|
|
46
43
|
const totalAmount = pricing?.total({ useNetPrice: false }).amount;
|
|
47
44
|
const paymentPageInitInput = {
|
|
@@ -68,8 +65,7 @@ const WordlineSaferpay = {
|
|
|
68
65
|
});
|
|
69
66
|
},
|
|
70
67
|
charge: async ({ transactionId }) => {
|
|
71
|
-
const { orderPayment } = params.paymentContext;
|
|
72
|
-
const order = await modules.orders.findOrder({ orderId: orderPayment.orderId });
|
|
68
|
+
const { orderPayment, order } = params.paymentContext;
|
|
73
69
|
const pricing = modules.orders.pricingSheet(order);
|
|
74
70
|
const totalAmount = pricing.total({ useNetPrice: false }).amount;
|
|
75
71
|
const paymentPageAssert = await saferpayClient.paymentPageAssert({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/payment/worldline-saferpay/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC5F,OAAO,EAA8B,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAEzF,MAAM,EACJ,kBAAkB,GAAG,+BAA+B,EACpD,qBAAqB,EACrB,cAAc,EACd,YAAY,EACZ,qBAAqB,EACrB,oBAAoB,GACrB,GAAG,OAAO,CAAC,GAAG,CAAC;AAEhB,MAAM,gBAAgB,GAAoB;IACxC,GAAG,cAAc;IAEjB,GAAG,EAAE,2CAA2C;IAChD,KAAK,EAAE,oBAAoB;IAC3B,OAAO,EAAE,OAAO;IAEhB,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,cAAc,GAAG,IAAI,cAAc,CACvC,kBAAkB,EAClB,qBAAqB,EACrB,cAAc,EACd,YAAY,CACb,CAAC;QAEF,MAAM,OAAO,GAAG;YACd,GAAG,cAAc,CAAC,OAAO,CAAC,MAAM,CAAC;YAEjC,aAAa;gBACX,OAAO,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,KAAK,YAAY,CAAC,EAAE,KAAK,CAAC;YACxE,CAAC;YAED,2BAA2B;YAC3B,kBAAkB;gBAChB,sBAAsB;gBACtB,IACE,CAAC,kBAAkB;oBACnB,CAAC,qBAAqB;oBACtB,CAAC,cAAc;oBACf,CAAC,YAAY;oBACb,CAAC,OAAO,CAAC,aAAa,EAAE,EACxB;oBACA,OAAO,YAAY,CAAC,wBAAwB,CAAC;iBAC9C;gBACD,OAAO,IAAI,CAAC;YACd,CAAC;YAED,QAAQ;gBACN,IAAI,OAAO,CAAC,kBAAkB,EAAE,KAAK,IAAI;oBAAE,OAAO,IAAI,CAAC;gBACvD,OAAO,KAAK,CAAC;YACf,CAAC;YAED,iBAAiB;gBACf,OAAO,KAAK,CAAC;YACf,CAAC;YAED,IAAI,EAAE,KAAK,EAAE,qBAA0B,EAAE,EAAE,EAAE;gBAC3C,MAAM,EAAE,YAAY,EAAE,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/payment/worldline-saferpay/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,7 +13,7 @@ const ETHMinter = {
|
|
|
13
13
|
return type === WarehousingProviderType.VIRTUAL;
|
|
14
14
|
},
|
|
15
15
|
actions: (configuration, context) => {
|
|
16
|
-
const { product, orderPosition, token, modules,
|
|
16
|
+
const { product, orderPosition, token, modules, locale } = context;
|
|
17
17
|
const getTokensCreated = async () => {
|
|
18
18
|
const existingTokens = await modules.warehousing.findTokens(product.tokenization.contractStandard === ProductContractStandard.ERC721
|
|
19
19
|
? { contractAddress: product.tokenization.contractAddress }
|
|
@@ -85,10 +85,10 @@ const ETHMinter = {
|
|
|
85
85
|
const url = file && (await modules.files.getUrl(file, {}));
|
|
86
86
|
const text = await modules.products.texts.findLocalizedText({
|
|
87
87
|
productId: product._id,
|
|
88
|
-
locale:
|
|
88
|
+
locale: locale?.normalized || systemLocale.normalized,
|
|
89
89
|
});
|
|
90
90
|
const name = `${text.title} #${chainTokenId}`;
|
|
91
|
-
const isDefaultLanguageActive =
|
|
91
|
+
const isDefaultLanguageActive = locale ? locale?.language === systemLocale.language : true;
|
|
92
92
|
const localization = isDefaultLanguageActive
|
|
93
93
|
? {
|
|
94
94
|
uri: `${process.env.ROOT_URL}/erc-metadata/${product._id}/{locale}/${product.tokenization.tokenId}.json`,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"eth-minter.js","sourceRoot":"","sources":["../../src/warehousing/eth-minter.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,mBAAmB,EACnB,kBAAkB,EAClB,uBAAuB,GACxB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,WAAW,EAAE,uBAAuB,EAAE,MAAM,+BAA+B,CAAC;AAErF,OAAO,EAAE,kBAAkB,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAExE,MAAM,EAAE,mBAAmB,GAAG,GAAG,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC;AAElD,MAAM,SAAS,GAAwB;IACrC,GAAG,kBAAkB;IAErB,GAAG,EAAE,4CAA4C;IACjD,OAAO,EAAE,KAAK;IACd,KAAK,EAAE,iBAAiB;IACxB,UAAU,EAAE,CAAC;IAEb,oBAAoB,EAAE,CAAC,EAAE,GAAG,EAAE,SAAS,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC;IAEtD,aAAa,EAAE,CAAC,IAAI,EAAE,EAAE;QACtB,OAAO,IAAI,KAAK,uBAAuB,CAAC,OAAO,CAAC;IAClD,CAAC;IAED,OAAO,EAAE,CAAC,aAAa,EAAE,OAAO,EAAE,EAAE;QAClC,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"eth-minter.js","sourceRoot":"","sources":["../../src/warehousing/eth-minter.ts"],"names":[],"mappings":"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"}
|
|
@@ -36,10 +36,9 @@ export const BulkImportWorker = {
|
|
|
36
36
|
type: 'BULK_IMPORT',
|
|
37
37
|
doWork: async (rawPayload, unchainedAPI) => {
|
|
38
38
|
try {
|
|
39
|
-
const { createShouldUpsertIfIDExists = false, skipCacheInvalidation = false
|
|
39
|
+
const { createShouldUpsertIfIDExists = false, skipCacheInvalidation = false } = rawPayload;
|
|
40
40
|
const bulkImporter = unchainedAPI.bulkImporter.createBulkImporter({
|
|
41
41
|
logger,
|
|
42
|
-
authorId,
|
|
43
42
|
createShouldUpsertIfIDExists,
|
|
44
43
|
skipCacheInvalidation,
|
|
45
44
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bulk-import.js","sourceRoot":"","sources":["../../src/worker/bulk-import.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3E,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAC/D,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,UAAU,MAAM,YAAY,CAAC;AACpC,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAG/C,MAAM,MAAM,GAAG,YAAY,CAAC,gCAAgC,CAAC,CAAC;AAE9D,MAAM,2BAA2B,GAAG,KAAK,EACvC,YAAY,EACZ,gBAAgB,EAChB,YAA2B,EAC3B,EAAE;IACF,MAAM,CAAC,OAAO,CAAC,YAAY,EAAE,EAAE,KAAK,EAAE,QAAQ,CAAC,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,CAAC,CAAC;IAEjF,MAAM,aAAa,GAAG,IAAI,aAAa,CACrC,CAAC,KAAK,EAAE,EAAE;QACR,MAAM,UAAU,GAAG,gBAAgB,EAAE,CAAC;QACtC,MAAM,UAAU,GAAG,UAAU,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,sBAAsB;QACvE,UAAU,CAAC,EAAE,CAAC,MAAM,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;QAClC,UAAU,CAAC,EAAE,CAAC,OAAO,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;QACnC,UAAU,CAAC,EAAE,CAAC,OAAO,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;QAEnC,KAAK,CAAC,EAAE,CAAC,WAAW,EAAE,GAAG,EAAE,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC,CAAC;QAChD,KAAK,CAAC,EAAE,CAAC,UAAU,EAAE,GAAG,EAAE,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC;QAEhD,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAC5B,UAAU,CAAC,EAAE,CAAC,OAAO,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;QAEnC,OAAO,GAAG,EAAE;YACV,UAAU,CAAC,cAAc,CAAC,MAAM,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;YAC9C,UAAU,CAAC,cAAc,CAAC,OAAO,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;YAC/C,UAAU,CAAC,cAAc,CAAC,OAAO,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;YAC/C,UAAU,CAAC,OAAO,EAAE,CAAC;QACvB,CAAC,CAAC;IACJ,CAAC,EACD,EAAE,aAAa,EAAE,GAAG,EAAE,YAAY,EAAE,CAAC,EAAE,CACxC,CAAC;IAEF,IAAI,KAAK,EAAE,MAAM,KAAK,IAAI,aAAa,EAAE,EAAE,sBAAsB;QAC/D,MAAM,YAAY,CAAC,OAAO,CAAC,KAAK,EAAE,YAAY,CAAC,CAAC;KACjD;IAED,MAAM,CAAC,OAAO,CAAC,YAAY,EAAE,EAAE,KAAK,EAAE,QAAQ,CAAC,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,CAAC,CAAC;AACnF,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,gBAAgB,GAAiD;IAC5E,GAAG,aAAa;IAEhB,GAAG,EAAE,0CAA0C;IAC/C,KAAK,EAAE,aAAa;IACpB,OAAO,EAAE,OAAO;IAChB,IAAI,EAAE,aAAa;IAEnB,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,YAAY,EAAE,EAAE;QACzC,IAAI;YACF,MAAM,
|
|
1
|
+
{"version":3,"file":"bulk-import.js","sourceRoot":"","sources":["../../src/worker/bulk-import.ts"],"names":[],"mappings":"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"}
|