@agnostack/next-shopify 1.9.4 → 1.9.5-beta.2
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,19 @@
|
|
|
1
|
+
## [1.9.5-beta.2](https://github.com/agnostack/next-shopify/compare/v1.9.5-beta.1...v1.9.5-beta.2) (2023-07-06)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### Bug Fixes
|
|
5
|
+
|
|
6
|
+
* added minimatch ([9a01d99](https://github.com/agnostack/next-shopify/commit/9a01d99836fdf927626c0b90e79013d353cb414a))
|
|
7
|
+
|
|
8
|
+
## [1.9.5-beta.1](https://github.com/agnostack/next-shopify/compare/v1.9.4...v1.9.5-beta.1) (2023-07-06)
|
|
9
|
+
|
|
10
|
+
|
|
11
|
+
### Bug Fixes
|
|
12
|
+
|
|
13
|
+
* added minimatch ([ab947d1](https://github.com/agnostack/next-shopify/commit/ab947d15078881071e51696ff408e9fa412dfaf4))
|
|
14
|
+
* added minimatch ([77330f6](https://github.com/agnostack/next-shopify/commit/77330f63d045819c4382cbfbd40178bfc00c9dae))
|
|
15
|
+
* added minimatch ([2ce5011](https://github.com/agnostack/next-shopify/commit/2ce5011b20ef7dcdd9bd21caafb84cbcc9a18ac8))
|
|
16
|
+
|
|
1
17
|
## [1.9.4](https://github.com/agnostack/next-shopify/compare/v1.9.3...v1.9.4) (2023-07-06)
|
|
2
18
|
|
|
3
19
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"proxy.d.ts","sourceRoot":"","sources":["../../../../src/lib/handlers/api/proxy.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"proxy.d.ts","sourceRoot":"","sources":["../../../../src/lib/handlers/api/proxy.js"],"names":[],"mappings":"AAqCO,0GAiIN"}
|
|
@@ -4,8 +4,9 @@ exports.handleProxy = void 0;
|
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
/* eslint-disable @typescript-eslint/no-unused-vars */
|
|
6
6
|
// NOTE: api routes do NOT work in `next export`
|
|
7
|
-
const http_proxy_1 = tslib_1.__importDefault(require("http-proxy"));
|
|
8
7
|
const nextjs_cors_1 = tslib_1.__importDefault(require("nextjs-cors"));
|
|
8
|
+
const http_proxy_1 = tslib_1.__importDefault(require("http-proxy"));
|
|
9
|
+
const minimatch_1 = require("minimatch");
|
|
9
10
|
const utils_1 = require("../../utils");
|
|
10
11
|
const shared_1 = require("../../../shared");
|
|
11
12
|
const PROXY_TIMEOUT = 6000; // NOTE: 6 seconds
|
|
@@ -13,6 +14,7 @@ const verifyAppProxySignature = (signature, verifiable, sharedSecret) => {
|
|
|
13
14
|
const hmac = (0, utils_1.generateHMAC)((0, shared_1.objectToSortedString)(verifiable), sharedSecret);
|
|
14
15
|
return (0, utils_1.compareHashes)(signature, hmac);
|
|
15
16
|
};
|
|
17
|
+
const matchPattern = (value, patterns) => ((0, shared_1.ensureArray)(patterns).find((pattern) => (0, minimatch_1.minimatch)(value, pattern)));
|
|
16
18
|
const handleProxy = (serverRuntimeConfig) => (req, res, _params) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
|
|
17
19
|
var _a, _b;
|
|
18
20
|
const { APP_CONFIG, APP_BASE_URL, TARGET_SAFELIST, ORIGIN_SAFELIST } = serverRuntimeConfig;
|
|
@@ -20,7 +22,7 @@ const handleProxy = (serverRuntimeConfig) => (req, res, _params) => tslib_1.__aw
|
|
|
20
22
|
const _c = (_a = req.query) !== null && _a !== void 0 ? _a : {}, { signature, proxyEncoded } = _c, verifiable = tslib_1.__rest(_c, ["signature", "proxyEncoded"]);
|
|
21
23
|
const { shop, host } = verifiable;
|
|
22
24
|
const appHostName = new URL(APP_BASE_URL).hostname;
|
|
23
|
-
const
|
|
25
|
+
const targetPatternsSafelist = Object.keys(Object.assign({ [appHostName]: {
|
|
24
26
|
// HMMM: can we generate our own session token so we can not have to tell handleGraph/Rest to behave as offline?
|
|
25
27
|
// headers: {
|
|
26
28
|
// Authorization: 'Bearer {{setting.zendesk.token}}',
|
|
@@ -29,8 +31,7 @@ const handleProxy = (serverRuntimeConfig) => (req, res, _params) => tslib_1.__aw
|
|
|
29
31
|
shop,
|
|
30
32
|
host,
|
|
31
33
|
},
|
|
32
|
-
} }, TARGET_SAFELIST);
|
|
33
|
-
const targetHostsSafelist = Object.keys(targetSafelist);
|
|
34
|
+
} }, TARGET_SAFELIST));
|
|
34
35
|
const originsSafelist = [
|
|
35
36
|
...(0, shared_1.ensureArray)(ORIGIN_SAFELIST),
|
|
36
37
|
'https://cdn.shopify.com' // NOTE: this is the domain for checkout UI extensions
|
|
@@ -60,7 +61,11 @@ const handleProxy = (serverRuntimeConfig) => (req, res, _params) => tslib_1.__aw
|
|
|
60
61
|
const _targetUrl = ((0, shared_1.stringEmpty)(targetParam) || targetParam.startsWith('http')) ? targetParam : `${APP_BASE_URL}/${(0, shared_1.removeLeadingSlash)(targetParam)}`;
|
|
61
62
|
const { origin: target, hostname, pathname, search } = (0, shared_1.stringNotEmpty)(_targetUrl) ? new URL(_targetUrl) : {};
|
|
62
63
|
let targetPath = [pathname, search].filter(shared_1.stringNotEmpty).join('');
|
|
63
|
-
|
|
64
|
+
console.log(`>>> > handleProxy > targetPath:`, targetPath);
|
|
65
|
+
console.log(`>>> > handleProxy > targetPatternsSafelist:`, targetPatternsSafelist);
|
|
66
|
+
const safelistedTarget = matchPattern(hostname, targetPatternsSafelist);
|
|
67
|
+
console.log(`>>> > handleProxy > safelistedTarget:`, { safelistedTarget, hostname, targetPatternsSafelist });
|
|
68
|
+
if ((0, shared_1.stringEmpty)(targetPath) || (safelistedTarget == undefined)) {
|
|
64
69
|
return res.status(407).json({ message: 'Unproxyable target.' });
|
|
65
70
|
}
|
|
66
71
|
const { shop: _shop, host: _host, timestamp, path_prefix } = verifiable;
|
|
@@ -83,8 +88,8 @@ const handleProxy = (serverRuntimeConfig) => (req, res, _params) => tslib_1.__aw
|
|
|
83
88
|
}
|
|
84
89
|
}
|
|
85
90
|
// TODO: explore adding hmac check/middleware?
|
|
86
|
-
|
|
87
|
-
|
|
91
|
+
const { headers: targetHeaders, params: targetParams } = (0, shared_1.ensureObject)(safelistedTarget);
|
|
92
|
+
console.log(`>>> > handleProxy > { headers, params }: ${hostname}`, { hostname, headers: targetHeaders, params: targetParams });
|
|
88
93
|
if ((0, shared_1.objectNotEmpty)(targetParams)) {
|
|
89
94
|
targetPath = (0, shared_1.appendQuery)(targetPath, new URLSearchParams(targetParams).toString());
|
|
90
95
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"proxy.js","sourceRoot":"","sources":["../../../../src/lib/handlers/api/proxy.js"],"names":[],"mappings":";;;;AAAA,sDAAsD;AACtD,gDAAgD;AAChD,oEAAkC;AAClC,
|
|
1
|
+
{"version":3,"file":"proxy.js","sourceRoot":"","sources":["../../../../src/lib/handlers/api/proxy.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": "1.9.
|
|
3
|
+
"version": "1.9.5-beta.2",
|
|
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",
|
|
@@ -70,6 +70,7 @@
|
|
|
70
70
|
"cookies": "0.8.0",
|
|
71
71
|
"isbot": "3.6.12",
|
|
72
72
|
"luxon": "3.2.1",
|
|
73
|
+
"minimatch": "9.0.1",
|
|
73
74
|
"mustache": "4.2.0",
|
|
74
75
|
"nextjs-cors": "2.1.1",
|
|
75
76
|
"raw-body": "2.5.2"
|