karibou-wallet 3.5.17 → 3.5.18
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/dist/webhook.js +27 -8
- package/dist/webhook.js.map +1 -1
- package/package.json +1 -1
package/dist/webhook.js
CHANGED
|
@@ -21,11 +21,13 @@ class Webhook {
|
|
|
21
21
|
return __awaiter(this, void 0, void 0, function* () {
|
|
22
22
|
let event = body;
|
|
23
23
|
try {
|
|
24
|
-
if (mock && mock.
|
|
25
|
-
|
|
24
|
+
if (mock && mock.event) {
|
|
25
|
+
event = mock.event;
|
|
26
|
+
}
|
|
27
|
+
else {
|
|
28
|
+
const webhookSecret = config_1.default.option('webhookSecret');
|
|
29
|
+
event = payments_1.$stripe.webhooks.constructEvent(body, sig, webhookSecret);
|
|
26
30
|
}
|
|
27
|
-
const webhookSecret = config_1.default.option('webhookSecret');
|
|
28
|
-
event = payments_1.$stripe.webhooks.constructEvent(body, sig, webhookSecret);
|
|
29
31
|
}
|
|
30
32
|
catch (err) {
|
|
31
33
|
console.log(`⚠️ Webhook signature verification failed.`, err.message);
|
|
@@ -74,8 +76,11 @@ class Webhook {
|
|
|
74
76
|
if (testing) {
|
|
75
77
|
return { event: event.type, testing, contract, error: false };
|
|
76
78
|
}
|
|
77
|
-
|
|
78
|
-
|
|
79
|
+
let transaction;
|
|
80
|
+
if (invoice.payment_intent) {
|
|
81
|
+
const paymentIntent = invoice.payment_intent['id'] || invoice.payment_intent;
|
|
82
|
+
transaction = yield transaction_1.Transaction.get((0, payments_1.xor)(paymentIntent));
|
|
83
|
+
}
|
|
79
84
|
const customer = yield contract.customer();
|
|
80
85
|
return { event: event.type, testing, contract, customer, transaction, error: false };
|
|
81
86
|
}
|
|
@@ -87,8 +92,11 @@ class Webhook {
|
|
|
87
92
|
if (testing) {
|
|
88
93
|
return { event: event.type, testing, contract, error: false };
|
|
89
94
|
}
|
|
90
|
-
|
|
91
|
-
|
|
95
|
+
let transaction;
|
|
96
|
+
if (invoice.payment_intent) {
|
|
97
|
+
const paymentIntent = invoice.payment_intent['id'] || invoice.payment_intent;
|
|
98
|
+
transaction = yield transaction_1.Transaction.get((0, payments_1.xor)(paymentIntent));
|
|
99
|
+
}
|
|
92
100
|
const customer = yield customer_1.Customer.get(invoice.customer.toString());
|
|
93
101
|
return { event: event.type, testing, contract, customer, transaction, error: false };
|
|
94
102
|
}
|
|
@@ -111,6 +119,17 @@ class Webhook {
|
|
|
111
119
|
const paymentIntentId = contract.content.latestPaymentIntent.id || contract.content.latestPaymentIntent;
|
|
112
120
|
transaction = yield transaction_1.Transaction.get((0, payments_1.xor)(paymentIntentId));
|
|
113
121
|
}
|
|
122
|
+
else {
|
|
123
|
+
try {
|
|
124
|
+
const fullInvoice = yield payments_1.$stripe.invoices.retrieve(invoice.id, { expand: ['payment_intent'] });
|
|
125
|
+
if (fullInvoice.payment_intent) {
|
|
126
|
+
transaction = yield transaction_1.Transaction.get((0, payments_1.xor)(fullInvoice.payment_intent.toString()));
|
|
127
|
+
}
|
|
128
|
+
}
|
|
129
|
+
catch (err) {
|
|
130
|
+
console.warn(`⚠️ Could not retrieve payment_intent for invoice ${invoice.id}:`, err.message);
|
|
131
|
+
}
|
|
132
|
+
}
|
|
114
133
|
const customer = yield customer_1.Customer.get(invoice.customer.toString());
|
|
115
134
|
return { event: event.type, testing, contract, customer, transaction, error: false };
|
|
116
135
|
}
|
package/dist/webhook.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webhook.js","sourceRoot":"","sources":["../lib/webhook.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,qCAA8B;AAE9B,yCAA0C;AAC1C,+CAA4C;AAC5C,mEAA+D;AAC/D,yCAAsC;AAiBtC,MAAa,OAAO;
|
|
1
|
+
{"version":3,"file":"webhook.js","sourceRoot":"","sources":["../lib/webhook.ts"],"names":[],"mappings":"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"}
|