@agnostack/next-shopify 1.7.1-beta.22 → 1.7.1-beta.23
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.
|
@@ -1,26 +1,15 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __rest = (this && this.__rest) || function (s, e) {
|
|
3
|
-
var t = {};
|
|
4
|
-
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
|
|
5
|
-
t[p] = s[p];
|
|
6
|
-
if (s != null && typeof Object.getOwnPropertySymbols === "function")
|
|
7
|
-
for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
|
|
8
|
-
if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
|
|
9
|
-
t[p[i]] = s[p[i]];
|
|
10
|
-
}
|
|
11
|
-
return t;
|
|
12
|
-
};
|
|
13
2
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
14
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
15
4
|
};
|
|
16
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
6
|
exports.handleProxy = void 0;
|
|
18
7
|
// NOTE: api routes do NOT work in `next export`
|
|
19
|
-
|
|
8
|
+
const http_proxy_1 = __importDefault(require("http-proxy"));
|
|
20
9
|
const nextjs_cors_1 = __importDefault(require("nextjs-cors"));
|
|
21
10
|
const utils_1 = require("../../utils");
|
|
22
11
|
const handleProxy = (serverRuntimeConfig) => async (req, res, _params) => {
|
|
23
|
-
|
|
12
|
+
const proxy = http_proxy_1.default.createProxy();
|
|
24
13
|
const { TARGET_SAFELIST, ORIGIN_SAFELIST } = serverRuntimeConfig;
|
|
25
14
|
const originSafelist = [
|
|
26
15
|
...utils_1.ensureArray(ORIGIN_SAFELIST),
|
|
@@ -31,11 +20,9 @@ const handleProxy = (serverRuntimeConfig) => async (req, res, _params) => {
|
|
|
31
20
|
origin: (origin, callback) => {
|
|
32
21
|
var _a;
|
|
33
22
|
if (originSafelist.includes(origin) || utils_1.stringNotEmpty((_a = utils_1.getSanitizedShopData(origin)) === null || _a === void 0 ? void 0 : _a.shop)) {
|
|
34
|
-
console.log(`>>> > NextCors: SUCCESS > origin:`, origin);
|
|
35
23
|
return callback(null, true);
|
|
36
24
|
}
|
|
37
25
|
else {
|
|
38
|
-
console.log(`>>> > NextCors: ERROR > origin:`, origin);
|
|
39
26
|
return callback(new Error('Invalid CORS origin'));
|
|
40
27
|
}
|
|
41
28
|
},
|
|
@@ -46,38 +33,43 @@ const handleProxy = (serverRuntimeConfig) => async (req, res, _params) => {
|
|
|
46
33
|
// if (arrayEmpty(TARGET_SAFELIST) || !TARGET_SAFELIST.includes(target)) {
|
|
47
34
|
// return res.status(407).json({ message: 'Unproxyable target.' })
|
|
48
35
|
// }
|
|
49
|
-
const { query: _query, headers: _headers, body, method } = req
|
|
36
|
+
// const { query: _query, headers: _headers, body, method } = req
|
|
37
|
+
const { query: _query, headers: _headers } = req;
|
|
50
38
|
const { shop: _shop, host: _host } = _query !== null && _query !== void 0 ? _query : {};
|
|
51
39
|
// TODO: explore moving this to sessionToken middleware??
|
|
52
|
-
const
|
|
53
|
-
|
|
40
|
+
const { 'x-extension-session': sessionToken, 'x-extension-point': extensionPoint, 'x-extension-type': extensionType,
|
|
41
|
+
// ...headers
|
|
42
|
+
} = _headers !== null && _headers !== void 0 ? _headers : {};
|
|
43
|
+
if (!_shop || !_host || !extensionPoint || !extensionType || !sessionToken) {
|
|
54
44
|
return res.status(400).json({ message: 'Invalid or missing headers.' });
|
|
55
45
|
}
|
|
56
|
-
const { shop, host } = utils_1.decodeShopData(
|
|
57
|
-
console.log(`>>> > handleProxy > shop:`, { shop, _shop, host, _host });
|
|
46
|
+
const { shop, host, sid } = utils_1.decodeShopData(sessionToken);
|
|
47
|
+
console.log(`>>> > handleProxy > shop:`, { shop, _shop, host, _host, sid });
|
|
58
48
|
if ((shop !== _shop) || (host !== _host)) {
|
|
59
49
|
return res.status(403).json({ message: 'Unauthorized shop or host.' });
|
|
60
50
|
}
|
|
61
|
-
const response = await fetch(target, {
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
});
|
|
66
|
-
return response.clone()
|
|
67
|
-
.json()
|
|
68
|
-
.catch(async () => {
|
|
69
|
-
const text = (await response.text());
|
|
70
|
-
return utils_1.ensureObject(utils_1.safeParse(text));
|
|
71
|
-
});
|
|
72
|
-
// TODO: explore adding hmac check/middleware?
|
|
73
|
-
// return new Promise((resolve, reject) => {
|
|
74
|
-
// proxy.web(req, res, { target, changeOrigin: true, secure: true }, (error) => {
|
|
75
|
-
// if (error) {
|
|
76
|
-
// return reject(error)
|
|
77
|
-
// }
|
|
78
|
-
// resolve()
|
|
79
|
-
// })
|
|
51
|
+
// const response = await fetch(target, {
|
|
52
|
+
// method,
|
|
53
|
+
// body,
|
|
54
|
+
// headers, // TODO: handle token replacement here??
|
|
80
55
|
// })
|
|
56
|
+
// return response.clone()
|
|
57
|
+
// .json()
|
|
58
|
+
// .catch(async () => {
|
|
59
|
+
// const text = (await response.text())
|
|
60
|
+
// return ensureObject(
|
|
61
|
+
// safeParse(text)
|
|
62
|
+
// )
|
|
63
|
+
// })
|
|
64
|
+
// TODO: explore adding hmac check/middleware?
|
|
65
|
+
return new Promise((resolve, reject) => {
|
|
66
|
+
proxy.web(req, res, { target, changeOrigin: true, secure: true }, (error) => {
|
|
67
|
+
if (error) {
|
|
68
|
+
return reject(error);
|
|
69
|
+
}
|
|
70
|
+
resolve();
|
|
71
|
+
});
|
|
72
|
+
});
|
|
81
73
|
};
|
|
82
74
|
exports.handleProxy = handleProxy;
|
|
83
75
|
//# sourceMappingURL=proxy.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"proxy.js","sourceRoot":"","sources":["../../../src/handlers/api/proxy.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"proxy.js","sourceRoot":"","sources":["../../../src/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.7.1-beta.
|
|
3
|
+
"version": "1.7.1-beta.23",
|
|
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",
|