@agnostack/next-shopify 2.0.6-beta.4 → 2.0.6-beta.6
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/auth.d.ts.map +1 -1
- package/dist/lib/handlers/api/auth.js +2 -1
- package/dist/lib/handlers/api/auth.js.map +1 -1
- package/dist/lib/handlers/ssr/protect.d.ts.map +1 -1
- package/dist/lib/handlers/ssr/protect.js +59 -56
- package/dist/lib/handlers/ssr/protect.js.map +1 -1
- package/dist/lib/utils/shopify.d.ts.map +1 -1
- package/dist/lib/utils/shopify.js +7 -3
- package/dist/lib/utils/shopify.js.map +1 -1
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,17 @@
|
|
|
1
|
+
## [2.0.6-beta.6](https://github.com/agnostack/next-shopify/compare/v2.0.6-beta.5...v2.0.6-beta.6) (2024-03-22)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### Bug Fixes
|
|
5
|
+
|
|
6
|
+
* updated to add logs ([d7e4468](https://github.com/agnostack/next-shopify/commit/d7e4468cb6c30dc21a194320ae232dd41f6bf336))
|
|
7
|
+
|
|
8
|
+
## [2.0.6-beta.5](https://github.com/agnostack/next-shopify/compare/v2.0.6-beta.4...v2.0.6-beta.5) (2024-03-22)
|
|
9
|
+
|
|
10
|
+
|
|
11
|
+
### Bug Fixes
|
|
12
|
+
|
|
13
|
+
* updated to add logs ([dc55864](https://github.com/agnostack/next-shopify/commit/dc55864b882d19dd38d3135a58e9078e0fbcbed7))
|
|
14
|
+
|
|
1
15
|
## [2.0.6-beta.4](https://github.com/agnostack/next-shopify/compare/v2.0.6-beta.3...v2.0.6-beta.4) (2024-03-22)
|
|
2
16
|
|
|
3
17
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../../../../src/lib/handlers/api/auth.js"],"names":[],"mappings":"AAYO,
|
|
1
|
+
{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../../../../src/lib/handlers/api/auth.js"],"names":[],"mappings":"AAYO,wGAuDN"}
|
|
@@ -43,7 +43,8 @@ const handleAuth = (serverRuntimeConfig) => {
|
|
|
43
43
|
console.warn(`>>> > handleAuth > callbackUrl:`, { callbackUrl });
|
|
44
44
|
// TODO: explore objectToQuerystring
|
|
45
45
|
const redirectUriParams = new URLSearchParams(Object.assign({ shop,
|
|
46
|
-
host
|
|
46
|
+
host,
|
|
47
|
+
embedded }, state && { state })).toString();
|
|
47
48
|
const queryParams = new URLSearchParams(Object.assign(Object.assign({}, query), { shop, redirectUri: `${callbackUrl}?${redirectUriParams}` })).toString();
|
|
48
49
|
console.warn(`>>> > handleAuth > exit > queryParams:`, queryParams);
|
|
49
50
|
return res.redirect(`${PAGE_PATHS[shared_1.PAGE_ROUTE_NAMES.EXIT]}?${queryParams}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../../../src/lib/handlers/api/auth.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;AAAA,uCAIoB;AACpB,4CAIwB;AAExB,wEAAwE;AACjE,MAAM,UAAU,GAAG,CAAC,mBAAmB,EAAE,EAAE;IAChD,MAAM,EACJ,UAAU,EACV,SAAS,EACT,QAAQ,EACR,UAAU,GACX,GAAG,mBAAmB,CAAA;IAEvB,OAAO,CAAO,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,EAAE;;QAChC,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,EAAE,CAAA;QACjC,MAAM,KAAgC,MAAA,GAAG,CAAC,KAAK,mCAAI,EAAE,EAA/C,EAAE,MAAM,EAAE,OAAO,OAA8B,EAAzB,KAAK,cAA3B,UAA6B,CAAkB,CAAA;QACrD,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,KAAK,CAAA;QACpD,MAAM,MAAM,GAAG,IAAA,eAAM,EAAC,OAAO,EAAE,WAAW,CAAC,CAAA;QAE3C,MAAM,OAAO,GAAG,IAAA,6BAAqB,EAAC,mBAAmB,CAAC,CAAA;QAC1D,MAAM,IAAI,GAAG,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,KAAK,CAAC,CAAA;QAC9C,OAAO,CAAC,IAAI,CAAC,8BAA8B,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAA;QAExE,IAAI,IAAA,oBAAW,EAAC,IAAI,CAAC,EAAE;YACrB,OAAO,GAAG,CAAC,QAAQ,CAAC,GAAG,UAAU,CAAC,yBAAgB,CAAC,KAAK,CAAC,wCAAwC,CAAC,CAAA;SACnG;QAED,IAAI,QAAQ,KAAK,GAAG,EAAE;YACpB,MAAM,WAAW,GAAG,IAAA,mBAAW,EAAC,QAAQ,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAA;YAC/D,OAAO,CAAC,IAAI,CAAC,iCAAiC,EAAE,EAAE,WAAW,EAAE,CAAC,CAAA;YAChE,oCAAoC;YACpC,MAAM,iBAAiB,GAAG,IAAI,eAAe,iBAC3C,IAAI;gBACJ,IAAI,
|
|
1
|
+
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../../../src/lib/handlers/api/auth.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;AAAA,uCAIoB;AACpB,4CAIwB;AAExB,wEAAwE;AACjE,MAAM,UAAU,GAAG,CAAC,mBAAmB,EAAE,EAAE;IAChD,MAAM,EACJ,UAAU,EACV,SAAS,EACT,QAAQ,EACR,UAAU,GACX,GAAG,mBAAmB,CAAA;IAEvB,OAAO,CAAO,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,EAAE;;QAChC,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,EAAE,CAAA;QACjC,MAAM,KAAgC,MAAA,GAAG,CAAC,KAAK,mCAAI,EAAE,EAA/C,EAAE,MAAM,EAAE,OAAO,OAA8B,EAAzB,KAAK,cAA3B,UAA6B,CAAkB,CAAA;QACrD,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,KAAK,CAAA;QACpD,MAAM,MAAM,GAAG,IAAA,eAAM,EAAC,OAAO,EAAE,WAAW,CAAC,CAAA;QAE3C,MAAM,OAAO,GAAG,IAAA,6BAAqB,EAAC,mBAAmB,CAAC,CAAA;QAC1D,MAAM,IAAI,GAAG,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,KAAK,CAAC,CAAA;QAC9C,OAAO,CAAC,IAAI,CAAC,8BAA8B,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAA;QAExE,IAAI,IAAA,oBAAW,EAAC,IAAI,CAAC,EAAE;YACrB,OAAO,GAAG,CAAC,QAAQ,CAAC,GAAG,UAAU,CAAC,yBAAgB,CAAC,KAAK,CAAC,wCAAwC,CAAC,CAAA;SACnG;QAED,IAAI,QAAQ,KAAK,GAAG,EAAE;YACpB,MAAM,WAAW,GAAG,IAAA,mBAAW,EAAC,QAAQ,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAA;YAC/D,OAAO,CAAC,IAAI,CAAC,iCAAiC,EAAE,EAAE,WAAW,EAAE,CAAC,CAAA;YAChE,oCAAoC;YACpC,MAAM,iBAAiB,GAAG,IAAI,eAAe,iBAC3C,IAAI;gBACJ,IAAI;gBACJ,QAAQ,IACL,KAAK,IAAI,EAAE,KAAK,EAAE,EACrB,CAAC,QAAQ,EAAE,CAAA;YACb,MAAM,WAAW,GAAG,IAAI,eAAe,iCAClC,KAAK,KACR,IAAI,EACJ,WAAW,EAAE,GAAG,WAAW,IAAI,iBAAiB,EAAE,IAClD,CAAC,QAAQ,EAAE,CAAA;YAEb,OAAO,CAAC,IAAI,CAAC,wCAAwC,EAAE,WAAW,CAAC,CAAA;YACnE,OAAO,GAAG,CAAC,QAAQ,CAAC,GAAG,UAAU,CAAC,yBAAgB,CAAC,IAAI,CAAC,IAAI,WAAW,EAAE,CAAC,CAAA;SAC3E;QAED,MAAM,YAAY,GAAG,IAAA,mBAAW,EAAC,SAAS,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAA;QACjE,OAAO,CAAC,IAAI,CAAC,kCAAkC,EAAE,EAAE,YAAY,EAAE,CAAC,CAAA;QAElE,OAAO,IAAA,iBAAS,EAAC;YACf,IAAI;YACJ,KAAK;YACL,QAAQ;YACR,YAAY;YACZ,UAAU,EAAE,GAAG;YACf,WAAW,EAAE,GAAG;YAChB,MAAM,EAAE,UAAU;SACnB,CAAC,CAAA;IACJ,CAAC,CAAA,CAAA;AACH,CAAC,CAAA;AAvDY,QAAA,UAAU,cAuDtB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"protect.d.ts","sourceRoot":"","sources":["../../../../src/lib/handlers/ssr/protect.js"],"names":[],"mappings":"AAiBO;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"protect.d.ts","sourceRoot":"","sources":["../../../../src/lib/handlers/ssr/protect.js"],"names":[],"mappings":"AAiBO;;;;;;;;;;;;;;GAsGN"}
|
|
@@ -16,75 +16,78 @@ exports.protectRoute = void 0;
|
|
|
16
16
|
const chalk_1 = __importDefault(require("chalk"));
|
|
17
17
|
const utils_1 = require("../../utils");
|
|
18
18
|
const shared_1 = require("../../../shared");
|
|
19
|
-
const protectRoute = (serverRuntimeConfig, props) =>
|
|
20
|
-
var _a, _b, _c, _d;
|
|
19
|
+
const protectRoute = (serverRuntimeConfig, props) => {
|
|
21
20
|
const { PAGE_PATHS, API_PATHS } = serverRuntimeConfig;
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
permanent: false,
|
|
29
|
-
},
|
|
30
|
-
};
|
|
31
|
-
}
|
|
32
|
-
// NOTE: this should handle running in next to test non-shopify functionality
|
|
33
|
-
const shouldBypassProtect = (0, utils_1.allowLocalBypass)(serverRuntimeConfig);
|
|
34
|
-
if (shouldBypassProtect) {
|
|
35
|
-
console.info(`${chalk_1.default.yellowBright('next-shopify')} - [${chalk_1.default.bold('protectRoute')}]: ${`Bypassing local protect - should ONLY happen when running in next to test non-shopify functionality!`}`);
|
|
36
|
-
return {
|
|
37
|
-
props: (0, shared_1.cleanObject)(Object.assign(Object.assign({ locale }, props), data)),
|
|
38
|
-
};
|
|
39
|
-
}
|
|
40
|
-
const { shopify, findSessionIds, loadSession } = yield (0, utils_1.getShopifyHelpers)(serverRuntimeConfig, { shop });
|
|
41
|
-
if (shopify === null || shopify === void 0 ? void 0 : shopify.config) {
|
|
42
|
-
res.setHeader('Content-Security-Policy', (0, utils_1.getSecurityHeader)(shop, shopify.config));
|
|
43
|
-
}
|
|
44
|
-
const existingSessionIds = yield findSessionIds(shop);
|
|
45
|
-
if ((0, shared_1.arrayEmpty)(existingSessionIds)) {
|
|
46
|
-
// TODO: explore objectToQuerystring
|
|
47
|
-
const queryParams = new URLSearchParams(Object.assign(Object.assign({}, query), { shop })).toString();
|
|
48
|
-
return {
|
|
49
|
-
redirect: {
|
|
50
|
-
destination: `${API_PATHS[shared_1.API_ROUTE_NAMES.AUTH_ONLINE]}?${queryParams}`,
|
|
51
|
-
permanent: false,
|
|
52
|
-
},
|
|
53
|
-
};
|
|
54
|
-
}
|
|
55
|
-
if (embedded !== '1') {
|
|
56
|
-
try {
|
|
57
|
-
// NOTE: this does not work if called INSIDE of embedded
|
|
58
|
-
yield loadSession({ req, res });
|
|
59
|
-
const destination = yield shopify.auth.getEmbeddedAppUrl({
|
|
60
|
-
rawRequest: req,
|
|
61
|
-
rawResponse: res,
|
|
62
|
-
});
|
|
21
|
+
return ({ req, res, query, locale, } = {}, data) => __awaiter(void 0, void 0, void 0, function* () {
|
|
22
|
+
var _a, _b, _c, _d;
|
|
23
|
+
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;
|
|
24
|
+
const embedded = (_c = query === null || query === void 0 ? void 0 : query.embedded) !== null && _c !== void 0 ? _c : (_d = req.query) === null || _d === void 0 ? void 0 : _d.embedded;
|
|
25
|
+
console.warn(`>>> > protectRoute > shop:`, { shop, embedded });
|
|
26
|
+
if ((0, shared_1.stringEmpty)(shop)) {
|
|
63
27
|
return {
|
|
64
28
|
redirect: {
|
|
65
|
-
destination
|
|
29
|
+
destination: `${PAGE_PATHS[shared_1.PAGE_ROUTE_NAMES.ERROR]}?code=no_shop_provided&type=protectRoute`,
|
|
66
30
|
permanent: false,
|
|
67
31
|
},
|
|
68
32
|
};
|
|
69
33
|
}
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
34
|
+
// NOTE: this should handle running in next to test non-shopify functionality
|
|
35
|
+
const shouldBypassProtect = (0, utils_1.allowLocalBypass)(serverRuntimeConfig);
|
|
36
|
+
if (shouldBypassProtect) {
|
|
37
|
+
console.info(`${chalk_1.default.yellowBright('next-shopify')} - [${chalk_1.default.bold('protectRoute')}]: ${`Bypassing local protect - should ONLY happen when running in next to test non-shopify functionality!`}`);
|
|
38
|
+
return {
|
|
39
|
+
props: (0, shared_1.cleanObject)(Object.assign(Object.assign({ locale }, props), data)),
|
|
40
|
+
};
|
|
41
|
+
}
|
|
42
|
+
const { shopify, findSessionIds, loadSession } = yield (0, utils_1.getShopifyHelpers)(serverRuntimeConfig, { shop });
|
|
43
|
+
if (shopify === null || shopify === void 0 ? void 0 : shopify.config) {
|
|
44
|
+
res.setHeader('Content-Security-Policy', (0, utils_1.getSecurityHeader)(shop, shopify.config));
|
|
45
|
+
}
|
|
46
|
+
const existingSessionIds = yield findSessionIds(shop);
|
|
47
|
+
if ((0, shared_1.arrayEmpty)(existingSessionIds)) {
|
|
48
|
+
// TODO: explore objectToQuerystring
|
|
49
|
+
const queryParams = new URLSearchParams(Object.assign(Object.assign({}, query), { shop })).toString();
|
|
50
|
+
return {
|
|
51
|
+
redirect: {
|
|
52
|
+
destination: `${API_PATHS[shared_1.API_ROUTE_NAMES.AUTH_ONLINE]}?${queryParams}`,
|
|
53
|
+
permanent: false,
|
|
54
|
+
},
|
|
55
|
+
};
|
|
56
|
+
}
|
|
57
|
+
if (embedded !== '1') {
|
|
58
|
+
try {
|
|
59
|
+
// NOTE: this does not work if called INSIDE of embedded
|
|
60
|
+
yield loadSession({ req, res });
|
|
61
|
+
const destination = yield shopify.auth.getEmbeddedAppUrl({
|
|
62
|
+
rawRequest: req,
|
|
63
|
+
rawResponse: res,
|
|
64
|
+
});
|
|
74
65
|
return {
|
|
75
66
|
redirect: {
|
|
76
|
-
destination
|
|
67
|
+
destination,
|
|
77
68
|
permanent: false,
|
|
78
69
|
},
|
|
79
70
|
};
|
|
80
71
|
}
|
|
81
|
-
|
|
82
|
-
|
|
72
|
+
catch (error) {
|
|
73
|
+
if (error instanceof shared_1.ShopifyAuthenticationError) {
|
|
74
|
+
// TODO: explore objectToQuerystring
|
|
75
|
+
const queryParams = new URLSearchParams(Object.assign(Object.assign({}, query), { shop, reAuth: (error instanceof shared_1.ShopifySessionAuthenticationError) })).toString();
|
|
76
|
+
return {
|
|
77
|
+
redirect: {
|
|
78
|
+
destination: `${API_PATHS[shared_1.API_ROUTE_NAMES.AUTH_ONLINE]}?${queryParams}`,
|
|
79
|
+
permanent: false,
|
|
80
|
+
},
|
|
81
|
+
};
|
|
82
|
+
}
|
|
83
|
+
console.error('Error protecting route.', error);
|
|
84
|
+
throw error;
|
|
85
|
+
}
|
|
83
86
|
}
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
};
|
|
88
|
-
}
|
|
87
|
+
return {
|
|
88
|
+
props: (0, shared_1.cleanObject)(Object.assign(Object.assign({ locale }, props), data)),
|
|
89
|
+
};
|
|
90
|
+
});
|
|
91
|
+
};
|
|
89
92
|
exports.protectRoute = protectRoute;
|
|
90
93
|
//# sourceMappingURL=protect.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"protect.js","sourceRoot":"","sources":["../../../../src/lib/handlers/ssr/protect.js"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,kDAAyB;AAEzB,uCAIoB;AACpB,4CAQwB;AAEjB,MAAM,YAAY,GAAG,CAAC,mBAAmB,EAAE,KAAK,EAAE,EAAE,
|
|
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":"shopify.d.ts","sourceRoot":"","sources":["../../../src/lib/utils/shopify.js"],"names":[],"mappings":"AAmBO;;
|
|
1
|
+
{"version":3,"file":"shopify.d.ts","sourceRoot":"","sources":["../../../src/lib/utils/shopify.js"],"names":[],"mappings":"AAmBO;;WAON;AAGM;;;YAQN;AAEM,yKAYN;AAEM,yFAwEN;AAEM;;;QAYN;AAEM;;;;;;;;;;EAiBN;AAED,uEAMC"}
|
|
@@ -30,9 +30,13 @@ const shopify_api_1 = require("@shopify/shopify-api");
|
|
|
30
30
|
const shared_1 = require("../../shared");
|
|
31
31
|
const VALID_WEBHOOK_TOPICS = Object.keys(shared_1.API_WEBHOOK_TOPICS);
|
|
32
32
|
// NOTE rejection response shows accepted value is "frame-ancestors https://admin.shopify.com https://[shop].myshopify.com"
|
|
33
|
-
const getSecurityHeader = (shop, { isEmbeddedApp } = {}) =>
|
|
34
|
-
|
|
35
|
-
|
|
33
|
+
const getSecurityHeader = (shop, { isEmbeddedApp } = {}) => {
|
|
34
|
+
const foo = ((0, shared_1.stringNotEmpty)(shop) && (0, shared_1.isTrue)(isEmbeddedApp))
|
|
35
|
+
? `frame-ancestors https://${encodeURIComponent(shop)} https://admin.shopify.com https://accounts.shopify.com;`
|
|
36
|
+
: "frame-ancestors 'none';";
|
|
37
|
+
console.log(`>>> > getSecurityHeader > foo: '${foo}'`);
|
|
38
|
+
return foo;
|
|
39
|
+
};
|
|
36
40
|
exports.getSecurityHeader = getSecurityHeader;
|
|
37
41
|
// NOTE: this should handle running in next to test non-shopify functionality
|
|
38
42
|
const allowLocalBypass = ({ SHOPIFY_RUN_MODE, APP_CONFIG } = {}) => ((SHOPIFY_RUN_MODE !== 'cli') &&
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shopify.js","sourceRoot":"","sources":["../../../src/lib/utils/shopify.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,kDAAyB;AAEzB,8CAA2C;AAC3C,sDAAiE;AAEjE,yCASqB;AAErB,MAAM,oBAAoB,GAAG,MAAM,CAAC,IAAI,CAAC,2BAAkB,CAAC,CAAA;AAE5D,2HAA2H;AACpH,MAAM,iBAAiB,GAAG,CAAC,IAAI,EAAE,EAAE,aAAa,EAAE,GAAG,EAAE,EAAE,EAAE,
|
|
1
|
+
{"version":3,"file":"shopify.js","sourceRoot":"","sources":["../../../src/lib/utils/shopify.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.0.6-beta.
|
|
3
|
+
"version": "2.0.6-beta.6",
|
|
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",
|