@agnostack/next-shopify 1.14.0-beta.41 → 1.14.0-beta.43
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 +14 -0
- package/dist/lib/handlers/api/graph.d.ts.map +1 -1
- package/dist/lib/handlers/api/graph.js +1 -12
- package/dist/lib/handlers/api/graph.js.map +1 -1
- package/dist/lib/handlers/api/proxy.d.ts.map +1 -1
- package/dist/lib/handlers/api/proxy.js +6 -17
- package/dist/lib/handlers/api/proxy.js.map +1 -1
- package/dist/lib/handlers/api/token.d.ts +1 -1
- package/dist/lib/handlers/api/token.d.ts.map +1 -1
- package/dist/lib/handlers/api/token.js +3 -9
- package/dist/lib/handlers/api/token.js.map +1 -1
- package/dist/lib/utils/token.d.ts +3 -3
- package/dist/lib/utils/token.d.ts.map +1 -1
- package/dist/lib/utils/token.js +4 -10
- package/dist/lib/utils/token.js.map +1 -1
- package/dist/lib/utils/verification.d.ts.map +1 -1
- package/dist/lib/utils/verification.js +0 -5
- package/dist/lib/utils/verification.js.map +1 -1
- package/dist/react/hooks/useVerification.d.ts.map +1 -1
- package/dist/react/hooks/useVerification.js +0 -4
- package/dist/react/hooks/useVerification.js.map +1 -1
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,17 @@
|
|
|
1
|
+
# [1.14.0-beta.43](https://github.com/agnostack/next-shopify/compare/v1.14.0-beta.42...v1.14.0-beta.43) (2023-12-05)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### Bug Fixes
|
|
5
|
+
|
|
6
|
+
* wip ([01f3211](https://github.com/agnostack/next-shopify/commit/01f3211c884251df01dcf604b681fff2c9b6be6f))
|
|
7
|
+
|
|
8
|
+
# [1.14.0-beta.42](https://github.com/agnostack/next-shopify/compare/v1.14.0-beta.41...v1.14.0-beta.42) (2023-12-05)
|
|
9
|
+
|
|
10
|
+
|
|
11
|
+
### Bug Fixes
|
|
12
|
+
|
|
13
|
+
* wip ([49ef4f4](https://github.com/agnostack/next-shopify/commit/49ef4f418a81eb30aa8ab31968e0e96842f7532f))
|
|
14
|
+
|
|
1
15
|
# [1.14.0-beta.41](https://github.com/agnostack/next-shopify/compare/v1.14.0-beta.40...v1.14.0-beta.41) (2023-12-05)
|
|
2
16
|
|
|
3
17
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"graph.d.ts","sourceRoot":"","sources":["../../../../src/lib/handlers/api/graph.js"],"names":[],"mappings":"AAoBO,
|
|
1
|
+
{"version":3,"file":"graph.d.ts","sourceRoot":"","sources":["../../../../src/lib/handlers/api/graph.js"],"names":[],"mappings":"AAoBO,yGAoHN"}
|
|
@@ -9,19 +9,13 @@ const handleGraph = (serverRuntimeConfig) => {
|
|
|
9
9
|
const _getVerifiedBody = (0, utils_1.getVerifiedBody)(serverRuntimeConfig);
|
|
10
10
|
return (req, res, params) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
|
|
11
11
|
var _a, _b, _c;
|
|
12
|
-
console.log(`>>> > handleGraph > req headers:`, req.headers);
|
|
13
|
-
console.log(`>>> > handleGraph > req body:`, req.body);
|
|
14
|
-
console.log(`>>> > handleGraph > params:`, params);
|
|
15
12
|
const [requestBody, processResponse] = yield _getVerifiedBody(req, res);
|
|
16
|
-
console.log(`>>> > handleGraph > requestBody:`, requestBody);
|
|
17
|
-
console.log(`>>> > handleGraph > req.query:`, req.query);
|
|
18
13
|
const _d = (_a = req.query) !== null && _a !== void 0 ? _a : {}, { shop, apiVersion } = _d, _query = tslib_1.__rest(_d, ["shop", "apiVersion"]);
|
|
19
14
|
const _e = params !== null && params !== void 0 ? params : (0, shared_1.safeParse)(requestBody || '{}'), { isOnline, query: graphQuery, variables: graphVariables, transform = (_data) => _data } = _e, graphParams = tslib_1.__rest(_e, ["isOnline", "query", "variables", "transform"]);
|
|
20
15
|
let query = _query;
|
|
21
16
|
if ((0, shared_1.isType)(query, 'string')) {
|
|
22
17
|
query = (0, shared_1.querystringToObject)(query);
|
|
23
18
|
}
|
|
24
|
-
console.log(`>>> > handleGraph > shop/graphQuery:`, { shop, graphQuery });
|
|
25
19
|
if ((0, shared_1.stringEmpty)(shop) || (0, shared_1.stringEmpty)(graphQuery)) {
|
|
26
20
|
return res.status(400).json({ message: 'Invalid arguments' });
|
|
27
21
|
}
|
|
@@ -36,7 +30,6 @@ const handleGraph = (serverRuntimeConfig) => {
|
|
|
36
30
|
query: graphQuery,
|
|
37
31
|
variables: graphVariables,
|
|
38
32
|
} : graphQuery }, (0, shared_1.objectNotEmpty)(query) && { query }), graphParams));
|
|
39
|
-
console.log(`>>> > handleGraph > response:`, response);
|
|
40
33
|
statusCode = 200;
|
|
41
34
|
}
|
|
42
35
|
catch (error) {
|
|
@@ -85,18 +78,14 @@ const handleGraph = (serverRuntimeConfig) => {
|
|
|
85
78
|
return res.status(statusCode).json({ message });
|
|
86
79
|
}
|
|
87
80
|
const responseBody = (0, shared_1.ensureObject)((_c = response.body.data) !== null && _c !== void 0 ? _c : response.body);
|
|
88
|
-
console.log(`>>> > handleGraph > responseBody:`, responseBody);
|
|
89
81
|
const [_responseData] = Object.values(responseBody);
|
|
90
82
|
const _f = (0, shared_1.ensureObject)(_responseData), { userErrors } = _f, responseData = tslib_1.__rest(_f, ["userErrors"]);
|
|
91
83
|
if ((0, shared_1.arrayNotEmpty)(userErrors)) {
|
|
92
84
|
const errorMessages = (0, shared_1.ensureArray)(userErrors).map(({ message }) => (0, shared_1.ensureString)(message));
|
|
93
85
|
return res.status(500).json({ message: `${message}. ${errorMessages.join('. ')}.` });
|
|
94
86
|
}
|
|
95
|
-
console.log(`>>> > handleGraph > responseData:`, { responseData });
|
|
96
|
-
const transformedResponse = yield processResponse(transform(responseData, responseBody));
|
|
97
|
-
console.log(`>>> > handleGraph > transformedResponse:`, { transformedResponse });
|
|
98
87
|
// NOTE: sending in both to transform in case someone needs the userErrors
|
|
99
|
-
return res.status(statusCode).json(
|
|
88
|
+
return res.status(statusCode).json(yield processResponse(transform(responseData, responseBody)));
|
|
100
89
|
}
|
|
101
90
|
catch (error) {
|
|
102
91
|
console.error(`${message}. Transformation Error.`, error);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"graph.js","sourceRoot":"","sources":["../../../../src/lib/handlers/api/graph.js"],"names":[],"mappings":";;;;AAAA,sDAAsE;AAEtE,uCAIoB;AACpB,4CAWwB;AAEjB,MAAM,WAAW,GAAG,CAAC,mBAAmB,EAAE,EAAE;IACjD,MAAM,gBAAgB,GAAG,IAAA,uBAAe,EAAC,mBAAmB,CAAC,CAAA;IAE7D,OAAO,CAAO,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,EAAE;;QAChC,
|
|
1
|
+
{"version":3,"file":"graph.js","sourceRoot":"","sources":["../../../../src/lib/handlers/api/graph.js"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"proxy.d.ts","sourceRoot":"","sources":["../../../../src/lib/handlers/api/proxy.js"],"names":[],"mappings":"AAmCO,
|
|
1
|
+
{"version":3,"file":"proxy.d.ts","sourceRoot":"","sources":["../../../../src/lib/handlers/api/proxy.js"],"names":[],"mappings":"AAmCO,sHAkMN"}
|
|
@@ -15,7 +15,7 @@ const verifyAppProxySignature = (signature, verifiable, hmacSecret) => {
|
|
|
15
15
|
};
|
|
16
16
|
const handleProxy = (serverRuntimeConfig, config) => {
|
|
17
17
|
const { generateReplacements } = config !== null && config !== void 0 ? config : {};
|
|
18
|
-
const { API_BASE_PATH, API_PATHS, APP_CONFIG, APP_BASE_URL, TARGET_SAFELIST, ORIGIN_SAFELIST, } = serverRuntimeConfig;
|
|
18
|
+
const { API_BASE_PATH, API_URLS, API_PATHS, APP_CONFIG, APP_BASE_URL, TARGET_SAFELIST, ORIGIN_SAFELIST, } = serverRuntimeConfig;
|
|
19
19
|
const _getVerifiedBody = (0, utils_1.getVerifiedBody)(serverRuntimeConfig);
|
|
20
20
|
const _getVerifiedSessionData = (0, utils_1.getVerifiedSessionData)(serverRuntimeConfig);
|
|
21
21
|
return (req, res, params) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
|
|
@@ -54,7 +54,6 @@ const handleProxy = (serverRuntimeConfig, config) => {
|
|
|
54
54
|
const _targetUrl = ((0, shared_1.stringEmpty)(targetParam) || targetParam.startsWith('http')) ? targetParam : `${APP_BASE_URL}/${(0, shared_1.removeLeadingSlash)(targetParam)}`;
|
|
55
55
|
const { origin: target, hostname, pathname, search } = (0, shared_1.stringNotEmpty)(_targetUrl) ? new URL(_targetUrl) : {};
|
|
56
56
|
targetPath = [pathname, search].filter(shared_1.stringNotEmpty).join('');
|
|
57
|
-
console.log(`>>> > handleProxy > targetPath:`, targetPath);
|
|
58
57
|
const safelistedTarget = (0, shared_1.matchHostname)(hostname, Object.assign({ [new URL(APP_BASE_URL).hostname]: {
|
|
59
58
|
// HMMM: can we generate our own session token (or use the current one) so as to not have to tell handleGraph/Rest to behave as offline?
|
|
60
59
|
// headers: {
|
|
@@ -78,17 +77,16 @@ const handleProxy = (serverRuntimeConfig, config) => {
|
|
|
78
77
|
if (!verifyAppProxySignature(signature, verifiable, isShopifyOriginOrRelative ? APP_CONFIG.apiSecretKey : timestamp)) {
|
|
79
78
|
return res.status(403).json({ message: 'Invalid signature' });
|
|
80
79
|
}
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
// TODO: clean up targetParam.startsWith??
|
|
80
|
+
const isTokenRequest = ((targetParam === null || targetParam === void 0 ? void 0 : targetParam.startsWith(API_PATHS[shared_1.API_ROUTE_NAMES.SESSION_TOKEN])) ||
|
|
81
|
+
(targetParam === null || targetParam === void 0 ? void 0 : targetParam.startsWith(API_URLS[shared_1.API_ROUTE_NAMES.SESSION_TOKEN])));
|
|
84
82
|
if (!isTokenRequest) {
|
|
85
|
-
const isVerifiedSession = yield _getVerifiedSessionData(sessionToken, { shop, host })
|
|
83
|
+
const isVerifiedSession = yield _getVerifiedSessionData(sessionToken, { shop, host })
|
|
84
|
+
.catch((_error) => {
|
|
86
85
|
if (_error instanceof shared_1.ShopifySessionInvalidError) {
|
|
87
86
|
return res.status(412).json({ message: _error.message, type: 'ShopifySessionInvalidError' });
|
|
88
87
|
}
|
|
89
88
|
throw _error;
|
|
90
89
|
});
|
|
91
|
-
console.log(`>>> > handleProxy > isVerifiedSession:`, { isVerifiedSession });
|
|
92
90
|
if (!isVerifiedSession) {
|
|
93
91
|
return res.status(403).json({ message: 'Unverified signature' });
|
|
94
92
|
}
|
|
@@ -99,9 +97,7 @@ const handleProxy = (serverRuntimeConfig, config) => {
|
|
|
99
97
|
}
|
|
100
98
|
const passthroughEncryption = ((targetParam === null || targetParam === void 0 ? void 0 : targetParam.startsWith(API_BASE_PATH)) || (targetParam === null || targetParam === void 0 ? void 0 : targetParam.startsWith(`${APP_BASE_URL}${API_BASE_PATH}`)));
|
|
101
99
|
// eslint-disable-next-line max-len
|
|
102
|
-
console.log(`>>> > handleProxy > passthroughEncryption: '${targetPath}'`, { targetParam, disableRecryption: passthroughEncryption, API_BASE_PATH, APP_BASE_URL });
|
|
103
100
|
const [requestBody, processResponse] = yield _getVerifiedBody(req, res, { uri: targetPath, disableRecryption: passthroughEncryption });
|
|
104
|
-
console.log(`>>> > handleProxy > requestBody: '${targetPath}'`, { requestBody, isTokenRequest });
|
|
105
101
|
const _prepareHeaders = (0, utils_1.prepareHeaders)(serverRuntimeConfig);
|
|
106
102
|
const headers = yield _prepareHeaders({
|
|
107
103
|
generateReplacements,
|
|
@@ -109,7 +105,6 @@ const handleProxy = (serverRuntimeConfig, config) => {
|
|
|
109
105
|
appId,
|
|
110
106
|
headers: Object.assign(Object.assign({}, _headers), targetHeaders),
|
|
111
107
|
});
|
|
112
|
-
console.log(`>>> > handleProxy > headers:`, headers);
|
|
113
108
|
const proxy = http_proxy_1.default.createProxy();
|
|
114
109
|
return new Promise((resolve, reject) => {
|
|
115
110
|
req.url = targetPath;
|
|
@@ -118,21 +113,15 @@ const handleProxy = (serverRuntimeConfig, config) => {
|
|
|
118
113
|
}
|
|
119
114
|
proxy.on('proxyReq', (proxyReq, proxyReqRequest, proxyReqResponse, options) => {
|
|
120
115
|
if (requestBody) {
|
|
121
|
-
console.log(`>>> > handleProxy > proxy.on > requestBody: '${targetPath}`, { requestBody });
|
|
122
116
|
const bodyData = JSON.stringify(requestBody);
|
|
123
|
-
console.log(`>>> > handleProxy > proxy.on > bodyData1: '${targetPath}' BEFORE:`, { bodyData });
|
|
124
117
|
proxyReq.setHeader('Content-Length', Buffer.byteLength(bodyData));
|
|
125
|
-
console.log(`>>> > handleProxy > proxy.on > bodyData2: '${targetPath} AFTER'`);
|
|
126
118
|
proxyReq.write(bodyData);
|
|
127
119
|
}
|
|
128
120
|
});
|
|
129
121
|
proxy.on('proxyRes', function (proxyRes, proxyResRequest, proxyResResponse) {
|
|
130
122
|
(0, node_http_proxy_json_1.default)(proxyResResponse, proxyRes, function (proxyResBody) {
|
|
131
123
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
132
|
-
|
|
133
|
-
const foo = yield processResponse(proxyResBody);
|
|
134
|
-
console.log(`>>> > handleProxy > proxyRes > foo:`, foo);
|
|
135
|
-
return foo;
|
|
124
|
+
return processResponse(proxyResBody);
|
|
136
125
|
});
|
|
137
126
|
});
|
|
138
127
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"proxy.js","sourceRoot":"","sources":["../../../../src/lib/handlers/api/proxy.js"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"proxy.js","sourceRoot":"","sources":["../../../../src/lib/handlers/api/proxy.js"],"names":[],"mappings":";;;;AAAA,sDAAsD;AACtD,sEAAkC;AAClC,oEAAkC;AAClC,wFAAkD;AAElD,uCAMoB;AACpB,4CAawB;AAExB,MAAM,aAAa,GAAG,IAAI,CAAA,CAAC,kBAAkB;AAE7C,MAAM,uBAAuB,GAAG,CAAC,SAAS,EAAE,UAAU,EAAE,UAAU,EAAE,EAAE;IACpE,MAAM,IAAI,GAAG,IAAA,oBAAY,EAAC,IAAA,6BAAoB,EAAC,UAAU,CAAC,EAAE,UAAU,CAAC,CAAA;IAEvE,OAAO,IAAA,qBAAa,EAAC,SAAS,EAAE,IAAI,CAAC,CAAA;AACvC,CAAC,CAAA;AAEM,MAAM,WAAW,GAAG,CAAC,mBAAmB,EAAE,MAAM,EAAE,EAAE;IACzD,MAAM,EAAE,oBAAoB,EAAE,GAAG,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,EAAE,CAAA;IAC7C,MAAM,EACJ,aAAa,EACb,QAAQ,EACR,SAAS,EACT,UAAU,EACV,YAAY,EACZ,eAAe,EACf,eAAe,GAChB,GAAG,mBAAmB,CAAA;IACvB,MAAM,gBAAgB,GAAG,IAAA,uBAAe,EAAC,mBAAmB,CAAC,CAAA;IAC7D,MAAM,uBAAuB,GAAG,IAAA,8BAAsB,EAAC,mBAAmB,CAAC,CAAA;IAE3E,OAAO,CAAO,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,EAAE;;QAChC,MAAM,KAOF,MAAA,GAAG,CAAC,OAAO,mCAAI,EAAE,EAPf,EACJ,MAAM,EACN,iBAAiB,EAAE,WAAW,EAC9B,mBAAmB,EAAE,aAAa,EAClC,kBAAkB,EAAE,WAAW,EAC/B,gBAAgB,EAAE,WAAW,OAEV,EADhB,QAAQ,sBANP,wFAOL,CAAoB,CAAA;QAErB,MAAM,EACJ,qBAAqB,EAAE,YAAY,EACnC,mBAAmB,EAAE,cAAc,EACnC,eAAe,EAAE,gBAAgB,EACjC,uBAAuB,EAAE,uBAAuB,EAChD,gBAAgB,EAAE,UAAU,GAAG,uBAAuB,aAAvB,uBAAuB,cAAvB,uBAAuB,GAAI,gBAAgB,EAC1E,kBAAkB,EAAE,YAAY,EAChC,UAAU,EAAE,KAAK,GAAG,YAAY;QAChC,6DAA6D;QAC7D,8GAA8G;QAC9G,oCAAoC;UACrC,GAAG,QAAQ,CAAA;QAEZ,IAAI,UAAU,CAAA;QACd,IAAI;YAEF,yDAAyD;YACzD,IAAI,IAAA,oBAAW,EAAC,MAAM,CAAC,EAAE;gBACvB,GAAG,CAAC,OAAO,mCACN,GAAG,CAAC,OAAO,KACd,MAAM,EAAE,WAAW,IAAI,WAAW,GACnC,CAAA;aACF;YAED,MAAM,KAA6C,MAAA,GAAG,CAAC,KAAK,mCAAI,EAAE,EAA5D,EAAE,SAAS,EAAE,YAAY,OAAmC,EAA9B,UAAU,sBAAxC,6BAA0C,CAAkB,CAAA;YAClE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,EAAE,GAAG,UAAU,CAAA;YAChE,MAAM,IAAI,GAAG,KAAK,IAAI,UAAU,CAAA;YAEhC,MAAM,IAAA,qBAAQ,EAAC,GAAG,EAAE,GAAG,EAAE;gBACvB,OAAO,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,CAAC;gBAC3C,MAAM,EAAE,CAAC,MAAM,EAAE,QAAQ,EAAE,EAAE;oBAC3B,MAAM,YAAY,GAAG,IAAA,sBAAa,EAAC,MAAM,EAAE;wBACzC,GAAG,eAAe;wBAClB,iBAAiB,CAAC,sDAAsD;qBACzE,CAAC,CAAA;oBAEF,IAAI,YAAY,EAAE;wBAChB,OAAO,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;qBAC5B;oBAED,OAAO,QAAQ,CAAC,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC,CAAA;gBACnD,CAAC;gBACD,oBAAoB,EAAE,GAAG,EAAE,6DAA6D;aACzF,CAAC,CAAA;YAEF,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,EAAE,CAAA;YAC5C,mCAAmC;YACnC,MAAM,UAAU,GAAG,CAAC,IAAA,oBAAW,EAAC,WAAW,CAAC,IAAI,WAAW,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,GAAG,YAAY,IAAI,IAAA,2BAAkB,EAAC,WAAW,CAAC,EAAE,CAAA;YACpJ,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,IAAA,uBAAc,EAAC,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;YAC5G,UAAU,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,MAAM,CAAC,uBAAc,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;YAE/D,MAAM,gBAAgB,GAAG,IAAA,sBAAa,EAAC,QAAQ,kBAC7C,CAAC,IAAI,GAAG,CAAC,YAAY,CAAC,CAAC,QAAQ,CAAC,EAAE;oBAChC,wIAAwI;oBACxI,aAAa;oBACb,uDAAuD;oBACvD,KAAK;oBACL,MAAM,EAAE;wBACN,IAAI;wBACJ,IAAI;qBACL;iBACF,IACE,eAAe,EAClB,CAAA;YAEF,IAAI,IAAA,oBAAW,EAAC,UAAU,CAAC,IAAI,CAAC,gBAAgB,IAAI,SAAS,CAAC,EAAE;gBAC9D,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,oBAAoB,EAAE,CAAC,CAAA;aAC/D;YAED,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,IAAI,CAAC,cAAc,IAAI,CAAC,SAAS,IAAI,CAAC,YAAY,EAAE;gBACpE,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,4BAA4B,EAAE,cAAc,EAAE,CAAC,CAAA;aACvF;YAED,MAAM,yBAAyB,GAAG,IAAA,uBAAc,EAC9C,IAAA,qBAAY,EAAC,WAAW,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC;gBAC1C,CAAC,CAAC,IAAA,qBAAY,EAAC,IAAI,GAAG,CAAC,WAAW,CAAC,CAAC,QAAQ,CAAC;gBAC7C,CAAC,CAAC,WAAW,CAChB,CAAA;YAED,mFAAmF;YACnF,IACE,CAAC,uBAAuB,CACtB,SAAS,EACT,UAAU,EACV,yBAAyB,CAAC,CAAC,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC,CAAC,SAAS,CAChE,EACD;gBACA,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,mBAAmB,EAAE,CAAC,CAAA;aAC9D;YAED,MAAM,cAAc,GAAG,CACrB,CAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,UAAU,CAAC,SAAS,CAAC,wBAAe,CAAC,aAAa,CAAC,CAAC;iBACjE,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,UAAU,CAAC,QAAQ,CAAC,wBAAe,CAAC,aAAa,CAAC,CAAC,CAAA,CACjE,CAAA;YAED,IAAI,CAAC,cAAc,EAAE;gBACnB,MAAM,iBAAiB,GAAG,MAAM,uBAAuB,CAAC,YAAY,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;qBAClF,KAAK,CAAC,CAAC,MAAM,EAAE,EAAE;oBAChB,IAAI,MAAM,YAAY,mCAA0B,EAAE;wBAChD,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,IAAI,EAAE,4BAA4B,EAAE,CAAC,CAAA;qBAC7F;oBACD,MAAM,MAAM,CAAA;gBACd,CAAC,CAAC,CAAA;gBAEJ,IAAI,CAAC,iBAAiB,EAAE;oBACtB,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,sBAAsB,EAAE,CAAC,CAAA;iBACjE;aACF;YAED,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,YAAY,EAAE,GAAG,IAAA,qBAAY,EAAC,gBAAgB,CAAC,CAAA;YACvF,IAAI,IAAA,uBAAc,EAAC,YAAY,CAAC,EAAE;gBAChC,UAAU,GAAG,IAAA,oBAAW,EAAC,UAAU,EAAE,IAAI,eAAe,CAAC,YAAY,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAA;aACnF;YAED,MAAM,qBAAqB,GAAG,CAAC,CAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,UAAU,CAAC,aAAa,CAAC,MAAI,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,UAAU,CAAC,GAAG,YAAY,GAAG,aAAa,EAAE,CAAC,CAAA,CAAC,CAAA;YACpI,mCAAmC;YACnC,MAAM,CAAC,WAAW,EAAE,eAAe,CAAC,GAAG,MAAM,gBAAgB,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,GAAG,EAAE,UAAU,EAAE,iBAAiB,EAAE,qBAAqB,EAAE,CAAC,CAAA;YAEtI,MAAM,eAAe,GAAG,IAAA,sBAAc,EAAC,mBAAmB,CAAC,CAAA;YAC3D,MAAM,OAAO,GAAG,MAAM,eAAe,CAAC;gBACpC,oBAAoB;gBACpB,IAAI;gBACJ,KAAK;gBACL,OAAO,kCACF,QAAQ,GACR,aAAa,CACjB;aACF,CAAC,CAAA;YAEF,MAAM,KAAK,GAAG,oBAAS,CAAC,WAAW,EAAE,CAAA;YAErC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;gBACrC,GAAG,CAAC,GAAG,GAAG,UAAU,CAAA;gBACpB,IAAI,OAAO,EAAE;oBACX,GAAG,CAAC,OAAO,GAAG,OAAO,CAAA;iBACtB;gBAED,KAAK,CAAC,EAAE,CAAC,UAAU,EAAE,CAAC,QAAQ,EAAE,eAAe,EAAE,gBAAgB,EAAE,OAAO,EAAE,EAAE;oBAC5E,IAAI,WAAW,EAAE;wBACf,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,CAAA;wBAC5C,QAAQ,CAAC,SAAS,CAAC,gBAAgB,EAAE,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAA;wBACjE,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAA;qBACzB;gBACH,CAAC,CAAC,CAAA;gBAEF,KAAK,CAAC,EAAE,CAAC,UAAU,EAAE,UAAU,QAAQ,EAAE,eAAe,EAAE,gBAAgB;oBACxE,IAAA,8BAAe,EAAC,gBAAgB,EAAE,QAAQ,EAAE,UAAgB,YAAY;;4BACtE,OAAO,eAAe,CAAC,YAAY,CAAC,CAAA;wBACtC,CAAC;qBAAA,CAAC,CAAA;gBACJ,CAAC,CAAC,CAAA;gBAEF,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;oBAC5B,OAAO,CAAC,KAAK,CAAC,aAAa,EAAE,KAAK,CAAC,CAAA;oBACnC,MAAM,CAAC,KAAK,CAAC,CAAA;gBACf,CAAC,CAAC,CAAA;gBAEF,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE;oBAClB,MAAM;oBACN,OAAO,EAAE,aAAa;oBACtB,YAAY,EAAE,aAAa;oBAC3B,eAAe,EAAE,KAAK;oBACtB,YAAY,EAAE,IAAI;oBAClB,MAAM,EAAE,IAAI;iBACb,CAAC,CAAA;YACJ,CAAC,CAAC,CAAA;SACH;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,CAAC,KAAK,CAAC,qCAAqC,UAAU,GAAG,EAAE,KAAK,CAAC,CAAA;YACxE,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,CAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,OAAO,KAAI,8BAA8B,EAAE,UAAU,EAAE,CAAC,CAAA;SACvG;IACH,CAAC,CAAA,CAAA;AACH,CAAC,CAAA;AAlMY,QAAA,WAAW,eAkMvB"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
export function handleSessionToken(serverRuntimeConfig: any, { signingSecret, ...signingData }?: {
|
|
1
|
+
export function handleSessionToken(serverRuntimeConfig: any, { signingSecret: _signingSecret, ...signingData }?: {
|
|
2
2
|
signingSecret: any;
|
|
3
3
|
}): (req: any, res: any) => Promise<any>;
|
|
4
4
|
//# sourceMappingURL=token.d.ts.map
|
|
@@ -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;;yCAqGN"}
|
|
@@ -9,7 +9,7 @@ const utils_1 = require("../../utils");
|
|
|
9
9
|
const shared_1 = require("../../../shared");
|
|
10
10
|
// NOTE: typically handling: "/api/token"
|
|
11
11
|
const handleSessionToken = (serverRuntimeConfig, _a = {}) => {
|
|
12
|
-
var { signingSecret } = _a, signingData = tslib_1.__rest(_a, ["signingSecret"]);
|
|
12
|
+
var { signingSecret: _signingSecret } = _a, signingData = tslib_1.__rest(_a, ["signingSecret"]);
|
|
13
13
|
const { APP_CONFIG } = serverRuntimeConfig !== null && serverRuntimeConfig !== void 0 ? serverRuntimeConfig : {};
|
|
14
14
|
const _getVerifiedBody = (0, utils_1.getVerifiedBody)(serverRuntimeConfig);
|
|
15
15
|
return (req, res) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
|
|
@@ -18,7 +18,6 @@ const handleSessionToken = (serverRuntimeConfig, _a = {}) => {
|
|
|
18
18
|
const _d = (_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,
|
|
19
19
|
// TODO: pass along providerSetId??
|
|
20
20
|
'x-client-id': clientId, 'x-shop-domain': shopDomain, 'x-shopify-shop-domain': shopifyShopDomain, 'x-shopify-shop': shop = shopifyShopDomain !== null && shopifyShopDomain !== void 0 ? shopifyShopDomain : shopDomain } = _d, headers = tslib_1.__rest(_d, ['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']);
|
|
21
|
-
console.log(`>>> > handleSessionToken > req.headers '${req.url}':`, req.headers);
|
|
22
21
|
try {
|
|
23
22
|
// TODO: un-btoa the host and check??
|
|
24
23
|
if ((0, shared_1.stringEmpty)(shop) || (0, shared_1.stringEmpty)(host)) {
|
|
@@ -51,13 +50,8 @@ const handleSessionToken = (serverRuntimeConfig, _a = {}) => {
|
|
|
51
50
|
jti,
|
|
52
51
|
sid,
|
|
53
52
|
aud }, sub && { sub }), appClaims), tokenBody);
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
console.log(`>>> > handleSessionToken > signingSecret:`, { hmac: signingSecret, payload });
|
|
57
|
-
}
|
|
58
|
-
else {
|
|
59
|
-
console.log(`>>> > handleSessionToken > HMMMMMMMMMM`, { hmac2: signingSecret });
|
|
60
|
-
}
|
|
53
|
+
// NOTE: signingSecret should only be sent in here from the /api/token/zendesk endpoint
|
|
54
|
+
const signingSecret = _signingSecret || (0, utils_1.generateHMAC)((0, shared_1.objectToSortedString)(payload), APP_CONFIG.apiSecretKey);
|
|
61
55
|
const token = (0, jsonwebtoken_1.sign)(payload, signingSecret, signingData);
|
|
62
56
|
if ((0, shared_1.stringEmpty)(token)) {
|
|
63
57
|
throw new Error('Error signing token');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"token.js","sourceRoot":"","sources":["../../../../src/lib/handlers/api/token.js"],"names":[],"mappings":";;;;AAAA,yCAAkC;AAClC,+CAAmC;AACnC,+BAAmC;AAEnC,uCAA2D;AAC3D,4CAMwB;AAExB,yCAAyC;AAClC,MAAM,kBAAkB,GAAG,CAAC,mBAAmB,EAAE,
|
|
1
|
+
{"version":3,"file":"token.js","sourceRoot":"","sources":["../../../../src/lib/handlers/api/token.js"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
export function getVerifiedSessionData(serverRuntimeConfig: any
|
|
1
|
+
export function getVerifiedSessionData(serverRuntimeConfig: any, { signingSecret: _signingSecret }?: {
|
|
2
|
+
signingSecret: any;
|
|
3
|
+
}): (sessionToken: any, { shop, host }: {
|
|
2
4
|
shop: any;
|
|
3
5
|
host: any;
|
|
4
|
-
uri: any;
|
|
5
|
-
signingSecret: any;
|
|
6
6
|
}) => Promise<{
|
|
7
7
|
dest?: undefined;
|
|
8
8
|
sid?: undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"token.d.ts","sourceRoot":"","sources":["../../../src/lib/utils/token.js"],"names":[],"mappings":"AAUO;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"token.d.ts","sourceRoot":"","sources":["../../../src/lib/utils/token.js"],"names":[],"mappings":"AAUO;;;;;;;;;;;;;;;;;GAiCN"}
|
package/dist/lib/utils/token.js
CHANGED
|
@@ -5,37 +5,31 @@ 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
|
-
//
|
|
9
|
-
const getVerifiedSessionData = (serverRuntimeConfig) => {
|
|
8
|
+
// NOTE: this signingSecret is not current used, but just in case we ever need it
|
|
9
|
+
const getVerifiedSessionData = (serverRuntimeConfig, { signingSecret: _signingSecret } = {}) => {
|
|
10
10
|
const { APP_CONFIG } = serverRuntimeConfig;
|
|
11
|
-
return (sessionToken, { shop, host
|
|
11
|
+
return (sessionToken, { shop, host }) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
|
|
12
12
|
let data;
|
|
13
13
|
try {
|
|
14
|
-
console.log(`>>> > getVerifiedSessionData > sessionToken:`, { sessionToken });
|
|
15
14
|
// NOTE: this does not always contain sid (depending on if calling from appbridge)
|
|
16
15
|
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
|
17
16
|
const _a = (0, shared_1.decodeShopData)(sessionToken), { decoded, token } = _a, _data = tslib_1.__rest(_a, ["decoded", "token"]);
|
|
18
|
-
console.log(`>>> > getVerifiedSessionData > _data/token/decoded:`, { _data, token, decoded });
|
|
19
17
|
const { shop: sessionShop, host: sessionHost } = _data;
|
|
20
18
|
data = _data;
|
|
21
|
-
console.log(`>>> > getVerifiedSessionData > sessionHost/sessionShop:`, { sessionHost, sessionShop });
|
|
22
19
|
if ((sessionShop !== shop) || (sessionHost !== host)) {
|
|
23
20
|
throw new shared_1.ShopifySessionInvalidError('Unauthorized shop or host');
|
|
24
21
|
}
|
|
25
22
|
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
|
26
23
|
const { iat, nbf, exp } = decoded, verifiable = tslib_1.__rest(decoded, ["iat", "nbf", "exp"]);
|
|
27
|
-
console.log(`>>> > getVerifiedSessionData > _signingSecret/payload:`, { hmac: _signingSecret, payload: verifiable });
|
|
28
24
|
const signingSecret = _signingSecret || (0, crypto_1.generateHMAC)((0, shared_1.objectToSortedString)(verifiable), APP_CONFIG.apiSecretKey);
|
|
29
|
-
console.log(`>>> > getVerifiedSessionData > hmac:`, { hmac: signingSecret });
|
|
30
25
|
const verified = (0, jsonwebtoken_1.verify)(sessionToken, signingSecret);
|
|
31
|
-
console.log(`>>> > getVerifiedSessionData > verified:`, { verified });
|
|
32
26
|
if (verified == undefined) {
|
|
33
27
|
throw new shared_1.ShopifySessionInvalidError('Verified Undefined');
|
|
34
28
|
}
|
|
35
29
|
}
|
|
36
30
|
catch (_error) {
|
|
37
31
|
console.error('Error verifying session token', _error);
|
|
38
|
-
throw new shared_1.ShopifySessionInvalidError('Error verifying session token');
|
|
32
|
+
throw new shared_1.ShopifySessionInvalidError('Error verifying session token', { message: _error === null || _error === void 0 ? void 0 : _error.message, name: _error === null || _error === void 0 ? void 0 : _error.name });
|
|
39
33
|
}
|
|
40
34
|
return data;
|
|
41
35
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"token.js","sourceRoot":"","sources":["../../../src/lib/utils/token.js"],"names":[],"mappings":";;;;AAAA,+CAAqC;AAErC,yCAIqB;AACrB,qCAAuC;AAEvC,
|
|
1
|
+
{"version":3,"file":"token.js","sourceRoot":"","sources":["../../../src/lib/utils/token.js"],"names":[],"mappings":";;;;AAAA,+CAAqC;AAErC,yCAIqB;AACrB,qCAAuC;AAEvC,iFAAiF;AAC1E,MAAM,sBAAsB,GAAG,CAAC,mBAAmB,EAAE,EAAE,aAAa,EAAE,cAAc,EAAE,GAAG,EAAE,EAAE,EAAE;IACpG,MAAM,EAAC,UAAU,EAAE,GAAG,mBAAmB,CAAA;IAEzC,OAAO,CAAO,YAAY,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE;QAC5C,IAAI,IAAI,CAAA;QACR,IAAI;YACF,kFAAkF;YAClF,6DAA6D;YAC7D,MAAM,KAA+B,IAAA,uBAAc,EAAC,YAAY,CAAC,EAA3D,EAAE,OAAO,EAAE,KAAK,OAA2C,EAAtC,KAAK,sBAA1B,oBAA4B,CAA+B,CAAA;YACjE,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,WAAW,EAAE,GAAG,KAAK,CAAA;YACtD,IAAI,GAAG,KAAK,CAAA;YAEZ,IAAI,CAAC,WAAW,KAAK,IAAI,CAAC,IAAI,CAAC,WAAW,KAAK,IAAI,CAAC,EAAE;gBACpD,MAAM,IAAI,mCAA0B,CAAC,2BAA2B,CAAC,CAAA;aAClE;YAED,6DAA6D;YAC7D,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,KAAoB,OAAO,EAAtB,UAAU,kBAAK,OAAO,EAA1C,qBAAgC,CAAU,CAAA;YAEhD,MAAM,aAAa,GAAG,cAAc,IAAI,IAAA,qBAAY,EAAC,IAAA,6BAAoB,EAAC,UAAU,CAAC,EAAE,UAAU,CAAC,YAAY,CAAC,CAAA;YAE/G,MAAM,QAAQ,GAAG,IAAA,qBAAM,EAAC,YAAY,EAAE,aAAa,CAAC,CAAA;YAEpD,IAAI,QAAQ,IAAI,SAAS,EAAE;gBACzB,MAAM,IAAI,mCAA0B,CAAC,oBAAoB,CAAC,CAAA;aAC3D;SACF;QAAC,OAAO,MAAM,EAAE;YACf,OAAO,CAAC,KAAK,CAAC,+BAA+B,EAAE,MAAM,CAAC,CAAA;YACtD,MAAM,IAAI,mCAA0B,CAAC,+BAA+B,EAAE,EAAE,OAAO,EAAE,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,OAAO,EAAE,IAAI,EAAE,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,EAAE,CAAC,CAAA;SACxH;QAED,OAAO,IAAI,CAAA;IACb,CAAC,CAAA,CAAA;AACH,CAAC,CAAA;AAjCY,QAAA,sBAAsB,0BAiClC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"verification.d.ts","sourceRoot":"","sources":["../../../src/lib/utils/verification.js"],"names":[],"mappings":"AAWO,
|
|
1
|
+
{"version":3,"file":"verification.d.ts","sourceRoot":"","sources":["../../../src/lib/utils/verification.js"],"names":[],"mappings":"AAWO,6GA8FN"}
|
|
@@ -13,7 +13,6 @@ const getVerifiedBody = (serverRuntimeConfig) => {
|
|
|
13
13
|
const disableRecryption = (0, shared_1.isTrue)(_disableRecryption);
|
|
14
14
|
const uri = _uri !== null && _uri !== void 0 ? _uri : req.url;
|
|
15
15
|
let isVerifiable;
|
|
16
|
-
console.log(`>>> > getVerifiedBody > req.headers: '${uri}'`, { headers: req.headers, disableRecryption });
|
|
17
16
|
try {
|
|
18
17
|
const [authProtocol, authSignature] = (0, shared_1.ensureString)(customAuth).split(' ');
|
|
19
18
|
isVerifiable = (apiKey &&
|
|
@@ -45,9 +44,7 @@ const getVerifiedBody = (serverRuntimeConfig) => {
|
|
|
45
44
|
return res.status(412).json({ message: 'Invalid or missing verification' });
|
|
46
45
|
}
|
|
47
46
|
const verificationPayload = (0, shared_1.objectToSortedString)(Object.assign({ method: (0, shared_1.getRequestMethod)(rawBody, req.method), timestamp: customAuthTimestamp, body: requestBody }, (0, shared_1.normalizeURIParts)(uri)));
|
|
48
|
-
console.log(`>>> > getVerifiedBody > verificationPayload: '${uri}'`, { verificationPayload });
|
|
49
47
|
const isValid = yield shared_1.subtle.verifyHMAC(verificationPayload, verificationKeys.derivedHMACKey, authSignature);
|
|
50
|
-
console.log(`>>> > getVerifiedBody > isValid: '${uri}'`, { isValid });
|
|
51
48
|
if (!isValid) {
|
|
52
49
|
return res.status(412).json({ message: 'Invalid or missing verification' });
|
|
53
50
|
}
|
|
@@ -58,9 +55,7 @@ const getVerifiedBody = (serverRuntimeConfig) => {
|
|
|
58
55
|
}
|
|
59
56
|
const postProcess = (response) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
|
|
60
57
|
// eslint-disable-next-line max-len
|
|
61
|
-
console.log(`>>> > getVerifiedBody > postProcess: '${uri}'`, { response, disableRecryption, isVerifiable, ndK: !(verificationKeys === null || verificationKeys === void 0 ? void 0 : verificationKeys.derivedSecretKey) });
|
|
62
58
|
if (!response || disableRecryption || !isVerifiable || !(verificationKeys === null || verificationKeys === void 0 ? void 0 : verificationKeys.derivedSecretKey)) {
|
|
63
|
-
console.log(`>>> > postProcess > response:`, { response });
|
|
64
59
|
return response;
|
|
65
60
|
}
|
|
66
61
|
return shared_1.subtle.encryptMessage(JSON.stringify(response), verificationKeys.derivedSecretKey);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"verification.js","sourceRoot":"","sources":["../../../src/lib/utils/verification.js"],"names":[],"mappings":";;;;AAAA,yCAQqB;AACrB,uCAAyC;AAElC,MAAM,eAAe,GAAG,CAAC,mBAAmB,EAAE,EAAE;IACrD,MAAM,EAAE,QAAQ,EAAE,GAAG,mBAAmB,CAAA;IAExC,OAAO,CAAO,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,EAAE;;QAChC,MAAM,EACJ,cAAc,EAAE,MAAM,EACtB,iBAAiB,EAAE,kBAAkB,EACrC,2BAA2B,EAAE,mBAAmB,EAChD,iBAAiB,EAAE,UAAU,GAC9B,GAAG,MAAA,GAAG,CAAC,OAAO,mCAAI,EAAE,CAAA;QACrB,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,GAAG,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,EAAE,CAAA;QACzE,MAAM,iBAAiB,GAAG,IAAA,eAAM,EAAC,kBAAkB,CAAC,CAAA;QACpD,MAAM,GAAG,GAAG,IAAI,aAAJ,IAAI,cAAJ,IAAI,GAAI,GAAG,CAAC,GAAG,CAAA;QAE3B,IAAI,YAAY,CAAA;
|
|
1
|
+
{"version":3,"file":"verification.js","sourceRoot":"","sources":["../../../src/lib/utils/verification.js"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useVerification.d.ts","sourceRoot":"","sources":["../../../src/react/hooks/useVerification.js"],"names":[],"mappings":"AAYO;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"useVerification.d.ts","sourceRoot":"","sources":["../../../src/react/hooks/useVerification.js"],"names":[],"mappings":"AAYO;;;;;;;;;;EAsGN"}
|
|
@@ -60,14 +60,10 @@ const useVerification = ({ publicKey, disableRecryption: _disableRecryption } =
|
|
|
60
60
|
const processResponse = (encryptedResponse, _derivedSecretKey) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
|
|
61
61
|
var _a;
|
|
62
62
|
const derivedSecretKey = _derivedSecretKey !== null && _derivedSecretKey !== void 0 ? _derivedSecretKey : (_a = keysData === null || keysData === void 0 ? void 0 : keysData.verification) === null || _a === void 0 ? void 0 : _a.derivedSecretKey;
|
|
63
|
-
console.log(`>>> > useVerification > processResponse > derivedSecretKey:`, { disableRecryption, encryptedResponse, nsK: !derivedSecretKey });
|
|
64
63
|
if (disableRecryption || !encryptedResponse || !derivedSecretKey) {
|
|
65
|
-
console.log(`>>> > useVerification > processResponse > derivedSecretKey2 > SHOULD NOT BE HERE:`, { encryptedResponse });
|
|
66
64
|
return encryptedResponse;
|
|
67
65
|
}
|
|
68
|
-
console.log(`>>> > processResponse > encryptedResponse:`, { encryptedResponse });
|
|
69
66
|
const decryptedMessage = yield shared_1.subtle.decryptMessage(encryptedResponse, derivedSecretKey);
|
|
70
|
-
console.log(`>>> > processResponse > decryptedMessage:`, { decryptedMessage });
|
|
71
67
|
return (0, shared_1.safeParse)(decryptedMessage);
|
|
72
68
|
});
|
|
73
69
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useVerification.js","sourceRoot":"","sources":["../../../src/react/hooks/useVerification.js"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"useVerification.js","sourceRoot":"","sources":["../../../src/react/hooks/useVerification.js"],"names":[],"mappings":";;;;AAAA,iCAAgC;AAEhC,yCAQqB;AAEd,MAAM,eAAe,GAAG,CAAC,EAAE,SAAS,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,GAAG,EAAE,EAAE,EAAE;IAC3F,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,IAAA,gBAAQ,GAAE,CAAA;IAE1C,MAAM,iBAAiB,GAAG,IAAA,eAAM,EAAC,kBAAkB,CAAC,CAAA;IAEpD,MAAM,WAAW,GAAG,GAAS,EAAE;QAC7B,MAAM,0BAA0B,GAAG,MAAM,eAAM,CAAC,kBAAkB,CAChE,MAAM,eAAM,CAAC,eAAe,EAAE,CAC/B,CAAA;QAED,MAAM,oBAAoB,GAAG,MAAM,eAAM,CAAC,mBAAmB,CAAC;YAC5D,SAAS;YACT,UAAU,EAAE,0BAA0B,CAAC,UAAU;SAClD,CAAC,CAAA;QAEF,OAAO;YACL,SAAS,EAAE,0BAA0B;YACrC,YAAY,EAAE,oBAAoB;SACnC,CAAA;IACH,CAAC,CAAA,CAAA;IAED,MAAM,mBAAmB,GAAG,CAAO,WAAW,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,EAAE,EAAE,EAAE;QAChH,IAAI,iBAAiB,EAAE;YACrB,MAAM,MAAM,GAAG,IAAA,yBAAgB,EAAC,OAAO,EAAE,SAAS,CAAC,CAAA;YAEnD,OAAO;gBACL,WAAW;gBACX;oBACE,MAAM;oBACN,IAAI,EAAE,OAAO;oBACb,OAAO,EAAE,UAAU;iBACpB;aACF,CAAA;SACF;QAED,MAAM,SAAS,GAAG,QAAQ,aAAR,QAAQ,cAAR,QAAQ,GAAI,CAAC,MAAM,WAAW,EAAE,CAAC,CAAA;QACnD,IAAI,SAAS,IAAI,CAAC,QAAQ,EAAE;YAC1B,WAAW,CAAC,SAAS,CAAC,CAAA;SACvB;QAED,MAAM,EACJ,YAAY,EAAE,EACZ,cAAc,EACd,gBAAgB,GACjB,GAAG,EAAE,EACN,SAAS,EAAE,EACT,SAAS,EAAE,kBAAkB,GAC9B,GAAG,EAAE,GACP,GAAG,SAAS,aAAT,SAAS,cAAT,SAAS,GAAI,EAAE,CAAA;QAEnB,IAAI,CAAC,cAAc,IAAI,CAAC,kBAAkB,EAAE;YAC1C,OAAO,SAAS,CAAA;SACjB;QAED,IAAI,IAAI,GAAG,IAAA,kBAAS,EAAC,OAAO,CAAC,CAAA;QAC7B,IAAI,IAAI,IAAI,gBAAgB,EAAE;YAC5B,IAAI,GAAG,MAAM,eAAM,CAAC,cAAc,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,gBAAgB,CAAC,CAAA;SAC3E;QAED,MAAM,MAAM,GAAG,IAAA,yBAAgB,EAAC,IAAI,EAAE,SAAS,CAAC,CAAA;QAChD,MAAM,SAAS,GAAG,IAAA,qBAAY,GAAE,CAAA;QAChC,MAAM,YAAY,GAAG,MAAM,eAAM,CAAC,YAAY,CAC5C,IAAA,6BAAoB,kBAClB,IAAI;YACJ,MAAM;YACN,SAAS,IACN,IAAA,0BAAiB,EAAC,WAAW,CAAC,EACjC,EACF,cAAc,CACf,CAAA;QAED,OAAO;YACL,WAAW;YACX;gBACE,IAAI;gBACJ,MAAM;gBACN,OAAO,kBACL,iBAAiB,EAAE,eAAe,YAAY,EAAE,EAChD,2BAA2B,EAAE,SAAS,EACtC,iBAAiB,EAAE,kBAAkB,EACrC,cAAc,EAAE,SAAS,IACtB,UAAU,CACd;aACF;YACD,gBAAgB;SACjB,CAAA;IACH,CAAC,CAAA,CAAA;IAED,MAAM,eAAe,GAAG,CAAO,iBAAiB,EAAE,iBAAiB,EAAE,EAAE;;QACrE,MAAM,gBAAgB,GAAG,iBAAiB,aAAjB,iBAAiB,cAAjB,iBAAiB,GAAI,MAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,YAAY,0CAAE,gBAAgB,CAAA;QACtF,IAAI,iBAAiB,IAAI,CAAC,iBAAiB,IAAI,CAAC,gBAAgB,EAAE;YAChE,OAAO,iBAAiB,CAAA;SACzB;QAED,MAAM,gBAAgB,GAAG,MAAM,eAAM,CAAC,cAAc,CAAC,iBAAiB,EAAE,gBAAgB,CAAC,CAAA;QACzF,OAAO,IAAA,kBAAS,EAAC,gBAAgB,CAAC,CAAA;IACpC,CAAC,CAAA,CAAA;IAED,OAAO;QACL,mBAAmB;QACnB,eAAe;KAChB,CAAA;AACH,CAAC,CAAA;AAtGY,QAAA,eAAe,mBAsG3B"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@agnostack/next-shopify",
|
|
3
|
-
"version": "1.14.0-beta.
|
|
3
|
+
"version": "1.14.0-beta.43",
|
|
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",
|