@agnostack/next-shopify 1.9.5-beta.2 → 1.9.5-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,10 @@
|
|
|
1
|
+
## [1.9.5-beta.3](https://github.com/agnostack/next-shopify/compare/v1.9.5-beta.2...v1.9.5-beta.3) (2023-07-06)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### Bug Fixes
|
|
5
|
+
|
|
6
|
+
* added minimatch ([65bd8c6](https://github.com/agnostack/next-shopify/commit/65bd8c6d026359cac149ba4715811999eadaa0d3))
|
|
7
|
+
|
|
1
8
|
## [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
9
|
|
|
3
10
|
|
|
@@ -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":"AA+CO,0GAiIN"}
|
|
@@ -14,7 +14,18 @@ const verifyAppProxySignature = (signature, verifiable, sharedSecret) => {
|
|
|
14
14
|
const hmac = (0, utils_1.generateHMAC)((0, shared_1.objectToSortedString)(verifiable), sharedSecret);
|
|
15
15
|
return (0, utils_1.compareHashes)(signature, hmac);
|
|
16
16
|
};
|
|
17
|
-
const
|
|
17
|
+
const matchFirst = (value, patterns) => {
|
|
18
|
+
let matched;
|
|
19
|
+
// NOTE: intentionally using for loops instead of map so we can break to exit quickly soon as matched
|
|
20
|
+
// eslint-disable-next-line no-restricted-syntax
|
|
21
|
+
for (const [pattern, data] of Object.entries(patterns)) {
|
|
22
|
+
if ((0, minimatch_1.minimatch)(value, pattern)) {
|
|
23
|
+
matched = data;
|
|
24
|
+
break;
|
|
25
|
+
}
|
|
26
|
+
}
|
|
27
|
+
return matched;
|
|
28
|
+
};
|
|
18
29
|
const handleProxy = (serverRuntimeConfig) => (req, res, _params) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
|
|
19
30
|
var _a, _b;
|
|
20
31
|
const { APP_CONFIG, APP_BASE_URL, TARGET_SAFELIST, ORIGIN_SAFELIST } = serverRuntimeConfig;
|
|
@@ -22,7 +33,7 @@ const handleProxy = (serverRuntimeConfig) => (req, res, _params) => tslib_1.__aw
|
|
|
22
33
|
const _c = (_a = req.query) !== null && _a !== void 0 ? _a : {}, { signature, proxyEncoded } = _c, verifiable = tslib_1.__rest(_c, ["signature", "proxyEncoded"]);
|
|
23
34
|
const { shop, host } = verifiable;
|
|
24
35
|
const appHostName = new URL(APP_BASE_URL).hostname;
|
|
25
|
-
const
|
|
36
|
+
const targetsSafelistPatterns = Object.assign({ [appHostName]: {
|
|
26
37
|
// HMMM: can we generate our own session token so we can not have to tell handleGraph/Rest to behave as offline?
|
|
27
38
|
// headers: {
|
|
28
39
|
// Authorization: 'Bearer {{setting.zendesk.token}}',
|
|
@@ -31,7 +42,7 @@ const handleProxy = (serverRuntimeConfig) => (req, res, _params) => tslib_1.__aw
|
|
|
31
42
|
shop,
|
|
32
43
|
host,
|
|
33
44
|
},
|
|
34
|
-
} }, TARGET_SAFELIST)
|
|
45
|
+
} }, TARGET_SAFELIST);
|
|
35
46
|
const originsSafelist = [
|
|
36
47
|
...(0, shared_1.ensureArray)(ORIGIN_SAFELIST),
|
|
37
48
|
'https://cdn.shopify.com' // NOTE: this is the domain for checkout UI extensions
|
|
@@ -62,9 +73,9 @@ const handleProxy = (serverRuntimeConfig) => (req, res, _params) => tslib_1.__aw
|
|
|
62
73
|
const { origin: target, hostname, pathname, search } = (0, shared_1.stringNotEmpty)(_targetUrl) ? new URL(_targetUrl) : {};
|
|
63
74
|
let targetPath = [pathname, search].filter(shared_1.stringNotEmpty).join('');
|
|
64
75
|
console.log(`>>> > handleProxy > targetPath:`, targetPath);
|
|
65
|
-
console.log(`>>> > handleProxy >
|
|
66
|
-
const safelistedTarget =
|
|
67
|
-
console.log(`>>> > handleProxy > safelistedTarget:`, { safelistedTarget, hostname,
|
|
76
|
+
console.log(`>>> > handleProxy > targetsSafelistPatterns:`, targetsSafelistPatterns);
|
|
77
|
+
const safelistedTarget = matchFirst(hostname, targetsSafelistPatterns);
|
|
78
|
+
console.log(`>>> > handleProxy > safelistedTarget:`, { safelistedTarget, hostname, targetsSafelistPatterns });
|
|
68
79
|
if ((0, shared_1.stringEmpty)(targetPath) || (safelistedTarget == undefined)) {
|
|
69
80
|
return res.status(407).json({ message: 'Unproxyable target.' });
|
|
70
81
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"proxy.js","sourceRoot":"","sources":["../../../../src/lib/handlers/api/proxy.js"],"names":[],"mappings":";;;;AAAA,sDAAsD;AACtD,gDAAgD;AAChD,sEAAkC;AAClC,oEAAkC;AAClC,yCAAqC;AAErC,uCAGoB;AACpB,4CAawB;AAExB,MAAM,aAAa,GAAG,IAAI,CAAA,CAAC,kBAAkB;AAE7C,MAAM,uBAAuB,GAAG,CAAC,SAAS,EAAE,UAAU,EAAE,YAAY,EAAE,EAAE;IACtE,MAAM,IAAI,GAAG,IAAA,oBAAY,EAAC,IAAA,6BAAoB,EAAC,UAAU,CAAC,EAAE,YAAY,CAAC,CAAA;IAEzE,OAAO,IAAA,qBAAa,EAAC,SAAS,EAAE,IAAI,CAAC,CAAA;AACvC,CAAC,CAAA;AAED,MAAM,
|
|
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.5-beta.
|
|
3
|
+
"version": "1.9.5-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",
|