@agnostack/next-shopify 2.1.1-alpha.9 → 2.1.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 +12 -39
- package/dist/lib/handlers/api/auth.d.ts +1 -1
- package/dist/lib/handlers/api/auth.d.ts.map +1 -1
- package/dist/lib/handlers/api/auth.js +10 -3
- package/dist/lib/handlers/api/auth.js.map +1 -1
- package/dist/lib/handlers/api/billing.d.ts +1 -1
- package/dist/lib/handlers/api/billing.d.ts.map +1 -1
- package/dist/lib/handlers/api/billing.js +52 -43
- package/dist/lib/handlers/api/billing.js.map +1 -1
- package/dist/lib/handlers/api/callback.d.ts +1 -1
- package/dist/lib/handlers/api/callback.d.ts.map +1 -1
- package/dist/lib/handlers/api/callback.js +11 -4
- package/dist/lib/handlers/api/callback.js.map +1 -1
- package/dist/lib/handlers/api/uninstall.d.ts +1 -1
- package/dist/lib/handlers/api/uninstall.d.ts.map +1 -1
- package/dist/lib/handlers/api/uninstall.js +42 -32
- package/dist/lib/handlers/api/uninstall.js.map +1 -1
- package/dist/lib/handlers/api/verifiable/appInstallation.d.ts +1 -1
- package/dist/lib/handlers/api/verifiable/appInstallation.d.ts.map +1 -1
- package/dist/lib/handlers/api/verifiable/appInstallation.js +10 -3
- package/dist/lib/handlers/api/verifiable/appInstallation.js.map +1 -1
- package/dist/lib/handlers/api/verifiable/graph.d.ts +1 -1
- package/dist/lib/handlers/api/verifiable/graph.d.ts.map +1 -1
- package/dist/lib/handlers/api/verifiable/graph.js +15 -8
- package/dist/lib/handlers/api/verifiable/graph.js.map +1 -1
- package/dist/lib/handlers/api/verifiable/proxy.d.ts +1 -1
- package/dist/lib/handlers/api/verifiable/proxy.d.ts.map +1 -1
- package/dist/lib/handlers/api/verifiable/proxy.js +16 -10
- package/dist/lib/handlers/api/verifiable/proxy.js.map +1 -1
- package/dist/lib/handlers/api/verifiable/token.d.ts +1 -3
- package/dist/lib/handlers/api/verifiable/token.d.ts.map +1 -1
- package/dist/lib/handlers/api/verifiable/token.js +13 -7
- package/dist/lib/handlers/api/verifiable/token.js.map +1 -1
- package/dist/lib/handlers/api/webhook.d.ts +1 -1
- package/dist/lib/handlers/api/webhook.d.ts.map +1 -1
- package/dist/lib/handlers/api/webhook.js +19 -12
- package/dist/lib/handlers/api/webhook.js.map +1 -1
- package/dist/lib/handlers/ssr/protect.d.ts.map +1 -1
- package/dist/lib/handlers/ssr/protect.js +4 -24
- package/dist/lib/handlers/ssr/protect.js.map +1 -1
- package/dist/lib/utils/session.d.ts.map +1 -1
- package/dist/lib/utils/session.js +68 -60
- package/dist/lib/utils/session.js.map +1 -1
- package/package.json +2 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"graph.js","sourceRoot":"","sources":["../../../../../src/lib/handlers/api/verifiable/graph.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;AAAA,sDAAsE;AAEtE,gDAA8E;AAE9E,0CAAwE;AACxE,+CAY2B;AAEpB,MAAM,WAAW,GAAG,CAAC,mBAAmB,EAAE,EAAE;
|
|
1
|
+
{"version":3,"file":"graph.js","sourceRoot":"","sources":["../../../../../src/lib/handlers/api/verifiable/graph.js"],"names":[],"mappings":"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"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export function handleProxy(serverRuntimeConfig: any,
|
|
1
|
+
export function handleProxy(serverRuntimeConfig: any, data: any): (req: any, res: any, params: any) => Promise<any>;
|
|
2
2
|
//# sourceMappingURL=proxy.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"proxy.d.ts","sourceRoot":"","sources":["../../../../../src/lib/handlers/api/verifiable/proxy.js"],"names":[],"mappings":"AAsCO,
|
|
1
|
+
{"version":3,"file":"proxy.d.ts","sourceRoot":"","sources":["../../../../../src/lib/handlers/api/verifiable/proxy.js"],"names":[],"mappings":"AAsCO,oHAwON"}
|
|
@@ -36,8 +36,8 @@ const verifyAppProxySignature = (signature, verifiable, hmacSecret) => {
|
|
|
36
36
|
const hmac = (0, utils_1.generateHMAC)((0, shared_1.objectToSortedString)(verifiable), hmacSecret);
|
|
37
37
|
return (0, utils_1.compareHashes)(signature, hmac);
|
|
38
38
|
};
|
|
39
|
-
const handleProxy = (serverRuntimeConfig,
|
|
40
|
-
const { generateReplacements } =
|
|
39
|
+
const handleProxy = (serverRuntimeConfig, data) => {
|
|
40
|
+
const { generateReplacements, returnResponse = true } = data !== null && data !== void 0 ? data : {};
|
|
41
41
|
const { API_BASE_PATH, API_URLS, API_PATHS, APP_CONFIG, APP_BASE_URL, TARGET_SAFELIST, ORIGIN_SAFELIST, } = serverRuntimeConfig;
|
|
42
42
|
const _prepareHeaders = (0, utils_1.prepareHeaders)(serverRuntimeConfig);
|
|
43
43
|
const _getVerificationHelpers = (0, verifyd_1.getVerificationHelpers)(serverRuntimeConfig);
|
|
@@ -50,6 +50,12 @@ const handleProxy = (serverRuntimeConfig, config) => {
|
|
|
50
50
|
// 'x-app-installation-id': appInstallationId = shopifyAppInstallationId, // TODO: pass along installationId??
|
|
51
51
|
// TODO: pass along providerSetId???
|
|
52
52
|
} = _headers;
|
|
53
|
+
const handleResponse = (body, statusCode = 200) => {
|
|
54
|
+
if (returnResponse) {
|
|
55
|
+
return res.status(statusCode).json(body);
|
|
56
|
+
}
|
|
57
|
+
return { statusCode, body };
|
|
58
|
+
};
|
|
53
59
|
let targetPath;
|
|
54
60
|
try {
|
|
55
61
|
// NOTE: GET requests are not always sending along origin
|
|
@@ -89,17 +95,17 @@ const handleProxy = (serverRuntimeConfig, config) => {
|
|
|
89
95
|
},
|
|
90
96
|
} }, TARGET_SAFELIST));
|
|
91
97
|
if ((0, shared_1.stringEmpty)(targetPath) || (safelistedTarget == undefined)) {
|
|
92
|
-
return
|
|
98
|
+
return handleResponse({ message: 'Unproxyable target' }, 407);
|
|
93
99
|
}
|
|
94
100
|
if (!shop || !host || !extensionPoint || !signature || !proxyEncoded) {
|
|
95
|
-
return
|
|
101
|
+
return handleResponse({ message: 'Invalid or missing headers', extensionPoint }, 400);
|
|
96
102
|
}
|
|
97
103
|
const isShopifyOriginOrRelative = (0, shared_1.stringNotEmpty)((0, shared_1.ensureString)(path_prefix).startsWith('http')
|
|
98
104
|
? (0, shared_1.sanitizeShop)(new URL(path_prefix).hostname)
|
|
99
105
|
: path_prefix);
|
|
100
106
|
// TODO: once Shopify fixes CORS issue when origin is cdn.shopify.com, update this!
|
|
101
107
|
if (!verifyAppProxySignature(signature, verifiable, isShopifyOriginOrRelative ? APP_CONFIG.apiSecretKey : timestamp)) {
|
|
102
|
-
return
|
|
108
|
+
return handleResponse({ message: 'Invalid signature' }, 403);
|
|
103
109
|
}
|
|
104
110
|
const isTokenRequest = ((targetParam === null || targetParam === void 0 ? void 0 : targetParam.startsWith(API_PATHS[shared_1.API_ROUTE_NAMES.SESSION_TOKEN])) ||
|
|
105
111
|
(targetParam === null || targetParam === void 0 ? void 0 : targetParam.startsWith(API_URLS[shared_1.API_ROUTE_NAMES.SESSION_TOKEN])));
|
|
@@ -107,7 +113,7 @@ const handleProxy = (serverRuntimeConfig, config) => {
|
|
|
107
113
|
const isVerifiedSession = yield _getVerifiedSessionData(sessionToken, { shop, host });
|
|
108
114
|
if (!isVerifiedSession) {
|
|
109
115
|
// NOTE: this should not get here/above should throw ShopifySessionInvalidError
|
|
110
|
-
return
|
|
116
|
+
return handleResponse({ message: 'Unverified signature' }, 403);
|
|
111
117
|
}
|
|
112
118
|
}
|
|
113
119
|
const { headers: targetHeaders, params: targetParams } = (0, shared_1.ensureObject)(safelistedTarget);
|
|
@@ -124,9 +130,9 @@ const handleProxy = (serverRuntimeConfig, config) => {
|
|
|
124
130
|
}
|
|
125
131
|
catch (error) {
|
|
126
132
|
if (error instanceof verifyd_1.VerificationError) {
|
|
127
|
-
return
|
|
133
|
+
return handleResponse({ message: error.message }, error.code);
|
|
128
134
|
}
|
|
129
|
-
return
|
|
135
|
+
return handleResponse({ message: 'Verification error' }, 403);
|
|
130
136
|
}
|
|
131
137
|
const headers = yield _prepareHeaders({
|
|
132
138
|
generateReplacements,
|
|
@@ -182,9 +188,9 @@ const handleProxy = (serverRuntimeConfig, config) => {
|
|
|
182
188
|
// eslint-disable-next-line max-len
|
|
183
189
|
console.error(`Error handling proxy request: ${targetPath}`, (0, shared_1.cleanObject)(Object.assign({ type: error === null || error === void 0 ? void 0 : error.type, code: error === null || error === void 0 ? void 0 : error.code, name: error === null || error === void 0 ? void 0 : error.name, message: error === null || error === void 0 ? void 0 : error.message }, error === null || error === void 0 ? void 0 : error.data), false, shared_1.stringEmptyOnly));
|
|
184
190
|
if (error instanceof shared_1.ShopifySessionInvalidError) {
|
|
185
|
-
return
|
|
191
|
+
return handleResponse({ message: error.message, type: (_c = error === null || error === void 0 ? void 0 : error.type) !== null && _c !== void 0 ? _c : 'ShopifySessionInvalidError' }, (_d = error === null || error === void 0 ? void 0 : error.code) !== null && _d !== void 0 ? _d : 407);
|
|
186
192
|
}
|
|
187
|
-
return
|
|
193
|
+
return handleResponse({ message: (error === null || error === void 0 ? void 0 : error.message) || 'Error handling proxy request', targetPath }, 400);
|
|
188
194
|
}
|
|
189
195
|
});
|
|
190
196
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"proxy.js","sourceRoot":"","sources":["../../../../../src/lib/handlers/api/verifiable/proxy.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,sDAAsD;AACtD,8DAAkC;AAClC,4DAAkC;AAClC,gFAAkD;AAElD,gDAA8E;AAE9E,0CAKuB;AACvB,+CAe2B;AAE3B,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,
|
|
1
|
+
{"version":3,"file":"proxy.js","sourceRoot":"","sources":["../../../../../src/lib/handlers/api/verifiable/proxy.js"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,2 @@
|
|
|
1
|
-
export function handleSessionToken(serverRuntimeConfig: any,
|
|
2
|
-
signingSecret: any;
|
|
3
|
-
}): (req: any, res: any) => Promise<any>;
|
|
1
|
+
export function handleSessionToken(serverRuntimeConfig: any, data: any): (req: any, res: any) => Promise<any>;
|
|
4
2
|
//# sourceMappingURL=token.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"token.d.ts","sourceRoot":"","sources":["../../../../../src/lib/handlers/api/verifiable/token.js"],"names":[],"mappings":"AAgBO
|
|
1
|
+
{"version":3,"file":"token.d.ts","sourceRoot":"","sources":["../../../../../src/lib/handlers/api/verifiable/token.js"],"names":[],"mappings":"AAgBO,8GAuHN"}
|
|
@@ -28,8 +28,8 @@ const verifyd_1 = require("@agnostack/verifyd");
|
|
|
28
28
|
const utils_1 = require("../../../utils");
|
|
29
29
|
const shared_1 = require("../../../../shared");
|
|
30
30
|
// NOTE: typically handling: "/api/token"
|
|
31
|
-
const handleSessionToken = (serverRuntimeConfig,
|
|
32
|
-
|
|
31
|
+
const handleSessionToken = (serverRuntimeConfig, data) => {
|
|
32
|
+
const _a = data !== null && data !== void 0 ? data : {}, { signingSecret: _signingSecret, returnResponse = true } = _a, signingData = __rest(_a, ["signingSecret", "returnResponse"]);
|
|
33
33
|
const { APP_CONFIG } = serverRuntimeConfig !== null && serverRuntimeConfig !== void 0 ? serverRuntimeConfig : {};
|
|
34
34
|
const _getVerificationHelpers = (0, verifyd_1.getVerificationHelpers)(serverRuntimeConfig);
|
|
35
35
|
return (req, res) => __awaiter(void 0, void 0, void 0, function* () {
|
|
@@ -38,9 +38,15 @@ const handleSessionToken = (serverRuntimeConfig, _a = {}) => {
|
|
|
38
38
|
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,
|
|
39
39
|
// TODO: pass along providerSetId??
|
|
40
40
|
'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 = __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']);
|
|
41
|
+
const handleResponse = (body, statusCode = 200) => {
|
|
42
|
+
if (returnResponse) {
|
|
43
|
+
return res.status(statusCode).json(body);
|
|
44
|
+
}
|
|
45
|
+
return { statusCode, body };
|
|
46
|
+
};
|
|
41
47
|
// TODO: un-btoa the host and check??
|
|
42
48
|
if ((0, shared_1.stringEmpty)(shop) || (0, shared_1.stringEmpty)(host)) {
|
|
43
|
-
return
|
|
49
|
+
return handleResponse({ message: 'Missing required param' }, 412);
|
|
44
50
|
}
|
|
45
51
|
let requestBody;
|
|
46
52
|
let processResponse;
|
|
@@ -49,9 +55,9 @@ const handleSessionToken = (serverRuntimeConfig, _a = {}) => {
|
|
|
49
55
|
}
|
|
50
56
|
catch (error) {
|
|
51
57
|
if (error instanceof verifyd_1.VerificationError) {
|
|
52
|
-
return
|
|
58
|
+
return handleResponse(Object.assign({ message: error.message }, error.data), error.code);
|
|
53
59
|
}
|
|
54
|
-
return
|
|
60
|
+
return handleResponse({ message: 'Verification error' }, 403);
|
|
55
61
|
}
|
|
56
62
|
try {
|
|
57
63
|
const appClaims = Object.entries(headers).reduce((_appClaims, [headerKey, headerValue]) => (Object.assign(Object.assign({}, _appClaims), headerKey.startsWith('x-shopify-app-metafield-') && {
|
|
@@ -87,11 +93,11 @@ const handleSessionToken = (serverRuntimeConfig, _a = {}) => {
|
|
|
87
93
|
throw new Error('Error signing token');
|
|
88
94
|
}
|
|
89
95
|
const response = yield processResponse({ token });
|
|
90
|
-
return
|
|
96
|
+
return handleResponse(response);
|
|
91
97
|
}
|
|
92
98
|
catch (error) {
|
|
93
99
|
console.error('Error generating session token', error);
|
|
94
|
-
return
|
|
100
|
+
return handleResponse({ message: 'Error generating session token' }, 500);
|
|
95
101
|
}
|
|
96
102
|
});
|
|
97
103
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"token.js","sourceRoot":"","sources":["../../../../../src/lib/handlers/api/verifiable/token.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;AAAA,yCAAkC;AAClC,+CAAmC;AACnC,+BAAmC;AAEnC,gDAA8E;AAE9E,0CAA6C;AAC7C,+CAM2B;AAE3B,yCAAyC;AAClC,MAAM,kBAAkB,GAAG,CAAC,mBAAmB,EAAE,
|
|
1
|
+
{"version":3,"file":"token.js","sourceRoot":"","sources":["../../../../../src/lib/handlers/api/verifiable/token.js"],"names":[],"mappings":"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"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export function handleWebhookEvent(serverRuntimeConfig: any,
|
|
1
|
+
export function handleWebhookEvent(serverRuntimeConfig: any, data: any): (req: any, res: any, data: any) => Promise<any>;
|
|
2
2
|
//# sourceMappingURL=webhook.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webhook.d.ts","sourceRoot":"","sources":["../../../../src/lib/handlers/api/webhook.js"],"names":[],"mappings":"AAcO,
|
|
1
|
+
{"version":3,"file":"webhook.d.ts","sourceRoot":"","sources":["../../../../src/lib/handlers/api/webhook.js"],"names":[],"mappings":"AAcO,yHAiHN"}
|
|
@@ -25,22 +25,29 @@ const verifyd_1 = require("@agnostack/verifyd");
|
|
|
25
25
|
const utils_1 = require("../../utils");
|
|
26
26
|
const shared_1 = require("../../../shared");
|
|
27
27
|
// NOTE: typically handling: "/api/webhooks/event" or "/api/webhooks/event/{appId}" or "/api/webhooks/event?appId={appId}"
|
|
28
|
-
const handleWebhookEvent = (serverRuntimeConfig,
|
|
28
|
+
const handleWebhookEvent = (serverRuntimeConfig, data) => {
|
|
29
29
|
const { ORIGIN_SAFELIST, WEBHOOK_TOPIC_BLOCKLIST } = serverRuntimeConfig;
|
|
30
|
+
const _a = data !== null && data !== void 0 ? data : {}, { returnResponse = true } = _a, config = __rest(_a, ["returnResponse"]);
|
|
30
31
|
return (req, res, data) => __awaiter(void 0, void 0, void 0, function* () {
|
|
31
|
-
var
|
|
32
|
+
var _b;
|
|
33
|
+
const handleResponse = (body, statusCode = 200) => {
|
|
34
|
+
if (returnResponse) {
|
|
35
|
+
return res.status(statusCode).json(body);
|
|
36
|
+
}
|
|
37
|
+
return { statusCode, body };
|
|
38
|
+
};
|
|
32
39
|
try {
|
|
33
|
-
const
|
|
40
|
+
const _c = (_b = req.headers) !== null && _b !== void 0 ? _b : {}, { 'x-shop-domain': shopDomain, 'x-shopify-shop-domain': shopifyShopDomain, 'x-shopify-shop': shop = shopifyShopDomain !== null && shopifyShopDomain !== void 0 ? shopifyShopDomain : shopDomain } = _c, _headers = __rest(_c, ['x-shop-domain', 'x-shopify-shop-domain', 'x-shopify-shop']);
|
|
34
41
|
if ((0, shared_1.stringEmpty)(shop)) {
|
|
35
|
-
return
|
|
42
|
+
return handleResponse({ handler: 'webhook', error: 'Missing shop' });
|
|
36
43
|
}
|
|
37
44
|
if (!(0, shared_1.matchHostname)(shop, ORIGIN_SAFELIST)) {
|
|
38
|
-
return
|
|
45
|
+
return handleResponse({ handler: 'webhook', error: 'Shop is not safelisted' });
|
|
39
46
|
}
|
|
40
47
|
const { shopify } = yield (0, utils_1.getShopifyHelpers)(serverRuntimeConfig, { shop });
|
|
41
48
|
// TODO: explore getVerificationHelpers?
|
|
42
49
|
const rawBody = yield (0, verifyd_1.ensureRawBody)(req);
|
|
43
|
-
const
|
|
50
|
+
const _d = (serverRuntimeConfig.SHOPIFY_RUN_MODE === 'cli') ? {
|
|
44
51
|
valid: true,
|
|
45
52
|
topic: _headers['x-shopify-topic'],
|
|
46
53
|
domain: _headers['x-shopify-shop-domain'] || shop,
|
|
@@ -50,10 +57,10 @@ const handleWebhookEvent = (serverRuntimeConfig, config) => {
|
|
|
50
57
|
rawBody,
|
|
51
58
|
rawRequest: req,
|
|
52
59
|
rawResponse: res,
|
|
53
|
-
})), { valid } =
|
|
60
|
+
})), { valid } = _d, message = __rest(_d, ["valid"]);
|
|
54
61
|
if (!valid) {
|
|
55
62
|
console.warn('Unable to validate webhook', message);
|
|
56
|
-
return
|
|
63
|
+
return handleResponse({ handler: 'webhook', error: 'Unable to validate webhook', message });
|
|
57
64
|
}
|
|
58
65
|
try {
|
|
59
66
|
const { topic, domain, webhookId, apiVersion } = message;
|
|
@@ -62,7 +69,7 @@ const handleWebhookEvent = (serverRuntimeConfig, config) => {
|
|
|
62
69
|
if (!shared_1.API_WEBHOOK_TOPICS_IMMUTABLE.includes(eventType) &&
|
|
63
70
|
((0, shared_1.stringEmpty)(eventShop) ||
|
|
64
71
|
((WEBHOOK_TOPIC_BLOCKLIST === 'ALL') || (0, shared_1.splitCommas)(WEBHOOK_TOPIC_BLOCKLIST).includes(eventShop)))) {
|
|
65
|
-
return
|
|
72
|
+
return handleResponse({ handler: 'webhook', message: 'blocked' });
|
|
66
73
|
}
|
|
67
74
|
const eventBody = (0, shared_1.safeParse)(rawBody);
|
|
68
75
|
// NOTE: this callback signature matches the built in callback option PLUS data
|
|
@@ -86,16 +93,16 @@ const handleWebhookEvent = (serverRuntimeConfig, config) => {
|
|
|
86
93
|
];
|
|
87
94
|
}, []);
|
|
88
95
|
yield Promise.all([...topicHandlePromises, ...registrationHandlePromises]);
|
|
89
|
-
return
|
|
96
|
+
return handleResponse({ handler: 'webhook', message: 'success' });
|
|
90
97
|
}
|
|
91
98
|
catch (error) {
|
|
92
99
|
console.error('Error handling webhook promises', error);
|
|
93
|
-
return
|
|
100
|
+
return handleResponse({ handler: 'webhook', error: error === null || error === void 0 ? void 0 : error.message });
|
|
94
101
|
}
|
|
95
102
|
}
|
|
96
103
|
catch (error) {
|
|
97
104
|
console.error('Error handling webhook', error);
|
|
98
|
-
return
|
|
105
|
+
return handleResponse({ handler: 'webhook', error: 'Error handling webhook' });
|
|
99
106
|
}
|
|
100
107
|
});
|
|
101
108
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webhook.js","sourceRoot":"","sources":["../../../../src/lib/handlers/api/webhook.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAAkD;AAElD,uCAA+C;AAC/C,4CAQwB;AAExB,0HAA0H;AACnH,MAAM,kBAAkB,GAAG,CAAC,mBAAmB,EAAE,
|
|
1
|
+
{"version":3,"file":"webhook.js","sourceRoot":"","sources":["../../../../src/lib/handlers/api/webhook.js"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"protect.d.ts","sourceRoot":"","sources":["../../../../src/lib/handlers/ssr/protect.js"],"names":[],"mappings":"AA0BO;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"protect.d.ts","sourceRoot":"","sources":["../../../../src/lib/handlers/ssr/protect.js"],"names":[],"mappings":"AA0BO;;;;;;;;;;;;;;;GA4MN"}
|
|
@@ -66,30 +66,14 @@ const protectRoute = (serverRuntimeConfig, _props) => {
|
|
|
66
66
|
// #region EMBEDDED APP FLOW
|
|
67
67
|
if (isEmbedded) {
|
|
68
68
|
const idToken = (_c = query === null || query === void 0 ? void 0 : query[shared_1.SESSION_TOKEN_PARAM]) !== null && _c !== void 0 ? _c : (_d = req.query) === null || _d === void 0 ? void 0 : _d[shared_1.SESSION_TOKEN_PARAM];
|
|
69
|
-
if ((0, shared_1.stringEmpty)(idToken)) {
|
|
70
|
-
return {
|
|
71
|
-
redirect: {
|
|
72
|
-
// TODO add custom code for this use case
|
|
73
|
-
destination: `${PAGE_PATHS[shared_1.PAGE_ROUTE_NAMES.ERROR]}?type=protectRoute`,
|
|
74
|
-
permanent: false,
|
|
75
|
-
},
|
|
76
|
-
};
|
|
77
|
-
}
|
|
78
|
-
let isValid;
|
|
79
|
-
let offlineSession;
|
|
80
69
|
const { isValid: isValidToken } = yield validateSessionToken({ idToken });
|
|
81
|
-
isValid = isValidToken;
|
|
70
|
+
let isValid = isValidToken;
|
|
71
|
+
let offlineSession;
|
|
82
72
|
if (isValid) {
|
|
83
73
|
const { isValid: isValidExchange, accessToken: { session, } = {}, } = yield exchangeSessionToken({ idToken });
|
|
84
74
|
isValid = isValidExchange;
|
|
85
75
|
offlineSession = session;
|
|
86
76
|
}
|
|
87
|
-
console.info(`>>> ~ protectRoute1`, {
|
|
88
|
-
offlineSession,
|
|
89
|
-
isValidToken,
|
|
90
|
-
isValid,
|
|
91
|
-
idToken,
|
|
92
|
-
});
|
|
93
77
|
// NOTE: this handles an invalid session token
|
|
94
78
|
if (!isValid || !offlineSession) {
|
|
95
79
|
const [resolvedPath, _resolvedParams] = (0, shared_1.ensureString)(resolvedUrl).split('?');
|
|
@@ -102,10 +86,6 @@ const protectRoute = (serverRuntimeConfig, _props) => {
|
|
|
102
86
|
});
|
|
103
87
|
}
|
|
104
88
|
const existingSessionIds = yield findSessionIds(shop);
|
|
105
|
-
console.info(`>>> ~ protectRoute2`, {
|
|
106
|
-
existingSessionIds,
|
|
107
|
-
id: offlineSession.id,
|
|
108
|
-
});
|
|
109
89
|
// NOTE: this handles first time installs
|
|
110
90
|
if (!existingSessionIds.includes(offlineSession.id)) {
|
|
111
91
|
try {
|
|
@@ -115,7 +95,7 @@ const protectRoute = (serverRuntimeConfig, _props) => {
|
|
|
115
95
|
console.error('Error storing session', error);
|
|
116
96
|
return {
|
|
117
97
|
redirect: {
|
|
118
|
-
// TODO add custom code for this use case
|
|
98
|
+
// TODO add custom 'code=' param for this use case
|
|
119
99
|
destination: `${PAGE_PATHS[shared_1.PAGE_ROUTE_NAMES.ERROR]}?type=protectRoute`,
|
|
120
100
|
permanent: false,
|
|
121
101
|
},
|
|
@@ -190,7 +170,7 @@ const protectRoute = (serverRuntimeConfig, _props) => {
|
|
|
190
170
|
}
|
|
191
171
|
return {
|
|
192
172
|
redirect: {
|
|
193
|
-
// TODO add custom code for this use case
|
|
173
|
+
// TODO add custom 'code=' param for this use case
|
|
194
174
|
destination: `${PAGE_PATHS[shared_1.PAGE_ROUTE_NAMES.ERROR]}?type=protectRoute`,
|
|
195
175
|
permanent: false,
|
|
196
176
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"protect.js","sourceRoot":"","sources":["../../../../src/lib/handlers/ssr/protect.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,kDAAyB;AAEzB,uCAKoB;AACpB,4CAgBwB;AAEjB,MAAM,YAAY,GAAG,CAAC,mBAAmB,EAAE,MAAM,EAAE,EAAE;IAC1D,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,UAAU,EAAE,cAAc,EAAE,GAAG,mBAAmB,CAAA;IACjF,MAAM,UAAU,GAAG,UAAU,CAAC,aAAa,CAAA;IAE3C,MAAM,mBAAmB,GAAG,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE,EAAE;QACnD,MAAM,WAAW,GAAG,IAAI,eAAe,iCAClC,KAAK,KACR,IAAI,EACJ,WAAW,EAAE,GAAG,IAChB,CAAC,QAAQ,EAAE,CAAA;QAEb,oFAAoF;QACpF,OAAO;YACL,QAAQ,EAAE;gBACR,WAAW,EAAE,GAAG,UAAU,CAAC,yBAAgB,CAAC,IAAI,CAAC,IAAI,WAAW,EAAE;gBAClE,SAAS,EAAE,KAAK;aACjB;SACF,CAAA;IACH,CAAC,CAAA;IAED,OAAO,CAAO,EACZ,GAAG,EACH,GAAG,EACH,KAAK,EACL,MAAM,EACN,WAAW,EAAE,kCAAkC;MAChD,GAAG,EAAE,EAAE,IAAI,EAAE,EAAE;;QACd,MAAM,CAAC,IAAI,CAAC,GAAG,IAAA,oBAAW,EAAC,MAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,IAAI,mCAAI,MAAA,GAAG,CAAC,KAAK,0CAAE,IAAI,CAAC,CAAA;QAE1D,IAAI,IAAA,oBAAW,EAAC,IAAI,CAAC,EAAE;YACrB,OAAO;gBACL,QAAQ,EAAE;oBACR,WAAW,EAAE,GAAG,UAAU,CAAC,yBAAgB,CAAC,KAAK,CAAC,0CAA0C;oBAC5F,SAAS,EAAE,KAAK;iBACjB;aACF,CAAA;SACF;QAED,MAAM,KAAK,GAAG,IAAA,oBAAW,gCAAG,MAAM,IAAK,MAAM,GAAK,IAAI,GAAI,KAAK,EAAE,wBAAe,CAAC,CAAA;QAEjF,6EAA6E;QAC7E,MAAM,mBAAmB,GAAG,IAAA,wBAAgB,EAAC,mBAAmB,CAAC,CAAA;QACjE,IAAI,mBAAmB,EAAE;YACvB,OAAO,CAAC,IAAI,CAAC,GAAG,eAAK,CAAC,YAAY,CAAC,cAAc,CAAC,OAAO,eAAK,CAAC,IAAI,CAAC,cAAc,CAAC,MACjF,sGACF,EAAE,CAAC,CAAA;YAEH,OAAO,EAAE,KAAK,EAAE,CAAA;SACjB;QAED,MAAM,EACJ,OAAO,EACP,WAAW,EACX,WAAW,EACX,YAAY,EACZ,cAAc,EACd,oBAAoB,EACpB,oBAAoB,EACpB,aAAa,EAAE,mBAAmB,GACnC,GAAG,MAAM,IAAA,yBAAiB,EAAC,mBAAmB,EAAE,EAAE,IAAI,EAAE,CAAC,CAAA;QAE1D,IAAI,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM,EAAE;YACnB,GAAG,CAAC,SAAS,CAAC,yBAAyB,EAAE,IAAA,yBAAiB,EAAC,IAAI,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC,CAAA;SAClF;QAED,4BAA4B;QAC5B,IAAI,UAAU,EAAE;YACd,MAAM,OAAO,GAAG,MAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAG,4BAAmB,CAAC,mCAAI,MAAA,GAAG,CAAC,KAAK,0CAAG,4BAAmB,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"protect.js","sourceRoot":"","sources":["../../../../src/lib/handlers/ssr/protect.js"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../../src/lib/utils/session.js"],"names":[],"mappings":"AAsCO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../../src/lib/utils/session.js"],"names":[],"mappings":"AAsCO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAyZN;AAoCM;;;;;;mBAoBN"}
|