@agnostack/next-shopify 1.7.1-beta.10 → 1.7.1-beta.11
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.
|
@@ -34,11 +34,9 @@ const handleProxy = (serverRuntimeConfig) => async (req, res, _params) => {
|
|
|
34
34
|
await nextjs_cors_1.default(req, res, {
|
|
35
35
|
methods: ['PUT', 'PATCH', 'POST', 'DELETE'],
|
|
36
36
|
origin: (origin, callback) => {
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
'https://cdn.shopify.com'
|
|
41
|
-
].includes(origin)) {
|
|
37
|
+
const { shop } = utils_1.getSanitizedShopData(origin, ORIGIN_SAFELIST);
|
|
38
|
+
console.log(`>>> > handleProxy > shop:`, { shop, origin });
|
|
39
|
+
if (utils_1.stringNotEmpty(shop)) {
|
|
42
40
|
console.log(`>>> > NextCors: SUCCESS > origin:`, origin);
|
|
43
41
|
return callback(null, true);
|
|
44
42
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"proxy.js","sourceRoot":"","sources":["../../../src/handlers/api/proxy.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,gDAAgD;AAChD,8DAAkC;AAClC,sDAA6D;AAE7D,
|
|
1
|
+
{"version":3,"file":"proxy.js","sourceRoot":"","sources":["../../../src/handlers/api/proxy.js"],"names":[],"mappings":"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"}
|
package/dist/utils/shopify.d.ts
CHANGED
package/dist/utils/shopify.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getInitializedShopify = exports.getSecurityHeader = void 0;
|
|
3
|
+
exports.getInitializedShopify = exports.getSanitizedShopData = exports.getSecurityHeader = void 0;
|
|
4
4
|
require("@shopify/shopify-api/adapters/node");
|
|
5
5
|
const shopify_api_1 = require("@shopify/shopify-api");
|
|
6
6
|
const display_1 = require("./display");
|
|
@@ -9,6 +9,24 @@ const getSecurityHeader = (shop) => (display_1.stringNotEmpty(shop)
|
|
|
9
9
|
? `frame-ancestors self https://admin.shopify.com https://${shop};`
|
|
10
10
|
: "frame-ancestors 'none';");
|
|
11
11
|
exports.getSecurityHeader = getSecurityHeader;
|
|
12
|
+
// NOTE: This is a semi-replica of shopify-api-node/src/utils/shop-validator.ts
|
|
13
|
+
const getSanitizedShopData = (shop, customDomains) => {
|
|
14
|
+
var _a;
|
|
15
|
+
const domainsRegex = display_1.ensureArray(customDomains).reduce((_domainsRegex, customDomain) => {
|
|
16
|
+
var _a;
|
|
17
|
+
return ([
|
|
18
|
+
..._domainsRegex,
|
|
19
|
+
(_a = customDomain === null || customDomain === void 0 ? void 0 : customDomain.source) !== null && _a !== void 0 ? _a : customDomain
|
|
20
|
+
]);
|
|
21
|
+
}, ['myshopify\\.com', 'myshopify\\.io', 'shopify\\.com']); // HMMM: do we need to add: shopify\\.com
|
|
22
|
+
const shopUrlRegex = new RegExp(`^([a-zA-Z0-9][a-zA-Z0-9-_]*)\\.(${domainsRegex.join('|')})[/]*$`);
|
|
23
|
+
const [sanitizedShop, store_name] = (_a = display_1.ensureString(shop).match(shopUrlRegex)) !== null && _a !== void 0 ? _a : [];
|
|
24
|
+
return {
|
|
25
|
+
shop: sanitizedShop,
|
|
26
|
+
store_name,
|
|
27
|
+
};
|
|
28
|
+
};
|
|
29
|
+
exports.getSanitizedShopData = getSanitizedShopData;
|
|
12
30
|
const getInitializedShopify = async (serverRuntimeConfig) => {
|
|
13
31
|
var _a, _b, _c;
|
|
14
32
|
const { APP_CONFIG, APP_WEBHOOKS, INITIALIZED_SHOPIFY, SHOPIFY_RUN_MODE } = serverRuntimeConfig;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shopify.js","sourceRoot":"","sources":["../../src/utils/shopify.js"],"names":[],"mappings":";;;AAAA,8CAA2C;AAC3C,sDAAiE;AAEjE,
|
|
1
|
+
{"version":3,"file":"shopify.js","sourceRoot":"","sources":["../../src/utils/shopify.js"],"names":[],"mappings":";;;AAAA,8CAA2C;AAC3C,sDAAiE;AAEjE,uCAA+F;AAC/F,2CAAgD;AAEzC,MAAM,iBAAiB,GAAG,CAAC,IAAI,EAAE,EAAE,CAAC,CACzC,wBAAc,CAAC,IAAI,CAAC;IAClB,CAAC,CAAC,0DAA0D,IAAI,GAAG;IACnE,CAAC,CAAC,yBAAyB,CAC9B,CAAA;AAJY,QAAA,iBAAiB,qBAI7B;AAED,+EAA+E;AACxE,MAAM,oBAAoB,GAAG,CAAC,IAAI,EAAE,aAAa,EAAE,EAAE;;IAC1D,MAAM,YAAY,GAAG,qBAAW,CAAC,aAAa,CAAC,CAAC,MAAM,CAAC,CAAC,aAAa,EAAE,YAAY,EAAE,EAAE;;QAAC,OAAA,CAAC;YACvF,GAAG,aAAa;YAChB,MAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,MAAM,mCAAI,YAAY;SACrC,CAAC,CAAA;KAAA,EAAE,CAAC,iBAAiB,EAAE,gBAAgB,EAAE,eAAe,CAAC,CAAC,CAAA,CAAC,yCAAyC;IAErG,MAAM,YAAY,GAAG,IAAI,MAAM,CAAC,mCAAmC,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;IAElG,MAAM,CAAC,aAAa,EAAE,UAAU,CAAC,GAAG,MAAA,sBAAY,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,YAAY,CAAC,mCAAI,EAAE,CAAA;IAEhF,OAAO;QACL,IAAI,EAAE,aAAa;QACnB,UAAU;KACX,CAAA;AACH,CAAC,CAAA;AAdY,QAAA,oBAAoB,wBAchC;AAEM,MAAM,qBAAqB,GAAG,KAAK,EAAE,mBAAmB,EAAE,EAAE;;IACjE,MAAM,EAAE,UAAU,EAAE,YAAY,EAAE,mBAAmB,EAAE,gBAAgB,EAAE,GAAG,mBAAmB,CAAA;IAE/F,IAAI,kBAAkB,GAAG,mBAAmB,CAAA;IAE5C,IAAI,kBAAkB,EAAE;QACtB,MAAM,yBAAyB,GAAG,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAA;QAC3D,MAAM,eAAe,GAAG,MAAA,MAAM,CAAA,MAAA,MAAA,kBAAkB,aAAlB,kBAAkB,uBAAlB,kBAAkB,CAAE,QAAQ,0CAAE,cAAc,kDAAI,CAAA,mCAAI,EAAE,CAAA;QACpF,MAAM,WAAW,GAAG,qBAAW,CAAC,eAAe,EAAE,yBAAyB,CAAC,CAAA;QAE3E,IAAI,WAAW,IAAI,eAAe,CAAC,QAAQ,CAAC,8BAAkB,CAAC,eAAe,CAAC,EAAE;YAC/E,OAAO,kBAAkB,CAAA;SAC1B;KACF;IAED,IACE,CAAC,gBAAgB,KAAK,KAAK,CAAC;QAC5B,CACE,CAAC,UAAU,CAAC,YAAY;YACxB,CAAC,UAAU,CAAC,QAAQ;YACpB,CAAC,UAAU,CAAC,MAAM;YAClB,CAAC,UAAU,CAAC,MAAM,CACnB,EACD;QACA,6EAA6E;QAC7E,OAAO,kBAAkB,CAAA;KAC1B;IAED,kBAAkB,GAAG,wBAAU,CAAC,UAAU,CAAC,CAAA;IAC3C,kBAAkB,CAAC,QAAQ,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,MAAM,CAAC,CAC1E,QAAQ,EACR,CAAC,YAAY,EAAE,QAAQ,CAAC,EACxB,EAAE,CAAC,iCACA,QAAQ,KACX,CAAC,YAAY,CAAC,EAAE,qBAAW,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC,cAAc,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE,EAAE;YAC7E,MAAM,WAAW,GAAG,IAAI,IAAI,GAAG,CAAA;YAE/B,IAAI,qBAAW,CAAC,WAAW,CAAC,EAAE;gBAC5B,OAAO,cAAc,CAAA;aACtB;YAED,OAAO;gBACL,GAAG,cAAc;gBACjB;oBACE,cAAc,EAAE,4BAAc,CAAC,IAAI;oBACnC,WAAW;oBACX,QAAQ,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;wBAC9B,sDAAsD;wBACtD,OAAO,CAAC,GAAG,CAAC,+BAA+B,IAAI,IAAI,KAAK,EAAE,CAAC,CAAA;wBAE3D,OAAO,IAAI,CAAA;oBACb,CAAC;iBACF;aACF,CAAA;QACH,CAAC,EAAE,EAAE,CAAC,IACN,EAAE,EAAE,CAAC,CAAC,CAAA;IAER,OAAO,kBAAkB,CAAA;AAC3B,CAAC,CAAA;AA1DY,QAAA,qBAAqB,yBA0DjC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@agnostack/next-shopify",
|
|
3
|
-
"version": "1.7.1-beta.
|
|
3
|
+
"version": "1.7.1-beta.11",
|
|
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",
|