@agnostack/next-shopify 1.8.10-alpha.7 → 1.8.10-alpha.8
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.
|
@@ -8,6 +8,7 @@ const handleAuth = (serverRuntimeConfig) => async (req, res, params) => {
|
|
|
8
8
|
const { PAGE_PATHS, API_PATHS, API_URLS, } = serverRuntimeConfig;
|
|
9
9
|
const { isOnline } = params !== null && params !== void 0 ? params : {};
|
|
10
10
|
const { embedded, host, shop: _shop, reAuth: _reAuth } = query !== null && query !== void 0 ? query : {};
|
|
11
|
+
const reAuth = utils_1.isTrue(_reAuth);
|
|
11
12
|
console.log(`>>> ~ handleAuth PAGE_PATHS`, PAGE_PATHS);
|
|
12
13
|
console.log(`>>> ~ handleAuth API_URLS`, API_URLS);
|
|
13
14
|
console.log(`>>> ~ handleAuth API_PATHS`, API_PATHS);
|
|
@@ -18,25 +19,13 @@ const handleAuth = (serverRuntimeConfig) => async (req, res, params) => {
|
|
|
18
19
|
return res.redirect(`${PAGE_PATHS[utils_1.PAGE_ROUTE_NAMES.ERROR]}?code=no_shop_provided&type=handleAuth`);
|
|
19
20
|
}
|
|
20
21
|
if (embedded === '1') {
|
|
21
|
-
const
|
|
22
|
-
const callbackURL = isOnline
|
|
23
|
-
? authCallbackOnlineUrl
|
|
24
|
-
: API_URLS[utils_1.API_ROUTE_NAMES.AUTH_OFFLINE_CALLBACK] || authCallbackOnlineUrl;
|
|
22
|
+
const callbackURL = utils_1.getCallback(API_URLS, { reAuth, isOnline });
|
|
25
23
|
// TODO: explore objectToQuerystring
|
|
26
24
|
const redirectUriParams = new URLSearchParams({ shop, host }).toString();
|
|
27
25
|
const queryParams = new URLSearchParams(Object.assign(Object.assign({}, query), { shop, redirectUri: `${callbackURL}?${redirectUriParams}` })).toString();
|
|
28
26
|
return res.redirect(`${PAGE_PATHS[utils_1.PAGE_ROUTE_NAMES.EXIT]}?${queryParams}`);
|
|
29
27
|
}
|
|
30
|
-
const
|
|
31
|
-
online: API_PATHS[utils_1.API_ROUTE_NAMES.AUTH_ONLINE_CALLBACK_REAUTH],
|
|
32
|
-
offline: API_PATHS[utils_1.API_ROUTE_NAMES.AUTH_OFFLINE_CALLBACK_REAUTH],
|
|
33
|
-
} : {
|
|
34
|
-
online: API_PATHS[utils_1.API_ROUTE_NAMES.AUTH_ONLINE_CALLBACK],
|
|
35
|
-
offline: API_PATHS[utils_1.API_ROUTE_NAMES.AUTH_OFFLINE_CALLBACK],
|
|
36
|
-
};
|
|
37
|
-
const callbackPath = isOnline
|
|
38
|
-
? authCallbackPaths.online
|
|
39
|
-
: authCallbackPaths.offline || authCallbackPaths.online;
|
|
28
|
+
const callbackPath = utils_1.getCallback(API_PATHS, { reAuth, isOnline });
|
|
40
29
|
return shopify.auth.begin({
|
|
41
30
|
shop,
|
|
42
31
|
isOnline,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../../src/handlers/api/auth.js"],"names":[],"mappings":";;;AAAA,uCAMoB;AAEpB,wEAAwE;AACjE,MAAM,UAAU,GAAG,CAAC,mBAAmB,EAAE,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,EAAE;IAC5E,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAA;IACvB,MAAM,EACJ,UAAU,EACV,SAAS,EACT,QAAQ,GACT,GAAG,mBAAmB,CAAA;IACvB,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,EAAE,CAAA;IACjC,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,KAAK,aAAL,KAAK,cAAL,KAAK,GAAI,EAAE,CAAA;IACpE,OAAO,CAAC,GAAG,CAAC,6BAA6B,EAAE,UAAU,CAAC,CAAA;IACtD,OAAO,CAAC,GAAG,CAAC,2BAA2B,EAAE,QAAQ,CAAC,CAAA;IAClD,OAAO,CAAC,GAAG,CAAC,4BAA4B,EAAE,SAAS,CAAC,CAAA;IACpD,OAAO,CAAC,GAAG,CAAC,wBAAwB,EAAE,KAAK,CAAC,CAAA;IAE5C,MAAM,OAAO,GAAG,6BAAqB,CAAC,mBAAmB,CAAC,CAAA;IAC1D,MAAM,IAAI,GAAG,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,KAAK,CAAC,CAAA;IAE9C,IAAI,mBAAW,CAAC,IAAI,CAAC,EAAE;QACrB,OAAO,GAAG,CAAC,QAAQ,CAAC,GAAG,UAAU,CAAC,wBAAgB,CAAC,KAAK,CAAC,wCAAwC,CAAC,CAAA;KACnG;IAED,IAAI,QAAQ,KAAK,GAAG,EAAE;QACpB,MAAM,
|
|
1
|
+
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../../src/handlers/api/auth.js"],"names":[],"mappings":";;;AAAA,uCAMoB;AAEpB,wEAAwE;AACjE,MAAM,UAAU,GAAG,CAAC,mBAAmB,EAAE,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,EAAE;IAC5E,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAA;IACvB,MAAM,EACJ,UAAU,EACV,SAAS,EACT,QAAQ,GACT,GAAG,mBAAmB,CAAA;IACvB,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,EAAE,CAAA;IACjC,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,KAAK,aAAL,KAAK,cAAL,KAAK,GAAI,EAAE,CAAA;IACpE,MAAM,MAAM,GAAG,cAAM,CAAC,OAAO,CAAC,CAAA;IAC9B,OAAO,CAAC,GAAG,CAAC,6BAA6B,EAAE,UAAU,CAAC,CAAA;IACtD,OAAO,CAAC,GAAG,CAAC,2BAA2B,EAAE,QAAQ,CAAC,CAAA;IAClD,OAAO,CAAC,GAAG,CAAC,4BAA4B,EAAE,SAAS,CAAC,CAAA;IACpD,OAAO,CAAC,GAAG,CAAC,wBAAwB,EAAE,KAAK,CAAC,CAAA;IAE5C,MAAM,OAAO,GAAG,6BAAqB,CAAC,mBAAmB,CAAC,CAAA;IAC1D,MAAM,IAAI,GAAG,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,KAAK,CAAC,CAAA;IAE9C,IAAI,mBAAW,CAAC,IAAI,CAAC,EAAE;QACrB,OAAO,GAAG,CAAC,QAAQ,CAAC,GAAG,UAAU,CAAC,wBAAgB,CAAC,KAAK,CAAC,wCAAwC,CAAC,CAAA;KACnG;IAED,IAAI,QAAQ,KAAK,GAAG,EAAE;QACpB,MAAM,WAAW,GAAG,mBAAW,CAAC,QAAQ,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAA;QAC/D,oCAAoC;QACpC,MAAM,iBAAiB,GAAG,IAAI,eAAe,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAA;QACxE,MAAM,WAAW,GAAG,IAAI,eAAe,iCAClC,KAAK,KACR,IAAI,EACJ,WAAW,EAAE,GAAG,WAAW,IAAI,iBAAiB,EAAE,IAClD,CAAC,QAAQ,EAAE,CAAA;QAEb,OAAO,GAAG,CAAC,QAAQ,CAAC,GAAG,UAAU,CAAC,wBAAgB,CAAC,IAAI,CAAC,IAAI,WAAW,EAAE,CAAC,CAAA;KAC3E;IAED,MAAM,YAAY,GAAG,mBAAW,CAAC,SAAS,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAA;IAEjE,OAAO,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC;QACxB,IAAI;QACJ,QAAQ;QACR,YAAY;QACZ,UAAU,EAAE,GAAG;QACf,WAAW,EAAE,GAAG;KACjB,CAAC,CAAA;AACJ,CAAC,CAAA;AA5CY,QAAA,UAAU,cA4CtB"}
|
package/dist/utils/shopify.d.ts
CHANGED
|
@@ -28,4 +28,8 @@ export function getInitializedShopify(props: any): import("@shopify/shopify-api"
|
|
|
28
28
|
export function getWebhookHandlers({ APP_WEBHOOKS }?: {
|
|
29
29
|
APP_WEBHOOKS: any;
|
|
30
30
|
}): {};
|
|
31
|
+
export function getCallback(data: any, { reAuth, isOnline }: {
|
|
32
|
+
reAuth: any;
|
|
33
|
+
isOnline: any;
|
|
34
|
+
}): any;
|
|
31
35
|
export const SHOP_QUERY: "\n {\n shop {\n name\n }\n }\n";
|
package/dist/utils/shopify.js
CHANGED
|
@@ -14,7 +14,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
14
14
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
15
15
|
};
|
|
16
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
|
-
exports.SHOP_QUERY = exports.getWebhookHandlers = exports.getInitializedShopify = exports.decodeShopData = exports.getSanitizedShopData = exports.allowLocalBypass = exports.getSecurityHeader = void 0;
|
|
17
|
+
exports.SHOP_QUERY = exports.getCallback = exports.getWebhookHandlers = exports.getInitializedShopify = exports.decodeShopData = exports.getSanitizedShopData = exports.allowLocalBypass = exports.getSecurityHeader = void 0;
|
|
18
18
|
const chalk_1 = __importDefault(require("chalk"));
|
|
19
19
|
require("@shopify/shopify-api/adapters/node");
|
|
20
20
|
const shopify_api_1 = require("@shopify/shopify-api");
|
|
@@ -114,6 +114,19 @@ const getWebhookHandlers = ({ APP_WEBHOOKS } = {}) => (Object.entries(display_1.
|
|
|
114
114
|
}, []) });
|
|
115
115
|
}, {}));
|
|
116
116
|
exports.getWebhookHandlers = getWebhookHandlers;
|
|
117
|
+
const getCallback = (data, { reAuth, isOnline }) => {
|
|
118
|
+
const authCallbacks = reAuth ? {
|
|
119
|
+
online: data[constants_1.API_ROUTE_NAMES.AUTH_ONLINE_CALLBACK_REAUTH],
|
|
120
|
+
offline: data[constants_1.API_ROUTE_NAMES.AUTH_OFFLINE_CALLBACK_REAUTH],
|
|
121
|
+
} : {
|
|
122
|
+
online: data[constants_1.API_ROUTE_NAMES.AUTH_ONLINE_CALLBACK],
|
|
123
|
+
offline: data[constants_1.API_ROUTE_NAMES.AUTH_OFFLINE_CALLBACK],
|
|
124
|
+
};
|
|
125
|
+
return isOnline
|
|
126
|
+
? authCallbacks.online
|
|
127
|
+
: authCallbacks.offline || authCallbacks.online;
|
|
128
|
+
};
|
|
129
|
+
exports.getCallback = getCallback;
|
|
117
130
|
exports.SHOP_QUERY = `
|
|
118
131
|
{
|
|
119
132
|
shop {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shopify.js","sourceRoot":"","sources":["../../src/utils/shopify.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,kDAAyB;AAEzB,8CAA2C;AAC3C,sDAAiE;AAEjE,4DAAmC;AACnC,yCAAkC;AAElC,uCAOkB;AAClB,
|
|
1
|
+
{"version":3,"file":"shopify.js","sourceRoot":"","sources":["../../src/utils/shopify.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,kDAAyB;AAEzB,8CAA2C;AAC3C,sDAAiE;AAEjE,4DAAmC;AACnC,yCAAkC;AAElC,uCAOkB;AAClB,2CAAiE;AAEjE,MAAM,oBAAoB,GAAG,MAAM,CAAC,IAAI,CAAC,8BAAkB,CAAC,CAAA;AAE5D,2HAA2H;AACpH,MAAM,iBAAiB,GAAG,CAAC,IAAI,EAAE,EAAE,aAAa,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,CACjE,CAAC,wBAAc,CAAC,IAAI,CAAC,IAAI,gBAAM,CAAC,aAAa,CAAC,CAAC;IAC7C,CAAC,CAAC,2BAA2B,kBAAkB,CAAC,IAAI,CAAC,6BAA6B;IAClF,CAAC,CAAC,yBAAyB,CAC9B,CAAA;AAJY,QAAA,iBAAiB,qBAI7B;AAED,6EAA6E;AACtE,MAAM,gBAAgB,GAAG,CAAC,EAAE,gBAAgB,EAAE,UAAU,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,CACzE,CAAC,gBAAgB,KAAK,KAAK,CAAC;IAC5B,CACE,CAAC,UAAU,CAAC,YAAY;QACxB,CAAC,UAAU,CAAC,QAAQ;QACpB,CAAC,UAAU,CAAC,MAAM;QAClB,CAAC,UAAU,CAAC,MAAM,CACnB,CACF,CAAA;AARY,QAAA,gBAAgB,oBAQ5B;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,CAAC,CAAC,CAAA,CAAC,yCAAyC;IAEpF,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,cAAc,GAAG,CAAC,KAAK,EAAE,EAAE;IACtC,IAAI,qBAAW,CAAC,KAAK,CAAC,EAAE;QACtB,OAAO,EAAE,CAAA;KACV;IAED,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,oBAAU,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAA;IAC1D,IAAI,qBAAW,CAAC,IAAI,CAAC,EAAE;QACrB,OAAO,EAAE,CAAA;KACV;IAED,IAAI,KAAK,CAAA;IACT,IAAI;QACF,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAA;KACrE;IAAC,OAAO,MAAM,EAAE;QACf,OAAO,CAAC,GAAG,CAAC,8BAA8B,EAAE,MAAM,CAAC,CAAA;KACpD;IAED,MAAM,EACJ,IAAI,EACJ,UAAU,GACV,GAAG,4BAAoB,CAAC,KAAK,aAAL,KAAK,cAAL,KAAK,GAAI,IAAI,CAAC,CAAA;IACxC,MAAM,IAAI,GAAG,wBAAc,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,kBAAM,CAAC,GAAG,IAAI,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;IAEvE,OAAO;QACL,KAAK;QACL,IAAI;QACJ,GAAG;QACH,IAAI;QACJ,IAAI;QACJ,UAAU;KACX,CAAA;AACH,CAAC,CAAA;AA/BY,QAAA,cAAc,kBA+B1B;AAEM,MAAM,qBAAqB,GAAG,CAAC,KAAK,EAAE,EAAE;IAC7C,6EAA6E;IAC7E,IAAI,wBAAgB,CAAC,KAAK,CAAC,EAAE;QAC3B,OAAO,SAAS,CAAA;KACjB;IAED,OAAO,wBAAU,CAAC,KAAK,CAAC,UAAU,CAAC,CAAA;AACrC,CAAC,CAAA;AAPY,QAAA,qBAAqB,yBAOjC;AAEM,MAAM,kBAAkB,GAAG,CAAC,EAAE,YAAY,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,CAC3D,MAAM,CAAC,OAAO,CAAC,sBAAY,CAAC,YAAY,CAAC,CAAC,CAAC,MAAM,CAAC,CAChD,gBAAgB,EAChB,CAAC,YAAY,EAAE,QAAQ,CAAC,EACxB,EAAE;IACF,IAAI,CAAC,oBAAoB,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE;QAChD,OAAO,CAAC,IAAI,CAAC,uCAAuC,YAAY,EAAE,CAAC,CAAA;QACnE,OAAO,gBAAgB,CAAA;KACxB;IAED,uCACK,gBAAgB,KACnB,CAAC,YAAY,CAAC,EAAE,qBAAW,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC,cAAc,EAAE,EAQ7D,EAAE,EAAE;gBARyD,EAC5D,GAAG,EACH,IAAI,EACJ,QAAQ,EAAE,SAAS,EACnB,WAAW,EAAE,YAAY,EACzB,cAAc,GAAG,4BAAc,CAAC,IAAI,OAGrC;YAFC,6GAA6G;YAC1G,aAAa,cAP4C,4DAQ7D,CADiB;YAEhB,MAAM,WAAW,GAAG,YAAY,IAAI,GAAG,IAAI,IAAI,CAAA;YAE/C,OAAO,CAAC,IAAI,CAAC,GAAG,eAAK,CAAC,YAAY,CAAC,cAAc,CAAC,OAAO,eAAK,CAAC,IAAI,CAAC,YAAY,CAAC,MAC/E,2BAA2B,cAAc,IAAI,WAAW,CAAC,CAAC,CAAC,uBAAuB,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,KACpG,mIACF,EAAE,EAAE,CAAC,CAAA;YAEL,OAAO;gBACL,GAAG,cAAc;4DAEf,cAAc,IACX,aAAa,GACb,WAAW,IAAI,EAAE,WAAW,EAAE,GAE9B,CAAC,WAAW,IAAI,SAAS,CAAC,IAAI;oBAC/B,QAAQ,EAAE,KAAK,EACb,KAAK,EACL,IAAI,EACJ,OAAO,EACP,SAAS,EACT,UAAU,EACV,EAAE;wBACF,IAAI,SAAS,EAAE;4BACb,OAAO,CAAC,GAAG,CAAC,wBAAwB,IAAI,IAAI,KAAK,IAAI,SAAS,EAAE,CAAC,CAAA;4BACjE,OAAO,SAAS,CACd,KAAK,EACL,IAAI,EACJ,OAAO,EACP,SAAS,EACT,UAAU,CACX,CAAA;yBACF;wBAED,OAAO,IAAI,CAAA;oBACb,CAAC;iBACF;aAEJ,CAAA;QACH,CAAC,EAAE,EAAE,CAAC,IACP;AACH,CAAC,EAAE,EAAE,CAAC,CACP,CAAA;AA9DY,QAAA,kBAAkB,sBA8D9B;AAEM,MAAM,WAAW,GAAG,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,EAAE,EAAE;IACxD,MAAM,aAAa,GAAG,MAAM,CAAC,CAAC,CAAC;QAC7B,MAAM,EAAE,IAAI,CAAC,2BAAe,CAAC,2BAA2B,CAAC;QACzD,OAAO,EAAE,IAAI,CAAC,2BAAe,CAAC,4BAA4B,CAAC;KAC5D,CAAC,CAAC,CAAC;QACF,MAAM,EAAE,IAAI,CAAC,2BAAe,CAAC,oBAAoB,CAAC;QAClD,OAAO,EAAE,IAAI,CAAC,2BAAe,CAAC,qBAAqB,CAAC;KACrD,CAAA;IAED,OAAO,QAAQ;QACb,CAAC,CAAC,aAAa,CAAC,MAAM;QACtB,CAAC,CAAC,aAAa,CAAC,OAAO,IAAI,aAAa,CAAC,MAAM,CAAA;AACnD,CAAC,CAAA;AAZY,QAAA,WAAW,eAYvB;AAEY,QAAA,UAAU,GAAG;;;;;;CAMzB,CAAA"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@agnostack/next-shopify",
|
|
3
|
-
"version": "1.8.10-alpha.
|
|
3
|
+
"version": "1.8.10-alpha.8",
|
|
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",
|