@agnostack/next-shopify 1.13.4-beta.28 → 1.13.4-beta.29
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.13.4-beta.29](https://github.com/agnostack/next-shopify/compare/v1.13.4-beta.28...v1.13.4-beta.29) (2023-11-28)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### Bug Fixes
|
|
5
|
+
|
|
6
|
+
* wip ([58b879d](https://github.com/agnostack/next-shopify/commit/58b879d2e18291c25da4e138075bb3a4889e2e75))
|
|
7
|
+
|
|
1
8
|
## [1.13.4-beta.28](https://github.com/agnostack/next-shopify/compare/v1.13.4-beta.27...v1.13.4-beta.28) (2023-11-28)
|
|
2
9
|
|
|
3
10
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"token.d.ts","sourceRoot":"","sources":["../../../../src/lib/handlers/api/token.js"],"names":[],"mappings":"AAkBO,
|
|
1
|
+
{"version":3,"file":"token.d.ts","sourceRoot":"","sources":["../../../../src/lib/handlers/api/token.js"],"names":[],"mappings":"AAkBO,qHA2KN"}
|
|
@@ -33,30 +33,27 @@ const handleSessionToken = (serverRuntimeConfig, signingData) => {
|
|
|
33
33
|
let decryptedBody = parsedBody;
|
|
34
34
|
const [authProtocol, authSignature] = (0, shared_1.ensureString)(authorization).split(' ');
|
|
35
35
|
const isVerifiable = (apiKey && ephemeralPublicKey && (keyPairs === null || keyPairs === void 0 ? void 0 : keyPairs.shared) && authTimestamp && authSignature && (authProtocol === 'HMAC-SHA256'));
|
|
36
|
-
|
|
36
|
+
let verificationKeys;
|
|
37
|
+
// TEMP!!! remove isVerifiable check once webwidget moved to react
|
|
37
38
|
if (isVerifiable) {
|
|
38
39
|
if (!apiKey || !ephemeralPublicKey || !(keyPairs === null || keyPairs === void 0 ? void 0 : keyPairs.shared) || !authTimestamp || !authSignature || (authProtocol !== 'HMAC-SHA256')) {
|
|
39
40
|
return res.status(401).json({ message: 'Invalid or missing authorization' });
|
|
40
41
|
}
|
|
41
|
-
|
|
42
|
+
verificationKeys = yield shared_1.subtle.getVerificationKeys({
|
|
42
43
|
publicKey: ephemeralPublicKey,
|
|
43
44
|
privateKey: keyPairs.shared.privateKey,
|
|
44
45
|
});
|
|
45
|
-
if (!
|
|
46
|
+
if (!verificationKeys) {
|
|
46
47
|
return res.status(412).json({ message: 'Invalid or missing verification' });
|
|
47
48
|
}
|
|
48
|
-
console.log(`>>> > next-shopify.req.method:`, req.method);
|
|
49
49
|
const verificationPayload = (0, shared_1.objectToSortedString)(Object.assign({ method: (0, shared_1.getRequestMethod)(parsedBody, req.method), timestamp: authTimestamp, body: parsedBody }, (0, shared_1.normalizeURIParts)(req.url)));
|
|
50
|
-
|
|
51
|
-
const isValid = yield shared_1.subtle.verifyHMAC(verificationPayload, derivedHMACKey, authSignature);
|
|
50
|
+
const isValid = yield shared_1.subtle.verifyHMAC(verificationPayload, verificationKeys.derivedHMACKey, authSignature);
|
|
52
51
|
if (!isValid) {
|
|
53
52
|
return res.status(412).json({ message: 'Invalid or missing verification' });
|
|
54
53
|
}
|
|
55
|
-
if (parsedBody
|
|
56
|
-
|
|
57
|
-
const decrypredMessage = yield shared_1.subtle.decryptMessage(parsedBody, derivedSecretKey);
|
|
54
|
+
if (parsedBody) {
|
|
55
|
+
const decrypredMessage = yield shared_1.subtle.decryptMessage(parsedBody, verificationKeys.derivedSecretKey);
|
|
58
56
|
decryptedBody = JSON.parse(decrypredMessage !== null && decrypredMessage !== void 0 ? decrypredMessage : '{}');
|
|
59
|
-
console.log(`>>> > next-shopify.decryptedBody:`, decryptedBody);
|
|
60
57
|
}
|
|
61
58
|
}
|
|
62
59
|
// NOTE/TODO: keyPairs.messenger need to move to app metafields instead
|
|
@@ -100,6 +97,13 @@ const handleSessionToken = (serverRuntimeConfig, signingData) => {
|
|
|
100
97
|
signingSecret = (0, utils_1.generateHMAC)((0, shared_1.objectToSortedString)(payload), APP_CONFIG.apiSecretKey);
|
|
101
98
|
}
|
|
102
99
|
const token = (0, jsonwebtoken_1.sign)(payload, signingSecret, signingData);
|
|
100
|
+
if ((0, shared_1.stringEmpty)(token)) {
|
|
101
|
+
throw new Error('Error signing token');
|
|
102
|
+
}
|
|
103
|
+
if (isVerifiable && verificationKeys) {
|
|
104
|
+
const encrypted = yield shared_1.subtle.encryptMessage(JSON.stringify({ token }), verificationKeys.derivedSecretKey);
|
|
105
|
+
return res.status(200).json(encrypted);
|
|
106
|
+
}
|
|
103
107
|
return res.status(200).json({ token });
|
|
104
108
|
}
|
|
105
109
|
catch (error) {
|
|
@@ -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,4CASwB;AAExB,yCAAyC;AAClC,MAAM,kBAAkB,GAAG,CAAC,mBAAmB,EAAE,WAAW,EAAE,EAAE;IACrE,MAAM,EACJ,QAAQ,EACR,UAAU,GACX,GAAG,mBAAmB,aAAnB,mBAAmB,cAAnB,mBAAmB,GAAI,EAAE,CAAA;IAE7B,OAAO,CAAO,GAAG,EAAE,GAAG,EAAE,EAAE;;QACxB,MAAM,EAAE,IAAI,EAAE,GAAG,MAAA,GAAG,CAAC,KAAK,mCAAI,EAAE,CAAA;QAChC,MAAM,KAgBF,MAAA,GAAG,CAAC,OAAO,mCAAI,EAAE,EAhBf;QACJ,kDAAkD;QAClD,aAAa,EACb,cAAc,EAAE,MAAM,EACtB,iBAAiB,EAAE,kBAAkB,EACrC,2BAA2B,EAAE,aAAa,EAC1C,+BAA+B,EAAE,wBAAwB,EACzD,kBAAkB,EAAE,YAAY,EAChC,uBAAuB,EAAE,iBAAiB,GAAG,wBAAwB,EACrE,UAAU,EAAE,KAAK,GAAG,YAAY,EAChC,UAAU,EAAE,KAAK,EAAE,kIAAkI;QACrJ,mCAAmC;QACnC,eAAe,EAAE,UAAU,EAC3B,uBAAuB,EAAE,iBAAiB,EAC1C,gBAAgB,EAAE,IAAI,GAAG,iBAAiB,aAAjB,iBAAiB,cAAjB,iBAAiB,GAAI,UAAU,OAErC,EADhB,OAAO,sBAfN,mPAgBL,CAAoB,CAAA;QAErB,IAAI;YACF,qCAAqC;YACrC,IAAI,IAAA,oBAAW,EAAC,IAAI,CAAC,IAAI,IAAA,oBAAW,EAAC,IAAI,CAAC,EAAE;gBAC1C,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,wBAAwB,EAAE,CAAC,CAAA;aACnE;YAED,wCAAwC;YACxC,IAAI,GAAG,GAAG,KAAK,CAAA,CAAC,uCAAuC;YAEvD,6DAA6D;YAC7D,MAAM,QAAQ,GAAG,MAAM,IAAA,kBAAU,EAAC,GAAG,CAAC,CAAA;YACtC,MAAM,OAAO,GAAG,QAAQ,CAAC,QAAQ,EAAE,CAAA;YACnC,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,IAAI,IAAI,CAAC,CAAA,CAAC,wDAAwD;YACvG,IAAI,aAAa,GAAG,UAAU,CAAA;YAE9B,MAAM,CAAC,YAAY,EAAE,aAAa,CAAC,GAAG,IAAA,qBAAY,EAAC,aAAa,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;YAC5E,MAAM,YAAY,GAAG,CAAC,MAAM,IAAI,kBAAkB,KAAI,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,MAAM,CAAA,IAAI,aAAa,IAAI,aAAa,IAAI,CAAC,YAAY,KAAK,aAAa,CAAC,CAAC,CAAA;YAE7I,
|
|
1
|
+
{"version":3,"file":"token.js","sourceRoot":"","sources":["../../../../src/lib/handlers/api/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.13.4-beta.
|
|
3
|
+
"version": "1.13.4-beta.29",
|
|
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",
|