@agnostack/next-shopify 1.4.6 → 1.4.7
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 +7 -0
- package/dist/handlers/ssr.js +19 -7
- package/dist/handlers/ssr.js.map +1 -1
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,10 @@
|
|
|
1
|
+
## [1.4.7](https://github.com/agnostack/next-shopify/compare/v1.4.6...v1.4.7) (2022-11-28)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### Bug Fixes
|
|
5
|
+
|
|
6
|
+
* testing session fallback ([1f569dd](https://github.com/agnostack/next-shopify/commit/1f569dd8bb71bb128aa42b723ae771387d7b2397))
|
|
7
|
+
|
|
1
8
|
## [1.4.6](https://github.com/agnostack/next-shopify/compare/v1.4.5...v1.4.6) (2022-11-23)
|
|
2
9
|
|
|
3
10
|
|
package/dist/handlers/ssr.js
CHANGED
|
@@ -1,23 +1,35 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
2
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
6
|
exports.protectRoute = exports.wrapRoute = void 0;
|
|
7
|
+
const shopify_api_1 = __importDefault(require("@shopify/shopify-api"));
|
|
4
8
|
const utils_1 = require("../utils");
|
|
5
|
-
const getSecurityHeader = (
|
|
9
|
+
const getSecurityHeader = (shop) => (utils_1.stringNotEmpty(shop)
|
|
6
10
|
? `frame-ancestors self https://admin.shopify.com https://${shop};`
|
|
7
11
|
: "frame-ancestors 'none';");
|
|
8
12
|
const wrapRoute = () => ({ res, query, locale } = {}, data) => {
|
|
9
|
-
res.setHeader('Content-Security-Policy', getSecurityHeader(query));
|
|
13
|
+
res.setHeader('Content-Security-Policy', getSecurityHeader(query === null || query === void 0 ? void 0 : query.shop));
|
|
10
14
|
return {
|
|
11
15
|
props: Object.assign({ locale }, data),
|
|
12
16
|
};
|
|
13
17
|
};
|
|
14
18
|
exports.wrapRoute = wrapRoute;
|
|
15
19
|
const protectRoute = (props) => async ({ req, res, query, locale } = {}, data) => {
|
|
16
|
-
var _a, _b, _c, _d, _e, _f;
|
|
20
|
+
var _a, _b, _c, _d, _e, _f, _g;
|
|
21
|
+
const loadedSess = await shopify_api_1.default.Utils.loadCurrentSession(req, res);
|
|
17
22
|
const { PAGE_PATHS } = props;
|
|
18
|
-
const shop =
|
|
19
|
-
const
|
|
20
|
-
|
|
23
|
+
// const shop = query?.shop ?? req.query?.shop ?? ensureObject(await Shopify.Utils.loadCurrentSession(req, res)).shop
|
|
24
|
+
const shop = (_c = (_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) !== null && _c !== void 0 ? _c : utils_1.ensureObject(loadedSess).shop;
|
|
25
|
+
console.warn(`>>> > protectRoute > shop`, {
|
|
26
|
+
shop,
|
|
27
|
+
queryshop: query === null || query === void 0 ? void 0 : query.shop,
|
|
28
|
+
loadedSess,
|
|
29
|
+
loadedShop: loadedSess === null || loadedSess === void 0 ? void 0 : loadedSess.shop,
|
|
30
|
+
});
|
|
31
|
+
const embedded = (_d = query === null || query === void 0 ? void 0 : query.embedded) !== null && _d !== void 0 ? _d : (_e = req.query) === null || _e === void 0 ? void 0 : _e.embedded;
|
|
32
|
+
res.setHeader('Content-Security-Policy', getSecurityHeader(shop));
|
|
21
33
|
if (utils_1.stringEmpty(shop)) {
|
|
22
34
|
const noShopUrl = `${PAGE_PATHS[utils_1.PAGE_ROUTE_NAMES.ERROR]}?code=no_shop_provided&type=protectRoute`;
|
|
23
35
|
return {
|
|
@@ -28,7 +40,7 @@ const protectRoute = (props) => async ({ req, res, query, locale } = {}, data) =
|
|
|
28
40
|
};
|
|
29
41
|
}
|
|
30
42
|
const shopify = utils_1.getInitializedShopify(props, shop);
|
|
31
|
-
const shopSessions = await ((
|
|
43
|
+
const shopSessions = await ((_g = (_f = shopify.Context.SESSION_STORAGE) === null || _f === void 0 ? void 0 : _f.findSessionsByShop) === null || _g === void 0 ? void 0 : _g.call(_f, shop));
|
|
32
44
|
if (utils_1.arrayEmpty(shopSessions)) {
|
|
33
45
|
const emptySessionUrl = utils_1.getRedirectUrl(props, {
|
|
34
46
|
req,
|
package/dist/handlers/ssr.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ssr.js","sourceRoot":"","sources":["../../src/handlers/ssr.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"ssr.js","sourceRoot":"","sources":["../../src/handlers/ssr.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.4.
|
|
3
|
+
"version": "1.4.7",
|
|
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",
|