@agnostack/next-shopify 1.7.4 → 1.7.5-beta.10
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.
|
@@ -21,9 +21,50 @@ const http_proxy_1 = __importDefault(require("http-proxy"));
|
|
|
21
21
|
const nextjs_cors_1 = __importDefault(require("nextjs-cors"));
|
|
22
22
|
const utils_1 = require("../../utils");
|
|
23
23
|
const PROXY_TIMEOUT = 6000; // NOTE: 6 seconds
|
|
24
|
-
const
|
|
24
|
+
const transformRecordToSortedKeyValueString = (object) => (Object.keys(object)
|
|
25
|
+
.sort()
|
|
26
|
+
.map(key => `${key}=${object[key]}`)
|
|
27
|
+
.join(''));
|
|
28
|
+
const verifyAppProxySignature = (_a, sharedSecret, APP_CONFIG) => {
|
|
25
29
|
var { signature } = _a, verifiable = __rest(_a, ["signature"]);
|
|
30
|
+
console.log(`>>> > verifyAppProxySignature > sharedSecret:`, sharedSecret);
|
|
31
|
+
console.log(`>>> > verifyAppProxySignature > signature:`, signature);
|
|
32
|
+
console.log(`>>> > verifyAppProxySignature > verifiable:`, verifiable);
|
|
26
33
|
const hmac = utils_1.generateHMAC(new URLSearchParams(verifiable).toString(), sharedSecret);
|
|
34
|
+
console.log(`>>> > verifyAppProxySignature > hmac:`, hmac);
|
|
35
|
+
const hmac_ = utils_1.generateHMAC(transformRecordToSortedKeyValueString(verifiable), sharedSecret);
|
|
36
|
+
console.log(`>>> > verifyAppProxySignature > hmac_:`, hmac_);
|
|
37
|
+
const { host } = verifiable, lessVerifiable = __rest(verifiable, ["host"]);
|
|
38
|
+
const hmac2 = utils_1.generateHMAC(new URLSearchParams(lessVerifiable).toString(), sharedSecret);
|
|
39
|
+
console.log(`>>> > verifyAppProxySignature > hmac2:`, hmac2);
|
|
40
|
+
const hmac2_ = utils_1.generateHMAC(transformRecordToSortedKeyValueString(lessVerifiable), sharedSecret);
|
|
41
|
+
console.log(`>>> > verifyAppProxySignature > hmac2_:`, hmac2_);
|
|
42
|
+
const hmac3 = utils_1.generateHMAC(new URLSearchParams(lessVerifiable).toString(), sharedSecret, 'base64');
|
|
43
|
+
console.log(`>>> > verifyAppProxySignature > hmac3:`, hmac3);
|
|
44
|
+
const hmac3_ = utils_1.generateHMAC(transformRecordToSortedKeyValueString(lessVerifiable), sharedSecret, 'base64');
|
|
45
|
+
console.log(`>>> > verifyAppProxySignature > hmac3_:`, hmac3_);
|
|
46
|
+
const _hmac = utils_1.generateHMAC(new URLSearchParams(verifiable).toString(), APP_CONFIG.apiKey);
|
|
47
|
+
console.log(`>>> > verifyAppProxySignature > _hmac:`, _hmac);
|
|
48
|
+
const _hmac_ = utils_1.generateHMAC(transformRecordToSortedKeyValueString(verifiable), APP_CONFIG.apiKey);
|
|
49
|
+
console.log(`>>> > verifyAppProxySignature > _hmac_:`, _hmac_);
|
|
50
|
+
const _hmac2 = utils_1.generateHMAC(new URLSearchParams(lessVerifiable).toString(), APP_CONFIG.apiKey);
|
|
51
|
+
console.log(`>>> > verifyAppProxySignature > _hmac2:`, _hmac2);
|
|
52
|
+
const _hmac2_ = utils_1.generateHMAC(transformRecordToSortedKeyValueString(lessVerifiable), APP_CONFIG.apiKey);
|
|
53
|
+
console.log(`>>> > verifyAppProxySignature > _hmac2_:`, _hmac2_);
|
|
54
|
+
const _hmac3 = utils_1.generateHMAC(new URLSearchParams(lessVerifiable).toString(), APP_CONFIG.apiKey, 'base64');
|
|
55
|
+
console.log(`>>> > verifyAppProxySignature > _hmac3:`, _hmac3);
|
|
56
|
+
const _hmac3_ = utils_1.generateHMAC(transformRecordToSortedKeyValueString(lessVerifiable), APP_CONFIG.apiKey, 'base64');
|
|
57
|
+
console.log(`>>> > verifyAppProxySignature > _hmac3_:`, _hmac3_);
|
|
58
|
+
const comp8 = utils_1.compareHashes(signature, hmac, 'utf-8');
|
|
59
|
+
console.log(`>>> > verifyAppProxySignature > comp8:`, comp8);
|
|
60
|
+
const comp8_ = utils_1.compareHashes(signature, hmac_, 'utf-8');
|
|
61
|
+
console.log(`>>> > verifyAppProxySignature > comp8_:`, comp8_);
|
|
62
|
+
const comp82 = utils_1.compareHashes(signature, hmac2, 'utf-8');
|
|
63
|
+
console.log(`>>> > verifyAppProxySignature > comp82:`, comp82);
|
|
64
|
+
const comp82_ = utils_1.compareHashes(signature, hmac2_, 'utf-8');
|
|
65
|
+
console.log(`>>> > verifyAppProxySignature > comp82_:`, comp82_);
|
|
66
|
+
const comp83_ = utils_1.compareHashes(signature, hmac3_, 'utf-8');
|
|
67
|
+
console.log(`>>> > verifyAppProxySignature > comp83_:`, comp83_);
|
|
27
68
|
return utils_1.compareHashes(signature, hmac);
|
|
28
69
|
};
|
|
29
70
|
const handleProxy = (serverRuntimeConfig) => async (req, res, _params) => {
|
|
@@ -65,6 +106,7 @@ const handleProxy = (serverRuntimeConfig) => async (req, res, _params) => {
|
|
|
65
106
|
}
|
|
66
107
|
const { query: _query, headers: _headers } = req;
|
|
67
108
|
const query = utils_1.ensureObject(_query);
|
|
109
|
+
console.log(`>>> > handleProxy > query:`, query);
|
|
68
110
|
// TODO!!!!!!: update this to not send as querystring/get via app itself somehow on backend?
|
|
69
111
|
const { signature } = query, verifiable = __rest(query, ["signature"]);
|
|
70
112
|
const { shop: _shop, host: _host, timestamp, path_prefix } = verifiable;
|
|
@@ -73,10 +115,13 @@ const handleProxy = (serverRuntimeConfig) => async (req, res, _params) => {
|
|
|
73
115
|
: path_prefix);
|
|
74
116
|
// TODO: explore moving this to sessionToken middleware??
|
|
75
117
|
const _b = _headers !== null && _headers !== void 0 ? _headers : {}, { 'x-extension-session': sessionToken, 'x-extension-point': extensionPoint } = _b, __headers = __rest(_b, ['x-extension-session', 'x-extension-point']);
|
|
76
|
-
|
|
118
|
+
console.log(`>>> > handleProxy > __headers:`, __headers);
|
|
119
|
+
// if (!_shop || !_host || !extensionPoint || !signature) {
|
|
120
|
+
if (!_shop || !extensionPoint || !signature) {
|
|
77
121
|
return res.status(400).json({ message: 'Invalid or missing headers.', extensionPoint });
|
|
78
122
|
}
|
|
79
|
-
|
|
123
|
+
console.log(`>>> > handleProxy > isShopifyOriginOrRelative: '${isShopifyOriginOrRelative}'`, APP_CONFIG);
|
|
124
|
+
if (!verifyAppProxySignature(query, isShopifyOriginOrRelative ? APP_CONFIG.apiSecretKey : timestamp, APP_CONFIG)) {
|
|
80
125
|
return res.status(403).json({ message: 'Invalid signature.' });
|
|
81
126
|
}
|
|
82
127
|
if (sessionToken) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"proxy.js","sourceRoot":"","sources":["../../../src/handlers/api/proxy.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,sDAAsD;AACtD,gDAAgD;AAChD,4DAAkC;AAClC,8DAAkC;AAElC,uCAWoB;AAEpB,MAAM,aAAa,GAAG,IAAI,CAAA,CAAC,kBAAkB;AAE7C,MAAM,uBAAuB,GAAG,CAAC,EAA4B,EAAE,YAAY,EAAE,EAAE;
|
|
1
|
+
{"version":3,"file":"proxy.js","sourceRoot":"","sources":["../../../src/handlers/api/proxy.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,sDAAsD;AACtD,gDAAgD;AAChD,4DAAkC;AAClC,8DAAkC;AAElC,uCAWoB;AAEpB,MAAM,aAAa,GAAG,IAAI,CAAA,CAAC,kBAAkB;AAE7C,MAAM,qCAAqC,GAAG,CAAC,MAAM,EAAE,EAAE,CAAC,CACxD,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC;KAClB,IAAI,EAAE;KACN,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,GAAG,IAAI,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC;KACnC,IAAI,CAAC,EAAE,CAAC,CACV,CAAA;AAED,MAAM,uBAAuB,GAAG,CAAC,EAA4B,EAAE,YAAY,EAAE,UAAU,EAAE,EAAE;QAA1D,EAAE,SAAS,OAAiB,EAAZ,UAAU,cAA1B,aAA4B,CAAF;IACzD,OAAO,CAAC,GAAG,CAAC,+CAA+C,EAAE,YAAY,CAAC,CAAA;IAC1E,OAAO,CAAC,GAAG,CAAC,4CAA4C,EAAE,SAAS,CAAC,CAAA;IACpE,OAAO,CAAC,GAAG,CAAC,6CAA6C,EAAE,UAAU,CAAC,CAAA;IACtE,MAAM,IAAI,GAAG,oBAAY,CAAC,IAAI,eAAe,CAAC,UAAU,CAAC,CAAC,QAAQ,EAAE,EAAE,YAAY,CAAC,CAAA;IACnF,OAAO,CAAC,GAAG,CAAC,uCAAuC,EAAE,IAAI,CAAC,CAAA;IAC1D,MAAM,KAAK,GAAG,oBAAY,CAAC,qCAAqC,CAAC,UAAU,CAAC,EAAE,YAAY,CAAC,CAAA;IAC3F,OAAO,CAAC,GAAG,CAAC,wCAAwC,EAAE,KAAK,CAAC,CAAA;IAC5D,MAAM,EAAE,IAAI,KAAwB,UAAU,EAA7B,cAAc,UAAK,UAAU,EAAxC,QAA2B,CAAa,CAAA;IAC9C,MAAM,KAAK,GAAG,oBAAY,CAAC,IAAI,eAAe,CAAC,cAAc,CAAC,CAAC,QAAQ,EAAE,EAAE,YAAY,CAAC,CAAA;IACxF,OAAO,CAAC,GAAG,CAAC,wCAAwC,EAAE,KAAK,CAAC,CAAA;IAC5D,MAAM,MAAM,GAAG,oBAAY,CAAC,qCAAqC,CAAC,cAAc,CAAC,EAAE,YAAY,CAAC,CAAA;IAChG,OAAO,CAAC,GAAG,CAAC,yCAAyC,EAAE,MAAM,CAAC,CAAA;IAC9D,MAAM,KAAK,GAAG,oBAAY,CAAC,IAAI,eAAe,CAAC,cAAc,CAAC,CAAC,QAAQ,EAAE,EAAE,YAAY,EAAE,QAAQ,CAAC,CAAA;IAClG,OAAO,CAAC,GAAG,CAAC,wCAAwC,EAAE,KAAK,CAAC,CAAA;IAC5D,MAAM,MAAM,GAAG,oBAAY,CAAC,qCAAqC,CAAC,cAAc,CAAC,EAAE,YAAY,EAAE,QAAQ,CAAC,CAAA;IAC1G,OAAO,CAAC,GAAG,CAAC,yCAAyC,EAAE,MAAM,CAAC,CAAA;IAG9D,MAAM,KAAK,GAAG,oBAAY,CAAC,IAAI,eAAe,CAAC,UAAU,CAAC,CAAC,QAAQ,EAAE,EAAE,UAAU,CAAC,MAAM,CAAC,CAAA;IACzF,OAAO,CAAC,GAAG,CAAC,wCAAwC,EAAE,KAAK,CAAC,CAAA;IAC5D,MAAM,MAAM,GAAG,oBAAY,CAAC,qCAAqC,CAAC,UAAU,CAAC,EAAE,UAAU,CAAC,MAAM,CAAC,CAAA;IACjG,OAAO,CAAC,GAAG,CAAC,yCAAyC,EAAE,MAAM,CAAC,CAAA;IAC9D,MAAM,MAAM,GAAG,oBAAY,CAAC,IAAI,eAAe,CAAC,cAAc,CAAC,CAAC,QAAQ,EAAE,EAAE,UAAU,CAAC,MAAM,CAAC,CAAA;IAC9F,OAAO,CAAC,GAAG,CAAC,yCAAyC,EAAE,MAAM,CAAC,CAAA;IAC9D,MAAM,OAAO,GAAG,oBAAY,CAAC,qCAAqC,CAAC,cAAc,CAAC,EAAE,UAAU,CAAC,MAAM,CAAC,CAAA;IACtG,OAAO,CAAC,GAAG,CAAC,0CAA0C,EAAE,OAAO,CAAC,CAAA;IAChE,MAAM,MAAM,GAAG,oBAAY,CAAC,IAAI,eAAe,CAAC,cAAc,CAAC,CAAC,QAAQ,EAAE,EAAE,UAAU,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAA;IACxG,OAAO,CAAC,GAAG,CAAC,yCAAyC,EAAE,MAAM,CAAC,CAAA;IAC9D,MAAM,OAAO,GAAG,oBAAY,CAAC,qCAAqC,CAAC,cAAc,CAAC,EAAE,UAAU,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAA;IAChH,OAAO,CAAC,GAAG,CAAC,0CAA0C,EAAE,OAAO,CAAC,CAAA;IAEhE,MAAM,KAAK,GAAG,qBAAa,CAAC,SAAS,EAAE,IAAI,EAAE,OAAO,CAAC,CAAA;IACrD,OAAO,CAAC,GAAG,CAAC,wCAAwC,EAAE,KAAK,CAAC,CAAA;IAC5D,MAAM,MAAM,GAAG,qBAAa,CAAC,SAAS,EAAE,KAAK,EAAE,OAAO,CAAC,CAAA;IACvD,OAAO,CAAC,GAAG,CAAC,yCAAyC,EAAE,MAAM,CAAC,CAAA;IAC9D,MAAM,MAAM,GAAG,qBAAa,CAAC,SAAS,EAAE,KAAK,EAAE,OAAO,CAAC,CAAA;IACvD,OAAO,CAAC,GAAG,CAAC,yCAAyC,EAAE,MAAM,CAAC,CAAA;IAC9D,MAAM,OAAO,GAAG,qBAAa,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,CAAC,CAAA;IACzD,OAAO,CAAC,GAAG,CAAC,0CAA0C,EAAE,OAAO,CAAC,CAAA;IAChE,MAAM,OAAO,GAAG,qBAAa,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,CAAC,CAAA;IACzD,OAAO,CAAC,GAAG,CAAC,0CAA0C,EAAE,OAAO,CAAC,CAAA;IAEhE,OAAO,qBAAa,CAAC,SAAS,EAAE,IAAI,CAAC,CAAA;AACvC,CAAC,CAAA;AAEM,MAAM,WAAW,GAAG,CAAC,mBAAmB,EAAE,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,OAAO,EAAE,EAAE;;IAC9E,MAAM,EAAE,UAAU,EAAE,oBAAoB,EAAE,eAAe,EAAE,eAAe,EAAE,GAAG,mBAAmB,CAAA;IAElG,MAAM,cAAc,GAAG,oBAAY,CAAC,eAAe,CAAC,CAAA;IACpD,MAAM,qBAAqB,GAAG,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,CAAA;IACzD,MAAM,eAAe,GAAG;QACtB,GAAG,mBAAW,CAAC,eAAe,CAAC;QAC/B,yBAAyB;KAC1B,CAAA;IAED,MAAM,qBAAQ,CAAC,GAAG,EAAE,GAAG,EAAE;QACvB,OAAO,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,CAAC;QAC3C,MAAM,EAAE,CAAC,MAAM,EAAE,QAAQ,EAAE,EAAE;;YAC3B,IAAI,eAAe,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE;gBACpC,OAAO,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;aAC5B;YAED,IAAI,KAAK,CAAA;YACT,IAAI;gBACF,KAAK,GAAG,oBAAY,CAAC,MAAM,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAA;aACpF;YAAC,OAAO,MAAM,EAAE;gBACf,OAAO,CAAC,GAAG,CAAC,gCAAgC,EAAE,MAAM,CAAC,CAAA;aACtD;YAED,IAAI,KAAK,IAAI,sBAAc,CAAC,MAAA,4BAAoB,CAAC,KAAK,CAAC,0CAAE,IAAI,CAAC,EAAE;gBAC9D,OAAO,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;aAC5B;YAED,OAAO,QAAQ,CAAC,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC,CAAA;QACnD,CAAC;QACD,oBAAoB,EAAE,GAAG,EAAE,6DAA6D;KACzF,CAAC,CAAA;IAEF,MAAM,KAAK,GAAG,oBAAS,CAAC,WAAW,EAAE,CAAA;IAErC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI,EAAE,CAAA;IACzC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;IACtF,MAAM,SAAS,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,MAAM,CAAC,sBAAc,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;IAEpE,IAAI,CAAC,SAAS,IAAI,kBAAU,CAAC,qBAAqB,CAAC,IAAI,CAAC,qBAAqB,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE;QAChG,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,qBAAqB,EAAE,CAAC,CAAA;KAChE;IAED,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,GAAG,CAAA;IAChD,MAAM,KAAK,GAAG,oBAAY,CAAC,MAAM,CAAC,CAAA;IAClC,OAAO,CAAC,GAAG,CAAC,4BAA4B,EAAE,KAAK,CAAC,CAAA;IAChD,4FAA4F;IAC5F,MAAM,EAAE,SAAS,KAAoB,KAAK,EAApB,UAAU,UAAK,KAAK,EAApC,aAA4B,CAAQ,CAAA;IAC1C,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE,GAAG,UAAU,CAAA;IACvE,MAAM,yBAAyB,GAAG,sBAAc,CAC9C,oBAAY,CAAC,WAAW,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC;QAC1C,CAAC,CAAC,MAAA,4BAAoB,CAAC,IAAI,GAAG,CAAC,WAAW,CAAC,CAAC,QAAQ,CAAC,0CAAE,IAAI;QAC3D,CAAC,CAAC,WAAW,CAChB,CAAA;IAED,yDAAyD;IACzD,MAAM,KAIF,QAAQ,aAAR,QAAQ,cAAR,QAAQ,GAAI,EAAE,EAJZ,EACJ,qBAAqB,EAAE,YAAY,EACnC,mBAAmB,EAAE,cAAc,OAEnB,EADb,SAAS,cAHR,4CAIL,CAAiB,CAAA;IAClB,OAAO,CAAC,GAAG,CAAC,gCAAgC,EAAE,SAAS,CAAC,CAAA;IACxD,2DAA2D;IAC3D,IAAI,CAAC,KAAK,IAAI,CAAC,cAAc,IAAI,CAAC,SAAS,EAAE;QAC3C,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,6BAA6B,EAAE,cAAc,EAAE,CAAC,CAAA;KACxF;IAED,OAAO,CAAC,GAAG,CAAC,mDAAmD,yBAAyB,GAAG,EAAE,UAAU,CAAC,CAAA;IACxG,IAAI,CAAC,uBAAuB,CAC1B,KAAK,EACL,yBAAyB,CAAC,CAAC,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC,CAAC,SAAS,EAC/D,UAAU,CACX,EAAE;QACD,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,oBAAoB,EAAE,CAAC,CAAA;KAC/D;IAED,IAAI,YAAY,EAAE;QAChB,kFAAkF;QAClF,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,sBAAc,CAAC,YAAY,CAAC,CAAA;QACnD,IAAI,CAAC,IAAI,KAAK,KAAK,CAAC,IAAI,CAAC,IAAI,KAAK,KAAK,CAAC,EAAE;YACxC,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,4BAA4B,EAAE,CAAC,CAAA;SACvE;KACF;IAED,8CAA8C;IAC9C,MAAM,OAAO,GAAG,oBAAY,CAAC,oBAAoB,CAAC,CAAA;IAClD,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,oBAAY,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAC5E,gBAAgB,EAChB,CAAC,MAAM,EAAE,WAAW,CAAC,EACrB,EAAE,CAAC,iCACA,gBAAgB,KACnB,CAAC,MAAM,CAAC,EAAE,uBAAe,CAAC,WAAW,EAAE,EAAE,OAAO,EAAE,CAAC,IACnD,EAAE,SAAS,CAAC,CAAA;IAEd,OAAO,IAAI,OAAO,CAAC,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE;QACtC,GAAG,CAAC,GAAG,GAAG,SAAS,CAAA;QACnB,GAAG,CAAC,OAAO,GAAG,OAAO,CAAA;QAErB,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAA;QAE3B,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE;YAClB,MAAM;YACN,OAAO,EAAE,aAAa;YACtB,YAAY,EAAE,aAAa;YAC3B,eAAe,EAAE,KAAK;YACtB,YAAY,EAAE,IAAI;YAClB,MAAM,EAAE,IAAI;SACb,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;AACJ,CAAC,CAAA;AA7GY,QAAA,WAAW,eA6GvB"}
|
package/dist/utils/session.js
CHANGED
|
@@ -37,18 +37,19 @@ const getShopifyHelpers = async (serverRuntimeConfig, _a) => {
|
|
|
37
37
|
const privateKey = crypto_1.wrapKeyData(crypto_1.decryptAES(recryptedPrivateKey, SESSION_CONFIG.sharedSecret, hiddenPrivateIv));
|
|
38
38
|
// #endregion CRYPTO
|
|
39
39
|
const decryptVerifySession = async ({ req, res }) => {
|
|
40
|
-
var _a;
|
|
40
|
+
var _a, _b;
|
|
41
41
|
const sessionId = await shopify.session.getCurrentId({
|
|
42
42
|
isOnline: true,
|
|
43
43
|
rawRequest: req,
|
|
44
44
|
rawResponse: res,
|
|
45
45
|
});
|
|
46
|
-
const
|
|
46
|
+
const _c = (_a = (await firebase_1.loadCallback(sessionHandler, sessionId))) !== null && _a !== void 0 ? _a : {}, { accessToken: encryptedAccessToken } = _c, session = __rest(_c, ["accessToken"]);
|
|
47
|
+
console.log(`>>> > decryptVerifySession > encryptedAccessToken:`, { sessionId, encryptedAccessToken });
|
|
47
48
|
// TODO clear sessions if undefined???
|
|
48
49
|
if (shop && (session === null || session === void 0 ? void 0 : session.shop) !== shop) {
|
|
49
50
|
throw new errors_1.ShopifyAuthenticationError('Invalid shop');
|
|
50
51
|
}
|
|
51
|
-
const scopesUnchanged = display_1.arraysMatch(display_1.splitCommas((
|
|
52
|
+
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));
|
|
52
53
|
const sessionExpired = !(session === null || session === void 0 ? void 0 : session.expires) || (luxon_1.DateTime.fromISO(session.expires) < luxon_1.DateTime.now());
|
|
53
54
|
const sessionActive = (scopesUnchanged && !sessionExpired);
|
|
54
55
|
if (!sessionActive) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../src/utils/session.js"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,sDAAwD;AACxD,iCAAgC;AAEhC,uCAAyC;AACzC,uCAAoE;AACpE,uCAAiD;AACjD,yCAMmB;AACnB,qCAAqD;AACrD,2CAAwC;AACxC,qCAAmF;AACnF,qCAA2C;AAEpC,MAAM,iBAAiB,GAAG,KAAK,EAAE,mBAAmB,EAAE,EAAsB,EAAE,EAAE;QAA1B,EAAE,IAAI,OAAgB,EAAX,SAAS,cAApB,QAAsB,CAAF;IAC/E,MAAM,OAAO,GAAG,MAAM,+BAAqB,CAAC,mBAAmB,EAAE,SAAS,CAAC,CAAA;IAC3E,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,EAAE,EAAE;;QAClD,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC;YACnD,QAAQ,EAAE,IAAI;YACd,UAAU,EAAE,GAAG;YACf,WAAW,EAAE,GAAG;SACjB,CAAC,CAAA;QAEF,MAAM,KAAoD,MAAM,uBAAY,CAAC,cAAc,EAAE,SAAS,CAAC,
|
|
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.
|
|
3
|
+
"version": "1.7.5-beta.10",
|
|
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",
|