@agnostack/next-shopify 1.7.5-beta.51 → 1.7.5-beta.52
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/dist/utils/session.js +25 -18
- package/dist/utils/session.js.map +1 -1
- package/package.json +1 -1
package/dist/utils/session.js
CHANGED
|
@@ -35,26 +35,33 @@ const getShopifyHelpers = async (serverRuntimeConfig, { shop }) => {
|
|
|
35
35
|
// #endregion CRYPTO
|
|
36
36
|
const decryptVerifySession = async ({ req, res } = {}) => {
|
|
37
37
|
var _a, _b;
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
38
|
+
try {
|
|
39
|
+
console.log(`>>> > decryptVerifySession > shop:`, shop);
|
|
40
|
+
const sessionId = ((req != undefined) && (res != undefined))
|
|
41
|
+
? (await shopify.session.getCurrentId({
|
|
42
|
+
isOnline: true,
|
|
43
|
+
rawRequest: req,
|
|
44
|
+
rawResponse: res,
|
|
45
|
+
})) : (await shopify.session.getOfflineId(shop));
|
|
46
|
+
console.log(`>>> > decryptVerifySession > sessionId:`, { sessionId });
|
|
47
|
+
const _c = (_a = (await firebase_1.loadCallback(sessionHandler, sessionId))) !== null && _a !== void 0 ? _a : {}, { accessToken: encryptedAccessToken } = _c, session = __rest(_c, ["accessToken"]);
|
|
48
|
+
console.log(`>>> > decryptVerifySession > encryptedAccessToken:`, { encryptedAccessToken });
|
|
49
|
+
// TODO clear sessions if undefined???
|
|
50
|
+
if (shop && ((session === null || session === void 0 ? void 0 : session.shop) !== shop)) {
|
|
51
|
+
throw new errors_1.ShopifyAuthenticationError('Invalid shop');
|
|
52
|
+
}
|
|
53
|
+
const scopesUnchanged = display_1.arraysMatch(display_1.splitCommas((_b = shopify.config) === null || _b === void 0 ? void 0 : _b.scopes.toString()), display_1.splitCommas(session === null || session === void 0 ? void 0 : session.scope));
|
|
54
|
+
const sessionExpired = !(session === null || session === void 0 ? void 0 : session.expires) || (luxon_1.DateTime.fromISO(session.expires) < luxon_1.DateTime.now());
|
|
55
|
+
const sessionActive = (scopesUnchanged && !sessionExpired);
|
|
56
|
+
if (!sessionActive) {
|
|
57
|
+
throw new errors_1.ShopifyAuthenticationError('Inactive session');
|
|
58
|
+
}
|
|
59
|
+
return Object.assign(Object.assign({}, session), { accessToken: JSON.parse(crypto_1.decryptRSAPublic(encryptedAccessToken, publicKey)) });
|
|
50
60
|
}
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
if (!sessionActive) {
|
|
55
|
-
throw new errors_1.ShopifyAuthenticationError('Inactive session');
|
|
61
|
+
catch (error) {
|
|
62
|
+
console.log(`>>> > decryptVerifySession > error:`, error);
|
|
63
|
+
throw new errors_1.ShopifyAuthenticationError(error === null || error === void 0 ? void 0 : error.message);
|
|
56
64
|
}
|
|
57
|
-
return Object.assign(Object.assign({}, session), { accessToken: JSON.parse(crypto_1.decryptRSAPublic(encryptedAccessToken, publicKey)) });
|
|
58
65
|
};
|
|
59
66
|
const encryptStoreSession = async (_session) => {
|
|
60
67
|
const { accessToken } = _session, session = __rest(_session, ["accessToken"]);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../src/utils/session.js"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,sDAAwD;AACxD,iCAAgC;AAEhC,uCAAyC;AACzC,qCAAqG;AACrG,uCAAoE;AACpE,uCAA6D;AAC7D,yCAMmB;AACnB,qCAAqD;AAE9C,MAAM,iBAAiB,GAAG,KAAK,EAAE,mBAAmB,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE;IACvE,MAAM,OAAO,GAAG,MAAM,+BAAqB,CAAC,mBAAmB,CAAC,CAAA;IAChE,MAAM,EAAE,SAAS,EAAE,kBAAkB,EAAE,cAAc,EAAE,MAAM,EAAE,GAAG,mBAAmB,CAAA;IAErF,MAAM,cAAc,GAAG,iCAAsB,CAAC,WAAW,CACvD,SAAS,EACT;QACE,UAAU,EAAE,kBAAkB;QAC9B,MAAM,EAAE,EAAE,eAAe,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE;KAC5E,CACF,CAAA;IAED,iBAAiB;IACjB,MAAM,EACJ,aAAa,EAAE,cAAc,EAC7B,SAAS,EAAE,kBAAkB,GAC9B,GAAG,qBAAY,CAAC,cAAc,CAAC,kBAAkB,CAAC,CAAA;IACnD,MAAM,SAAS,GAAG,oBAAW,CAAC,mBAAU,CACtC,kBAAkB,EAClB,cAAc,CAAC,YAAY,EAC3B,cAAc,CACf,EAAE,YAAY,CAAC,CAAA;IAEhB,MAAM,EACJ,aAAa,EAAE,eAAe,EAC9B,SAAS,EAAE,mBAAmB,GAC/B,GAAG,qBAAY,CAAC,cAAc,CAAC,mBAAmB,CAAC,CAAA;IACpD,MAAM,UAAU,GAAG,oBAAW,CAAC,mBAAU,CACvC,mBAAmB,EACnB,cAAc,CAAC,YAAY,EAC3B,eAAe,CAChB,CAAC,CAAA;IACF,oBAAoB;IAEpB,MAAM,oBAAoB,GAAG,KAAK,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,EAAE;;QACvD,OAAO,CAAC,GAAG,CAAC,oCAAoC,EAAE,IAAI,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../src/utils/session.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.5-beta.
|
|
3
|
+
"version": "1.7.5-beta.52",
|
|
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",
|