@unchainedshop/plugins 2.4.0 → 2.4.3
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 -2
- package/lib/files/minio/minio-adapter.js +3 -3
- package/lib/files/minio/minio-adapter.js.map +1 -1
- package/lib/payment/stripe.js +34 -9
- package/lib/payment/stripe.js.map +1 -1
- package/package.json +22 -22
- package/src/files/minio/minio-adapter.ts +4 -4
- package/src/payment/stripe.ts +46 -12
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { IFileAdapter } from '@unchainedshop/types/files.js';
|
|
2
|
-
import
|
|
3
|
-
export declare function connectToMinio(): Promise<
|
|
2
|
+
import { Client } from 'minio';
|
|
3
|
+
export declare function connectToMinio(): Promise<Client>;
|
|
4
4
|
export declare const MinioAdapter: IFileAdapter;
|
|
5
5
|
export default MinioAdapter;
|
|
@@ -5,8 +5,8 @@ import { URL } from 'url';
|
|
|
5
5
|
import { FileAdapter, FileDirector, buildHashedFilename, resolveExpirationDate, } from '@unchainedshop/file-upload';
|
|
6
6
|
import { log, LogLevel } from '@unchainedshop/logger';
|
|
7
7
|
import mimeType from 'mime-types';
|
|
8
|
-
import
|
|
9
|
-
import { AssumeRoleProvider } from 'minio/dist/
|
|
8
|
+
import { Client } from 'minio';
|
|
9
|
+
import { AssumeRoleProvider } from 'minio/dist/esm/AssumeRoleProvider.mjs';
|
|
10
10
|
import { expiryOffsetInMs } from '@unchainedshop/file-upload/put-expiration.js';
|
|
11
11
|
const { MINIO_ACCESS_KEY, MINIO_REGION, MINIO_STS_ENDPOINT, MINIO_SECRET_KEY, MINIO_ENDPOINT, MINIO_BUCKET_NAME, MINIO_UPLOAD_PREFIX, NODE_ENV, AMAZON_S3_SESSION_TOKEN, } = process.env;
|
|
12
12
|
let client;
|
|
@@ -17,7 +17,7 @@ export async function connectToMinio() {
|
|
|
17
17
|
}
|
|
18
18
|
try {
|
|
19
19
|
const resolvedUrl = new URL(MINIO_ENDPOINT);
|
|
20
|
-
const minioClient = new
|
|
20
|
+
const minioClient = new Client({
|
|
21
21
|
endPoint: resolvedUrl.hostname,
|
|
22
22
|
useSSL: resolvedUrl.protocol === 'https:',
|
|
23
23
|
port: parseInt(resolvedUrl.port, 10) || undefined,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"minio-adapter.js","sourceRoot":"","sources":["../../../src/files/minio/minio-adapter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,IAA6B,MAAM,MAAM,CAAC;AACjD,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAClC,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAE1B,OAAO,EACL,WAAW,EACX,YAAY,EACZ,mBAAmB,EACnB,qBAAqB,GACtB,MAAM,4BAA4B,CAAC;AAEpC,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,QAAQ,MAAM,YAAY,CAAC;AAClC,OAAO,
|
|
1
|
+
{"version":3,"file":"minio-adapter.js","sourceRoot":"","sources":["../../../src/files/minio/minio-adapter.ts"],"names":[],"mappings":"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"}
|
package/lib/payment/stripe.js
CHANGED
|
@@ -21,20 +21,30 @@ export const stripeHandler = async (request, response) => {
|
|
|
21
21
|
let event;
|
|
22
22
|
try {
|
|
23
23
|
event = stripe.webhooks.constructEvent(request.body, sig, STRIPE_ENDPOINT_SECRET);
|
|
24
|
+
logger.verbose(`Webhook received`, {
|
|
25
|
+
type: event.type,
|
|
26
|
+
});
|
|
24
27
|
}
|
|
25
28
|
catch (err) {
|
|
29
|
+
logger.error(`Webhook failed: ${err.message}`);
|
|
26
30
|
response.writeHead(400);
|
|
27
|
-
response.end(
|
|
31
|
+
response.end(err.message);
|
|
28
32
|
return;
|
|
29
33
|
}
|
|
30
34
|
try {
|
|
31
35
|
if (event.type === 'payment_intent.succeeded') {
|
|
32
36
|
const paymentIntent = event.data.object;
|
|
33
37
|
const orderPaymentId = paymentIntent.metadata?.orderPaymentId;
|
|
38
|
+
logger.verbose(`Webhook tries to checkout with orderPaymentId: ${orderPaymentId}`, {
|
|
39
|
+
type: event.type,
|
|
40
|
+
});
|
|
34
41
|
await modules.orders.payments.logEvent(orderPaymentId, event);
|
|
35
42
|
const orderPayment = await modules.orders.payments.findOrderPayment({
|
|
36
43
|
orderPaymentId,
|
|
37
44
|
});
|
|
45
|
+
if (!orderPayment) {
|
|
46
|
+
throw new Error(`Order payment object not found with orderPaymentId: ${orderPaymentId}`);
|
|
47
|
+
}
|
|
38
48
|
const order = await modules.orders.checkout(orderPayment.orderId, {
|
|
39
49
|
transactionContext: {
|
|
40
50
|
paymentIntentId: paymentIntent.id,
|
|
@@ -43,32 +53,44 @@ export const stripeHandler = async (request, response) => {
|
|
|
43
53
|
paymentIntentId: paymentIntent.id,
|
|
44
54
|
},
|
|
45
55
|
}, resolvedContext);
|
|
46
|
-
logger.info(`
|
|
56
|
+
logger.info(`Webhook confirmed checkout for order: ${order._id}`, {
|
|
47
57
|
orderId: order._id,
|
|
58
|
+
type: event.type,
|
|
48
59
|
});
|
|
49
60
|
}
|
|
50
61
|
else if (event.type === 'setup_intent.succeeded') {
|
|
51
62
|
const setupIntent = event.data.object;
|
|
52
63
|
const { paymentProviderId, userId } = setupIntent.metadata;
|
|
64
|
+
logger.verbose(`Webhook tries to register payment credential with paymentProviderId: ${paymentProviderId}`, {
|
|
65
|
+
type: event.type,
|
|
66
|
+
userId,
|
|
67
|
+
});
|
|
53
68
|
await modules.payment.registerCredentials(paymentProviderId, {
|
|
54
69
|
transactionContext: {
|
|
55
70
|
setupIntentId: setupIntent.id,
|
|
56
71
|
},
|
|
57
72
|
userId,
|
|
58
73
|
}, resolvedContext);
|
|
59
|
-
logger.info(`
|
|
74
|
+
logger.info(`Webhook registered payment credentials with paymentProviderId: ${paymentProviderId}`, {
|
|
60
75
|
userId,
|
|
76
|
+
type: event.type,
|
|
61
77
|
});
|
|
62
78
|
}
|
|
63
79
|
else {
|
|
80
|
+
logger.verbose(`Unhandled webhook type`, {
|
|
81
|
+
type: event.type,
|
|
82
|
+
});
|
|
64
83
|
response.writeHead(404);
|
|
65
84
|
response.end();
|
|
66
85
|
return;
|
|
67
86
|
}
|
|
68
87
|
}
|
|
69
88
|
catch (err) {
|
|
89
|
+
logger.error(`Webhook failed: ${err.message}`, {
|
|
90
|
+
type: event.type,
|
|
91
|
+
});
|
|
70
92
|
response.writeHead(400);
|
|
71
|
-
response.end(
|
|
93
|
+
response.end(err.message || 'Error');
|
|
72
94
|
return;
|
|
73
95
|
}
|
|
74
96
|
// Return a 200 response to acknowledge receipt of the event
|
|
@@ -145,7 +167,7 @@ const Stripe = {
|
|
|
145
167
|
},
|
|
146
168
|
register: async ({ setupIntentId }) => {
|
|
147
169
|
if (!setupIntentId) {
|
|
148
|
-
throw new Error('You have to provide a
|
|
170
|
+
throw new Error('You have to provide a setupIntentId');
|
|
149
171
|
}
|
|
150
172
|
const setupIntent = await stripe.setupIntents.retrieve(setupIntentId);
|
|
151
173
|
if (setupIntent.status === 'succeeded') {
|
|
@@ -157,7 +179,7 @@ const Stripe = {
|
|
|
157
179
|
usage: setupIntent.usage,
|
|
158
180
|
};
|
|
159
181
|
}
|
|
160
|
-
logger.warn('
|
|
182
|
+
logger.warn('Registration declined', setupIntentId);
|
|
161
183
|
return null;
|
|
162
184
|
},
|
|
163
185
|
sign: async (transactionContext = {}) => {
|
|
@@ -177,7 +199,7 @@ const Stripe = {
|
|
|
177
199
|
},
|
|
178
200
|
charge: async ({ paymentIntentId, paymentCredentials }) => {
|
|
179
201
|
if (!paymentIntentId && !paymentCredentials) {
|
|
180
|
-
throw new Error('You have to provide
|
|
202
|
+
throw new Error('You have to provide paymentIntentId or paymentCredentials');
|
|
181
203
|
}
|
|
182
204
|
const { order } = params.paymentContext;
|
|
183
205
|
const orderPayment = await modules.orders.payments.findOrderPayment({
|
|
@@ -196,14 +218,17 @@ const Stripe = {
|
|
|
196
218
|
const { currency, amount } = pricing.total({ useNetPrice: false });
|
|
197
219
|
if (paymentIntentObject.currency !== currency.toLowerCase() ||
|
|
198
220
|
paymentIntentObject.amount !== Math.round(amount)) {
|
|
199
|
-
throw new Error('The price has changed since
|
|
221
|
+
throw new Error('The price has changed since the intent has been created');
|
|
200
222
|
}
|
|
201
223
|
if (paymentIntentObject.metadata?.orderPaymentId !== orderPayment?._id) {
|
|
202
|
-
throw new Error('The order payment is different from the initiating intent
|
|
224
|
+
throw new Error('The order payment is different from the initiating intent');
|
|
203
225
|
}
|
|
204
226
|
if (paymentIntentObject.status === 'succeeded') {
|
|
205
227
|
return paymentIntentObject;
|
|
206
228
|
}
|
|
229
|
+
logger.verbose('Charge postponed because paymentIntent has wrong status', {
|
|
230
|
+
orderPaymentId: paymentIntentObject.id,
|
|
231
|
+
});
|
|
207
232
|
return false;
|
|
208
233
|
},
|
|
209
234
|
};
|
|
@@ -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,GAAG,eAAe,CAAC;IAEpC,IAAI,KAAK,CAAC;IAEV,IAAI;QACF,KAAK,GAAG,MAAM,CAAC,QAAQ,CAAC,cAAc,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,EAAE,sBAAsB,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"stripe.js","sourceRoot":"","sources":["../../src/payment/stripe.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.4.
|
|
3
|
+
"version": "2.4.3",
|
|
4
4
|
"main": "lib/plugins-index.js",
|
|
5
5
|
"types": "lib/plugins-index.d.ts",
|
|
6
6
|
"exports": {
|
|
@@ -78,43 +78,43 @@
|
|
|
78
78
|
"ethers": "^6.7.1",
|
|
79
79
|
"express": "^4.18.2",
|
|
80
80
|
"mongodb": "^4.0.0",
|
|
81
|
-
"stripe": "^
|
|
81
|
+
"stripe": "^13.4.0",
|
|
82
82
|
"tiny-secp256k1": "^2.2.3",
|
|
83
83
|
"web-push": "^3.6.3"
|
|
84
84
|
},
|
|
85
85
|
"devDependencies": {
|
|
86
86
|
"@redis/client": "^1.5.9",
|
|
87
|
-
"@types/node": "^18.17.
|
|
88
|
-
"@unchainedshop/api": "^2.4.
|
|
89
|
-
"@unchainedshop/core-delivery": "^2.4.
|
|
90
|
-
"@unchainedshop/core-enrollments": "^2.4.
|
|
91
|
-
"@unchainedshop/core-filters": "^2.4.
|
|
92
|
-
"@unchainedshop/core-messaging": "^2.4.
|
|
93
|
-
"@unchainedshop/core-orders": "^2.4.
|
|
94
|
-
"@unchainedshop/core-payment": "^2.4.
|
|
95
|
-
"@unchainedshop/core-products": "^2.4.
|
|
96
|
-
"@unchainedshop/core-quotations": "^2.4.
|
|
97
|
-
"@unchainedshop/core-warehousing": "^2.4.
|
|
98
|
-
"@unchainedshop/core-worker": "^2.4.
|
|
99
|
-
"@unchainedshop/events": "^2.4.
|
|
100
|
-
"@unchainedshop/file-upload": "^2.4.
|
|
101
|
-
"@unchainedshop/logger": "^2.4.
|
|
102
|
-
"@unchainedshop/types": "^2.4.
|
|
103
|
-
"@unchainedshop/utils": "^2.4.
|
|
87
|
+
"@types/node": "^18.17.14",
|
|
88
|
+
"@unchainedshop/api": "^2.4.3",
|
|
89
|
+
"@unchainedshop/core-delivery": "^2.4.3",
|
|
90
|
+
"@unchainedshop/core-enrollments": "^2.4.3",
|
|
91
|
+
"@unchainedshop/core-filters": "^2.4.3",
|
|
92
|
+
"@unchainedshop/core-messaging": "^2.4.3",
|
|
93
|
+
"@unchainedshop/core-orders": "^2.4.3",
|
|
94
|
+
"@unchainedshop/core-payment": "^2.4.3",
|
|
95
|
+
"@unchainedshop/core-products": "^2.4.3",
|
|
96
|
+
"@unchainedshop/core-quotations": "^2.4.3",
|
|
97
|
+
"@unchainedshop/core-warehousing": "^2.4.3",
|
|
98
|
+
"@unchainedshop/core-worker": "^2.4.3",
|
|
99
|
+
"@unchainedshop/events": "^2.4.3",
|
|
100
|
+
"@unchainedshop/file-upload": "^2.4.3",
|
|
101
|
+
"@unchainedshop/logger": "^2.4.3",
|
|
102
|
+
"@unchainedshop/types": "^2.4.3",
|
|
103
|
+
"@unchainedshop/utils": "^2.4.3",
|
|
104
104
|
"bluebird": "^3.7.2",
|
|
105
105
|
"event-iterator": "^2.0.0",
|
|
106
106
|
"express": "^4.18.2",
|
|
107
107
|
"jest": "^29.6.4",
|
|
108
108
|
"JSONStream": "^1.3.5",
|
|
109
|
-
"minio": "^7.1.
|
|
109
|
+
"minio": "^7.1.3",
|
|
110
110
|
"mongodb": "^4.17.1",
|
|
111
111
|
"node-sheets": "^1.2.0",
|
|
112
|
-
"nodemailer": "^6.9.
|
|
112
|
+
"nodemailer": "^6.9.5",
|
|
113
113
|
"open": "^9.1.0",
|
|
114
114
|
"request": "^2.88.2",
|
|
115
115
|
"ts-jest": "^29.1.1",
|
|
116
116
|
"typescript": "^5.2.2",
|
|
117
|
-
"web-push": "^3.6.
|
|
117
|
+
"web-push": "^3.6.5",
|
|
118
118
|
"xml-js": "^1.6.11"
|
|
119
119
|
}
|
|
120
120
|
}
|
|
@@ -12,8 +12,8 @@ import {
|
|
|
12
12
|
|
|
13
13
|
import { log, LogLevel } from '@unchainedshop/logger';
|
|
14
14
|
import mimeType from 'mime-types';
|
|
15
|
-
import
|
|
16
|
-
import { AssumeRoleProvider } from 'minio/dist/
|
|
15
|
+
import { Client } from 'minio';
|
|
16
|
+
import { AssumeRoleProvider } from 'minio/dist/esm/AssumeRoleProvider.mjs';
|
|
17
17
|
import { expiryOffsetInMs } from '@unchainedshop/file-upload/put-expiration.js';
|
|
18
18
|
|
|
19
19
|
const {
|
|
@@ -28,7 +28,7 @@ const {
|
|
|
28
28
|
AMAZON_S3_SESSION_TOKEN,
|
|
29
29
|
} = process.env;
|
|
30
30
|
|
|
31
|
-
let client:
|
|
31
|
+
let client: Client;
|
|
32
32
|
|
|
33
33
|
export async function connectToMinio() {
|
|
34
34
|
if (!MINIO_ENDPOINT || !MINIO_BUCKET_NAME) {
|
|
@@ -41,7 +41,7 @@ export async function connectToMinio() {
|
|
|
41
41
|
|
|
42
42
|
try {
|
|
43
43
|
const resolvedUrl = new URL(MINIO_ENDPOINT);
|
|
44
|
-
const minioClient = new
|
|
44
|
+
const minioClient = new Client({
|
|
45
45
|
endPoint: resolvedUrl.hostname,
|
|
46
46
|
useSSL: resolvedUrl.protocol === 'https:',
|
|
47
47
|
port: parseInt(resolvedUrl.port, 10) || undefined,
|
package/src/payment/stripe.ts
CHANGED
|
@@ -31,9 +31,13 @@ export const stripeHandler = async (request, response) => {
|
|
|
31
31
|
|
|
32
32
|
try {
|
|
33
33
|
event = stripe.webhooks.constructEvent(request.body, sig, STRIPE_ENDPOINT_SECRET);
|
|
34
|
+
logger.verbose(`Webhook received`, {
|
|
35
|
+
type: event.type,
|
|
36
|
+
});
|
|
34
37
|
} catch (err) {
|
|
38
|
+
logger.error(`Webhook failed: ${err.message}`);
|
|
35
39
|
response.writeHead(400);
|
|
36
|
-
response.end(
|
|
40
|
+
response.end(err.message);
|
|
37
41
|
return;
|
|
38
42
|
}
|
|
39
43
|
|
|
@@ -42,12 +46,19 @@ export const stripeHandler = async (request, response) => {
|
|
|
42
46
|
const paymentIntent = event.data.object;
|
|
43
47
|
const orderPaymentId = paymentIntent.metadata?.orderPaymentId;
|
|
44
48
|
|
|
45
|
-
|
|
49
|
+
logger.verbose(`Webhook tries to checkout with orderPaymentId: ${orderPaymentId}`, {
|
|
50
|
+
type: event.type,
|
|
51
|
+
});
|
|
46
52
|
|
|
53
|
+
await modules.orders.payments.logEvent(orderPaymentId, event);
|
|
47
54
|
const orderPayment = await modules.orders.payments.findOrderPayment({
|
|
48
55
|
orderPaymentId,
|
|
49
56
|
});
|
|
50
57
|
|
|
58
|
+
if (!orderPayment) {
|
|
59
|
+
throw new Error(`Order payment object not found with orderPaymentId: ${orderPaymentId}`);
|
|
60
|
+
}
|
|
61
|
+
|
|
51
62
|
const order = await modules.orders.checkout(
|
|
52
63
|
orderPayment.orderId,
|
|
53
64
|
{
|
|
@@ -61,13 +72,22 @@ export const stripeHandler = async (request, response) => {
|
|
|
61
72
|
resolvedContext,
|
|
62
73
|
);
|
|
63
74
|
|
|
64
|
-
logger.info(`
|
|
75
|
+
logger.info(`Webhook confirmed checkout for order: ${order._id}`, {
|
|
65
76
|
orderId: order._id,
|
|
77
|
+
type: event.type,
|
|
66
78
|
});
|
|
67
79
|
} else if (event.type === 'setup_intent.succeeded') {
|
|
68
80
|
const setupIntent = event.data.object;
|
|
69
81
|
const { paymentProviderId, userId } = setupIntent.metadata;
|
|
70
82
|
|
|
83
|
+
logger.verbose(
|
|
84
|
+
`Webhook tries to register payment credential with paymentProviderId: ${paymentProviderId}`,
|
|
85
|
+
{
|
|
86
|
+
type: event.type,
|
|
87
|
+
userId,
|
|
88
|
+
},
|
|
89
|
+
);
|
|
90
|
+
|
|
71
91
|
await modules.payment.registerCredentials(
|
|
72
92
|
paymentProviderId,
|
|
73
93
|
{
|
|
@@ -79,17 +99,27 @@ export const stripeHandler = async (request, response) => {
|
|
|
79
99
|
resolvedContext,
|
|
80
100
|
);
|
|
81
101
|
|
|
82
|
-
logger.info(
|
|
83
|
-
|
|
84
|
-
|
|
102
|
+
logger.info(
|
|
103
|
+
`Webhook registered payment credentials with paymentProviderId: ${paymentProviderId}`,
|
|
104
|
+
{
|
|
105
|
+
userId,
|
|
106
|
+
type: event.type,
|
|
107
|
+
},
|
|
108
|
+
);
|
|
85
109
|
} else {
|
|
110
|
+
logger.verbose(`Unhandled webhook type`, {
|
|
111
|
+
type: event.type,
|
|
112
|
+
});
|
|
86
113
|
response.writeHead(404);
|
|
87
114
|
response.end();
|
|
88
115
|
return;
|
|
89
116
|
}
|
|
90
117
|
} catch (err) {
|
|
118
|
+
logger.error(`Webhook failed: ${err.message}`, {
|
|
119
|
+
type: event.type,
|
|
120
|
+
});
|
|
91
121
|
response.writeHead(400);
|
|
92
|
-
response.end(
|
|
122
|
+
response.end(err.message || 'Error');
|
|
93
123
|
return;
|
|
94
124
|
}
|
|
95
125
|
// Return a 200 response to acknowledge receipt of the event
|
|
@@ -177,7 +207,7 @@ const Stripe: IPaymentAdapter = {
|
|
|
177
207
|
|
|
178
208
|
register: async ({ setupIntentId }) => {
|
|
179
209
|
if (!setupIntentId) {
|
|
180
|
-
throw new Error('You have to provide a
|
|
210
|
+
throw new Error('You have to provide a setupIntentId');
|
|
181
211
|
}
|
|
182
212
|
|
|
183
213
|
const setupIntent = await stripe.setupIntents.retrieve(setupIntentId);
|
|
@@ -192,7 +222,7 @@ const Stripe: IPaymentAdapter = {
|
|
|
192
222
|
};
|
|
193
223
|
}
|
|
194
224
|
|
|
195
|
-
logger.warn('
|
|
225
|
+
logger.warn('Registration declined', setupIntentId);
|
|
196
226
|
return null;
|
|
197
227
|
},
|
|
198
228
|
|
|
@@ -223,7 +253,7 @@ const Stripe: IPaymentAdapter = {
|
|
|
223
253
|
|
|
224
254
|
charge: async ({ paymentIntentId, paymentCredentials }) => {
|
|
225
255
|
if (!paymentIntentId && !paymentCredentials) {
|
|
226
|
-
throw new Error('You have to provide
|
|
256
|
+
throw new Error('You have to provide paymentIntentId or paymentCredentials');
|
|
227
257
|
}
|
|
228
258
|
|
|
229
259
|
const { order } = params.paymentContext;
|
|
@@ -252,16 +282,20 @@ const Stripe: IPaymentAdapter = {
|
|
|
252
282
|
paymentIntentObject.currency !== currency.toLowerCase() ||
|
|
253
283
|
paymentIntentObject.amount !== Math.round(amount)
|
|
254
284
|
) {
|
|
255
|
-
throw new Error('The price has changed since
|
|
285
|
+
throw new Error('The price has changed since the intent has been created');
|
|
256
286
|
}
|
|
257
287
|
if (paymentIntentObject.metadata?.orderPaymentId !== orderPayment?._id) {
|
|
258
|
-
throw new Error('The order payment is different from the initiating intent
|
|
288
|
+
throw new Error('The order payment is different from the initiating intent');
|
|
259
289
|
}
|
|
260
290
|
|
|
261
291
|
if (paymentIntentObject.status === 'succeeded') {
|
|
262
292
|
return paymentIntentObject;
|
|
263
293
|
}
|
|
264
294
|
|
|
295
|
+
logger.verbose('Charge postponed because paymentIntent has wrong status', {
|
|
296
|
+
orderPaymentId: paymentIntentObject.id,
|
|
297
|
+
});
|
|
298
|
+
|
|
265
299
|
return false;
|
|
266
300
|
},
|
|
267
301
|
};
|