@agnostack/next-shopify 1.16.2-beta.7 → 1.16.2-beta.8
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.16.2-beta.8](https://github.com/agnostack/next-shopify/compare/v1.16.2-beta.7...v1.16.2-beta.8) (2023-12-12)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### Bug Fixes
|
|
5
|
+
|
|
6
|
+
* cookie wip ([321aa71](https://github.com/agnostack/next-shopify/commit/321aa71263c9a33a96b0b5dccbe9564ede8f5b4e))
|
|
7
|
+
|
|
1
8
|
## [1.16.2-beta.7](https://github.com/agnostack/next-shopify/compare/v1.16.2-beta.6...v1.16.2-beta.7) (2023-12-12)
|
|
2
9
|
|
|
3
10
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"token.d.ts","sourceRoot":"","sources":["../../../../../src/lib/handlers/api/verifiable/token.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"token.d.ts","sourceRoot":"","sources":["../../../../../src/lib/handlers/api/verifiable/token.js"],"names":[],"mappings":"AAmBO;;;yCAyIN"}
|
|
@@ -34,11 +34,11 @@ const handleSessionToken = (serverRuntimeConfig, _a = {}) => {
|
|
|
34
34
|
const { APP_CONFIG } = serverRuntimeConfig !== null && serverRuntimeConfig !== void 0 ? serverRuntimeConfig : {};
|
|
35
35
|
const _getVerificationHelpers = (0, verifyd_1.getVerificationHelpers)(serverRuntimeConfig);
|
|
36
36
|
return (req, res) => __awaiter(void 0, void 0, void 0, function* () {
|
|
37
|
-
var _b, _c, _d, _e, _f;
|
|
37
|
+
var _b, _c, _d, _e, _f, _g;
|
|
38
38
|
const { host } = (_b = req.query) !== null && _b !== void 0 ? _b : {};
|
|
39
|
-
const
|
|
39
|
+
const _h = (_c = req.headers) !== null && _c !== void 0 ? _c : {}, { 'x-shopify-app-installation-id': shopifyAppInstallationId, 'x-shopify-app-id': shopifyAppId, 'x-app-installation-id': appInstallationId = shopifyAppInstallationId, 'x-app-id': appId = shopifyAppId,
|
|
40
40
|
// TODO: pass along providerSetId??
|
|
41
|
-
'x-client-id': clientId, 'x-shop-domain': shopDomain, 'x-shopify-shop-domain': shopifyShopDomain, 'x-shopify-shop': shop = shopifyShopDomain !== null && shopifyShopDomain !== void 0 ? shopifyShopDomain : shopDomain } =
|
|
41
|
+
'x-client-id': clientId, 'x-shop-domain': shopDomain, 'x-shopify-shop-domain': shopifyShopDomain, 'x-shopify-shop': shop = shopifyShopDomain !== null && shopifyShopDomain !== void 0 ? shopifyShopDomain : shopDomain } = _h, headers = __rest(_h, ['x-shopify-app-installation-id', 'x-shopify-app-id', 'x-app-installation-id', 'x-app-id', 'x-client-id', 'x-shop-domain', 'x-shopify-shop-domain', 'x-shopify-shop']);
|
|
42
42
|
// TODO: un-btoa the host and check??
|
|
43
43
|
if ((0, shared_1.stringEmpty)(shop) || (0, shared_1.stringEmpty)(host)) {
|
|
44
44
|
return res.status(412).json({ message: 'Missing required param' });
|
|
@@ -58,7 +58,7 @@ const handleSessionToken = (serverRuntimeConfig, _a = {}) => {
|
|
|
58
58
|
const appClaims = Object.entries(headers).reduce((_appClaims, [headerKey, headerValue]) => (Object.assign(Object.assign({}, _appClaims), headerKey.startsWith('x-shopify-app-metafield-') && {
|
|
59
59
|
[(0, shared_1.snakecase)(headerKey.replace('x-shopify-app-metafield-', ''))]: headerValue,
|
|
60
60
|
})), Object.assign(Object.assign({}, appId && { app_id: (0, shared_1.normalizeShopifyId)(appId).id }), appInstallationId && { installation_id: (0, shared_1.normalizeShopifyId)(appInstallationId).id }));
|
|
61
|
-
const
|
|
61
|
+
const _j = requestBody !== null && requestBody !== void 0 ? requestBody : {}, { sub, aud: _aud } = _j, body = __rest(_j, ["sub", "aud"]);
|
|
62
62
|
const aud = [clientId, _aud, APP_CONFIG.apiKey].find(shared_1.stringNotEmpty);
|
|
63
63
|
let { dest, iss, sid, jti } = body, tokenBody = __rest(body, ["dest", "iss", "sid", "jti"]);
|
|
64
64
|
if ((0, shared_1.stringEmpty)(dest)) {
|
|
@@ -86,7 +86,7 @@ const handleSessionToken = (serverRuntimeConfig, _a = {}) => {
|
|
|
86
86
|
const signingSecret = _signingSecret || (0, utils_1.generateHMAC)((0, shared_1.objectToSortedString)(payload), APP_CONFIG.apiSecretKey);
|
|
87
87
|
const token = (0, jsonwebtoken_1.sign)(payload, signingSecret, signingData);
|
|
88
88
|
if ((0, shared_1.stringNotEmpty)(cookieName)) {
|
|
89
|
-
console.log(`>>> > return > token:`, { token });
|
|
89
|
+
console.log(`>>> > return > token:`, { token, decoded: (0, shared_1.decodeJWT)(token), exp: (_d = (0, shared_1.decodeJWT)(token)) === null || _d === void 0 ? void 0 : _d.exp });
|
|
90
90
|
console.log(`>>> > return > req:`, { req });
|
|
91
91
|
console.log(`>>> > return > cookies BEFORE:`, { cookieName, url: req.url, cookies: req.cookies });
|
|
92
92
|
const cookies = new runtime_1.Cookies(req, res, {
|
|
@@ -97,11 +97,10 @@ const handleSessionToken = (serverRuntimeConfig, _a = {}) => {
|
|
|
97
97
|
console.log(`>>> > return > foo:`, { foo });
|
|
98
98
|
console.log(`>>> > return > new Date(Date.now() + 60000):`, new Date(Date.now() + 60000));
|
|
99
99
|
const zed = {
|
|
100
|
-
|
|
101
|
-
sameSite: 'none',
|
|
100
|
+
sameSite: 'lax',
|
|
102
101
|
secure: true,
|
|
103
102
|
expires: new Date(Date.now() + 60000),
|
|
104
|
-
path: ((
|
|
103
|
+
path: ((_g = (_f = (_e = req.url) === null || _e === void 0 ? void 0 : _e.split) === null || _f === void 0 ? void 0 : _f.call(_e, '?')) === null || _g === void 0 ? void 0 : _g[0]) || '/',
|
|
105
104
|
};
|
|
106
105
|
console.log(`>>> > return > zed:`, { zed });
|
|
107
106
|
yield cookies.setAndSign(cookieName, token, zed);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"token.js","sourceRoot":"","sources":["../../../../../src/lib/handlers/api/verifiable/token.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;AAAA,yCAAkC;AAClC,+CAAmC;AACnC,+BAAmC;AAEnC,0DAAsD;AAEtD,gDAA8E;AAE9E,0CAA6C;AAC7C,+
|
|
1
|
+
{"version":3,"file":"token.js","sourceRoot":"","sources":["../../../../../src/lib/handlers/api/verifiable/token.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.16.2-beta.
|
|
3
|
+
"version": "1.16.2-beta.8",
|
|
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",
|