@agnostack/next-shopify 1.9.4-beta.3 → 1.9.4-beta.4
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.4-beta.4](https://github.com/agnostack/next-shopify/compare/v1.9.4-beta.3...v1.9.4-beta.4) (2023-07-06)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### Bug Fixes
|
|
5
|
+
|
|
6
|
+
* allow local proxy ([75a406d](https://github.com/agnostack/next-shopify/commit/75a406d9e169a8c45fe8b5848d7aa8acc7a7a822))
|
|
7
|
+
|
|
1
8
|
## [1.9.4-beta.3](https://github.com/agnostack/next-shopify/compare/v1.9.4-beta.2...v1.9.4-beta.3) (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":"AAiCO,0GAqIN"}
|
|
@@ -14,14 +14,12 @@ const verifyAppProxySignature = (signature, verifiable, sharedSecret) => {
|
|
|
14
14
|
return (0, utils_1.compareHashes)(signature, hmac);
|
|
15
15
|
};
|
|
16
16
|
const handleProxy = (serverRuntimeConfig) => (req, res, _params) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
|
|
17
|
-
var _a;
|
|
18
17
|
const { APP_CONFIG, APP_BASE_URL, TARGET_SAFELIST, ORIGIN_SAFELIST } = serverRuntimeConfig;
|
|
19
|
-
const
|
|
18
|
+
const appHostName = new URL(APP_BASE_URL).hostname;
|
|
19
|
+
console.log(`>>> > handleProxy > appHost:`, appHostName);
|
|
20
|
+
const targetSafelist = Object.assign({ appHost: appHostName }, TARGET_SAFELIST);
|
|
20
21
|
console.log(`>>> > handleProxy > targetSafelist:`, targetSafelist);
|
|
21
|
-
const targetHostsSafelist =
|
|
22
|
-
new URL(APP_BASE_URL).hostname,
|
|
23
|
-
...Object.keys(targetSafelist)
|
|
24
|
-
];
|
|
22
|
+
const targetHostsSafelist = Object.keys(targetSafelist);
|
|
25
23
|
console.log(`>>> > handleProxy > targetHostsSafelist:`, targetHostsSafelist);
|
|
26
24
|
const originsSafelist = [
|
|
27
25
|
...(0, shared_1.ensureArray)(ORIGIN_SAFELIST),
|
|
@@ -31,7 +29,6 @@ const handleProxy = (serverRuntimeConfig) => (req, res, _params) => tslib_1.__aw
|
|
|
31
29
|
yield (0, nextjs_cors_1.default)(req, res, {
|
|
32
30
|
methods: ['PUT', 'PATCH', 'POST', 'DELETE'],
|
|
33
31
|
origin: (origin, callback) => {
|
|
34
|
-
var _a;
|
|
35
32
|
if (originsSafelist.includes(origin)) {
|
|
36
33
|
return callback(null, true);
|
|
37
34
|
}
|
|
@@ -42,7 +39,7 @@ const handleProxy = (serverRuntimeConfig) => (req, res, _params) => tslib_1.__aw
|
|
|
42
39
|
catch (ignore) {
|
|
43
40
|
console.log('Ignoring error decoding origin', ignore);
|
|
44
41
|
}
|
|
45
|
-
if (_shop && (0, shared_1.stringNotEmpty)((
|
|
42
|
+
if (_shop && (0, shared_1.stringNotEmpty)((0, shared_1.sanitizeShop)(_shop))) {
|
|
46
43
|
return callback(null, true);
|
|
47
44
|
}
|
|
48
45
|
return callback(new Error('Invalid CORS origin'));
|
|
@@ -58,8 +55,8 @@ const handleProxy = (serverRuntimeConfig) => (req, res, _params) => tslib_1.__aw
|
|
|
58
55
|
console.log(`>>> > handleProxy > search:`, search);
|
|
59
56
|
console.log(`>>> > handleProxy > pathname:`, pathname);
|
|
60
57
|
console.log(`>>> > handleProxy > target:`, target);
|
|
61
|
-
|
|
62
|
-
console.log(`>>> > handleProxy > targetPath:`, targetPath);
|
|
58
|
+
let targetPath = [pathname, search].filter(shared_1.stringNotEmpty).join('');
|
|
59
|
+
console.log(`>>> > handleProxy > targetPath 1:`, targetPath);
|
|
63
60
|
if (!targetPath || (0, shared_1.arrayEmpty)(targetHostsSafelist) || !targetHostsSafelist.includes(hostname)) {
|
|
64
61
|
return res.status(407).json({ message: 'Unproxyable target.' });
|
|
65
62
|
}
|
|
@@ -69,10 +66,10 @@ const handleProxy = (serverRuntimeConfig) => (req, res, _params) => tslib_1.__aw
|
|
|
69
66
|
const { signature, proxyEncoded } = query, verifiable = tslib_1.__rest(query, ["signature", "proxyEncoded"]);
|
|
70
67
|
const { shop: _shop, host: _host, timestamp, path_prefix } = verifiable;
|
|
71
68
|
const isShopifyOriginOrRelative = (0, shared_1.stringNotEmpty)((0, shared_1.ensureString)(path_prefix).startsWith('http')
|
|
72
|
-
? (
|
|
69
|
+
? (0, shared_1.sanitizeShop)(new URL(path_prefix).hostname)
|
|
73
70
|
: path_prefix);
|
|
74
71
|
// TODO: explore moving this to sessionToken middleware??
|
|
75
|
-
const
|
|
72
|
+
const _a = _headers !== null && _headers !== void 0 ? _headers : {}, { 'x-extension-session': sessionToken, 'x-extension-point': extensionPoint } = _a, __headers = tslib_1.__rest(_a, ['x-extension-session', 'x-extension-point']);
|
|
76
73
|
if (!_shop || !_host || !extensionPoint || !signature || !proxyEncoded) {
|
|
77
74
|
return res.status(400).json({ message: 'Invalid or missing headers.', extensionPoint });
|
|
78
75
|
}
|
|
@@ -88,7 +85,15 @@ const handleProxy = (serverRuntimeConfig) => (req, res, _params) => tslib_1.__aw
|
|
|
88
85
|
}
|
|
89
86
|
// TODO: explore adding hmac check/middleware?
|
|
90
87
|
// TODO: handle targetSafelist w/ pattern match regex/globpattern/etc
|
|
91
|
-
const headers
|
|
88
|
+
const { headers: targetHeaders, params: targetParams } = (0, shared_1.ensureObject)((hostname === appHostName)
|
|
89
|
+
? { params: { shop: _shop } }
|
|
90
|
+
: targetSafelist[hostname]);
|
|
91
|
+
console.log(`>>> > handleProxy > { headers: targetHeaders, params: targetParams }:`, { headers: targetHeaders, params: targetParams });
|
|
92
|
+
if ((0, shared_1.objectNotEmpty)(targetParams)) {
|
|
93
|
+
targetPath = (0, shared_1.appendQuery)(targetPath, new URLSearchParams(targetParams).toString());
|
|
94
|
+
console.log(`>>> > handleProxy > targetPath 2:`, targetPath);
|
|
95
|
+
}
|
|
96
|
+
const headers = Object.entries((0, shared_1.ensureObject)(targetHeaders)).reduce((_replacedHeaders, [header, headerValue]) => (Object.assign(Object.assign({}, _replacedHeaders), { [header]: (0, shared_1.templateReplace)(headerValue, { setting: replacements }) })), __headers);
|
|
92
97
|
return new Promise((_resolve, reject) => {
|
|
93
98
|
req.url = targetPath;
|
|
94
99
|
req.headers = headers;
|
|
@@ -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,sEAAkC;AAElC,uCAGoB;AACpB,
|
|
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.4-beta.
|
|
3
|
+
"version": "1.9.4-beta.4",
|
|
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",
|