@agnostack/next-shopify 1.10.0-beta.2 → 1.10.0-beta.20
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 +127 -0
- package/dist/lib/handlers/api/billing.d.ts.map +1 -1
- package/dist/lib/handlers/api/billing.js +1 -1
- package/dist/lib/handlers/api/billing.js.map +1 -1
- package/dist/lib/handlers/api/proxy.d.ts.map +1 -1
- package/dist/lib/handlers/api/proxy.js +13 -14
- package/dist/lib/handlers/api/proxy.js.map +1 -1
- package/dist/lib/handlers/api/token.d.ts.map +1 -1
- package/dist/lib/handlers/api/token.js +2 -8
- package/dist/lib/handlers/api/token.js.map +1 -1
- package/dist/lib/handlers/api/uninstall.d.ts.map +1 -1
- package/dist/lib/handlers/api/uninstall.js +1 -1
- package/dist/lib/handlers/api/uninstall.js.map +1 -1
- package/dist/lib/handlers/api/webhook.d.ts +1 -1
- package/dist/lib/handlers/api/webhook.d.ts.map +1 -1
- package/dist/lib/handlers/api/webhook.js +3 -4
- package/dist/lib/handlers/api/webhook.js.map +1 -1
- package/dist/lib/utils/headers.d.ts.map +1 -1
- package/dist/lib/utils/headers.js +2 -1
- package/dist/lib/utils/headers.js.map +1 -1
- package/dist/lib/utils/session.d.ts +1 -1
- package/dist/lib/utils/session.d.ts.map +1 -1
- package/dist/lib/utils/session.js +18 -10
- package/dist/lib/utils/session.js.map +1 -1
- package/dist/shared/display.js +1 -1
- package/dist/shared/display.js.map +1 -1
- package/dist/shared/match.d.ts +3 -1
- package/dist/shared/match.d.ts.map +1 -1
- package/dist/shared/match.js +23 -6
- package/dist/shared/match.js.map +1 -1
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,130 @@
|
|
|
1
|
+
# [1.10.0-beta.20](https://github.com/agnostack/next-shopify/compare/v1.10.0-beta.19...v1.10.0-beta.20) (2023-07-10)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### Bug Fixes
|
|
5
|
+
|
|
6
|
+
* prepareHeaders ([2fdb0fa](https://github.com/agnostack/next-shopify/commit/2fdb0fa68300c6354400ffecff8a88282e0816f1))
|
|
7
|
+
|
|
8
|
+
# [1.10.0-beta.19](https://github.com/agnostack/next-shopify/compare/v1.10.0-beta.18...v1.10.0-beta.19) (2023-07-10)
|
|
9
|
+
|
|
10
|
+
|
|
11
|
+
### Bug Fixes
|
|
12
|
+
|
|
13
|
+
* prepareHeaders ([cbbeeb6](https://github.com/agnostack/next-shopify/commit/cbbeeb63290ed102d62d472d22fe6b342f77ac46))
|
|
14
|
+
|
|
15
|
+
# [1.10.0-beta.18](https://github.com/agnostack/next-shopify/compare/v1.10.0-beta.17...v1.10.0-beta.18) (2023-07-10)
|
|
16
|
+
|
|
17
|
+
|
|
18
|
+
### Bug Fixes
|
|
19
|
+
|
|
20
|
+
* prepareHeaders ([7b40a39](https://github.com/agnostack/next-shopify/commit/7b40a39ee4aea6547700d6d31a027eb6e7258c22))
|
|
21
|
+
|
|
22
|
+
# [1.10.0-beta.17](https://github.com/agnostack/next-shopify/compare/v1.10.0-beta.16...v1.10.0-beta.17) (2023-07-10)
|
|
23
|
+
|
|
24
|
+
|
|
25
|
+
### Bug Fixes
|
|
26
|
+
|
|
27
|
+
* prepareHeaders ([f74f227](https://github.com/agnostack/next-shopify/commit/f74f227c7b50381746fb833b416951ea205c9503))
|
|
28
|
+
|
|
29
|
+
# [1.10.0-beta.16](https://github.com/agnostack/next-shopify/compare/v1.10.0-beta.15...v1.10.0-beta.16) (2023-07-10)
|
|
30
|
+
|
|
31
|
+
|
|
32
|
+
### Bug Fixes
|
|
33
|
+
|
|
34
|
+
* prepareHeaders ([7eba9ad](https://github.com/agnostack/next-shopify/commit/7eba9ad482a13e865dee520019e41254291346f6))
|
|
35
|
+
|
|
36
|
+
# [1.10.0-beta.15](https://github.com/agnostack/next-shopify/compare/v1.10.0-beta.14...v1.10.0-beta.15) (2023-07-09)
|
|
37
|
+
|
|
38
|
+
|
|
39
|
+
### Bug Fixes
|
|
40
|
+
|
|
41
|
+
* prepareHeaders ([0eacf0a](https://github.com/agnostack/next-shopify/commit/0eacf0a682af1181b8e16b0bd56229fb295997f5))
|
|
42
|
+
|
|
43
|
+
# [1.10.0-beta.14](https://github.com/agnostack/next-shopify/compare/v1.10.0-beta.13...v1.10.0-beta.14) (2023-07-09)
|
|
44
|
+
|
|
45
|
+
|
|
46
|
+
### Bug Fixes
|
|
47
|
+
|
|
48
|
+
* prepareHeaders ([1ad0578](https://github.com/agnostack/next-shopify/commit/1ad05785b292a6fe14d86121e887562496b434d3))
|
|
49
|
+
|
|
50
|
+
# [1.10.0-beta.13](https://github.com/agnostack/next-shopify/compare/v1.10.0-beta.12...v1.10.0-beta.13) (2023-07-08)
|
|
51
|
+
|
|
52
|
+
|
|
53
|
+
### Bug Fixes
|
|
54
|
+
|
|
55
|
+
* prepareHeaders ([0f8979f](https://github.com/agnostack/next-shopify/commit/0f8979fbab2fa08e43b383f649aa33dc833d6a46))
|
|
56
|
+
|
|
57
|
+
# [1.10.0-beta.12](https://github.com/agnostack/next-shopify/compare/v1.10.0-beta.11...v1.10.0-beta.12) (2023-07-08)
|
|
58
|
+
|
|
59
|
+
|
|
60
|
+
### Bug Fixes
|
|
61
|
+
|
|
62
|
+
* prepareHeaders ([b0f8fe3](https://github.com/agnostack/next-shopify/commit/b0f8fe34f76fe5082e7e1b2a874b9b3278698c38))
|
|
63
|
+
|
|
64
|
+
# [1.10.0-beta.11](https://github.com/agnostack/next-shopify/compare/v1.10.0-beta.10...v1.10.0-beta.11) (2023-07-08)
|
|
65
|
+
|
|
66
|
+
|
|
67
|
+
### Bug Fixes
|
|
68
|
+
|
|
69
|
+
* prepareHeaders ([ed1ba82](https://github.com/agnostack/next-shopify/commit/ed1ba82aabf6456a79a46f30027c096663509da0))
|
|
70
|
+
|
|
71
|
+
# [1.10.0-beta.10](https://github.com/agnostack/next-shopify/compare/v1.10.0-beta.9...v1.10.0-beta.10) (2023-07-08)
|
|
72
|
+
|
|
73
|
+
|
|
74
|
+
### Bug Fixes
|
|
75
|
+
|
|
76
|
+
* prepareHeaders ([ca1bb86](https://github.com/agnostack/next-shopify/commit/ca1bb86d37e464755ecf33f62b3040c642b8a62d))
|
|
77
|
+
* prepareHeaders ([0ad8e8a](https://github.com/agnostack/next-shopify/commit/0ad8e8a82cd3e51c875a8c7f2a7cd4d4fd6d5a02))
|
|
78
|
+
|
|
79
|
+
# [1.10.0-beta.9](https://github.com/agnostack/next-shopify/compare/v1.10.0-beta.8...v1.10.0-beta.9) (2023-07-08)
|
|
80
|
+
|
|
81
|
+
|
|
82
|
+
### Bug Fixes
|
|
83
|
+
|
|
84
|
+
* prepareHeaders ([df67c21](https://github.com/agnostack/next-shopify/commit/df67c2120ec44ff0e848433c2f457f95f5dcd28e))
|
|
85
|
+
|
|
86
|
+
# [1.10.0-beta.8](https://github.com/agnostack/next-shopify/compare/v1.10.0-beta.7...v1.10.0-beta.8) (2023-07-08)
|
|
87
|
+
|
|
88
|
+
|
|
89
|
+
### Bug Fixes
|
|
90
|
+
|
|
91
|
+
* prepareHeaders ([5e84131](https://github.com/agnostack/next-shopify/commit/5e8413186dabb5237359e021d32a6540c19e7eb0))
|
|
92
|
+
|
|
93
|
+
# [1.10.0-beta.7](https://github.com/agnostack/next-shopify/compare/v1.10.0-beta.6...v1.10.0-beta.7) (2023-07-08)
|
|
94
|
+
|
|
95
|
+
|
|
96
|
+
### Bug Fixes
|
|
97
|
+
|
|
98
|
+
* webhooks ([14bb9f1](https://github.com/agnostack/next-shopify/commit/14bb9f1a700230fa33952b3d4acff9d8fc7f6874))
|
|
99
|
+
|
|
100
|
+
# [1.10.0-beta.6](https://github.com/agnostack/next-shopify/compare/v1.10.0-beta.5...v1.10.0-beta.6) (2023-07-08)
|
|
101
|
+
|
|
102
|
+
|
|
103
|
+
### Bug Fixes
|
|
104
|
+
|
|
105
|
+
* webhooks ([5cb3187](https://github.com/agnostack/next-shopify/commit/5cb3187257aa71490b609284f00ee209396e6ee2))
|
|
106
|
+
|
|
107
|
+
# [1.10.0-beta.5](https://github.com/agnostack/next-shopify/compare/v1.10.0-beta.4...v1.10.0-beta.5) (2023-07-08)
|
|
108
|
+
|
|
109
|
+
|
|
110
|
+
### Bug Fixes
|
|
111
|
+
|
|
112
|
+
* update hostmatching ([5437469](https://github.com/agnostack/next-shopify/commit/5437469a8d22bf98ee3ff85d7732c6608eb47846))
|
|
113
|
+
|
|
114
|
+
# [1.10.0-beta.4](https://github.com/agnostack/next-shopify/compare/v1.10.0-beta.3...v1.10.0-beta.4) (2023-07-08)
|
|
115
|
+
|
|
116
|
+
|
|
117
|
+
### Bug Fixes
|
|
118
|
+
|
|
119
|
+
* work in progress ([86f0256](https://github.com/agnostack/next-shopify/commit/86f0256fa2dd2110c974a912cd456fc6246ba878))
|
|
120
|
+
|
|
121
|
+
# [1.10.0-beta.3](https://github.com/agnostack/next-shopify/compare/v1.10.0-beta.2...v1.10.0-beta.3) (2023-07-08)
|
|
122
|
+
|
|
123
|
+
|
|
124
|
+
### Bug Fixes
|
|
125
|
+
|
|
126
|
+
* work in progress ([e4740ac](https://github.com/agnostack/next-shopify/commit/e4740ac5101db1e6a0794dc447173454cdb4aa2b))
|
|
127
|
+
|
|
1
128
|
# [1.10.0-beta.2](https://github.com/agnostack/next-shopify/compare/v1.10.0-beta.1...v1.10.0-beta.2) (2023-07-08)
|
|
2
129
|
|
|
3
130
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"billing.d.ts","sourceRoot":"","sources":["../../../../src/lib/handlers/api/billing.js"],"names":[],"mappings":"AAeO,
|
|
1
|
+
{"version":3,"file":"billing.d.ts","sourceRoot":"","sources":["../../../../src/lib/handlers/api/billing.js"],"names":[],"mappings":"AAeO,iGA2DN"}
|
|
@@ -14,7 +14,7 @@ const TERMINAL_STATUSES = [
|
|
|
14
14
|
const handleAppBilling = (serverRuntimeConfig) => (req, res) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
|
|
15
15
|
var _a;
|
|
16
16
|
try {
|
|
17
|
-
const { 'x-shopify-shop-domain': shop } = (_a = req.headers) !== null && _a !== void 0 ? _a : {};
|
|
17
|
+
const { 'x-shop-domain': shopDomain, 'x-shopify-shop-domain': shopifyShopDomain, 'x-shopify-shop': shop = shopifyShopDomain !== null && shopifyShopDomain !== void 0 ? shopifyShopDomain : shopDomain, } = (_a = req.headers) !== null && _a !== void 0 ? _a : {};
|
|
18
18
|
if ((0, shared_1.stringEmpty)(shop)) {
|
|
19
19
|
return res.status(200).json({ handler: 'billing', error: 'Missing shop' });
|
|
20
20
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"billing.js","sourceRoot":"","sources":["../../../../src/lib/handlers/api/billing.js"],"names":[],"mappings":";;;;AAAA,gEAAiC;AAEjC,uCAA+C;AAC/C,4CAGwB;AAExB,MAAM,iBAAiB,GAAG;IACxB,SAAS;IACT,UAAU;IACV,WAAW;CACZ,CAAA;AAED,wDAAwD;AACjD,MAAM,gBAAgB,GAAG,CAAC,mBAAmB,EAAE,EAAE,CAAC,CAAO,GAAG,EAAE,GAAG,EAAE,EAAE;;IAC1E,IAAI;QACF,MAAM,EAAE,uBAAuB,EAAE,
|
|
1
|
+
{"version":3,"file":"billing.js","sourceRoot":"","sources":["../../../../src/lib/handlers/api/billing.js"],"names":[],"mappings":"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"}
|
|
@@ -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+BO,sHA2IN"}
|
|
@@ -16,16 +16,14 @@ const handleProxy = (serverRuntimeConfig, config) => (req, res, params) => tslib
|
|
|
16
16
|
var _a, _b;
|
|
17
17
|
const { generateReplacements } = config !== null && config !== void 0 ? config : {};
|
|
18
18
|
const { APP_CONFIG, APP_BASE_URL, TARGET_SAFELIST, ORIGIN_SAFELIST } = serverRuntimeConfig;
|
|
19
|
-
const _c = (_a = req.headers) !== null && _a !== void 0 ? _a : {}, { origin, 'x-
|
|
20
|
-
|
|
21
|
-
'x-shopify-
|
|
19
|
+
const _c = (_a = req.headers) !== null && _a !== void 0 ? _a : {}, { origin, 'x-forwarded-for': _forwardFor, 'x-forwarded-proto': _forwardProto, 'x-forwarded-host': forwardHost, 'x-proxy-origin': proxyOrigin } = _c, _headers = tslib_1.__rest(_c, ["origin", 'x-forwarded-for', 'x-forwarded-proto', 'x-forwarded-host', 'x-proxy-origin']);
|
|
20
|
+
console.log(`>>> > handleProxy > req.headers:`, req.headers);
|
|
21
|
+
const { 'x-extension-session': sessionToken, 'x-extension-point': extensionPoint, 'x-shop-domain': shopDomainHeader, 'x-shopify-shop-domain': shopifyShopDomainHeader, 'x-shopify-shop': shopHeader = shopifyShopDomainHeader !== null && shopifyShopDomainHeader !== void 0 ? shopifyShopDomainHeader : shopDomainHeader, 'x-shopify-app-id': appId,
|
|
22
22
|
// 'x-shopify-app-installation-id': appInstallationId,
|
|
23
|
-
|
|
24
|
-
console.log(`>>> > handleProxy > origin1:`, origin);
|
|
25
|
-
console.log(`>>> > handleProxy > proxyOrigin1:`, proxyOrigin);
|
|
23
|
+
} = _headers;
|
|
26
24
|
// NOTE: GET requests are not always sending along origin
|
|
27
|
-
if ((0, shared_1.stringEmpty)(origin)
|
|
28
|
-
req.headers = Object.assign(Object.assign({}, req.headers), { origin: proxyOrigin });
|
|
25
|
+
if ((0, shared_1.stringEmpty)(origin)) {
|
|
26
|
+
req.headers = Object.assign(Object.assign({}, req.headers), { origin: proxyOrigin || forwardHost });
|
|
29
27
|
}
|
|
30
28
|
const _d = (_b = req.query) !== null && _b !== void 0 ? _b : {}, { signature, proxyEncoded } = _d, verifiable = tslib_1.__rest(_d, ["signature", "proxyEncoded"]);
|
|
31
29
|
const { shop: _shop, host, timestamp, path_prefix } = verifiable;
|
|
@@ -33,13 +31,11 @@ const handleProxy = (serverRuntimeConfig, config) => (req, res, params) => tslib
|
|
|
33
31
|
yield (0, nextjs_cors_1.default)(req, res, {
|
|
34
32
|
methods: ['PUT', 'PATCH', 'POST', 'DELETE'],
|
|
35
33
|
origin: (origin, callback) => {
|
|
36
|
-
|
|
37
|
-
console.log(`>>> > handleProxy > proxyOrigin2:`, proxyOrigin);
|
|
38
|
-
console.log(`>>> > handleProxy > ORIGIN_SAFELIST:`, ORIGIN_SAFELIST);
|
|
39
|
-
if ((0, shared_1.matchArray)(origin, [
|
|
34
|
+
const isSafelisted = (0, shared_1.matchHostname)(origin, [
|
|
40
35
|
...ORIGIN_SAFELIST,
|
|
41
36
|
'cdn.shopify.com' // NOTE: this is the domain for checkout UI extensions
|
|
42
|
-
])
|
|
37
|
+
]);
|
|
38
|
+
if (isSafelisted) {
|
|
43
39
|
return callback(null, true);
|
|
44
40
|
}
|
|
45
41
|
return callback(new Error('Invalid CORS origin'));
|
|
@@ -50,7 +46,7 @@ const handleProxy = (serverRuntimeConfig, config) => (req, res, params) => tslib
|
|
|
50
46
|
const _targetUrl = ((0, shared_1.stringEmpty)(targetParam) || targetParam.startsWith('http')) ? targetParam : `${APP_BASE_URL}/${(0, shared_1.removeLeadingSlash)(targetParam)}`;
|
|
51
47
|
const { origin: target, hostname, pathname, search } = (0, shared_1.stringNotEmpty)(_targetUrl) ? new URL(_targetUrl) : {};
|
|
52
48
|
let targetPath = [pathname, search].filter(shared_1.stringNotEmpty).join('');
|
|
53
|
-
const safelistedTarget = (0, shared_1.
|
|
49
|
+
const safelistedTarget = (0, shared_1.matchHostname)(hostname, Object.assign({ [new URL(APP_BASE_URL).hostname]: {
|
|
54
50
|
// HMMM: can we generate our own session token so we can not have to tell handleGraph/Rest to behave as offline?
|
|
55
51
|
// headers: {
|
|
56
52
|
// Authorization: 'Bearer {{setting.zendesk.token}}',
|
|
@@ -82,10 +78,12 @@ const handleProxy = (serverRuntimeConfig, config) => (req, res, params) => tslib
|
|
|
82
78
|
return res.status(403).json({ message: 'Unauthorized shop or host.' });
|
|
83
79
|
}
|
|
84
80
|
}
|
|
81
|
+
console.log(`>>> > handleProxy > safelistedTarget:`, safelistedTarget);
|
|
85
82
|
const { headers: targetHeaders, params: targetParams } = (0, shared_1.ensureObject)(safelistedTarget);
|
|
86
83
|
if ((0, shared_1.objectNotEmpty)(targetParams)) {
|
|
87
84
|
targetPath = (0, shared_1.appendQuery)(targetPath, new URLSearchParams(targetParams).toString());
|
|
88
85
|
}
|
|
86
|
+
console.log(`>>> > handleProxy > targetHeaders:`, targetHeaders);
|
|
89
87
|
const _prepareHeaders = (0, utils_1.prepareHeaders)(serverRuntimeConfig);
|
|
90
88
|
const headers = yield _prepareHeaders({
|
|
91
89
|
generateReplacements,
|
|
@@ -93,6 +91,7 @@ const handleProxy = (serverRuntimeConfig, config) => (req, res, params) => tslib
|
|
|
93
91
|
appId,
|
|
94
92
|
headers: Object.assign(Object.assign({}, _headers), targetHeaders),
|
|
95
93
|
});
|
|
94
|
+
console.log(`>>> > handleProxy > headers:`, headers);
|
|
96
95
|
const proxy = http_proxy_1.default.createProxy();
|
|
97
96
|
return new Promise((_resolve, reject) => {
|
|
98
97
|
req.url = targetPath;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"proxy.js","sourceRoot":"","sources":["../../../../src/lib/handlers/api/proxy.js"],"names":[],"mappings":";;;;AAAA,sDAAsD;AACtD,sEAAkC;AAClC,oEAAkC;AAElC,uCAIoB;AACpB,
|
|
1
|
+
{"version":3,"file":"proxy.js","sourceRoot":"","sources":["../../../../src/lib/handlers/api/proxy.js"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"token.d.ts","sourceRoot":"","sources":["../../../../src/lib/handlers/api/token.js"],"names":[],"mappings":"AAWO;;
|
|
1
|
+
{"version":3,"file":"token.d.ts","sourceRoot":"","sources":["../../../../src/lib/handlers/api/token.js"],"names":[],"mappings":"AAWO;;sDAiEN"}
|
|
@@ -13,10 +13,8 @@ const shared_1 = require("../../../shared");
|
|
|
13
13
|
const handleSessionToken = ({ APP_CONFIG }, config) => (req, res) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
|
|
14
14
|
var _a, _b;
|
|
15
15
|
const { host } = (_a = req.query) !== null && _a !== void 0 ? _a : {};
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
console.log(`>>> > handleSessionToken > shop:`, shop);
|
|
19
|
-
// TODO: un-btoa the host and check
|
|
16
|
+
const { 'x-shop-domain': shopDomain, 'x-shopify-shop-domain': shopifyShopDomain, 'x-shopify-shop': shop = shopifyShopDomain !== null && shopifyShopDomain !== void 0 ? shopifyShopDomain : shopDomain, } = (_b = req.headers) !== null && _b !== void 0 ? _b : {};
|
|
17
|
+
// TODO: un-btoa the host and check??
|
|
20
18
|
if ((0, shared_1.stringEmpty)(shop) || (0, shared_1.stringEmpty)(host)) {
|
|
21
19
|
return res.status(412).json({ message: 'Missing required param' });
|
|
22
20
|
}
|
|
@@ -46,14 +44,10 @@ const handleSessionToken = ({ APP_CONFIG }, config) => (req, res) => tslib_1.__a
|
|
|
46
44
|
jti,
|
|
47
45
|
sid,
|
|
48
46
|
aud }, sub && { sub }), body);
|
|
49
|
-
console.log(`>>> > handleSessionToken > payload:`, payload);
|
|
50
47
|
// HMMM: not sure which key (pub vs private) to use here??
|
|
51
48
|
const hmac = (0, utils_1.generateHMAC)((0, shared_1.objectToSortedString)(payload), APP_CONFIG.apiSecretKey);
|
|
52
49
|
const token = (0, jsonwebtoken_1.sign)(payload, hmac, config);
|
|
53
|
-
console.log(`>>> > handleSessionToken > token:`, token);
|
|
54
|
-
// TODO: pass options for other stuff a second param
|
|
55
50
|
return res.status(200).json({ token });
|
|
56
51
|
});
|
|
57
52
|
exports.handleSessionToken = handleSessionToken;
|
|
58
|
-
// must be called w host query AND w/ x-shop header?
|
|
59
53
|
//# sourceMappingURL=token.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"token.js","sourceRoot":"","sources":["../../../../src/lib/handlers/api/token.js"],"names":[],"mappings":";;;;AAAA,gEAAiC;AACjC,yCAAkC;AAClC,+CAAmC;AACnC,+BAAmC;AAEnC,0DAAwD;AAExD,uCAA0C;AAC1C,4CAAmE;AAEnE,yCAAyC;AAClC,MAAM,kBAAkB,GAAG,CAAC,EAAE,UAAU,EAAE,EAAE,MAAM,EAAE,EAAE,CAAC,CAAO,GAAG,EAAE,GAAG,EAAE,EAAE;;IAC/E,MAAM,EAAE,IAAI,EAAE,GAAG,MAAA,GAAG,CAAC,KAAK,mCAAI,EAAE,CAAA;IAChC,
|
|
1
|
+
{"version":3,"file":"token.js","sourceRoot":"","sources":["../../../../src/lib/handlers/api/token.js"],"names":[],"mappings":";;;;AAAA,gEAAiC;AACjC,yCAAkC;AAClC,+CAAmC;AACnC,+BAAmC;AAEnC,0DAAwD;AAExD,uCAA0C;AAC1C,4CAAmE;AAEnE,yCAAyC;AAClC,MAAM,kBAAkB,GAAG,CAAC,EAAE,UAAU,EAAE,EAAE,MAAM,EAAE,EAAE,CAAC,CAAO,GAAG,EAAE,GAAG,EAAE,EAAE;;IAC/E,MAAM,EAAE,IAAI,EAAE,GAAG,MAAA,GAAG,CAAC,KAAK,mCAAI,EAAE,CAAA;IAChC,MAAM,EACJ,eAAe,EAAE,UAAU,EAC3B,uBAAuB,EAAE,iBAAiB,EAC1C,gBAAgB,EAAE,IAAI,GAAG,iBAAiB,aAAjB,iBAAiB,cAAjB,iBAAiB,GAAI,UAAU,GACzD,GAAG,MAAA,GAAG,CAAC,OAAO,mCAAI,EAAE,CAAA;IAErB,qCAAqC;IACrC,IAAI,IAAA,oBAAW,EAAC,IAAI,CAAC,IAAI,IAAA,oBAAW,EAAC,IAAI,CAAC,EAAE;QAC1C,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,wBAAwB,EAAE,CAAC,CAAA;KACnE;IAED,mCAAmC;IAEnC,mDAAmD;IACnD,MAAM,QAAQ,GAAG,MAAM,IAAA,kBAAU,EAAC,GAAG,CAAC,CAAA;IACtC,MAAM,OAAO,GAAG,QAAQ,CAAC,QAAQ,EAAE,CAAA;IACnC,MAAM,KAIF,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,EAJjB,EACJ,GAAG,EACH,GAAG,GAAG,UAAU,CAAC,MAAM,OAEF,EADlB,KAAK,sBAHJ,cAIL,CAAsB,CAAA;IACvB,IAAI,EACF,IAAI,EACJ,GAAG,EACH,GAAG,EACH,GAAG,KAED,KAAK,EADJ,IAAI,kBACL,KAAK,EANL,6BAMH,CAAQ,CAAA;IAET,IAAI,IAAA,oBAAW,EAAC,IAAI,CAAC,EAAE;QACrB,IAAI,GAAG,IAAI,CAAA;KACZ;IAED,IAAI,IAAA,oBAAW,EAAC,GAAG,CAAC,EAAE;QACpB,GAAG,GAAG,IAAA,kBAAM,EAAC,IAAI,CAAC,CAAA;KACnB;IAED,IAAI,IAAA,6BAAc,EAAC,GAAG,CAAC,EAAE;QACvB,GAAG,GAAG,IAAA,SAAM,GAAE,CAAA;KACf;IAED,IAAI,IAAA,oBAAW,EAAC,GAAG,CAAC,EAAE;QACpB,GAAG,GAAG,IAAA,SAAM,GAAE,CAAA;QACd,GAAG,GAAG,GAAG,GAAG,IAAI,GAAG,EAAE,CAAA;KACtB;IAED,MAAM,OAAO,iCACX,IAAI;QACJ,IAAI;QACJ,GAAG;QACH,IAAI;QACJ,GAAG;QACH,GAAG;QACH,GAAG,IACA,GAAG,IAAI,EAAE,GAAG,EAAE,GACd,IAAI,CACR,CAAA;IAED,0DAA0D;IAC1D,MAAM,IAAI,GAAG,IAAA,oBAAY,EAAC,IAAA,6BAAoB,EAAC,OAAO,CAAC,EAAE,UAAU,CAAC,YAAY,CAAC,CAAA;IACjF,MAAM,KAAK,GAAG,IAAA,mBAAI,EAAC,OAAO,EAAE,IAAI,EAAE,MAAM,CAAC,CAAA;IAEzC,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,CAAC,CAAA;AACxC,CAAC,CAAA,CAAA;AAjEY,QAAA,kBAAkB,sBAiE9B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"uninstall.d.ts","sourceRoot":"","sources":["../../../../src/lib/handlers/api/uninstall.js"],"names":[],"mappings":"AASO,
|
|
1
|
+
{"version":3,"file":"uninstall.d.ts","sourceRoot":"","sources":["../../../../src/lib/handlers/api/uninstall.js"],"names":[],"mappings":"AASO,qGAwCN"}
|
|
@@ -9,7 +9,7 @@ const shared_1 = require("../../../shared");
|
|
|
9
9
|
const handleAppUninstalled = (serverRuntimeConfig) => (req, res) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
|
|
10
10
|
var _a;
|
|
11
11
|
try {
|
|
12
|
-
const { 'x-shopify-shop-domain': shop } = (_a = req.headers) !== null && _a !== void 0 ? _a : {};
|
|
12
|
+
const { 'x-shop-domain': shopDomain, 'x-shopify-shop-domain': shopifyShopDomain, 'x-shopify-shop': shop = shopifyShopDomain !== null && shopifyShopDomain !== void 0 ? shopifyShopDomain : shopDomain, } = (_a = req.headers) !== null && _a !== void 0 ? _a : {};
|
|
13
13
|
if ((0, shared_1.stringEmpty)(shop)) {
|
|
14
14
|
return res.status(200).json({ handler: 'uninstall', error: 'Missing shop' });
|
|
15
15
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"uninstall.js","sourceRoot":"","sources":["../../../../src/lib/handlers/api/uninstall.js"],"names":[],"mappings":";;;;AAAA,gEAAiC;AAEjC,uCAA+C;AAC/C,4CAGwB;AAExB,4DAA4D;AACrD,MAAM,oBAAoB,GAAG,CAAC,mBAAmB,EAAE,EAAE,CAAC,CAAO,GAAG,EAAE,GAAG,EAAE,EAAE;;IAC9E,IAAI;QACF,MAAM,EAAE,uBAAuB,EAAE,
|
|
1
|
+
{"version":3,"file":"uninstall.js","sourceRoot":"","sources":["../../../../src/lib/handlers/api/uninstall.js"],"names":[],"mappings":";;;;AAAA,gEAAiC;AAEjC,uCAA+C;AAC/C,4CAGwB;AAExB,4DAA4D;AACrD,MAAM,oBAAoB,GAAG,CAAC,mBAAmB,EAAE,EAAE,CAAC,CAAO,GAAG,EAAE,GAAG,EAAE,EAAE;;IAC9E,IAAI;QACF,MAAM,EACJ,eAAe,EAAE,UAAU,EAC3B,uBAAuB,EAAE,iBAAiB,EAC1C,gBAAgB,EAAE,IAAI,GAAG,iBAAiB,aAAjB,iBAAiB,cAAjB,iBAAiB,GAAI,UAAU,GACzD,GAAG,MAAA,GAAG,CAAC,OAAO,mCAAI,EAAE,CAAA;QAErB,IAAI,IAAA,oBAAW,EAAC,IAAI,CAAC,EAAE;YACrB,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,cAAc,EAAE,CAAC,CAAA;SAC7E;QAED,MAAM,EAAE,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,GAAG,MAAM,IAAA,yBAAiB,EAAC,mBAAmB,EAAE,EAAE,IAAI,EAAE,CAAC,CAAA;QAE1G,mEAAmE;QACnE,MAAM,OAAO,GAAG,MAAM,IAAA,kBAAU,EAAC,GAAG,CAAC,CAAA;QACrC,MAAM,KAA6B,MAAM,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC;YACjE,OAAO,EAAE,OAAO,CAAC,QAAQ,EAAE;YAC3B,UAAU,EAAE,GAAG;YACf,WAAW,EAAE,GAAG;SACjB,CAAC,EAJI,EAAE,KAAK,OAIX,EAJgB,YAAY,sBAAxB,SAA0B,CAI9B,CAAA;QAEF,IAAI,KAAK,EAAE;YACT,IAAI;gBACF,MAAM,WAAW,GAAG,MAAM,cAAc,CAAC,IAAI,CAAC,CAAA;gBAC9C,IAAI,IAAA,sBAAa,EAAC,WAAW,CAAC,EAAE;oBAC9B,MAAM,cAAc,CAAC,WAAW,CAAC,CAAA;iBAClC;gBACD,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,SAAS,EAAE,CAAC,CAAA;aAC1E;YAAC,OAAO,KAAK,EAAE;gBACd,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,OAAO,EAAE,CAAC,CAAA;aAC7E;SACF;QAED,OAAO,CAAC,IAAI,CAAC,sCAAsC,EAAE,YAAY,CAAC,CAAA;QAClE,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,sCAAsC,EAAE,CAAC,CAAA;KACrG;IAAC,OAAO,KAAK,EAAE;QACd,OAAO,CAAC,KAAK,CAAC,0BAA0B,EAAE,KAAK,CAAC,CAAA;QAChD,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,0BAA0B,EAAE,CAAC,CAAA;KACzF;AACH,CAAC,CAAA,CAAA;AAxCY,QAAA,oBAAoB,wBAwChC"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export function handleWebhookEvent(serverRuntimeConfig: any, config: any): (req: any, res: any,
|
|
1
|
+
export function handleWebhookEvent(serverRuntimeConfig: any, config: any): (req: any, res: any, data: any) => Promise<any>;
|
|
2
2
|
//# sourceMappingURL=webhook.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webhook.d.ts","sourceRoot":"","sources":["../../../../src/lib/handlers/api/webhook.js"],"names":[],"mappings":"AAYO,
|
|
1
|
+
{"version":3,"file":"webhook.d.ts","sourceRoot":"","sources":["../../../../src/lib/handlers/api/webhook.js"],"names":[],"mappings":"AAYO,2HA0FN"}
|
|
@@ -7,16 +7,15 @@ const utils_1 = require("../../utils");
|
|
|
7
7
|
const shared_1 = require("../../../shared");
|
|
8
8
|
// TODO: this should allow us to get the appId into the webhooks (param)
|
|
9
9
|
// NOTE: typically handling: "/api/webhooks/event" or "/api/webhooks/event/{appId}" or "/api/webhooks/event?appId={appId}"
|
|
10
|
-
const handleWebhookEvent = (serverRuntimeConfig, config) => (req, res,
|
|
10
|
+
const handleWebhookEvent = (serverRuntimeConfig, config) => (req, res, data) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
|
|
11
11
|
var _a;
|
|
12
12
|
const { ORIGIN_SAFELIST } = serverRuntimeConfig;
|
|
13
13
|
try {
|
|
14
|
-
const _b = (_a = req.headers) !== null && _a !== void 0 ? _a : {}, { 'x-shopify-shop-domain': shop } = _b, _headers = tslib_1.__rest(_b, ['x-shopify-shop-domain']);
|
|
15
|
-
const data = Object.assign(Object.assign({}, params), req.query);
|
|
14
|
+
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 = tslib_1.__rest(_b, ['x-shop-domain', 'x-shopify-shop-domain', 'x-shopify-shop']);
|
|
16
15
|
if ((0, shared_1.stringEmpty)(shop)) {
|
|
17
16
|
return res.status(200).json({ handler: 'webhook', error: 'Missing shop' });
|
|
18
17
|
}
|
|
19
|
-
if (!(0, shared_1.
|
|
18
|
+
if (!(0, shared_1.matchHostname)(shop, ORIGIN_SAFELIST)) {
|
|
20
19
|
return res.status(200).json({ handler: 'webhook', error: 'Shop is not safelisted' });
|
|
21
20
|
}
|
|
22
21
|
const { shopify } = yield (0, utils_1.getShopifyHelpers)(serverRuntimeConfig, { shop });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webhook.js","sourceRoot":"","sources":["../../../../src/lib/handlers/api/webhook.js"],"names":[],"mappings":";;;;AAAA,gEAAiC;AAEjC,uCAA+C;AAC/C,4CAKwB;AAExB,wEAAwE;AACxE,0HAA0H;AACnH,MAAM,kBAAkB,GAAG,CAAC,mBAAmB,EAAE,MAAM,EAAE,EAAE,CAAC,CAAO,GAAG,EAAE,GAAG,EAAE,
|
|
1
|
+
{"version":3,"file":"webhook.js","sourceRoot":"","sources":["../../../../src/lib/handlers/api/webhook.js"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"headers.d.ts","sourceRoot":"","sources":["../../../src/lib/utils/headers.js"],"names":[],"mappings":"AAeO;;;
|
|
1
|
+
{"version":3,"file":"headers.d.ts","sourceRoot":"","sources":["../../../src/lib/utils/headers.js"],"names":[],"mappings":"AAeO;;;QAaN"}
|
|
@@ -10,10 +10,11 @@ const templateReplace = (template, replacements, partials, tokens) => {
|
|
|
10
10
|
return mustache_1.default.render((0, shared_1.ensureString)(template), (0, shared_1.ensureObject)(replacements), partials, tokens);
|
|
11
11
|
};
|
|
12
12
|
const replaceHeaders = ({ headers, replacements }) => {
|
|
13
|
+
console.log(`>>> > replaceHeaders > { headers, replacements }:`, { headers, replacements });
|
|
13
14
|
if ((0, shared_1.objectEmpty)(replacements)) {
|
|
14
15
|
return headers;
|
|
15
16
|
}
|
|
16
|
-
return Object.entries(headers).reduce((_replacedHeaders, [header, headerValue]) => (Object.assign(Object.assign({}, _replacedHeaders), { [header]:
|
|
17
|
+
return Object.entries(headers).reduce((_replacedHeaders, [header, headerValue]) => (Object.assign(Object.assign({}, _replacedHeaders), { [header]: headerValue.includes('{{') ? templateReplace(headerValue, replacements) : headerValue })), {});
|
|
17
18
|
};
|
|
18
19
|
exports.replaceHeaders = replaceHeaders;
|
|
19
20
|
//# sourceMappingURL=headers.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"headers.js","sourceRoot":"","sources":["../../../src/lib/utils/headers.js"],"names":[],"mappings":";;;;AAAA,gEAA+B;AAE/B,yCAIqB;AAErB,MAAM,eAAe,GAAG,CAAC,QAAQ,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE;IACnE,kKAAkK;IAClK,kBAAQ,CAAC,MAAM,GAAG,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,CAAA;IAEpC,OAAO,kBAAQ,CAAC,MAAM,CAAC,IAAA,qBAAY,EAAC,QAAQ,CAAC,EAAE,IAAA,qBAAY,EAAC,YAAY,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAA;AAC9F,CAAC,CAAA;AAEM,MAAM,cAAc,GAAG,CAAC,EAAE,OAAO,EAAE,YAAY,EAAE,EAAE,EAAE;IAC1D,IAAI,IAAA,oBAAW,EAAC,YAAY,CAAC,EAAE;QAC7B,OAAO,OAAO,CAAA;KACf;IAED,OAAO,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CACpC,gBAAgB,EAChB,CAAC,MAAM,EAAE,WAAW,CAAC,EACrB,EAAE,CAAC,iCACA,gBAAgB,KACnB,CAAC,MAAM,CAAC,EAAE,
|
|
1
|
+
{"version":3,"file":"headers.js","sourceRoot":"","sources":["../../../src/lib/utils/headers.js"],"names":[],"mappings":";;;;AAAA,gEAA+B;AAE/B,yCAIqB;AAErB,MAAM,eAAe,GAAG,CAAC,QAAQ,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE;IACnE,kKAAkK;IAClK,kBAAQ,CAAC,MAAM,GAAG,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,CAAA;IAEpC,OAAO,kBAAQ,CAAC,MAAM,CAAC,IAAA,qBAAY,EAAC,QAAQ,CAAC,EAAE,IAAA,qBAAY,EAAC,YAAY,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAA;AAC9F,CAAC,CAAA;AAEM,MAAM,cAAc,GAAG,CAAC,EAAE,OAAO,EAAE,YAAY,EAAE,EAAE,EAAE;IAC1D,OAAO,CAAC,GAAG,CAAC,mDAAmD,EAAE,EAAE,OAAO,EAAE,YAAY,EAAE,CAAC,CAAA;IAC3F,IAAI,IAAA,oBAAW,EAAC,YAAY,CAAC,EAAE;QAC7B,OAAO,OAAO,CAAA;KACf;IAED,OAAO,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CACpC,gBAAgB,EAChB,CAAC,MAAM,EAAE,WAAW,CAAC,EACrB,EAAE,CAAC,iCACA,gBAAgB,KACnB,CAAC,MAAM,CAAC,EAAE,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,WAAW,IAC/F,EAAE,EAAE,CAAC,CAAA;AACT,CAAC,CAAA;AAbY,QAAA,cAAc,kBAa1B"}
|
|
@@ -21,7 +21,7 @@ export function getShopifyHelpers(serverRuntimeConfig: any, config: any): Promis
|
|
|
21
21
|
ensureBilling: (() => undefined) | ((session: any, skipBillingCheck: any) => Promise<any>);
|
|
22
22
|
shopify: import("@shopify/shopify-api").Shopify<import("@shopify/shopify-api").ShopifyRestResources> | undefined;
|
|
23
23
|
}>;
|
|
24
|
-
export function loadAppData(serverRuntimeConfig: any): ({ shop, appId }: {
|
|
24
|
+
export function loadAppData(serverRuntimeConfig: any): ({ shop, appId: _appId }: {
|
|
25
25
|
shop: any;
|
|
26
26
|
appId: any;
|
|
27
27
|
}) => Promise<{
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../../src/lib/utils/session.js"],"names":[],"mappings":"AAiCO;;;;;;;;;;;;;;;;;;;;;;GA+JN;AAGM;;;;;;;
|
|
1
|
+
{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../../src/lib/utils/session.js"],"names":[],"mappings":"AAiCO;;;;;;;;;;;;;;;;;;;;;;GA+JN;AAGM;;;;;;;GA+BN;AAEM;;;;;;;mBAiCN"}
|
|
@@ -127,18 +127,23 @@ const getShopifyHelpers = (serverRuntimeConfig, config) => tslib_1.__awaiter(voi
|
|
|
127
127
|
});
|
|
128
128
|
exports.getShopifyHelpers = getShopifyHelpers;
|
|
129
129
|
// TODO: move loadAppData inside of getShopifyHelpersgetShopifyHelpers above (and fix all calls across app)
|
|
130
|
-
const loadAppData = (serverRuntimeConfig) => ({ shop, appId }) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
|
|
131
|
-
var _k, _l, _m, _o, _p, _q, _r
|
|
130
|
+
const loadAppData = (serverRuntimeConfig) => ({ shop, appId: _appId }) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
|
|
131
|
+
var _k, _l, _m, _o, _p, _q, _r;
|
|
132
132
|
// TODO!!!!!: ensure this is all cached
|
|
133
|
+
let { id: appId } = (0, shared_1.normalizeShopifyId)(_appId);
|
|
134
|
+
// TODO: throw/return early if still no shop??
|
|
133
135
|
const { getVerifiedClients } = (_k = yield (0, exports.getShopifyHelpers)(serverRuntimeConfig, { shop })) !== null && _k !== void 0 ? _k : {};
|
|
134
136
|
const { Graphql } = (_l = yield getVerifiedClients()) !== null && _l !== void 0 ? _l : {};
|
|
137
|
+
console.log(`>>> > loadAppData > appId:`, appId);
|
|
135
138
|
if ((0, shared_1.stringEmpty)(appId)) {
|
|
136
139
|
const appResponse = yield Graphql.query({
|
|
137
140
|
data: {
|
|
138
141
|
query: shared_1.APP_QUERY.INSTALLATION_BASIC,
|
|
139
142
|
},
|
|
140
143
|
});
|
|
141
|
-
|
|
144
|
+
console.log(`>>> > loadAppData > appResponse:`, appResponse);
|
|
145
|
+
const { id: currentAppId } = (0, shared_1.normalizeShopifyId)((_p = (_o = (_m = appResponse === null || appResponse === void 0 ? void 0 : appResponse.body) === null || _m === void 0 ? void 0 : _m.data) === null || _o === void 0 ? void 0 : _o.currentAppInstallation) === null || _p === void 0 ? void 0 : _p.app);
|
|
146
|
+
console.log(`>>> > loadAppData > currentAppId:`, currentAppId);
|
|
142
147
|
appId = currentAppId;
|
|
143
148
|
}
|
|
144
149
|
// TODO: throw/return early if still no appId??
|
|
@@ -148,11 +153,12 @@ const loadAppData = (serverRuntimeConfig) => ({ shop, appId }) => tslib_1.__awai
|
|
|
148
153
|
variables: { namespace: `${appId}-metafields` },
|
|
149
154
|
},
|
|
150
155
|
});
|
|
151
|
-
|
|
156
|
+
console.log(`>>> > loadAppData > appInstallation:`, appInstallation);
|
|
157
|
+
return (0, shared_1.APP_QUERY_TRANSFORM)((_r = (_q = appInstallation === null || appInstallation === void 0 ? void 0 : appInstallation.body) === null || _q === void 0 ? void 0 : _q.data) === null || _r === void 0 ? void 0 : _r.currentAppInstallation);
|
|
152
158
|
});
|
|
153
159
|
exports.loadAppData = loadAppData;
|
|
154
160
|
const prepareHeaders = (serverRuntimeConfig) => ({ generateReplacements, session, appData, shop, appId, headers }) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
|
|
155
|
-
var
|
|
161
|
+
var _s;
|
|
156
162
|
// HMMM: do we need to cleanObject here before checking empty??
|
|
157
163
|
if ((0, shared_1.objectEmpty)(headers) || !generateReplacements) {
|
|
158
164
|
return headers;
|
|
@@ -160,9 +166,10 @@ const prepareHeaders = (serverRuntimeConfig) => ({ generateReplacements, session
|
|
|
160
166
|
if (!appData) {
|
|
161
167
|
const _loadAppData = (0, exports.loadAppData)(serverRuntimeConfig);
|
|
162
168
|
appData = yield _loadAppData({ shop, appId }); // NOTE: this handles even if no appId
|
|
169
|
+
console.log(`>>> > prepareHeaders > appData:`, appData);
|
|
163
170
|
}
|
|
164
171
|
if (appData && !session) {
|
|
165
|
-
const { loadSession } = (
|
|
172
|
+
const { loadSession } = (_s = yield (0, exports.getShopifyHelpers)(serverRuntimeConfig, { shop })) !== null && _s !== void 0 ? _s : {};
|
|
166
173
|
session = yield loadSession().catch((_error) => {
|
|
167
174
|
// NOTE: first time install - this is expected
|
|
168
175
|
if (_error instanceof shared_1.ShopifySessionMissingError) {
|
|
@@ -170,14 +177,15 @@ const prepareHeaders = (serverRuntimeConfig) => ({ generateReplacements, session
|
|
|
170
177
|
}
|
|
171
178
|
throw _error;
|
|
172
179
|
});
|
|
180
|
+
console.log(`>>> > prepareHeaders > session:`, session);
|
|
173
181
|
}
|
|
174
182
|
if (!session || !appData) {
|
|
175
183
|
return headers;
|
|
176
184
|
}
|
|
177
|
-
return
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
185
|
+
return (0, headers_1.replaceHeaders)({
|
|
186
|
+
headers,
|
|
187
|
+
replacements: generateReplacements(Object.assign({ session }, appData)),
|
|
188
|
+
});
|
|
181
189
|
});
|
|
182
190
|
exports.prepareHeaders = prepareHeaders;
|
|
183
191
|
//# sourceMappingURL=session.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../../src/lib/utils/session.js"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../../src/lib/utils/session.js"],"names":[],"mappings":"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"}
|
package/dist/shared/display.js
CHANGED
|
@@ -18,7 +18,7 @@ const querystringToObject = (queryString) => {
|
|
|
18
18
|
exports.querystringToObject = querystringToObject;
|
|
19
19
|
const isType = (value, type) => (
|
|
20
20
|
// eslint-disable-next-line eqeqeq, valid-typeof
|
|
21
|
-
value != undefined && typeof value === type);
|
|
21
|
+
(value != undefined) && (typeof value === type));
|
|
22
22
|
exports.isType = isType;
|
|
23
23
|
const isNumericOnly = (value) => {
|
|
24
24
|
var _a;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"display.js","sourceRoot":"","sources":["../../src/shared/display.js"],"names":[],"mappings":";;;AAAA,yCAAyC;AACzC,+BAAmC;AAE5B,MAAM,OAAO,GAAG,GAAG,EAAE,CAAC,CAC3B,IAAA,SAAM,GAAE,CACT,CAAA;AAFY,QAAA,OAAO,WAEnB;AAEM,MAAM,UAAU,GAAG,GAAG,EAAE,CAAC,CAC9B,IAAA,eAAO,GAAE,CAAC,OAAO,CAAC,KAAK,EAAC,EAAE,CAAC,CAC5B,CAAA;AAFY,QAAA,UAAU,cAEtB;AAED,iCAAiC;AAC1B,MAAM,mBAAmB,GAAG,CAAC,WAAW,EAAE,EAAE;IACjD,IAAI,IAAA,mBAAW,EAAC,WAAW,CAAC,EAAE;QAC5B,OAAO,EAAE,CAAA;KACV;IAED,MAAM,SAAS,GAAG,IAAI,eAAe,CAAC,WAAW,CAAC,CAAA;IAClD,OAAO,MAAM,CAAC,WAAW,CAAC,SAAS,CAAC,CAAA;AACtC,CAAC,CAAA;AAPY,QAAA,mBAAmB,uBAO/B;AAEM,MAAM,MAAM,GAAG,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE,CAAC;AACrC,gDAAgD;AAChD,KAAK,IAAI,SAAS,IAAI,OAAO,KAAK,KAAK,IAAI,
|
|
1
|
+
{"version":3,"file":"display.js","sourceRoot":"","sources":["../../src/shared/display.js"],"names":[],"mappings":"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"}
|
package/dist/shared/match.d.ts
CHANGED
|
@@ -1,4 +1,6 @@
|
|
|
1
|
+
export function safeHostname(nameable: any): any;
|
|
1
2
|
export function isMatch(value: any, pattern: any): boolean;
|
|
2
|
-
export function matchArray(value: any, patterns: any): boolean
|
|
3
|
+
export function matchArray(value: any, patterns: any): boolean;
|
|
3
4
|
export function matchObject(value: any, patterns: any): any;
|
|
5
|
+
export function matchHostname(nameable: any, patterns: any): any;
|
|
4
6
|
//# sourceMappingURL=match.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"match.d.ts","sourceRoot":"","sources":["../../src/shared/match.js"],"names":[],"mappings":"AAIO,2DAIN;AAEM,
|
|
1
|
+
{"version":3,"file":"match.d.ts","sourceRoot":"","sources":["../../src/shared/match.js"],"names":[],"mappings":"AAIO,iDAQN;AAEM,2DAIN;AAEM,+DAYN;AAEM,4DAYN;AAEM,iEAKN"}
|
package/dist/shared/match.js
CHANGED
|
@@ -1,19 +1,29 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.matchObject = exports.matchArray = exports.isMatch = void 0;
|
|
3
|
+
exports.matchHostname = exports.matchObject = exports.matchArray = exports.isMatch = exports.safeHostname = void 0;
|
|
4
4
|
const minimatch_1 = require("minimatch");
|
|
5
5
|
const display_1 = require("./display");
|
|
6
|
+
const safeHostname = (nameable) => {
|
|
7
|
+
let hostname;
|
|
8
|
+
try {
|
|
9
|
+
hostname = (nameable === null || nameable === void 0 ? void 0 : nameable.startsWith('http')) ? new URL(nameable).hostname : nameable;
|
|
10
|
+
// eslint-disable-next-line no-empty
|
|
11
|
+
}
|
|
12
|
+
catch (_ignore) { }
|
|
13
|
+
return hostname;
|
|
14
|
+
};
|
|
15
|
+
exports.safeHostname = safeHostname;
|
|
6
16
|
const isMatch = (value, pattern) => ((0, display_1.stringNotEmpty)(value) &&
|
|
7
17
|
(0, display_1.stringNotEmpty)(pattern) &&
|
|
8
18
|
(0, minimatch_1.minimatch)(value, pattern));
|
|
9
19
|
exports.isMatch = isMatch;
|
|
10
20
|
const matchArray = (value, patterns) => {
|
|
11
|
-
let matched;
|
|
12
|
-
// NOTE: intentionally using for
|
|
21
|
+
let matched = false;
|
|
22
|
+
// NOTE: intentionally using for/of loop instead of map so we can break to exit quickly soon as matched
|
|
13
23
|
// eslint-disable-next-line no-restricted-syntax
|
|
14
24
|
for (const pattern of (0, display_1.ensureArray)(patterns)) {
|
|
15
|
-
|
|
16
|
-
|
|
25
|
+
matched = (0, exports.isMatch)(value, pattern);
|
|
26
|
+
if (matched) {
|
|
17
27
|
break;
|
|
18
28
|
}
|
|
19
29
|
}
|
|
@@ -22,7 +32,7 @@ const matchArray = (value, patterns) => {
|
|
|
22
32
|
exports.matchArray = matchArray;
|
|
23
33
|
const matchObject = (value, patterns) => {
|
|
24
34
|
let matched;
|
|
25
|
-
// NOTE: intentionally using for
|
|
35
|
+
// NOTE: intentionally using for/of loop instead of map so we can break to exit quickly soon as matched
|
|
26
36
|
// eslint-disable-next-line no-restricted-syntax
|
|
27
37
|
for (const [pattern, data] of Object.entries((0, display_1.ensureObject)(patterns))) {
|
|
28
38
|
if ((0, exports.isMatch)(value, pattern)) {
|
|
@@ -33,4 +43,11 @@ const matchObject = (value, patterns) => {
|
|
|
33
43
|
return matched;
|
|
34
44
|
};
|
|
35
45
|
exports.matchObject = matchObject;
|
|
46
|
+
const matchHostname = (nameable, patterns) => {
|
|
47
|
+
const hostname = (0, exports.safeHostname)(nameable);
|
|
48
|
+
return Array.isArray(patterns) || (0, display_1.isType)(patterns, 'string')
|
|
49
|
+
? (0, exports.matchArray)(hostname, patterns)
|
|
50
|
+
: (0, exports.matchObject)(hostname, patterns);
|
|
51
|
+
};
|
|
52
|
+
exports.matchHostname = matchHostname;
|
|
36
53
|
//# sourceMappingURL=match.js.map
|
package/dist/shared/match.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"match.js","sourceRoot":"","sources":["../../src/shared/match.js"],"names":[],"mappings":";;;AAAA,yCAAqC;AAErC,
|
|
1
|
+
{"version":3,"file":"match.js","sourceRoot":"","sources":["../../src/shared/match.js"],"names":[],"mappings":";;;AAAA,yCAAqC;AAErC,uCAA6E;AAEtE,MAAM,YAAY,GAAG,CAAC,QAAQ,EAAE,EAAE;IACvC,IAAI,QAAQ,CAAA;IACZ,IAAI;QACF,QAAQ,GAAG,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,UAAU,CAAC,MAAM,CAAC,EAAC,CAAC,CAAC,IAAI,GAAG,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAA;QACjF,oCAAoC;KACnC;IAAC,OAAO,OAAO,EAAE,GAAE;IAEpB,OAAO,QAAQ,CAAA;AACjB,CAAC,CAAA;AARY,QAAA,YAAY,gBAQxB;AAEM,MAAM,OAAO,GAAG,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE,CAAC,CACzC,IAAA,wBAAc,EAAC,KAAK,CAAC;IACrB,IAAA,wBAAc,EAAC,OAAO,CAAC;IACvB,IAAA,qBAAS,EAAC,KAAK,EAAE,OAAO,CAAC,CAC1B,CAAA;AAJY,QAAA,OAAO,WAInB;AAEM,MAAM,UAAU,GAAG,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE;IAC5C,IAAI,OAAO,GAAG,KAAK,CAAA;IACnB,uGAAuG;IACvG,gDAAgD;IAChD,KAAK,MAAM,OAAO,IAAI,IAAA,qBAAW,EAAC,QAAQ,CAAC,EAAE;QAC3C,OAAO,GAAG,IAAA,eAAO,EAAC,KAAK,EAAE,OAAO,CAAC,CAAA;QACjC,IAAI,OAAO,EAAE;YACX,MAAK;SACN;KACF;IAED,OAAO,OAAO,CAAA;AAChB,CAAC,CAAA;AAZY,QAAA,UAAU,cAYtB;AAEM,MAAM,WAAW,GAAG,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE;IAC7C,IAAI,OAAO,CAAA;IACX,uGAAuG;IACvG,gDAAgD;IAChD,KAAK,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAA,sBAAY,EAAC,QAAQ,CAAC,CAAC,EAAE;QACpE,IAAI,IAAA,eAAO,EAAC,KAAK,EAAE,OAAO,CAAC,EAAE;YAC3B,OAAO,GAAG,IAAI,CAAA;YACd,MAAK;SACN;KACF;IAED,OAAO,OAAO,CAAA;AAChB,CAAC,CAAA;AAZY,QAAA,WAAW,eAYvB;AAEM,MAAM,aAAa,GAAG,CAAC,QAAQ,EAAE,QAAQ,EAAE,EAAE;IAClD,MAAM,QAAQ,GAAG,IAAA,oBAAY,EAAC,QAAQ,CAAC,CAAA;IACvC,OAAO,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,IAAA,gBAAM,EAAC,QAAQ,EAAE,QAAQ,CAAC;QAC1D,CAAC,CAAC,IAAA,kBAAU,EAAC,QAAQ,EAAE,QAAQ,CAAC;QAChC,CAAC,CAAC,IAAA,mBAAW,EAAC,QAAQ,EAAE,QAAQ,CAAC,CAAA;AACrC,CAAC,CAAA;AALY,QAAA,aAAa,iBAKzB"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@agnostack/next-shopify",
|
|
3
|
-
"version": "1.10.0-beta.
|
|
3
|
+
"version": "1.10.0-beta.20",
|
|
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",
|