@agnostack/next-shopify 2.0.3 → 2.0.4-beta.1
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,10 @@
|
|
|
1
|
+
## [2.0.4-beta.1](https://github.com/agnostack/next-shopify/compare/v2.0.3...v2.0.4-beta.1) (2024-03-15)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### Bug Fixes
|
|
5
|
+
|
|
6
|
+
* added logs ([484babd](https://github.com/agnostack/next-shopify/commit/484babda08a44dfc920ab6c5957571928dcdc41c))
|
|
7
|
+
|
|
1
8
|
## [2.0.3](https://github.com/agnostack/next-shopify/compare/v2.0.2...v2.0.3) (2024-03-15)
|
|
2
9
|
|
|
3
10
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webhook.d.ts","sourceRoot":"","sources":["../../../../src/lib/handlers/api/webhook.js"],"names":[],"mappings":"AAaO,
|
|
1
|
+
{"version":3,"file":"webhook.d.ts","sourceRoot":"","sources":["../../../../src/lib/handlers/api/webhook.js"],"names":[],"mappings":"AAaO,2HA+GN"}
|
|
@@ -25,78 +25,87 @@ const verifyd_1 = require("@agnostack/verifyd");
|
|
|
25
25
|
const utils_1 = require("../../utils");
|
|
26
26
|
const shared_1 = require("../../../shared");
|
|
27
27
|
// NOTE: typically handling: "/api/webhooks/event" or "/api/webhooks/event/{appId}" or "/api/webhooks/event?appId={appId}"
|
|
28
|
-
const handleWebhookEvent = (serverRuntimeConfig, config) =>
|
|
29
|
-
var _a;
|
|
28
|
+
const handleWebhookEvent = (serverRuntimeConfig, config) => {
|
|
30
29
|
const { ORIGIN_SAFELIST, WEBHOOK_TOPIC_BLOCKLIST } = serverRuntimeConfig;
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
}
|
|
39
|
-
const { shopify } = yield (0, utils_1.getShopifyHelpers)(serverRuntimeConfig, { shop });
|
|
40
|
-
// TODO: explore getVerificationHelpers?
|
|
41
|
-
const rawBody = yield (0, verifyd_1.ensureRawBody)(req);
|
|
42
|
-
const _c = (serverRuntimeConfig.SHOPIFY_RUN_MODE === 'cli') ? {
|
|
43
|
-
valid: true,
|
|
44
|
-
topic: _headers['x-shopify-topic'],
|
|
45
|
-
domain: _headers['x-shopify-shop-domain'] || shop,
|
|
46
|
-
webhookId: _headers['x-shopify-webhook-id'],
|
|
47
|
-
apiVersion: _headers['x-shopify-api-version'],
|
|
48
|
-
rawBody,
|
|
49
|
-
} : (yield shopify.webhooks.validate({
|
|
50
|
-
rawBody,
|
|
51
|
-
rawRequest: req,
|
|
52
|
-
rawResponse: res,
|
|
53
|
-
})), { valid } = _c, message = __rest(_c, ["valid"]);
|
|
54
|
-
if (valid) {
|
|
55
|
-
try {
|
|
56
|
-
const { topic, domain, webhookId, apiVersion, rawBody: eventRawBody } = message;
|
|
57
|
-
const eventType = (0, shared_1.convertEventTopic)(topic);
|
|
58
|
-
const eventShop = domain || shop;
|
|
59
|
-
if (!shared_1.API_WEBHOOK_TOPICS_IMMUTABLE.includes(eventType) &&
|
|
60
|
-
((0, shared_1.stringEmpty)(eventShop) ||
|
|
61
|
-
((WEBHOOK_TOPIC_BLOCKLIST === 'ALL') || (0, shared_1.splitCommas)(WEBHOOK_TOPIC_BLOCKLIST).includes(eventShop)))) {
|
|
62
|
-
return res.status(200).json({ handler: 'webhook', message: 'blocked' });
|
|
63
|
-
}
|
|
64
|
-
const eventBody = JSON.parse(eventRawBody);
|
|
65
|
-
// NOTE: this callback signature matches the built in callback option PLUS data
|
|
66
|
-
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({
|
|
67
|
-
apiVersion,
|
|
68
|
-
webhookId,
|
|
69
|
-
eventType,
|
|
70
|
-
topic,
|
|
71
|
-
data,
|
|
72
|
-
shop: eventShop,
|
|
73
|
-
body: eventBody,
|
|
74
|
-
})));
|
|
75
|
-
const registrationHandlePromises = shopify.webhooks.getHandlers(topic).reduce((_registrationHandlePromises, handler) => {
|
|
76
|
-
if (!handler.callback) {
|
|
77
|
-
return _registrationHandlePromises;
|
|
78
|
-
}
|
|
79
|
-
return [
|
|
80
|
-
..._registrationHandlePromises,
|
|
81
|
-
// NOTE: this callback signature matches the built in callback option PLUS data
|
|
82
|
-
handler.callback(topic, domain || shop, eventRawBody, webhookId, apiVersion, data)
|
|
83
|
-
];
|
|
84
|
-
}, []);
|
|
85
|
-
yield Promise.all([...topicHandlePromises, ...registrationHandlePromises]);
|
|
86
|
-
return res.status(200).json({ handler: 'webhook', message: 'success' });
|
|
30
|
+
return (req, res, data) => __awaiter(void 0, void 0, void 0, function* () {
|
|
31
|
+
var _a;
|
|
32
|
+
try {
|
|
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
|
+
if ((0, shared_1.stringEmpty)(shop)) {
|
|
36
|
+
return res.status(200).json({ handler: 'webhook', error: 'Missing shop' });
|
|
87
37
|
}
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
return res.status(200).json({ handler: 'webhook', error: error === null || error === void 0 ? void 0 : error.message });
|
|
38
|
+
if (!(0, shared_1.matchHostname)(shop, ORIGIN_SAFELIST)) {
|
|
39
|
+
return res.status(200).json({ handler: 'webhook', error: 'Shop is not safelisted' });
|
|
91
40
|
}
|
|
41
|
+
const { shopify } = yield (0, utils_1.getShopifyHelpers)(serverRuntimeConfig, { shop });
|
|
42
|
+
// TODO: explore getVerificationHelpers?
|
|
43
|
+
const rawBody = yield (0, verifyd_1.ensureRawBody)(req);
|
|
44
|
+
console.warn(`>>> > handleWebhookEvent > rawBody:`, { rawBody });
|
|
45
|
+
const _c = (serverRuntimeConfig.SHOPIFY_RUN_MODE === 'cli') ? {
|
|
46
|
+
valid: true,
|
|
47
|
+
topic: _headers['x-shopify-topic'],
|
|
48
|
+
domain: _headers['x-shopify-shop-domain'] || shop,
|
|
49
|
+
webhookId: _headers['x-shopify-webhook-id'],
|
|
50
|
+
apiVersion: _headers['x-shopify-api-version'],
|
|
51
|
+
rawBody,
|
|
52
|
+
} : (yield shopify.webhooks.validate({
|
|
53
|
+
rawBody,
|
|
54
|
+
rawRequest: req,
|
|
55
|
+
rawResponse: res,
|
|
56
|
+
})), { valid } = _c, message = __rest(_c, ["valid"]);
|
|
57
|
+
if (valid) {
|
|
58
|
+
try {
|
|
59
|
+
const { topic, domain, webhookId, apiVersion, rawBody: eventRawBody } = message;
|
|
60
|
+
console.warn(`>>> > handleWebhookEvent > message:`, { message });
|
|
61
|
+
const eventType = (0, shared_1.convertEventTopic)(topic);
|
|
62
|
+
const eventShop = domain || shop;
|
|
63
|
+
console.warn(`>>> > handleWebhookEvent > API_WEBHOOK_TOPICS_IMMUTABLE:`, {
|
|
64
|
+
eventType, API_WEBHOOK_TOPICS_IMMUTABLE: shared_1.API_WEBHOOK_TOPICS_IMMUTABLE, WEBHOOK_TOPIC_BLOCKLIST
|
|
65
|
+
});
|
|
66
|
+
if (!shared_1.API_WEBHOOK_TOPICS_IMMUTABLE.includes(eventType) &&
|
|
67
|
+
((0, shared_1.stringEmpty)(eventShop) ||
|
|
68
|
+
((WEBHOOK_TOPIC_BLOCKLIST === 'ALL') || (0, shared_1.splitCommas)(WEBHOOK_TOPIC_BLOCKLIST).includes(eventShop)))) {
|
|
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 });
|
|
99
|
+
}
|
|
100
|
+
}
|
|
101
|
+
console.warn('Unable to validate webhook', message);
|
|
102
|
+
return res.status(200).json({ handler: 'webhook', error: 'Unable to validate webhook', message });
|
|
103
|
+
}
|
|
104
|
+
catch (error) {
|
|
105
|
+
console.error('Error handling webhook', error);
|
|
106
|
+
return res.status(200).json({ handler: 'webhook', error: 'Error handling webhook' });
|
|
92
107
|
}
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
}
|
|
96
|
-
catch (error) {
|
|
97
|
-
console.error('Error handling webhook', error);
|
|
98
|
-
return res.status(200).json({ handler: 'webhook', error: 'Error handling webhook' });
|
|
99
|
-
}
|
|
100
|
-
});
|
|
108
|
+
});
|
|
109
|
+
};
|
|
101
110
|
exports.handleWebhookEvent = handleWebhookEvent;
|
|
102
111
|
//# sourceMappingURL=webhook.js.map
|
|
@@ -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,4CAOwB;AAExB,0HAA0H;AACnH,MAAM,kBAAkB,GAAG,CAAC,mBAAmB,EAAE,MAAM,EAAE,EAAE,
|
|
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.
|
|
3
|
+
"version": "2.0.4-beta.1",
|
|
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",
|