@agnostack/next-shopify 2.1.0-alpha.3 → 2.1.0-alpha.4
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
|
+
# [2.1.0-alpha.4](https://github.com/agnostack/next-shopify/compare/v2.1.0-alpha.3...v2.1.0-alpha.4) (2024-10-18)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### Bug Fixes
|
|
5
|
+
|
|
6
|
+
* debug ([2029859](https://github.com/agnostack/next-shopify/commit/20298599126f359c2fb7e439136bc46c2873e619))
|
|
7
|
+
|
|
1
8
|
# [2.1.0-alpha.3](https://github.com/agnostack/next-shopify/compare/v2.1.0-alpha.2...v2.1.0-alpha.3) (2024-10-18)
|
|
2
9
|
|
|
3
10
|
|
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
export function protectRoute(serverRuntimeConfig: any, props: any): ({ req, res,
|
|
1
|
+
export function protectRoute(serverRuntimeConfig: any, props: any): ({ req, res, query, locale, resolvedUrl, }: {
|
|
2
2
|
req: any;
|
|
3
3
|
res: any;
|
|
4
|
-
resolvedUrl: any;
|
|
5
4
|
query: any;
|
|
6
5
|
locale: any;
|
|
6
|
+
resolvedUrl: any;
|
|
7
7
|
} | undefined, data: any) => Promise<{
|
|
8
8
|
redirect: {
|
|
9
9
|
destination: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"protect.d.ts","sourceRoot":"","sources":["../../../../src/lib/handlers/ssr/protect.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"protect.d.ts","sourceRoot":"","sources":["../../../../src/lib/handlers/ssr/protect.js"],"names":[],"mappings":"AAwBO;;;;;;;;;;;;;;;GAgNN"}
|
|
@@ -8,6 +8,17 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
8
8
|
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
9
|
});
|
|
10
10
|
};
|
|
11
|
+
var __rest = (this && this.__rest) || function (s, e) {
|
|
12
|
+
var t = {};
|
|
13
|
+
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
|
|
14
|
+
t[p] = s[p];
|
|
15
|
+
if (s != null && typeof Object.getOwnPropertySymbols === "function")
|
|
16
|
+
for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
|
|
17
|
+
if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
|
|
18
|
+
t[p[i]] = s[p[i]];
|
|
19
|
+
}
|
|
20
|
+
return t;
|
|
21
|
+
};
|
|
11
22
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
23
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
24
|
};
|
|
@@ -21,7 +32,8 @@ const protectRoute = (serverRuntimeConfig, props) => {
|
|
|
21
32
|
const { PAGE_PATHS, API_PATHS, APP_CONFIG, PAYMENT_CONFIG } = serverRuntimeConfig;
|
|
22
33
|
console.info(`>>> ~ PAGE_PATHS`, PAGE_PATHS);
|
|
23
34
|
const isEmbedded = APP_CONFIG.isEmbeddedApp;
|
|
24
|
-
return ({ req, res,
|
|
35
|
+
return ({ req, res, query, locale, resolvedUrl, // NOTE: this comes in from nextJS
|
|
36
|
+
} = {}, data) => __awaiter(void 0, void 0, void 0, function* () {
|
|
25
37
|
var _a, _b, _c, _d;
|
|
26
38
|
const shop = (_a = query === null || query === void 0 ? void 0 : query.shop) !== null && _a !== void 0 ? _a : (_b = req.query) === null || _b === void 0 ? void 0 : _b.shop;
|
|
27
39
|
if ((0, shared_1.stringEmpty)(shop)) {
|
|
@@ -40,7 +52,9 @@ const protectRoute = (serverRuntimeConfig, props) => {
|
|
|
40
52
|
props: (0, shared_1.cleanObject)(Object.assign(Object.assign({ locale }, props), data), false, shared_1.stringEmptyOnly),
|
|
41
53
|
};
|
|
42
54
|
}
|
|
43
|
-
const { shopify, loadAppData, loadSession, storeSession, findSessionIds,
|
|
55
|
+
const { shopify, loadAppData, loadSession, storeSession, findSessionIds,
|
|
56
|
+
// getInstalledAppUrl,
|
|
57
|
+
validateAccessToken, ensureBilling: handleEnsureBilling, } = yield (0, utils_1.getShopifyHelpers)(serverRuntimeConfig, { shop });
|
|
44
58
|
if (shopify === null || shopify === void 0 ? void 0 : shopify.config) {
|
|
45
59
|
res.setHeader('Content-Security-Policy', (0, utils_1.getSecurityHeader)(shop, shopify.config));
|
|
46
60
|
}
|
|
@@ -50,11 +64,16 @@ const protectRoute = (serverRuntimeConfig, props) => {
|
|
|
50
64
|
const { isValid, accessToken: { session: _offlineSession, } = {}, } = yield validateAccessToken({ idToken });
|
|
51
65
|
if (!isValid) {
|
|
52
66
|
console.warn('>>> Invalid or missing Session (protectRoute > validateAccessToken)');
|
|
53
|
-
const
|
|
67
|
+
const [resolvedPath, _resolvedParams] = (0, shared_1.ensureString)(resolvedUrl).split('?');
|
|
68
|
+
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
|
69
|
+
const _e = (0, shared_1.querystringToObject)(_resolvedParams), { id_token: _oldToken } = _e, resolvedParams = __rest(_e, ["id_token"]);
|
|
70
|
+
resolvedParams;
|
|
71
|
+
const redirectUri = (0, shared_1.appendQuery)(resolvedPath, new URLSearchParams(Object.assign({}, resolvedParams)).toString());
|
|
54
72
|
console.info(`>>> ~ protect > redirectUri`, { resolvedUrl, redirectUri });
|
|
55
73
|
return {
|
|
56
74
|
redirect: {
|
|
57
|
-
destination: `${PAGE_PATHS[shared_1.PAGE_ROUTE_NAMES.EXIT]}?${new URLSearchParams(Object.assign(Object.assign({}, query), { shop,
|
|
75
|
+
destination: `${PAGE_PATHS[shared_1.PAGE_ROUTE_NAMES.EXIT]}?${new URLSearchParams(Object.assign(Object.assign({}, query), { shop,
|
|
76
|
+
redirectUri })).toString()}`,
|
|
58
77
|
permanent: false,
|
|
59
78
|
},
|
|
60
79
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"protect.js","sourceRoot":"","sources":["../../../../src/lib/handlers/ssr/protect.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"protect.js","sourceRoot":"","sources":["../../../../src/lib/handlers/ssr/protect.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": "2.1.0-alpha.
|
|
3
|
+
"version": "2.1.0-alpha.4",
|
|
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",
|