@agnostack/next-shopify 2.0.4-beta.1 → 2.0.4-beta.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/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,17 @@
|
|
|
1
|
+
## [2.0.4-beta.3](https://github.com/agnostack/next-shopify/compare/v2.0.4-beta.2...v2.0.4-beta.3) (2024-03-15)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### Bug Fixes
|
|
5
|
+
|
|
6
|
+
* revert logs ([9fbd48c](https://github.com/agnostack/next-shopify/commit/9fbd48cd5c51b77215a52fe9a539a79c2a836145))
|
|
7
|
+
|
|
8
|
+
## [2.0.4-beta.2](https://github.com/agnostack/next-shopify/compare/v2.0.4-beta.1...v2.0.4-beta.2) (2024-03-15)
|
|
9
|
+
|
|
10
|
+
|
|
11
|
+
### Bug Fixes
|
|
12
|
+
|
|
13
|
+
* added logs ([9e16f53](https://github.com/agnostack/next-shopify/commit/9e16f53d96bbb213c6cf5b193da81cfa82e2049f))
|
|
14
|
+
|
|
1
15
|
## [2.0.4-beta.1](https://github.com/agnostack/next-shopify/compare/v2.0.3...v2.0.4-beta.1) (2024-03-15)
|
|
2
16
|
|
|
3
17
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webhook.d.ts","sourceRoot":"","sources":["../../../../src/lib/handlers/api/webhook.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"webhook.d.ts","sourceRoot":"","sources":["../../../../src/lib/handlers/api/webhook.js"],"names":[],"mappings":"AAcO,2HAwGN"}
|
|
@@ -31,7 +31,6 @@ const handleWebhookEvent = (serverRuntimeConfig, config) => {
|
|
|
31
31
|
var _a;
|
|
32
32
|
try {
|
|
33
33
|
const _b = (_a = req.headers) !== null && _a !== void 0 ? _a : {}, { 'x-shop-domain': shopDomain, 'x-shopify-shop-domain': shopifyShopDomain, 'x-shopify-shop': shop = shopifyShopDomain !== null && shopifyShopDomain !== void 0 ? shopifyShopDomain : shopDomain } = _b, _headers = __rest(_b, ['x-shop-domain', 'x-shopify-shop-domain', 'x-shopify-shop']);
|
|
34
|
-
console.warn(`>>> > handleWebhookEvent > req.headers:`, req.headers);
|
|
35
34
|
if ((0, shared_1.stringEmpty)(shop)) {
|
|
36
35
|
return res.status(200).json({ handler: 'webhook', error: 'Missing shop' });
|
|
37
36
|
}
|
|
@@ -41,65 +40,58 @@ const handleWebhookEvent = (serverRuntimeConfig, config) => {
|
|
|
41
40
|
const { shopify } = yield (0, utils_1.getShopifyHelpers)(serverRuntimeConfig, { shop });
|
|
42
41
|
// TODO: explore getVerificationHelpers?
|
|
43
42
|
const rawBody = yield (0, verifyd_1.ensureRawBody)(req);
|
|
44
|
-
console.warn(`>>> > handleWebhookEvent > rawBody:`, { rawBody });
|
|
45
43
|
const _c = (serverRuntimeConfig.SHOPIFY_RUN_MODE === 'cli') ? {
|
|
46
44
|
valid: true,
|
|
47
45
|
topic: _headers['x-shopify-topic'],
|
|
48
46
|
domain: _headers['x-shopify-shop-domain'] || shop,
|
|
49
47
|
webhookId: _headers['x-shopify-webhook-id'],
|
|
50
48
|
apiVersion: _headers['x-shopify-api-version'],
|
|
51
|
-
rawBody,
|
|
52
49
|
} : (yield shopify.webhooks.validate({
|
|
53
50
|
rawBody,
|
|
54
51
|
rawRequest: req,
|
|
55
52
|
rawResponse: res,
|
|
56
53
|
})), { valid } = _c, message = __rest(_c, ["valid"]);
|
|
57
|
-
if (valid) {
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
((0, shared_1.
|
|
68
|
-
|
|
69
|
-
return res.status(200).json({ handler: 'webhook', message: 'blocked' });
|
|
70
|
-
}
|
|
71
|
-
const eventBody = JSON.parse(eventRawBody);
|
|
72
|
-
console.warn(`>>> > handleWebhookEvent > eventBody:`, { eventBody });
|
|
73
|
-
// NOTE: this callback signature matches the built in callback option PLUS data
|
|
74
|
-
const topicHandlePromises = (0, shared_1.ensureArray)(config === null || config === void 0 ? void 0 : config[eventType]).map((handler) => (handler === null || handler === void 0 ? void 0 : handler({
|
|
75
|
-
apiVersion,
|
|
76
|
-
webhookId,
|
|
77
|
-
eventType,
|
|
78
|
-
topic,
|
|
79
|
-
data,
|
|
80
|
-
shop: eventShop,
|
|
81
|
-
body: eventBody,
|
|
82
|
-
})));
|
|
83
|
-
const registrationHandlePromises = shopify.webhooks.getHandlers(topic).reduce((_registrationHandlePromises, handler) => {
|
|
84
|
-
if (!handler.callback) {
|
|
85
|
-
return _registrationHandlePromises;
|
|
86
|
-
}
|
|
87
|
-
return [
|
|
88
|
-
..._registrationHandlePromises,
|
|
89
|
-
// NOTE: this callback signature matches the built in callback option PLUS data
|
|
90
|
-
handler.callback(topic, domain || shop, eventRawBody, webhookId, apiVersion, data)
|
|
91
|
-
];
|
|
92
|
-
}, []);
|
|
93
|
-
yield Promise.all([...topicHandlePromises, ...registrationHandlePromises]);
|
|
94
|
-
return res.status(200).json({ handler: 'webhook', message: 'success' });
|
|
95
|
-
}
|
|
96
|
-
catch (error) {
|
|
97
|
-
console.error('Error handling webhook promises', error);
|
|
98
|
-
return res.status(200).json({ handler: 'webhook', error: error === null || error === void 0 ? void 0 : error.message });
|
|
54
|
+
if (!valid) {
|
|
55
|
+
console.warn('Unable to validate webhook', message);
|
|
56
|
+
return res.status(200).json({ handler: 'webhook', error: 'Unable to validate webhook', message });
|
|
57
|
+
}
|
|
58
|
+
try {
|
|
59
|
+
const { topic, domain, webhookId, apiVersion } = message;
|
|
60
|
+
const eventType = (0, shared_1.convertEventTopic)(topic);
|
|
61
|
+
const eventShop = domain || shop;
|
|
62
|
+
if (!shared_1.API_WEBHOOK_TOPICS_IMMUTABLE.includes(eventType) &&
|
|
63
|
+
((0, shared_1.stringEmpty)(eventShop) ||
|
|
64
|
+
((WEBHOOK_TOPIC_BLOCKLIST === 'ALL') || (0, shared_1.splitCommas)(WEBHOOK_TOPIC_BLOCKLIST).includes(eventShop)))) {
|
|
65
|
+
return res.status(200).json({ handler: 'webhook', message: 'blocked' });
|
|
99
66
|
}
|
|
67
|
+
const eventBody = (0, shared_1.safeParse)(rawBody);
|
|
68
|
+
// NOTE: this callback signature matches the built in callback option PLUS data
|
|
69
|
+
const topicHandlePromises = (0, shared_1.ensureArray)(config === null || config === void 0 ? void 0 : config[eventType]).map((handler) => (handler === null || handler === void 0 ? void 0 : handler({
|
|
70
|
+
apiVersion,
|
|
71
|
+
webhookId,
|
|
72
|
+
eventType,
|
|
73
|
+
topic,
|
|
74
|
+
data,
|
|
75
|
+
shop: eventShop,
|
|
76
|
+
body: eventBody,
|
|
77
|
+
})));
|
|
78
|
+
const registrationHandlePromises = shopify.webhooks.getHandlers(topic).reduce((_registrationHandlePromises, handler) => {
|
|
79
|
+
if (!handler.callback) {
|
|
80
|
+
return _registrationHandlePromises;
|
|
81
|
+
}
|
|
82
|
+
return [
|
|
83
|
+
..._registrationHandlePromises,
|
|
84
|
+
// NOTE: this callback signature matches the built in callback option PLUS data
|
|
85
|
+
handler.callback(topic, domain || shop, eventBody, webhookId, apiVersion, data)
|
|
86
|
+
];
|
|
87
|
+
}, []);
|
|
88
|
+
yield Promise.all([...topicHandlePromises, ...registrationHandlePromises]);
|
|
89
|
+
return res.status(200).json({ handler: 'webhook', message: 'success' });
|
|
90
|
+
}
|
|
91
|
+
catch (error) {
|
|
92
|
+
console.error('Error handling webhook promises', error);
|
|
93
|
+
return res.status(200).json({ handler: 'webhook', error: error === null || error === void 0 ? void 0 : error.message });
|
|
100
94
|
}
|
|
101
|
-
console.warn('Unable to validate webhook', message);
|
|
102
|
-
return res.status(200).json({ handler: 'webhook', error: 'Unable to validate webhook', message });
|
|
103
95
|
}
|
|
104
96
|
catch (error) {
|
|
105
97
|
console.error('Error handling webhook', error);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webhook.js","sourceRoot":"","sources":["../../../../src/lib/handlers/api/webhook.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAAkD;AAElD,uCAA+C;AAC/C,
|
|
1
|
+
{"version":3,"file":"webhook.js","sourceRoot":"","sources":["../../../../src/lib/handlers/api/webhook.js"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@agnostack/next-shopify",
|
|
3
|
-
"version": "2.0.4-beta.
|
|
3
|
+
"version": "2.0.4-beta.3",
|
|
4
4
|
"author": "agnoStack Dev <developers@agnostack.com> (https://agnostack.com)",
|
|
5
5
|
"owner": "agnoStack",
|
|
6
6
|
"description": "Please contact agnoStack via info@agnostack.com for any questions",
|