@agnostack/next-shopify 1.8.1-beta.15 → 1.8.1-beta.16
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.
|
@@ -1 +1 @@
|
|
|
1
|
-
export function handleAuth(serverRuntimeConfig: any): (req: any, res: any) => Promise<any>;
|
|
1
|
+
export function handleAuth(serverRuntimeConfig: any, params: any): (req: any, res: any) => Promise<any>;
|
|
@@ -3,34 +3,38 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.handleAuth = void 0;
|
|
4
4
|
const utils_1 = require("../../utils");
|
|
5
5
|
// NOTE: typically handling: "/api/auth"
|
|
6
|
-
const handleAuth = (serverRuntimeConfig) => async (req, res) => {
|
|
7
|
-
var _a;
|
|
8
|
-
const { PAGE_PATHS, API_PATHS, API_URLS, } = serverRuntimeConfig;
|
|
6
|
+
const handleAuth = (serverRuntimeConfig, params) => async (req, res) => {
|
|
7
|
+
var _a, _b, _c;
|
|
9
8
|
const query = (_a = req.query) !== null && _a !== void 0 ? _a : {};
|
|
10
|
-
const {
|
|
11
|
-
|
|
9
|
+
const { PAGE_PATHS, API_PATHS, API_URLS, } = serverRuntimeConfig;
|
|
10
|
+
const { embedded, host, shop: _shop } = query !== null && query !== void 0 ? query : {};
|
|
11
|
+
const { isOnline: _isOnline = true } = params !== null && params !== void 0 ? params : {};
|
|
12
12
|
const isOnline = utils_1.isTrue(_isOnline);
|
|
13
|
-
console.log(`>>> > handleAuth > isOnline:`, isOnline);
|
|
13
|
+
console.log(`>>> > handleAuth > isOnline/_isOnline:`, { _isOnline, isOnline });
|
|
14
14
|
const shopify = await utils_1.getInitializedShopify(serverRuntimeConfig);
|
|
15
15
|
const shop = shopify.utils.sanitizeShop(_shop);
|
|
16
16
|
if (utils_1.stringEmpty(shop)) {
|
|
17
17
|
return res.redirect(`${PAGE_PATHS[utils_1.PAGE_ROUTE_NAMES.ERROR]}?code=no_shop_provided&type=handleAuth`);
|
|
18
18
|
}
|
|
19
19
|
if (embedded === '1') {
|
|
20
|
+
const callbackURL = isOnline
|
|
21
|
+
? API_URLS[utils_1.API_ROUTE_NAMES.AUTH_CALLBACK]
|
|
22
|
+
: (_b = API_URLS[utils_1.API_ROUTE_NAMES.AUTH_CALLBACK_OFFLINE]) !== null && _b !== void 0 ? _b : API_URLS[utils_1.API_ROUTE_NAMES.AUTH_CALLBACK];
|
|
20
23
|
// TODO: explore objectToQuerystring
|
|
21
24
|
const redirectUriParams = new URLSearchParams({ shop, host }).toString();
|
|
22
|
-
const queryParams = new URLSearchParams(Object.assign(Object.assign({}, query), { shop, redirectUri: `${
|
|
25
|
+
const queryParams = new URLSearchParams(Object.assign(Object.assign({}, query), { shop, redirectUri: `${callbackURL}?${redirectUriParams}` })).toString();
|
|
23
26
|
return res.redirect(`${PAGE_PATHS[utils_1.PAGE_ROUTE_NAMES.EXIT]}?${queryParams}`);
|
|
24
27
|
}
|
|
28
|
+
const callbackPath = isOnline
|
|
29
|
+
? API_PATHS[utils_1.API_ROUTE_NAMES.AUTH_CALLBACK]
|
|
30
|
+
: (_c = API_PATHS[utils_1.API_ROUTE_NAMES.AUTH_CALLBACK_OFFLINE]) !== null && _c !== void 0 ? _c : API_PATHS[utils_1.API_ROUTE_NAMES.AUTH_CALLBACK];
|
|
25
31
|
const authPayload = {
|
|
26
|
-
rawRequest: req,
|
|
27
|
-
rawResponse: res,
|
|
28
32
|
shop,
|
|
29
33
|
isOnline,
|
|
30
|
-
callbackPath
|
|
34
|
+
callbackPath,
|
|
31
35
|
};
|
|
32
36
|
console.log(`>>> > handleAuth > authPayload:`, authPayload);
|
|
33
|
-
return shopify.auth.begin(authPayload);
|
|
37
|
+
return shopify.auth.begin(Object.assign(Object.assign({}, authPayload), { rawRequest: req, rawResponse: res }));
|
|
34
38
|
};
|
|
35
39
|
exports.handleAuth = handleAuth;
|
|
36
40
|
//# sourceMappingURL=auth.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../../src/handlers/api/auth.js"],"names":[],"mappings":";;;AAAA,uCAMoB;AAEpB,wCAAwC;AACjC,MAAM,UAAU,GAAG,CAAC,mBAAmB,EAAE,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;;
|
|
1
|
+
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../../src/handlers/api/auth.js"],"names":[],"mappings":";;;AAAA,uCAMoB;AAEpB,wCAAwC;AACjC,MAAM,UAAU,GAAG,CAAC,mBAAmB,EAAE,MAAM,EAAE,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;;IAC5E,MAAM,KAAK,GAAG,MAAA,GAAG,CAAC,KAAK,mCAAI,EAAE,CAAA;IAC7B,MAAM,EACJ,UAAU,EACV,SAAS,EACT,QAAQ,GACT,GAAG,mBAAmB,CAAA;IACvB,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,KAAK,aAAL,KAAK,cAAL,KAAK,GAAI,EAAE,CAAA;IACnD,MAAM,EAAE,QAAQ,EAAE,SAAS,GAAG,IAAI,EAAE,GAAG,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,EAAE,CAAA;IACnD,MAAM,QAAQ,GAAG,cAAM,CAAC,SAAS,CAAC,CAAA;IAClC,OAAO,CAAC,GAAG,CAAC,wCAAwC,EAAE,EAAC,SAAS,EAAE,QAAQ,EAAC,CAAC,CAAA;IAE5E,MAAM,OAAO,GAAG,MAAM,6BAAqB,CAAC,mBAAmB,CAAC,CAAA;IAChE,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,QAAQ;YAC1B,CAAC,CAAC,QAAQ,CAAC,uBAAe,CAAC,aAAa,CAAC;YACzC,CAAC,CAAC,MAAA,QAAQ,CAAC,uBAAe,CAAC,qBAAqB,CAAC,mCAAI,QAAQ,CAAC,uBAAe,CAAC,aAAa,CAAC,CAAA;QAE9F,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,QAAQ;QAC3B,CAAC,CAAC,SAAS,CAAC,uBAAe,CAAC,aAAa,CAAC;QAC1C,CAAC,CAAC,MAAA,SAAS,CAAC,uBAAe,CAAC,qBAAqB,CAAC,mCAAI,SAAS,CAAC,uBAAe,CAAC,aAAa,CAAC,CAAA;IAEhG,MAAM,WAAW,GAAG;QAClB,IAAI;QACJ,QAAQ;QACR,YAAY;KACb,CAAA;IACD,OAAO,CAAC,GAAG,CAAC,iCAAiC,EAAE,WAAW,CAAC,CAAA;IAE3D,OAAO,OAAO,CAAC,IAAI,CAAC,KAAK,iCACpB,WAAW,KACd,UAAU,EAAE,GAAG,EACf,WAAW,EAAE,GAAG,IAChB,CAAA;AACJ,CAAC,CAAA;AAnDY,QAAA,UAAU,cAmDtB"}
|
|
@@ -16,14 +16,14 @@ const shopify_api_1 = require("@shopify/shopify-api");
|
|
|
16
16
|
const utils_1 = require("../../utils");
|
|
17
17
|
// NOTE: typically handling: "/api/auth/callback" and "/api/auth/callback/offline"
|
|
18
18
|
const handleCallback = (serverRuntimeConfig, params) => async (req, res) => {
|
|
19
|
-
var _a;
|
|
20
|
-
const
|
|
19
|
+
var _a, _b;
|
|
20
|
+
const _c = serverRuntimeConfig, { PAYMENT_CONFIG, PAGE_PATHS, API_PATHS } = _c, _d = _c.APP_WEBHOOKS, _e = _d === void 0 ? {} : _d,
|
|
21
21
|
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
|
22
|
-
|
|
22
|
+
_f = utils_1.API_WEBHOOK_TOPICS.APP_UNINSTALLED,
|
|
23
23
|
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
|
24
|
-
_uninstalledWebhook =
|
|
24
|
+
_uninstalledWebhook = _e[_f], webhooks = __rest(_e, [typeof _f === "symbol" ? _f : _f + ""]);
|
|
25
25
|
const { isOnline = true } = params !== null && params !== void 0 ? params : {};
|
|
26
|
-
const { shop, host } = req.query;
|
|
26
|
+
const { shop, host } = (_a = req.query) !== null && _a !== void 0 ? _a : {};
|
|
27
27
|
const errorPath = PAGE_PATHS[utils_1.PAGE_ROUTE_NAMES.ERROR];
|
|
28
28
|
if (utils_1.stringEmpty(shop) || utils_1.stringEmpty(host)) {
|
|
29
29
|
// HMMM: why is this a 303 (rather than a 302 or or anything)??
|
|
@@ -86,7 +86,7 @@ const handleCallback = (serverRuntimeConfig, params) => async (req, res) => {
|
|
|
86
86
|
}
|
|
87
87
|
// TODO: fix these to not just redirect as standalone route (as app already installed)
|
|
88
88
|
case error instanceof shopify_api_1.GraphqlQueryError: {
|
|
89
|
-
const errorMessages = utils_1.ensureArray((
|
|
89
|
+
const errorMessages = utils_1.ensureArray((_b = error.response) === null || _b === void 0 ? void 0 : _b.errors).map(({ message }) => utils_1.ensureString(message));
|
|
90
90
|
console.error(`${errorMessage}. GraphqlQuery Error ${errorMessages.join('. ')}`);
|
|
91
91
|
redirectUrl = `${errorPath}?code=${utils_1.ERROR_CODES.QUERY}`;
|
|
92
92
|
break;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"callback.js","sourceRoot":"","sources":["../../../src/handlers/api/callback.js"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,sDAM6B;AAE7B,uCAYoB;AAEpB,mFAAmF;AAC5E,MAAM,cAAc,GAAG,CAAC,mBAAmB,EAAE,MAAM,EAAE,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;;IAChF,MASI,KAAA,mBAAmB,
|
|
1
|
+
{"version":3,"file":"callback.js","sourceRoot":"","sources":["../../../src/handlers/api/callback.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.8.1-beta.
|
|
3
|
+
"version": "1.8.1-beta.16",
|
|
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",
|