@agnostack/next-shopify 1.13.1-beta.1 → 1.13.1-beta.2
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 +8 -0
- package/dist/lib/handlers/api/token.d.ts.map +1 -1
- package/dist/lib/handlers/api/token.js +5 -1
- package/dist/lib/handlers/api/token.js.map +1 -1
- package/dist/lib/utils/session.js +1 -1
- package/dist/lib/utils/token.d.ts.map +1 -1
- package/dist/lib/utils/token.js +7 -1
- package/dist/lib/utils/token.js.map +1 -1
- package/package.json +2 -3
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,11 @@
|
|
|
1
|
+
## [1.13.1-beta.2](https://github.com/agnostack/next-shopify/compare/v1.13.1-beta.1...v1.13.1-beta.2) (2023-11-21)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### Bug Fixes
|
|
5
|
+
|
|
6
|
+
* wip ([e10a3a6](https://github.com/agnostack/next-shopify/commit/e10a3a67e4d3fe5bbb743a968730847b4479eb89))
|
|
7
|
+
* wip ([860ac69](https://github.com/agnostack/next-shopify/commit/860ac69b07e173f5098169673cf3e64c34aac52c))
|
|
8
|
+
|
|
1
9
|
## [1.13.1-beta.1](https://github.com/agnostack/next-shopify/compare/v1.13.0...v1.13.1-beta.1) (2023-11-17)
|
|
2
10
|
|
|
3
11
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"token.d.ts","sourceRoot":"","sources":["../../../../src/lib/handlers/api/token.js"],"names":[],"mappings":"AAcO;;;;
|
|
1
|
+
{"version":3,"file":"token.d.ts","sourceRoot":"","sources":["../../../../src/lib/handlers/api/token.js"],"names":[],"mappings":"AAcO;;;;yCAqFN"}
|
|
@@ -14,7 +14,9 @@ const handleSessionToken = ({ APP_CONFIG }, _a = {}) => {
|
|
|
14
14
|
return (req, res) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
|
|
15
15
|
var _b, _c;
|
|
16
16
|
const { host } = (_b = req.query) !== null && _b !== void 0 ? _b : {};
|
|
17
|
-
const _d = (_c = req.headers) !== null && _c !== void 0 ? _c : {}, { 'x-shop-domain': shopDomain, 'x-shopify-shop-domain': shopifyShopDomain, 'x-shopify-shop': shop = shopifyShopDomain !== null && shopifyShopDomain !== void 0 ? shopifyShopDomain : shopDomain, 'x-shopify-app-id': appId,
|
|
17
|
+
const _d = (_c = req.headers) !== null && _c !== void 0 ? _c : {}, { 'x-shop-domain': shopDomain, 'x-shopify-shop-domain': shopifyShopDomain, 'x-shopify-shop': shop = shopifyShopDomain !== null && shopifyShopDomain !== void 0 ? shopifyShopDomain : shopDomain, 'x-shopify-app-id': appId, // HMMMM: revisit appid and installation id (and explore provider set id)
|
|
18
|
+
'x-shopify-app-installation-id': appInstallationId } = _d, // HMMMM: revisit appid and installation id (and explore provider set id)
|
|
19
|
+
headers = tslib_1.__rest(_d, ['x-shop-domain', 'x-shopify-shop-domain', 'x-shopify-shop', 'x-shopify-app-id', 'x-shopify-app-installation-id']);
|
|
18
20
|
const appClaims = Object.entries(headers).reduce((_appClaims, [headerKey, headerValue]) => (Object.assign(Object.assign({}, _appClaims), headerKey.startsWith('x-shopify-app-metafield-') && {
|
|
19
21
|
[(0, shared_1.snakecase)(headerKey.replace('x-shopify-app-metafield-', ''))]: headerValue,
|
|
20
22
|
})), Object.assign(Object.assign({}, appId && { app_id: (0, shared_1.normalizeShopifyId)(appId).id }), appInstallationId && { installation_id: (0, shared_1.normalizeShopifyId)(appInstallationId).id }));
|
|
@@ -49,6 +51,8 @@ const handleSessionToken = ({ APP_CONFIG }, _a = {}) => {
|
|
|
49
51
|
jti,
|
|
50
52
|
sid,
|
|
51
53
|
aud }, sub && { sub }), appClaims), body);
|
|
54
|
+
// HMMM: explore update for HMAC secret?
|
|
55
|
+
// const hmacSecret = generateHMAC(objectToSortedString(payload), secret ?? APP_CONFIG.apiSecretKey)
|
|
52
56
|
const hmacSecret = secret !== null && secret !== void 0 ? secret : (0, utils_1.generateHMAC)((0, shared_1.objectToSortedString)(payload), APP_CONFIG.apiSecretKey);
|
|
53
57
|
token = (0, jsonwebtoken_1.sign)(payload, hmacSecret, config);
|
|
54
58
|
}
|
|
@@ -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,uCAA0C;AAC1C,4CAKwB;AAExB,yCAAyC;AAClC,MAAM,kBAAkB,GAAG,CAAC,EAAE,UAAU,EAAE,EAAE,KAAwB,EAAE,EAAE,EAAE;QAA9B,EAAE,MAAM,OAAkB,EAAb,MAAM,sBAAnB,UAAqB,CAAF;IAAY,OAAA,CAAO,GAAG,EAAE,GAAG,EAAE,EAAE;;QACnG,MAAM,EAAE,IAAI,EAAE,GAAG,MAAA,GAAG,CAAC,KAAK,mCAAI,EAAE,CAAA;QAChC,MAAM,KAOF,MAAA,GAAG,CAAC,OAAO,mCAAI,EAAE,EAPf,EACJ,eAAe,EAAE,UAAU,EAC3B,uBAAuB,EAAE,iBAAiB,EAC1C,gBAAgB,EAAE,IAAI,GAAG,iBAAiB,aAAjB,iBAAiB,cAAjB,iBAAiB,GAAI,UAAU,EACxD,kBAAkB,EAAE,KAAK,
|
|
1
|
+
{"version":3,"file":"token.js","sourceRoot":"","sources":["../../../../src/lib/handlers/api/token.js"],"names":[],"mappings":"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"}
|
|
@@ -20,7 +20,7 @@ const getShopifyHelpers = (serverRuntimeConfig, config) => tslib_1.__awaiter(voi
|
|
|
20
20
|
const isReviewMode = ((SHOPIFY_RUN_MODE === 'review') &&
|
|
21
21
|
(PAYMENT_CONFIG === null || PAYMENT_CONFIG === void 0 ? void 0 : PAYMENT_CONFIG.required) &&
|
|
22
22
|
API_PATHS[shared_1.API_ROUTE_NAMES.AUTH_OFFLINE]);
|
|
23
|
-
// TODO: should this use
|
|
23
|
+
// TODO: should this use our helper instead (and/or as a fallback)??
|
|
24
24
|
const shopId = (_b = (_a = shopify === null || shopify === void 0 ? void 0 : shopify.utils) === null || _a === void 0 ? void 0 : _a.sanitizeShop) === null || _b === void 0 ? void 0 : _b.call(_a, shop);
|
|
25
25
|
const cryptoHandler = crypto_1.CryptoHandler.getInstance(SESSION_CONFIG);
|
|
26
26
|
const sessionHandler = firebase_1.FirebaseSessionHandler.getInstance(FB_CONFIG, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"token.d.ts","sourceRoot":"","sources":["../../../src/lib/utils/token.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"token.d.ts","sourceRoot":"","sources":["../../../src/lib/utils/token.js"],"names":[],"mappings":"AAUO;;;;;;;;;;;;;;;GA6BN"}
|
package/dist/lib/utils/token.js
CHANGED
|
@@ -5,6 +5,7 @@ const tslib_1 = require("tslib");
|
|
|
5
5
|
const jsonwebtoken_1 = require("jsonwebtoken");
|
|
6
6
|
const shared_1 = require("../../shared");
|
|
7
7
|
const crypto_1 = require("./crypto");
|
|
8
|
+
// export const getVerifiedSessionData = (serverRuntimeConfig) => async (sessionToken, { secret, shop, host }) => {
|
|
8
9
|
const getVerifiedSessionData = (serverRuntimeConfig) => (sessionToken, { shop, host }) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
|
|
9
10
|
const { APP_CONFIG } = serverRuntimeConfig;
|
|
10
11
|
let data;
|
|
@@ -18,7 +19,12 @@ const getVerifiedSessionData = (serverRuntimeConfig) => (sessionToken, { shop, h
|
|
|
18
19
|
throw new shared_1.ShopifySessionInvalidError('Unauthorized shop or host');
|
|
19
20
|
}
|
|
20
21
|
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
|
21
|
-
const { iat, nbf, exp } = decoded, verifiable = tslib_1.__rest(decoded
|
|
22
|
+
const { iat, nbf, exp } = decoded, verifiable = tslib_1.__rest(decoded
|
|
23
|
+
// HMMM: explore update for HMAC secret?
|
|
24
|
+
// const hmac = generateHMAC(objectToSortedString(verifiable), secret?? APP_CONFIG.apiSecretKey)
|
|
25
|
+
, ["iat", "nbf", "exp"]);
|
|
26
|
+
// HMMM: explore update for HMAC secret?
|
|
27
|
+
// const hmac = generateHMAC(objectToSortedString(verifiable), secret?? APP_CONFIG.apiSecretKey)
|
|
22
28
|
const hmac = (0, crypto_1.generateHMAC)((0, shared_1.objectToSortedString)(verifiable), APP_CONFIG.apiSecretKey);
|
|
23
29
|
const verified = (0, jsonwebtoken_1.verify)(sessionToken, hmac);
|
|
24
30
|
if (verified == undefined) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"token.js","sourceRoot":"","sources":["../../../src/lib/utils/token.js"],"names":[],"mappings":";;;;AAAA,+CAAqC;AAErC,yCAIqB;AACrB,qCAAuC;
|
|
1
|
+
{"version":3,"file":"token.js","sourceRoot":"","sources":["../../../src/lib/utils/token.js"],"names":[],"mappings":";;;;AAAA,+CAAqC;AAErC,yCAIqB;AACrB,qCAAuC;AAEvC,mHAAmH;AAC5G,MAAM,sBAAsB,GAAG,CAAC,mBAAmB,EAAE,EAAE,CAAC,CAAO,YAAY,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE;IACpG,MAAM,EAAC,UAAU,EAAE,GAAG,mBAAmB,CAAA;IACzC,IAAI,IAAI,CAAA;IACR,IAAI;QACF,kFAAkF;QAClF,6DAA6D;QAC7D,MAAM,KAA+B,IAAA,uBAAc,EAAC,YAAY,CAAC,EAA3D,EAAE,OAAO,EAAE,KAAK,OAA2C,EAAtC,KAAK,sBAA1B,oBAA4B,CAA+B,CAAA;QACjE,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,WAAW,EAAE,GAAG,KAAK,CAAA;QACtD,IAAI,GAAG,KAAK,CAAA;QAEZ,IAAI,CAAC,WAAW,KAAK,IAAI,CAAC,IAAI,CAAC,WAAW,KAAK,IAAI,CAAC,EAAE;YACpD,MAAM,IAAI,mCAA0B,CAAC,2BAA2B,CAAC,CAAA;SAClE;QAED,6DAA6D;QAC7D,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,KAAoB,OAAO,EAAtB,UAAU,kBAAK,OAAO;QAChD,wCAAwC;QACxC,gGAAgG;UAF1F,qBAAgC,CAAU,CAAA;QAChD,wCAAwC;QACxC,gGAAgG;QAChG,MAAM,IAAI,GAAG,IAAA,qBAAY,EAAC,IAAA,6BAAoB,EAAC,UAAU,CAAC,EAAE,UAAU,CAAC,YAAY,CAAC,CAAA;QAEpF,MAAM,QAAQ,GAAG,IAAA,qBAAM,EAAC,YAAY,EAAE,IAAI,CAAC,CAAA;QAC3C,IAAI,QAAQ,IAAI,SAAS,EAAE;YACzB,MAAM,IAAI,mCAA0B,CAAC,+BAA+B,CAAC,CAAA;SACtE;KACF;IAAC,OAAO,MAAM,EAAE;QACf,OAAO,CAAC,KAAK,CAAC,+BAA+B,EAAE,MAAM,CAAC,CAAA;QACtD,MAAM,IAAI,mCAA0B,CAAC,+BAA+B,CAAC,CAAA;KACtE;IACD,OAAO,IAAI,CAAA;AACb,CAAC,CAAA,CAAA;AA7BY,QAAA,sBAAsB,0BA6BlC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@agnostack/next-shopify",
|
|
3
|
-
"version": "1.13.1-beta.
|
|
3
|
+
"version": "1.13.1-beta.2",
|
|
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",
|
|
@@ -64,7 +64,7 @@
|
|
|
64
64
|
"react-is": ">=17.0.2"
|
|
65
65
|
},
|
|
66
66
|
"dependencies": {
|
|
67
|
-
"@agnostack/next-plugins": "
|
|
67
|
+
"@agnostack/next-plugins": "beta",
|
|
68
68
|
"@shopify/shopify-api": "7.2.0",
|
|
69
69
|
"browser-monads": "1.0.0",
|
|
70
70
|
"cookies": "0.8.0",
|
|
@@ -88,7 +88,6 @@
|
|
|
88
88
|
"@semantic-release/npm": "7.1.3",
|
|
89
89
|
"@semantic-release/release-notes-generator": "9.0.3",
|
|
90
90
|
"@types/jest": "26.0.24",
|
|
91
|
-
"@types/next": "9.0.0",
|
|
92
91
|
"@types/react": "17.0.2",
|
|
93
92
|
"@types/react-dom": "17.0.2",
|
|
94
93
|
"@typescript-eslint/eslint-plugin": "5.36.1",
|