@agnostack/next-shopify 1.8.1-beta.43 → 1.8.1-beta.44
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,95 +1,75 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
// import {
|
|
3
|
+
// stringEmpty,
|
|
4
|
+
// getInitializedShopify,
|
|
5
|
+
// API_ROUTE_NAMES,
|
|
6
|
+
// PAGE_ROUTE_NAMES,
|
|
7
|
+
// } from '../../utils'
|
|
2
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
9
|
exports.handleAuth = void 0;
|
|
10
|
+
// // NOTE: typically handling: "/api/auth"
|
|
11
|
+
// export const handleAuth = (serverRuntimeConfig) => async (req, res) => {
|
|
12
|
+
// const { API_URLS, API_PATHS, PAGE_PATHS } = serverRuntimeConfig
|
|
13
|
+
// const query = req.query ?? {}
|
|
14
|
+
// const { embedded, host, shop: _shop } = query ?? {}
|
|
15
|
+
// const shopify = await getInitializedShopify(serverRuntimeConfig)
|
|
16
|
+
// const shop = shopify.utils.sanitizeShop(_shop)
|
|
17
|
+
// if (stringEmpty(shop)) {
|
|
18
|
+
// return res.redirect(`${PAGE_PATHS[PAGE_ROUTE_NAMES.ERROR]}?code=no_shop_provided&type=handleAuth`)
|
|
19
|
+
// }
|
|
20
|
+
// if (embedded === '1') {
|
|
21
|
+
// // TODO: explore objectToQuerystring
|
|
22
|
+
// const redirectUriParams = new URLSearchParams({ shop, host }).toString()
|
|
23
|
+
// const queryParams = new URLSearchParams({
|
|
24
|
+
// ...query,
|
|
25
|
+
// shop,
|
|
26
|
+
// redirectUri: `${API_URLS[API_ROUTE_NAMES.AUTH_CALLBACK]}?${redirectUriParams}`,
|
|
27
|
+
// }).toString()
|
|
28
|
+
// return res.redirect(`${PAGE_PATHS[PAGE_ROUTE_NAMES.EXIT]}?${queryParams}`)
|
|
29
|
+
// }
|
|
30
|
+
// return shopify.auth.begin({
|
|
31
|
+
// shop,
|
|
32
|
+
// isOnline: true,
|
|
33
|
+
// rawRequest: req,
|
|
34
|
+
// rawResponse: res,
|
|
35
|
+
// callbackPath: API_PATHS[API_ROUTE_NAMES.AUTH_CALLBACK],
|
|
36
|
+
// })
|
|
37
|
+
// }
|
|
4
38
|
const utils_1 = require("../../utils");
|
|
5
39
|
// NOTE: typically handling: "/api/auth"
|
|
6
40
|
const handleAuth = (serverRuntimeConfig) => async (req, res) => {
|
|
7
41
|
var _a;
|
|
8
|
-
const { API_URLS, API_PATHS, PAGE_PATHS } = serverRuntimeConfig;
|
|
9
42
|
const query = (_a = req.query) !== null && _a !== void 0 ? _a : {};
|
|
10
|
-
const {
|
|
43
|
+
const { PAGE_PATHS, API_PATHS, API_URLS, } = serverRuntimeConfig;
|
|
44
|
+
const { embedded, host, shop: _shop, isOnline: _isOnline } = query !== null && query !== void 0 ? query : {};
|
|
45
|
+
const isOnline = utils_1.isTrue(_isOnline);
|
|
46
|
+
console.log(`>>> > handleAuth > req > isOnline/_isOnline:`, { _isOnline, isOnline });
|
|
11
47
|
const shopify = await utils_1.getInitializedShopify(serverRuntimeConfig);
|
|
12
48
|
const shop = shopify.utils.sanitizeShop(_shop);
|
|
13
49
|
if (utils_1.stringEmpty(shop)) {
|
|
14
50
|
return res.redirect(`${PAGE_PATHS[utils_1.PAGE_ROUTE_NAMES.ERROR]}?code=no_shop_provided&type=handleAuth`);
|
|
15
51
|
}
|
|
16
52
|
if (embedded === '1') {
|
|
53
|
+
const authCallbackUrl = API_URLS[utils_1.API_ROUTE_NAMES.AUTH_CALLBACK];
|
|
54
|
+
const callbackURL = isOnline
|
|
55
|
+
? authCallbackUrl
|
|
56
|
+
: API_URLS[utils_1.API_ROUTE_NAMES.AUTH_CALLBACK_OFFLINE] || authCallbackUrl;
|
|
17
57
|
// TODO: explore objectToQuerystring
|
|
18
58
|
const redirectUriParams = new URLSearchParams({ shop, host }).toString();
|
|
19
|
-
const queryParams = new URLSearchParams(Object.assign(Object.assign({}, query), { shop, redirectUri: `${
|
|
59
|
+
const queryParams = new URLSearchParams(Object.assign(Object.assign({}, query), { shop, redirectUri: `${callbackURL}?${redirectUriParams}` })).toString();
|
|
20
60
|
return res.redirect(`${PAGE_PATHS[utils_1.PAGE_ROUTE_NAMES.EXIT]}?${queryParams}`);
|
|
21
61
|
}
|
|
22
|
-
|
|
62
|
+
const authCallbackPath = API_PATHS[utils_1.API_ROUTE_NAMES.AUTH_CALLBACK];
|
|
63
|
+
const callbackPath = isOnline
|
|
64
|
+
? authCallbackPath
|
|
65
|
+
: API_PATHS[utils_1.API_ROUTE_NAMES.AUTH_CALLBACK_OFFLINE] || authCallbackPath;
|
|
66
|
+
const authPayload = {
|
|
23
67
|
shop,
|
|
24
|
-
isOnline
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
});
|
|
68
|
+
isOnline,
|
|
69
|
+
callbackPath,
|
|
70
|
+
};
|
|
71
|
+
console.log(`>>> > handleAuth > authPayload:`, authPayload);
|
|
72
|
+
return shopify.auth.begin(Object.assign(Object.assign({}, authPayload), { rawRequest: req, rawResponse: res }));
|
|
29
73
|
};
|
|
30
74
|
exports.handleAuth = handleAuth;
|
|
31
|
-
/*
|
|
32
|
-
import {
|
|
33
|
-
// isTrue,
|
|
34
|
-
stringEmpty,
|
|
35
|
-
getInitializedShopify,
|
|
36
|
-
PAGE_ROUTE_NAMES,
|
|
37
|
-
API_ROUTE_NAMES,
|
|
38
|
-
} from '../../utils'
|
|
39
|
-
|
|
40
|
-
// NOTE: typically handling: "/api/auth"
|
|
41
|
-
export const handleAuth = (serverRuntimeConfig) => async (req, res) => {
|
|
42
|
-
const query = req.query ?? {}
|
|
43
|
-
const {
|
|
44
|
-
PAGE_PATHS,
|
|
45
|
-
API_PATHS,
|
|
46
|
-
API_URLS,
|
|
47
|
-
} = serverRuntimeConfig
|
|
48
|
-
const { embedded, host, shop: _shop, isOnline: _isOnline } = query ?? {}
|
|
49
|
-
const isOnline = true // isTrue(_isOnline)
|
|
50
|
-
console.log(`>>> > handleAuth > req > isOnline/_isOnline:`, {_isOnline, isOnline})
|
|
51
|
-
|
|
52
|
-
const shopify = await getInitializedShopify(serverRuntimeConfig)
|
|
53
|
-
const shop = shopify.utils.sanitizeShop(_shop)
|
|
54
|
-
|
|
55
|
-
if (stringEmpty(shop)) {
|
|
56
|
-
return res.redirect(`${PAGE_PATHS[PAGE_ROUTE_NAMES.ERROR]}?code=no_shop_provided&type=handleAuth`)
|
|
57
|
-
}
|
|
58
|
-
|
|
59
|
-
if (embedded === '1') {
|
|
60
|
-
const authCallbackUrl = API_URLS[API_ROUTE_NAMES.AUTH_CALLBACK]
|
|
61
|
-
const callbackURL = isOnline
|
|
62
|
-
? authCallbackUrl
|
|
63
|
-
: API_URLS[API_ROUTE_NAMES.AUTH_CALLBACK_OFFLINE] || authCallbackUrl
|
|
64
|
-
|
|
65
|
-
// TODO: explore objectToQuerystring
|
|
66
|
-
const redirectUriParams = new URLSearchParams({ shop, host }).toString()
|
|
67
|
-
const queryParams = new URLSearchParams({
|
|
68
|
-
...query,
|
|
69
|
-
shop,
|
|
70
|
-
redirectUri: `${callbackURL}?${redirectUriParams}`,
|
|
71
|
-
}).toString()
|
|
72
|
-
|
|
73
|
-
return res.redirect(`${PAGE_PATHS[PAGE_ROUTE_NAMES.EXIT]}?${queryParams}`)
|
|
74
|
-
}
|
|
75
|
-
|
|
76
|
-
const authCallbackPath = API_PATHS[API_ROUTE_NAMES.AUTH_CALLBACK]
|
|
77
|
-
const callbackPath = isOnline
|
|
78
|
-
? authCallbackPath
|
|
79
|
-
: API_PATHS[API_ROUTE_NAMES.AUTH_CALLBACK_OFFLINE] || authCallbackPath
|
|
80
|
-
|
|
81
|
-
const authPayload = {
|
|
82
|
-
shop,
|
|
83
|
-
isOnline,
|
|
84
|
-
callbackPath,
|
|
85
|
-
}
|
|
86
|
-
console.log(`>>> > handleAuth > authPayload:`, authPayload)
|
|
87
|
-
|
|
88
|
-
return shopify.auth.begin({
|
|
89
|
-
...authPayload,
|
|
90
|
-
rawRequest: req,
|
|
91
|
-
rawResponse: res,
|
|
92
|
-
})
|
|
93
|
-
}
|
|
94
|
-
*/
|
|
95
75
|
//# sourceMappingURL=auth.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../../src/handlers/api/auth.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../../src/handlers/api/auth.js"],"names":[],"mappings":"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"}
|
|
@@ -47,15 +47,15 @@ const handleCallback = (serverRuntimeConfig, params) => async (req, res) => {
|
|
|
47
47
|
if (utils_1.isTrue(isOnline) && utils_1.objectNotEmpty(webhooks)) {
|
|
48
48
|
console.log(`>>> > handleCallback > YEP!!!!`);
|
|
49
49
|
// TODO: explore objectToQuerystring
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
return shopify.auth.begin({
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
})
|
|
50
|
+
const queryParams = new URLSearchParams({ host, shop, isOnline: false }).toString();
|
|
51
|
+
console.log(`>>> > handleCallback > YEP > redirectUrl:`, `${API_PATHS[utils_1.API_ROUTE_NAMES.AUTH]}?${queryParams}`);
|
|
52
|
+
return res.redirect(302, `${API_PATHS[utils_1.API_ROUTE_NAMES.AUTH]}?${queryParams}`);
|
|
53
|
+
// return shopify.auth.begin({
|
|
54
|
+
// shop,
|
|
55
|
+
// rawRequest: req,
|
|
56
|
+
// rawResponse: res,
|
|
57
|
+
// callbackPath: API_PATHS[API_ROUTE_NAMES.AUTH_CALLBACK_OFFLINE],
|
|
58
|
+
// })
|
|
59
59
|
}
|
|
60
60
|
console.log(`>>> > handleCallback > session?.isOnline: '${session === null || session === void 0 ? void 0 : session.isOnline}'`);
|
|
61
61
|
if (!utils_1.isTrue(session === null || session === void 0 ? void 0 : session.isOnline)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"callback.js","sourceRoot":"","sources":["../../../src/handlers/api/callback.js"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,sDAM6B;AAE7B,uCAYoB;AAEpB,wEAAwE;AACjE,MAAM,cAAc,GAAG,CAAC,mBAAmB,EAAE,MAAM,EAAE,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;;IAChF,MASI,KAAA,mBAAmB,EATjB,EACJ,cAAc,EACd,UAAU,EACV,SAAS,OAMY,EALrB,oBAIM,EAJN,qBAII,EAAE,KAAA;IAHJ,6DAA6D;IAC7D,KAAC,0BAAkB,CAAC,eAAgB;IADpC,6DAA6D;IACvB,mBAAmB,SAAA,EACtD,QAAQ,cAHC,uCAIb,CACoB,CAAA;IACvB,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,EAAE,CAAA;IACjC,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,MAAA,GAAG,CAAC,KAAK,mCAAI,EAAE,CAAA;IACtC,OAAO,CAAC,GAAG,CAAC,mCAAmC,EAAE,EAAC,MAAM,EAAE,KAAK,EAAC,GAAG,CAAC,KAAK,EAAC,CAAC,CAAA;IAE3E,MAAM,SAAS,GAAG,UAAU,CAAC,wBAAgB,CAAC,KAAK,CAAC,CAAA;IACpD,IAAI,mBAAW,CAAC,IAAI,CAAC,IAAI,mBAAW,CAAC,IAAI,CAAC,EAAE;QAC1C,+DAA+D;QAC/D,OAAO,GAAG,CAAC,QAAQ,CAAC,GAAG,EAAE,GAAG,SAAS,SAAS,mBAAW,CAAC,gBAAgB,EAAE,CAAC,CAAA;KAC9E;IAED,IAAI,WAAW,GAAG,GAAG,SAAS,4BAA4B,CAAA;IAE1D,IAAI;QACF,2FAA2F;QAC3F,MAAM,EAAE,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,GAAG,MAAM,yBAAiB,CAAC,mBAAmB,EAAE,EAAE,IAAI,EAAE,CAAC,CAAA;QAEvG,MAAM,WAAW,GAAG,EAAE,UAAU,EAAE,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,CAAA;QACzD,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAA;QAC5D,MAAM,gBAAgB,GAAG,MAAM,YAAY,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAA;QAE/D,OAAO,CAAC,GAAG,CAAC,kCAAkC,EAAE;YAC9C,QAAQ;YACR,OAAO,EAAE,OAAO,CAAC,QAAQ,EAAE;YAC3B,SAAS,EAAE,cAAM,CAAC,QAAQ,CAAC;YAC3B,QAAQ;YACR,gBAAgB;SACjB,CAAC,CAAA;QACF,IAAI,cAAM,CAAC,QAAQ,CAAC,IAAI,sBAAc,CAAC,QAAQ,CAAC,EAAE;YAChD,OAAO,CAAC,GAAG,CAAC,gCAAgC,CAAC,CAAA;YAC7C,oCAAoC;YACpC,
|
|
1
|
+
{"version":3,"file":"callback.js","sourceRoot":"","sources":["../../../src/handlers/api/callback.js"],"names":[],"mappings":"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"}
|
|
@@ -26,8 +26,8 @@ const protectRoute = (props) => async ({ req, res, query, locale } = {}, data) =
|
|
|
26
26
|
const existingSessionIds = await findSessionIds(shop);
|
|
27
27
|
if (utils_1.arrayEmpty(existingSessionIds)) {
|
|
28
28
|
// TODO: explore objectToQuerystring
|
|
29
|
-
const queryParams = new URLSearchParams(
|
|
30
|
-
|
|
29
|
+
// const queryParams = new URLSearchParams({ ...query, shop }).toString()
|
|
30
|
+
const queryParams = new URLSearchParams(Object.assign(Object.assign({}, query), { shop, isOnline: true })).toString();
|
|
31
31
|
return {
|
|
32
32
|
redirect: {
|
|
33
33
|
destination: `${API_PATHS[utils_1.API_ROUTE_NAMES.AUTH]}?${queryParams}`,
|
|
@@ -37,8 +37,8 @@ const protectRoute = (props) => async ({ req, res, query, locale } = {}, data) =
|
|
|
37
37
|
}
|
|
38
38
|
if (embedded !== '1') {
|
|
39
39
|
try {
|
|
40
|
-
|
|
41
|
-
|
|
40
|
+
// NOTE: this does not work if called outside of embedded
|
|
41
|
+
await loadSession({ req, res });
|
|
42
42
|
const destination = await shopify.auth.getEmbeddedAppUrl({
|
|
43
43
|
rawRequest: req,
|
|
44
44
|
rawResponse: res,
|
|
@@ -52,9 +52,9 @@ const protectRoute = (props) => async ({ req, res, query, locale } = {}, data) =
|
|
|
52
52
|
}
|
|
53
53
|
catch (error) {
|
|
54
54
|
if (error instanceof utils_1.ShopifyAuthenticationError) {
|
|
55
|
-
// TODO
|
|
56
|
-
const queryParams = new URLSearchParams(
|
|
57
|
-
|
|
55
|
+
// TODO: explore objectToQuerystring
|
|
56
|
+
// const queryParams = new URLSearchParams({ ...query, shop }).toString()
|
|
57
|
+
const queryParams = new URLSearchParams(Object.assign(Object.assign({}, query), { shop, isOnline: true })).toString();
|
|
58
58
|
return {
|
|
59
59
|
redirect: {
|
|
60
60
|
destination: `${API_PATHS[utils_1.API_ROUTE_NAMES.AUTH]}?${queryParams}`,
|
|
@@ -66,8 +66,6 @@ const protectRoute = (props) => async ({ req, res, query, locale } = {}, data) =
|
|
|
66
66
|
throw error;
|
|
67
67
|
}
|
|
68
68
|
}
|
|
69
|
-
// const nonEmbeddedSess = await loadSession({ req, res })
|
|
70
|
-
// console.log(`>>> > protectRoute > embeddedSess:`, nonEmbeddedSess)
|
|
71
69
|
return {
|
|
72
70
|
props: utils_1.cleanObject(Object.assign({ locale }, data)),
|
|
73
71
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"protect.js","sourceRoot":"","sources":["../../../src/handlers/ssr/protect.js"],"names":[],"mappings":";;;AAAA,uCAUoB;AAEb,MAAM,YAAY,GAAG,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,EAAE,IAAI,EAAE,EAAE;;IACtF,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,GAAG,KAAK,CAAA;IACvC,MAAM,IAAI,GAAG,MAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,IAAI,mCAAI,MAAA,GAAG,CAAC,KAAK,0CAAE,IAAI,CAAA;IAC3C,MAAM,QAAQ,GAAG,MAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,QAAQ,mCAAI,MAAA,GAAG,CAAC,KAAK,0CAAE,QAAQ,CAAA;IAEvD,IAAI,mBAAW,CAAC,IAAI,CAAC,EAAE;QACrB,OAAO;YACL,QAAQ,EAAE;gBACR,WAAW,EAAE,GAAG,UAAU,CAAC,wBAAgB,CAAC,KAAK,CAAC,0CAA0C;gBAC5F,SAAS,EAAE,KAAK;aACjB;SACF,CAAA;KACF;IAED,6EAA6E;IAC7E,IAAI,wBAAgB,CAAC,KAAK,CAAC,EAAE;QAC3B,OAAO;YACL,KAAK,EAAE,mBAAW,iBAChB,MAAM,IACH,IAAI,EACP;SACH,CAAA;KACF;IAED,MAAM,EAAE,OAAO,EAAE,cAAc,EAAE,WAAW,EAAE,GAAG,MAAM,yBAAiB,CAAC,KAAK,EAAE,EAAE,IAAI,EAAE,CAAC,CAAA;IACzF,GAAG,CAAC,SAAS,CAAC,yBAAyB,EAAE,yBAAiB,CAAC,IAAI,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC,CAAA;IAEjF,MAAM,kBAAkB,GAAG,MAAM,cAAc,CAAC,IAAI,CAAC,CAAA;IACrD,IAAI,kBAAU,CAAC,kBAAkB,CAAC,EAAE;QAClC,oCAAoC;QACpC,MAAM,WAAW,GAAG,IAAI,eAAe,iCAAM,KAAK,KAAE,IAAI,IAAG,CAAC,QAAQ,EAAE,CAAA;
|
|
1
|
+
{"version":3,"file":"protect.js","sourceRoot":"","sources":["../../../src/handlers/ssr/protect.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.44",
|
|
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",
|