@agnostack/next-shopify 1.8.1-beta.44 → 1.8.1-beta.46
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/dist/handlers/api/auth.d.ts +1 -1
- package/dist/handlers/api/auth.js +11 -11
- package/dist/handlers/api/auth.js.map +1 -1
- package/dist/handlers/api/callback.d.ts +1 -1
- package/dist/handlers/api/callback.js +19 -35
- package/dist/handlers/api/callback.js.map +1 -1
- package/dist/handlers/api/index.d.ts +0 -1
- package/dist/handlers/ssr/protect.js +4 -6
- package/dist/handlers/ssr/protect.js.map +1 -1
- package/dist/utils/constants.d.ts +4 -3
- package/dist/utils/constants.js +4 -3
- package/dist/utils/constants.js.map +1 -1
- package/dist/utils/errors.js +1 -1
- package/dist/utils/errors.js.map +1 -1
- package/dist/withShopify.js +26 -19
- package/dist/withShopify.js.map +1 -1
- package/package.json +1 -1
- package/dist/handlers/api/offline.d.ts +0 -1
- package/dist/handlers/api/offline.js +0 -89
- package/dist/handlers/api/offline.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
export function handleAuth(serverRuntimeConfig: any): (req: any, res: any) => Promise<any>;
|
|
1
|
+
export function handleAuth(serverRuntimeConfig: any): (req: any, res: any, params: any) => Promise<any>;
|
|
@@ -36,33 +36,33 @@ exports.handleAuth = void 0;
|
|
|
36
36
|
// })
|
|
37
37
|
// }
|
|
38
38
|
const utils_1 = require("../../utils");
|
|
39
|
-
// NOTE: typically handling: "/api/auth"
|
|
40
|
-
const handleAuth = (serverRuntimeConfig) => async (req, res) => {
|
|
39
|
+
// NOTE: typically handling: "/api/auth/online" and "/api/auth/offline"
|
|
40
|
+
const handleAuth = (serverRuntimeConfig) => async (req, res, params) => {
|
|
41
41
|
var _a;
|
|
42
42
|
const query = (_a = req.query) !== null && _a !== void 0 ? _a : {};
|
|
43
43
|
const { PAGE_PATHS, API_PATHS, API_URLS, } = serverRuntimeConfig;
|
|
44
|
-
const {
|
|
45
|
-
const
|
|
46
|
-
console.log(`>>> > handleAuth > req > isOnline/_isOnline:`, {
|
|
44
|
+
const { isOnline } = params !== null && params !== void 0 ? params : {};
|
|
45
|
+
const { embedded, host, shop: _shop } = query !== null && query !== void 0 ? query : {};
|
|
46
|
+
console.log(`>>> > handleAuth > req > isOnline/_isOnline:`, { isOnline });
|
|
47
47
|
const shopify = await utils_1.getInitializedShopify(serverRuntimeConfig);
|
|
48
48
|
const shop = shopify.utils.sanitizeShop(_shop);
|
|
49
49
|
if (utils_1.stringEmpty(shop)) {
|
|
50
50
|
return res.redirect(`${PAGE_PATHS[utils_1.PAGE_ROUTE_NAMES.ERROR]}?code=no_shop_provided&type=handleAuth`);
|
|
51
51
|
}
|
|
52
52
|
if (embedded === '1') {
|
|
53
|
-
const
|
|
53
|
+
const authCallbackOnlineUrl = API_URLS[utils_1.API_ROUTE_NAMES.AUTH_ONLINE_CALLBACK];
|
|
54
54
|
const callbackURL = isOnline
|
|
55
|
-
?
|
|
56
|
-
: API_URLS[utils_1.API_ROUTE_NAMES.
|
|
55
|
+
? authCallbackOnlineUrl
|
|
56
|
+
: API_URLS[utils_1.API_ROUTE_NAMES.AUTH_OFFLINE_CALLBACK] || authCallbackOnlineUrl;
|
|
57
57
|
// TODO: explore objectToQuerystring
|
|
58
58
|
const redirectUriParams = new URLSearchParams({ shop, host }).toString();
|
|
59
59
|
const queryParams = new URLSearchParams(Object.assign(Object.assign({}, query), { shop, redirectUri: `${callbackURL}?${redirectUriParams}` })).toString();
|
|
60
60
|
return res.redirect(`${PAGE_PATHS[utils_1.PAGE_ROUTE_NAMES.EXIT]}?${queryParams}`);
|
|
61
61
|
}
|
|
62
|
-
const
|
|
62
|
+
const authCallbackOnlinePath = API_PATHS[utils_1.API_ROUTE_NAMES.AUTH_ONLINE_CALLBACK];
|
|
63
63
|
const callbackPath = isOnline
|
|
64
|
-
?
|
|
65
|
-
: API_PATHS[utils_1.API_ROUTE_NAMES.
|
|
64
|
+
? authCallbackOnlinePath
|
|
65
|
+
: API_PATHS[utils_1.API_ROUTE_NAMES.AUTH_OFFLINE_CALLBACK] || authCallbackOnlinePath;
|
|
66
66
|
const authPayload = {
|
|
67
67
|
shop,
|
|
68
68
|
isOnline,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../../src/handlers/api/auth.js"],"names":[],"mappings":";AAAA,WAAW;AACX,kBAAkB;AAClB,2BAA2B;AAC3B,qBAAqB;AACrB,sBAAsB;AACtB,uBAAuB;;;AAEvB,2CAA2C;AAC3C,2EAA2E;AAC3E,oEAAoE;AACpE,kCAAkC;AAClC,wDAAwD;AAExD,qEAAqE;AAErE,mDAAmD;AACnD,6BAA6B;AAC7B,yGAAyG;AACzG,MAAM;AAEN,4BAA4B;AAC5B,2CAA2C;AAC3C,+EAA+E;AAC/E,gDAAgD;AAChD,kBAAkB;AAClB,cAAc;AACd,wFAAwF;AACxF,oBAAoB;AAEpB,iFAAiF;AACjF,MAAM;AAEN,gCAAgC;AAChC,YAAY;AACZ,sBAAsB;AACtB,uBAAuB;AACvB,wBAAwB;AACxB,8DAA8D;AAC9D,OAAO;AACP,IAAI;AAEJ,
|
|
1
|
+
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../../src/handlers/api/auth.js"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
export function handleCallback(serverRuntimeConfig: any
|
|
1
|
+
export function handleCallback(serverRuntimeConfig: any): (req: any, res: any, params: any) => Promise<any>;
|
|
@@ -14,8 +14,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
14
14
|
exports.handleCallback = void 0;
|
|
15
15
|
const shopify_api_1 = require("@shopify/shopify-api");
|
|
16
16
|
const utils_1 = require("../../utils");
|
|
17
|
-
// NOTE: typically handling: "/api/auth/online" and "/api/auth/offline"
|
|
18
|
-
const handleCallback = (serverRuntimeConfig
|
|
17
|
+
// NOTE: typically handling: "/api/auth/online/callback" and "/api/auth/offline/callback"
|
|
18
|
+
const handleCallback = (serverRuntimeConfig) => async (req, res, params) => {
|
|
19
19
|
var _a, _b;
|
|
20
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
|
|
@@ -44,21 +44,18 @@ const handleCallback = (serverRuntimeConfig, params) => async (req, res) => {
|
|
|
44
44
|
webhooks,
|
|
45
45
|
encryptedSession,
|
|
46
46
|
});
|
|
47
|
-
|
|
47
|
+
// // NOTE: sets up an offline token as webhooks cannot use the online one to make API calls
|
|
48
|
+
if (isOnline && utils_1.objectNotEmpty(webhooks) && API_PATHS[utils_1.API_ROUTE_NAMES.AUTH_OFFLINE]) {
|
|
48
49
|
console.log(`>>> > handleCallback > YEP!!!!`);
|
|
49
50
|
// TODO: explore objectToQuerystring
|
|
50
51
|
const queryParams = new URLSearchParams({ host, shop, isOnline: false }).toString();
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
// shop,
|
|
55
|
-
// rawRequest: req,
|
|
56
|
-
// rawResponse: res,
|
|
57
|
-
// callbackPath: API_PATHS[API_ROUTE_NAMES.AUTH_CALLBACK_OFFLINE],
|
|
58
|
-
// })
|
|
52
|
+
// TODO!!!!!!: DELETE THIS
|
|
53
|
+
console.log(`>>> > handleCallback > YEP > redirectUrl:`, `${API_PATHS[utils_1.API_ROUTE_NAMES.AUTH_OFFLINE]}?${queryParams}`);
|
|
54
|
+
return res.redirect(302, `${API_PATHS[utils_1.API_ROUTE_NAMES.AUTH_OFFLINE]}?${queryParams}`);
|
|
59
55
|
}
|
|
60
56
|
console.log(`>>> > handleCallback > session?.isOnline: '${session === null || session === void 0 ? void 0 : session.isOnline}'`);
|
|
61
|
-
if (!utils_1.isTrue(session === null || session === void 0 ? void 0 : session.isOnline)) {
|
|
57
|
+
if (!utils_1.isTrue(session === null || session === void 0 ? void 0 : session.isOnline) || !API_PATHS[utils_1.API_ROUTE_NAMES.AUTH_OFFLINE]) {
|
|
58
|
+
// NOTE: webhooks cannot use an online session to make API calls to Shopify (but not all webooks may be doing that for all apps)
|
|
62
59
|
await shopify.webhooks.register({ session });
|
|
63
60
|
}
|
|
64
61
|
redirectUrl = await shopify.auth.getEmbeddedAppUrl(authPayload);
|
|
@@ -70,27 +67,6 @@ const handleCallback = (serverRuntimeConfig, params) => async (req, res) => {
|
|
|
70
67
|
redirectUrl = confirmationUrl;
|
|
71
68
|
}
|
|
72
69
|
}
|
|
73
|
-
///////////////////
|
|
74
|
-
// const authPayload = { rawRequest: req, rawResponse: res }
|
|
75
|
-
// const { session } = await shopify.auth.callback(authPayload)
|
|
76
|
-
// const encryptedSession = await storeSession(session.toObject())
|
|
77
|
-
// console.log(`>>> > handleCallback2 > isOnline:`, {
|
|
78
|
-
// // isOnline,
|
|
79
|
-
// session: session.toObject(),
|
|
80
|
-
// // isTOnline: isTrue(isOnline),
|
|
81
|
-
// // webhooks,
|
|
82
|
-
// encryptedSession,
|
|
83
|
-
// })
|
|
84
|
-
// // HMMM: move to handleCallbackOffline ONLY??
|
|
85
|
-
// // await shopify.webhooks.register({ session })
|
|
86
|
-
// // TODO: conditionally do this
|
|
87
|
-
// // NOTE redirect a second time to fetch the offline token
|
|
88
|
-
// return shopify.auth.begin({
|
|
89
|
-
// shop,
|
|
90
|
-
// rawRequest: req,
|
|
91
|
-
// rawResponse: res,
|
|
92
|
-
// callbackPath: `${API_PATHS[API_ROUTE_NAMES.AUTH_CALLBACK_OFFLINE]}`,
|
|
93
|
-
// })
|
|
94
70
|
}
|
|
95
71
|
catch (error) {
|
|
96
72
|
console.error('Error handling callback route', error);
|
|
@@ -99,16 +75,24 @@ const handleCallback = (serverRuntimeConfig, params) => async (req, res) => {
|
|
|
99
75
|
// TODO implement a custom SessionNotFound error
|
|
100
76
|
case error instanceof shopify_api_1.InvalidHmacError: {
|
|
101
77
|
console.warn(`${errorMessage}. InvalidHmac Error ${error.message}`);
|
|
78
|
+
const authOnlinePath = API_PATHS[utils_1.API_ROUTE_NAMES.AUTH_ONLINE];
|
|
79
|
+
const authPath = isOnline
|
|
80
|
+
? authOnlinePath
|
|
81
|
+
: API_PATHS[utils_1.API_ROUTE_NAMES.AUTH_OFFLINE] || authOnlinePath;
|
|
102
82
|
// TODO: explore objectToQuerystring
|
|
103
83
|
const queryParams = new URLSearchParams({ host, shop }).toString();
|
|
104
|
-
redirectUrl = `${
|
|
84
|
+
redirectUrl = `${authPath}?${queryParams}`;
|
|
105
85
|
break;
|
|
106
86
|
}
|
|
107
87
|
case error instanceof shopify_api_1.CookieNotFound: {
|
|
108
88
|
console.warn(`${errorMessage}. This may occur if Cookie is already deleted. CookieNotFound Error ${error.message}`);
|
|
89
|
+
const authOnlinePath = API_PATHS[utils_1.API_ROUTE_NAMES.AUTH_ONLINE];
|
|
90
|
+
const authPath = isOnline
|
|
91
|
+
? authOnlinePath
|
|
92
|
+
: API_PATHS[utils_1.API_ROUTE_NAMES.AUTH_OFFLINE] || authOnlinePath;
|
|
109
93
|
// TODO: explore objectToQuerystring
|
|
110
94
|
const queryParams = new URLSearchParams({ host, shop }).toString();
|
|
111
|
-
redirectUrl = `${
|
|
95
|
+
redirectUrl = `${authPath}?${queryParams}`;
|
|
112
96
|
break;
|
|
113
97
|
}
|
|
114
98
|
// getEmbeddedAppUrl??
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"callback.js","sourceRoot":"","sources":["../../../src/handlers/api/callback.js"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,sDAM6B;AAE7B,uCAYoB;AAEpB,
|
|
1
|
+
{"version":3,"file":"callback.js","sourceRoot":"","sources":["../../../src/handlers/api/callback.js"],"names":[],"mappings":"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"}
|
|
@@ -26,11 +26,10 @@ 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
|
-
|
|
30
|
-
const queryParams = new URLSearchParams(Object.assign(Object.assign({}, query), { shop, isOnline: true })).toString();
|
|
29
|
+
const queryParams = new URLSearchParams(Object.assign(Object.assign({}, query), { shop })).toString();
|
|
31
30
|
return {
|
|
32
31
|
redirect: {
|
|
33
|
-
destination: `${API_PATHS[utils_1.API_ROUTE_NAMES.
|
|
32
|
+
destination: `${API_PATHS[utils_1.API_ROUTE_NAMES.AUTH_ONLINE]}?${queryParams}`,
|
|
34
33
|
permanent: false,
|
|
35
34
|
},
|
|
36
35
|
};
|
|
@@ -53,11 +52,10 @@ const protectRoute = (props) => async ({ req, res, query, locale } = {}, data) =
|
|
|
53
52
|
catch (error) {
|
|
54
53
|
if (error instanceof utils_1.ShopifyAuthenticationError) {
|
|
55
54
|
// TODO: explore objectToQuerystring
|
|
56
|
-
|
|
57
|
-
const queryParams = new URLSearchParams(Object.assign(Object.assign({}, query), { shop, isOnline: true })).toString();
|
|
55
|
+
const queryParams = new URLSearchParams(Object.assign(Object.assign({}, query), { shop })).toString();
|
|
58
56
|
return {
|
|
59
57
|
redirect: {
|
|
60
|
-
destination: `${API_PATHS[utils_1.API_ROUTE_NAMES.
|
|
58
|
+
destination: `${API_PATHS[utils_1.API_ROUTE_NAMES.AUTH_ONLINE]}?${queryParams}`,
|
|
61
59
|
permanent: false,
|
|
62
60
|
},
|
|
63
61
|
};
|
|
@@ -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,
|
|
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;QAEtE,OAAO;YACL,QAAQ,EAAE;gBACR,WAAW,EAAE,GAAG,SAAS,CAAC,uBAAe,CAAC,WAAW,CAAC,IAAI,WAAW,EAAE;gBACvE,SAAS,EAAE,KAAK;aACjB;SACF,CAAA;KACF;IAED,IAAI,QAAQ,KAAK,GAAG,EAAE;QACpB,IAAI;YACF,yDAAyD;YACzD,MAAM,WAAW,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAA;YAE/B,MAAM,WAAW,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,iBAAiB,CAAC;gBACvD,UAAU,EAAE,GAAG;gBACf,WAAW,EAAE,GAAG;aACjB,CAAC,CAAA;YAEF,OAAO;gBACL,QAAQ,EAAE;oBACR,WAAW;oBACX,SAAS,EAAE,KAAK;iBACjB;aACF,CAAA;SACF;QAAC,OAAO,KAAK,EAAE;YACd,IAAI,KAAK,YAAY,kCAA0B,EAAE;gBAC/C,oCAAoC;gBACpC,MAAM,WAAW,GAAG,IAAI,eAAe,iCAAM,KAAK,KAAE,IAAI,IAAG,CAAC,QAAQ,EAAE,CAAA;gBAEtE,OAAO;oBACL,QAAQ,EAAE;wBACR,WAAW,EAAE,GAAG,SAAS,CAAC,uBAAe,CAAC,WAAW,CAAC,IAAI,WAAW,EAAE;wBACvE,SAAS,EAAE,KAAK;qBACjB;iBACF,CAAA;aACF;YACD,OAAO,CAAC,KAAK,CAAC,yBAAyB,EAAE,KAAK,CAAC,CAAA;YAE/C,MAAM,KAAK,CAAA;SACZ;KACF;IAED,OAAO;QACL,KAAK,EAAE,mBAAW,iBAChB,MAAM,IACH,IAAI,EACP;KACH,CAAA;AACH,CAAC,CAAA;AAhFY,QAAA,YAAY,gBAgFxB"}
|
|
@@ -184,9 +184,10 @@ export function convertEventTopic(topic: any): any;
|
|
|
184
184
|
export const API_ROUTE_NAMES: {
|
|
185
185
|
[x: string]: string;
|
|
186
186
|
WEBHOOK_EVENT: string;
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
187
|
+
AUTH_ONLINE: string;
|
|
188
|
+
AUTH_OFFLINE: string;
|
|
189
|
+
AUTH_ONLINE_CALLBACK: string;
|
|
190
|
+
AUTH_OFFLINE_CALLBACK: string;
|
|
190
191
|
};
|
|
191
192
|
export namespace BILLING_INTERVALS {
|
|
192
193
|
const ONE_TIME: string;
|
package/dist/utils/constants.js
CHANGED
|
@@ -189,9 +189,10 @@ const convertEventTopic = (topic) => (exports.API_WEBHOOK_TOPICS[topic === null
|
|
|
189
189
|
exports.convertEventTopic = convertEventTopic;
|
|
190
190
|
exports.API_ROUTE_NAMES = {
|
|
191
191
|
WEBHOOK_EVENT: 'apiRouteWebhook',
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
192
|
+
AUTH_ONLINE: 'apiRouteAuthOnline',
|
|
193
|
+
AUTH_OFFLINE: 'apiRouteAuthOffline',
|
|
194
|
+
AUTH_ONLINE_CALLBACK: 'apiRouteAuthOnlineCallback',
|
|
195
|
+
AUTH_OFFLINE_CALLBACK: 'apiRouteAuthOfflineCallback',
|
|
195
196
|
[exports.API_WEBHOOK_TOPICS.APP_UNINSTALLED]: 'apiRouteAppUninstalled',
|
|
196
197
|
[exports.API_WEBHOOK_TOPICS.APP_PURCHASES_ONE_TIME_UPDATE]: 'apiRouteAppOneTimeBilling',
|
|
197
198
|
[exports.API_WEBHOOK_TOPICS.APP_SUBSCRIPTIONS_UPDATE]: 'apiRouteAppSubscriptionBilling',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/utils/constants.js"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/utils/constants.js"],"names":[],"mappings":"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"}
|
package/dist/utils/errors.js
CHANGED
|
@@ -22,7 +22,7 @@ exports.ERROR_CODES = {
|
|
|
22
22
|
const getAuthErrorResponse = ({ error, shop, serverRuntimeConfig }) => {
|
|
23
23
|
const { message, data } = error;
|
|
24
24
|
const { API_URLS } = serverRuntimeConfig;
|
|
25
|
-
const reauthorizationUrl = (data === null || data === void 0 ? void 0 : data.redirectUrl) || `${API_URLS[constants_1.API_ROUTE_NAMES.
|
|
25
|
+
const reauthorizationUrl = (data === null || data === void 0 ? void 0 : data.redirectUrl) || `${API_URLS[constants_1.API_ROUTE_NAMES.AUTH_ONLINE]}?shop=${shop}`;
|
|
26
26
|
return {
|
|
27
27
|
statusCode: 403,
|
|
28
28
|
message,
|
package/dist/utils/errors.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../src/utils/errors.js"],"names":[],"mappings":";;;AAAA,2CAA6C;AAE7C,MAAa,0BAA2B,SAAQ,KAAK;IACnD,YAAY,OAAO,EAAE,IAAI;QACvB,KAAK,CAAC,OAAO,CAAC,CAAA;QACd,IAAI,CAAC,IAAI,GAAG,IAAI,CAAA;QAChB,IAAI,CAAC,IAAI,GAAG,4BAA4B,CAAA;QACxC,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,0BAA0B,CAAC,SAAS,CAAC,CAAA;IACnE,CAAC;CACF;AAPD,gEAOC;AAEY,QAAA,WAAW,GAAG;IACzB,QAAQ,EAAE,gBAAgB;IAC1B,KAAK,EAAE,aAAa;IACpB,OAAO,EAAE,eAAe;IACxB,KAAK,EAAE,aAAa;IACpB,YAAY,EAAE,kBAAkB;IAChC,gBAAgB,EAAE,kBAAkB;CACrC,CAAA;AAEM,MAAM,oBAAoB,GAAG,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,mBAAmB,EAAE,EAAE,EAAE;IAC3E,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,KAAK,CAAA;IAC/B,MAAM,EAAE,QAAQ,EAAE,GAAG,mBAAmB,CAAA;IACxC,MAAM,kBAAkB,GAAG,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,WAAW,KAAI,GAAG,QAAQ,CAAC,2BAAe,CAAC,
|
|
1
|
+
{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../src/utils/errors.js"],"names":[],"mappings":";;;AAAA,2CAA6C;AAE7C,MAAa,0BAA2B,SAAQ,KAAK;IACnD,YAAY,OAAO,EAAE,IAAI;QACvB,KAAK,CAAC,OAAO,CAAC,CAAA;QACd,IAAI,CAAC,IAAI,GAAG,IAAI,CAAA;QAChB,IAAI,CAAC,IAAI,GAAG,4BAA4B,CAAA;QACxC,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,0BAA0B,CAAC,SAAS,CAAC,CAAA;IACnE,CAAC;CACF;AAPD,gEAOC;AAEY,QAAA,WAAW,GAAG;IACzB,QAAQ,EAAE,gBAAgB;IAC1B,KAAK,EAAE,aAAa;IACpB,OAAO,EAAE,eAAe;IACxB,KAAK,EAAE,aAAa;IACpB,YAAY,EAAE,kBAAkB;IAChC,gBAAgB,EAAE,kBAAkB;CACrC,CAAA;AAEM,MAAM,oBAAoB,GAAG,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,mBAAmB,EAAE,EAAE,EAAE;IAC3E,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,KAAK,CAAA;IAC/B,MAAM,EAAE,QAAQ,EAAE,GAAG,mBAAmB,CAAA;IACxC,MAAM,kBAAkB,GAAG,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,WAAW,KAAI,GAAG,QAAQ,CAAC,2BAAe,CAAC,WAAW,CAAC,SAAS,IAAI,EAAE,CAAA;IAEvG,OAAO;QACL,UAAU,EAAE,GAAG;QACf,OAAO;QACP,OAAO,EAAE;YACP,2CAA2C,EAAE,GAAG;YAChD,+CAA+C,EAAE,kBAAkB;SACpE;KACF,CAAA;AACH,CAAC,CAAA;AAbY,QAAA,oBAAoB,wBAahC"}
|
package/dist/withShopify.js
CHANGED
|
@@ -25,9 +25,8 @@ const withShopify = async (nextPhase, _a) => {
|
|
|
25
25
|
defaultConfig } = _h, // NOTE: This is here in case we need anything from it
|
|
26
26
|
pluginConfig = __rest(_h, ["defaultConfig"]);
|
|
27
27
|
const basePath = utils_1.ensureString(_basePath);
|
|
28
|
-
const _j = pluginConfig !== null && pluginConfig !== void 0 ? pluginConfig : {}, { data, interactive, paymentConfig, firebaseConfig, appWebhooks, apiRoutes: { [utils_1.API_ROUTE_NAMES.
|
|
29
|
-
[utils_1.API_ROUTE_NAMES.
|
|
30
|
-
[utils_1.API_ROUTE_NAMES.APP_PURCHASES_ONE_TIME_UPDATE]: _apiRouteAppOneTimeBilling = '/api/webhooks/app/billing', [utils_1.API_ROUTE_NAMES.APP_SUBSCRIPTIONS_UPDATE]: _apiRouteAppSubscriptionBilling = '/api/webhooks/app/billing', [utils_1.API_ROUTE_NAMES.APP_UNINSTALLED]: _apiRouteAppUninstalled = '/api/webhooks/app/uninstalled', [utils_1.API_ROUTE_NAMES.WEBHOOK_EVENT]: _apiRouteWebhookEvent = '/api/webhooks/event', } = {}, pageRoutes: { [utils_1.PAGE_ROUTE_NAMES.EXIT]: _pageRouteExit = '/exit', [utils_1.PAGE_ROUTE_NAMES.ERROR]: _pageRouteError = '/error', } = {} } = _j, _k = _j.params, _l = _k === void 0 ? {} : _k, { APP_ID: _appId, APP_NAME: _appName, APP_TITLE: _appTitle = _appName, URL: netlifyUrl, HOST: shopifyCLIUrl, FIREBASE_SESSION_SK, FIREBASE_SESSION_PK, NEXT_PUBLIC_APP_BASE_URL, NEXT_PUBLIC_SHOPIFY_API_ID, NEXT_PUBLIC_SHOPIFY_API_KEY, NEXT_PUBLIC_APP_ROUTE_PAGE_EXIT: _pageRouteParamExit, NEXT_PUBLIC_APP_ROUTE_PAGE_ERROR: _pageRouteParamError, NEXT_PUBLIC_APP_ROUTE_API_AUTH: _apiRouteParamAuth, NEXT_PUBLIC_APP_ROUTE_API_AUTH_CALLBACK: _apiRouteParamAuthCallback, NEXT_PUBLIC_APP_ROUTE_API_AUTH_CALLBACK_OFFLINE: _apiRouteParamAuthCallbackOffline, NEXT_PUBLIC_APP_ROUTE_API_APP_UNINSTALLED: _apiRouteParamAppUninstalled, NEXT_PUBLIC_APP_ROUTE_API_APP_BILLING_ONE_TIME: _apiRouteParamAppOneTimeBilling, NEXT_PUBLIC_APP_ROUTE_API_APP_BILLING_SUBSCRIPTION: _apiRouteParamAppSubscriptionBilling, NEXT_PUBLIC_APP_ROUTE_WEBHOOK_EVENT: _apiRouteParamWebhookEvent, NEXT_PUBLIC_FB_ROOT_COLLECTION: FB_ROOT_COLLECTION, NEXT_PUBLIC_APP_NAME: _appNameParam = _appTitle, NEXT_PUBLIC_APP_TITLE: _appTitleParam = _appNameParam, SHOPIFY_API_PUBLIC_KEY: _shopifyPublicAPIKey, SHOPIFY_API_VERSION = shopify_api_1.LATEST_API_VERSION, SHOPIFY_API_SCOPES, SHOPIFY_API_KEY, SHOPIFY_RUN_MODE, SETTING_REPLACEMENTS, CONFIG_DATA } = _l, params = __rest(_l, ["APP_ID", "APP_NAME", "APP_TITLE", "URL", "HOST", "FIREBASE_SESSION_SK", "FIREBASE_SESSION_PK", "NEXT_PUBLIC_APP_BASE_URL", "NEXT_PUBLIC_SHOPIFY_API_ID", "NEXT_PUBLIC_SHOPIFY_API_KEY", "NEXT_PUBLIC_APP_ROUTE_PAGE_EXIT", "NEXT_PUBLIC_APP_ROUTE_PAGE_ERROR", "NEXT_PUBLIC_APP_ROUTE_API_AUTH", "NEXT_PUBLIC_APP_ROUTE_API_AUTH_CALLBACK", "NEXT_PUBLIC_APP_ROUTE_API_AUTH_CALLBACK_OFFLINE", "NEXT_PUBLIC_APP_ROUTE_API_APP_UNINSTALLED", "NEXT_PUBLIC_APP_ROUTE_API_APP_BILLING_ONE_TIME", "NEXT_PUBLIC_APP_ROUTE_API_APP_BILLING_SUBSCRIPTION", "NEXT_PUBLIC_APP_ROUTE_WEBHOOK_EVENT", "NEXT_PUBLIC_FB_ROOT_COLLECTION", "NEXT_PUBLIC_APP_NAME", "NEXT_PUBLIC_APP_TITLE", "SHOPIFY_API_PUBLIC_KEY", "SHOPIFY_API_VERSION", "SHOPIFY_API_SCOPES", "SHOPIFY_API_KEY", "SHOPIFY_RUN_MODE", "SETTING_REPLACEMENTS", "CONFIG_DATA"]);
|
|
28
|
+
const _j = pluginConfig !== null && pluginConfig !== void 0 ? pluginConfig : {}, { data, interactive, paymentConfig, firebaseConfig, appWebhooks, apiRoutes: { [utils_1.API_ROUTE_NAMES.AUTH_ONLINE]: _apiRouteAuthOnline = '/api/auth/online', [utils_1.API_ROUTE_NAMES.AUTH_OFFLINE]: _apiRouteAuthOffline = '/api/auth/offline', [utils_1.API_ROUTE_NAMES.AUTH_ONLINE_CALLBACK]: _apiRouteAuthOnlineCallback = '/api/auth/online/callback', [utils_1.API_ROUTE_NAMES.AUTH_OFFLINE_CALLBACK]: _apiRouteAuthOfflineCallback, // NOTE: this is usually '/api/auth/offline/callback'
|
|
29
|
+
[utils_1.API_ROUTE_NAMES.APP_PURCHASES_ONE_TIME_UPDATE]: _apiRouteAppOneTimeBilling = '/api/webhooks/app/billing', [utils_1.API_ROUTE_NAMES.APP_SUBSCRIPTIONS_UPDATE]: _apiRouteAppSubscriptionBilling = '/api/webhooks/app/billing', [utils_1.API_ROUTE_NAMES.APP_UNINSTALLED]: _apiRouteAppUninstalled = '/api/webhooks/app/uninstalled', [utils_1.API_ROUTE_NAMES.WEBHOOK_EVENT]: _apiRouteWebhookEvent = '/api/webhooks/event', } = {}, pageRoutes: { [utils_1.PAGE_ROUTE_NAMES.EXIT]: _pageRouteExit = '/exit', [utils_1.PAGE_ROUTE_NAMES.ERROR]: _pageRouteError = '/error', } = {} } = _j, _k = _j.params, _l = _k === void 0 ? {} : _k, { APP_ID: _appId, APP_NAME: _appName, APP_TITLE: _appTitle = _appName, URL: netlifyUrl, HOST: shopifyCLIUrl, FIREBASE_SESSION_SK, FIREBASE_SESSION_PK, NEXT_PUBLIC_APP_BASE_URL, NEXT_PUBLIC_SHOPIFY_API_ID, NEXT_PUBLIC_SHOPIFY_API_KEY, NEXT_PUBLIC_APP_ROUTE_PAGE_EXIT: _pageRouteParamExit, NEXT_PUBLIC_APP_ROUTE_PAGE_ERROR: _pageRouteParamError, NEXT_PUBLIC_APP_ROUTE_API_AUTH_ONLINE: _apiRouteParamAuthOnline, NEXT_PUBLIC_APP_ROUTE_API_AUTH_OFFLINE: _apiRouteParamAuthOffline, NEXT_PUBLIC_APP_ROUTE_API_AUTH_ONLINE_CALLBACK: _apiRouteParamAuthOnlineCallback, NEXT_PUBLIC_APP_ROUTE_API_AUTH_OFFLINE_CALLBACK: _apiRouteParamAuthOfflineCallback, NEXT_PUBLIC_APP_ROUTE_API_APP_UNINSTALLED: _apiRouteParamAppUninstalled, NEXT_PUBLIC_APP_ROUTE_API_APP_BILLING_ONE_TIME: _apiRouteParamAppOneTimeBilling, NEXT_PUBLIC_APP_ROUTE_API_APP_BILLING_SUBSCRIPTION: _apiRouteParamAppSubscriptionBilling, NEXT_PUBLIC_APP_ROUTE_WEBHOOK_EVENT: _apiRouteParamWebhookEvent, NEXT_PUBLIC_FB_ROOT_COLLECTION: FB_ROOT_COLLECTION, NEXT_PUBLIC_APP_NAME: _appNameParam = _appTitle, NEXT_PUBLIC_APP_TITLE: _appTitleParam = _appNameParam, SHOPIFY_API_PUBLIC_KEY: _shopifyPublicAPIKey, SHOPIFY_API_VERSION = shopify_api_1.LATEST_API_VERSION, SHOPIFY_API_SCOPES, SHOPIFY_API_KEY, SHOPIFY_RUN_MODE, SETTING_REPLACEMENTS, CONFIG_DATA } = _l, params = __rest(_l, ["APP_ID", "APP_NAME", "APP_TITLE", "URL", "HOST", "FIREBASE_SESSION_SK", "FIREBASE_SESSION_PK", "NEXT_PUBLIC_APP_BASE_URL", "NEXT_PUBLIC_SHOPIFY_API_ID", "NEXT_PUBLIC_SHOPIFY_API_KEY", "NEXT_PUBLIC_APP_ROUTE_PAGE_EXIT", "NEXT_PUBLIC_APP_ROUTE_PAGE_ERROR", "NEXT_PUBLIC_APP_ROUTE_API_AUTH_ONLINE", "NEXT_PUBLIC_APP_ROUTE_API_AUTH_OFFLINE", "NEXT_PUBLIC_APP_ROUTE_API_AUTH_ONLINE_CALLBACK", "NEXT_PUBLIC_APP_ROUTE_API_AUTH_OFFLINE_CALLBACK", "NEXT_PUBLIC_APP_ROUTE_API_APP_UNINSTALLED", "NEXT_PUBLIC_APP_ROUTE_API_APP_BILLING_ONE_TIME", "NEXT_PUBLIC_APP_ROUTE_API_APP_BILLING_SUBSCRIPTION", "NEXT_PUBLIC_APP_ROUTE_WEBHOOK_EVENT", "NEXT_PUBLIC_FB_ROOT_COLLECTION", "NEXT_PUBLIC_APP_NAME", "NEXT_PUBLIC_APP_TITLE", "SHOPIFY_API_PUBLIC_KEY", "SHOPIFY_API_VERSION", "SHOPIFY_API_SCOPES", "SHOPIFY_API_KEY", "SHOPIFY_RUN_MODE", "SETTING_REPLACEMENTS", "CONFIG_DATA"]);
|
|
31
30
|
const SHOPIFY_API_PUBLIC_KEY = NEXT_PUBLIC_SHOPIFY_API_KEY || _shopifyPublicAPIKey;
|
|
32
31
|
// NOTE APP_ID in shopify cli defaults to client id/SHOPIFY_API_PUBLIC_KEY
|
|
33
32
|
const APP_ID = NEXT_PUBLIC_SHOPIFY_API_ID || _appId || SHOPIFY_API_PUBLIC_KEY;
|
|
@@ -39,25 +38,33 @@ const withShopify = async (nextPhase, _a) => {
|
|
|
39
38
|
}
|
|
40
39
|
const appTitle = _appTitleParam || (data === null || data === void 0 ? void 0 : data.appName);
|
|
41
40
|
const PAYMENT_CONFIG = utils_1.generatePaymentConfig(Object.assign(Object.assign({}, data), { appTitle, paymentConfig, SHOPIFY_RUN_MODE }));
|
|
42
|
-
const { [utils_1.PAGE_ROUTE_NAMES.EXIT]: pageRouteExit, [utils_1.PAGE_ROUTE_NAMES.ERROR]: pageRouteError, [utils_1.API_ROUTE_NAMES.
|
|
41
|
+
const { [utils_1.PAGE_ROUTE_NAMES.EXIT]: pageRouteExit, [utils_1.PAGE_ROUTE_NAMES.ERROR]: pageRouteError, [utils_1.API_ROUTE_NAMES.AUTH_ONLINE]: apiRouteAuthOnline, [utils_1.API_ROUTE_NAMES.AUTH_OFFLINE]: apiRouteAuthOffline, [utils_1.API_ROUTE_NAMES.AUTH_ONLINE_CALLBACK]: apiRouteAuthOnlineCallback, [utils_1.API_ROUTE_NAMES.AUTH_OFFLINE_CALLBACK]: apiRouteAuthOfflineCallback, [utils_1.API_ROUTE_NAMES.APP_UNINSTALLED]: apiRouteAppUninstalled, [utils_1.API_ROUTE_NAMES.APP_PURCHASES_ONE_TIME_UPDATE]: apiRouteAppOneTimeBilling, [utils_1.API_ROUTE_NAMES.APP_SUBSCRIPTIONS_UPDATE]: apiRouteAppSubscriptionBilling, [utils_1.API_ROUTE_NAMES.WEBHOOK_EVENT]: apiRouteWebhookEvent, } = await next_plugins_1.getPrompts([
|
|
43
42
|
{
|
|
44
43
|
type: 'text',
|
|
45
|
-
name: utils_1.API_ROUTE_NAMES.
|
|
46
|
-
message: 'API Route: Auth
|
|
47
|
-
initial: [
|
|
44
|
+
name: utils_1.API_ROUTE_NAMES.AUTH_ONLINE,
|
|
45
|
+
message: 'API Route: Auth (Online)',
|
|
46
|
+
initial: [_apiRouteParamAuthOnline, _apiRouteAuthOnline].find(utils_1.stringNotEmpty),
|
|
48
47
|
},
|
|
49
48
|
{
|
|
50
49
|
type: 'text',
|
|
51
|
-
name: utils_1.API_ROUTE_NAMES.
|
|
52
|
-
message: 'API Route: Auth Callback
|
|
53
|
-
initial: [
|
|
54
|
-
},
|
|
55
|
-
{
|
|
56
|
-
type: 'text',
|
|
57
|
-
name: utils_1.API_ROUTE_NAMES.AUTH,
|
|
58
|
-
message: 'API Route: Auth',
|
|
59
|
-
initial: [_apiRouteParamAuth, _apiRouteAuth].find(utils_1.stringNotEmpty),
|
|
50
|
+
name: utils_1.API_ROUTE_NAMES.AUTH_ONLINE_CALLBACK,
|
|
51
|
+
message: 'API Route: Auth Callback (Online)',
|
|
52
|
+
initial: [_apiRouteParamAuthOnlineCallback, _apiRouteAuthOnlineCallback].find(utils_1.stringNotEmpty),
|
|
60
53
|
},
|
|
54
|
+
...((PAYMENT_CONFIG === null || PAYMENT_CONFIG === void 0 ? void 0 : PAYMENT_CONFIG.required) || utils_1.arrayNotEmpty(appWebhooks)) ? [
|
|
55
|
+
{
|
|
56
|
+
type: 'text',
|
|
57
|
+
name: utils_1.API_ROUTE_NAMES.AUTH_ONLINE,
|
|
58
|
+
message: 'API Route: Auth (offline)',
|
|
59
|
+
initial: [_apiRouteParamAuthOffline, _apiRouteAuthOffline].find(utils_1.stringNotEmpty),
|
|
60
|
+
},
|
|
61
|
+
{
|
|
62
|
+
type: 'text',
|
|
63
|
+
name: utils_1.API_ROUTE_NAMES.AUTH_OFFLINE_CALLBACK,
|
|
64
|
+
message: 'API Route: Auth Callback (Offline)',
|
|
65
|
+
initial: [_apiRouteParamAuthOfflineCallback, _apiRouteAuthOfflineCallback].find(utils_1.stringNotEmpty),
|
|
66
|
+
}
|
|
67
|
+
] : [],
|
|
61
68
|
{
|
|
62
69
|
type: 'text',
|
|
63
70
|
name: utils_1.API_ROUTE_NAMES.APP_UNINSTALLED,
|
|
@@ -101,9 +108,9 @@ const withShopify = async (nextPhase, _a) => {
|
|
|
101
108
|
[utils_1.PAGE_ROUTE_NAMES.ERROR]: pageRouteError,
|
|
102
109
|
};
|
|
103
110
|
const PAGE_PATHS = Object.entries(PAGE_ROUTES).reduce((_pagePaths, [routeName, routePath]) => (Object.assign(Object.assign({}, _pagePaths), { [routeName]: `${basePath}${routePath}` })), {});
|
|
104
|
-
const API_ROUTES = Object.assign(Object.assign(Object.assign({ [utils_1.API_ROUTE_NAMES.
|
|
105
|
-
[utils_1.API_ROUTE_NAMES.
|
|
106
|
-
}), PAYMENT_CONFIG.required && Object.assign(Object.assign({}, apiRouteAppOneTimeBilling && {
|
|
111
|
+
const API_ROUTES = Object.assign(Object.assign(Object.assign({ [utils_1.API_ROUTE_NAMES.AUTH_ONLINE]: apiRouteAuthOnline, [utils_1.API_ROUTE_NAMES.AUTH_ONLINE_CALLBACK]: apiRouteAuthOnlineCallback }, apiRouteAuthOffline && Object.assign({ [utils_1.API_ROUTE_NAMES.AUTH_OFFLINE]: apiRouteAuthOffline }, apiRouteAuthOfflineCallback && {
|
|
112
|
+
[utils_1.API_ROUTE_NAMES.AUTH_OFFLINE_CALLBACK]: apiRouteAuthOfflineCallback,
|
|
113
|
+
})), PAYMENT_CONFIG.required && Object.assign(Object.assign({}, apiRouteAppOneTimeBilling && {
|
|
107
114
|
[utils_1.API_ROUTE_NAMES.APP_PURCHASES_ONE_TIME_UPDATE]: apiRouteAppOneTimeBilling,
|
|
108
115
|
}), apiRouteAppSubscriptionBilling && {
|
|
109
116
|
[utils_1.API_ROUTE_NAMES.APP_SUBSCRIPTIONS_UPDATE]: apiRouteAppSubscriptionBilling,
|
package/dist/withShopify.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"withShopify.js","sourceRoot":"","sources":["../src/withShopify.js"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,sDAAyD;AAEzD,0DAAiE;AAEjE,
|
|
1
|
+
{"version":3,"file":"withShopify.js","sourceRoot":"","sources":["../src/withShopify.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.46",
|
|
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",
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
export function handleCallbackOffline(serverRuntimeConfig: any): (req: any, res: any) => Promise<any>;
|
|
@@ -1,89 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.handleCallbackOffline = void 0;
|
|
4
|
-
const shopify_api_1 = require("@shopify/shopify-api");
|
|
5
|
-
const utils_1 = require("../../utils");
|
|
6
|
-
// NOTE: typically NO LONGER handling: "/api/auth/offline"
|
|
7
|
-
const handleCallbackOffline = (serverRuntimeConfig) => async (req, res) => {
|
|
8
|
-
var _a;
|
|
9
|
-
console.log(`>>> > WE SHOULD NOT BE HERE!!!`);
|
|
10
|
-
console.log(`>>> > WE SHOULD NOT BE HERE!!!`);
|
|
11
|
-
console.log(`>>> > WE SHOULD NOT BE HERE!!!`);
|
|
12
|
-
console.log(`>>> > WE SHOULD NOT BE HERE!!!`);
|
|
13
|
-
console.log(`>>> > WE SHOULD NOT BE HERE!!!`);
|
|
14
|
-
console.log(`>>> > WE SHOULD NOT BE HERE!!!`);
|
|
15
|
-
console.log(`>>> > WE SHOULD NOT BE HERE!!!`);
|
|
16
|
-
console.log(`>>> > WE SHOULD NOT BE HERE!!!`);
|
|
17
|
-
const { PAGE_PATHS, PAYMENT_CONFIG, API_PATHS } = serverRuntimeConfig;
|
|
18
|
-
const { shop, host } = req.query;
|
|
19
|
-
const errorPath = PAGE_PATHS[utils_1.PAGE_ROUTE_NAMES.ERROR];
|
|
20
|
-
if (utils_1.stringEmpty(shop) || utils_1.stringEmpty(host)) {
|
|
21
|
-
// HMMM: why is this a 303 (rather than a 302 or or anything)??
|
|
22
|
-
return res.redirect(303, `${errorPath}?code=${utils_1.ERROR_CODES.INVALID_CALLBACK}`);
|
|
23
|
-
}
|
|
24
|
-
let redirectUrl = `${errorPath}?invalid_callback_response`;
|
|
25
|
-
try {
|
|
26
|
-
const { shopify, storeSession, ensureBilling } = await utils_1.getShopifyHelpers(serverRuntimeConfig, { shop });
|
|
27
|
-
const authPayload = { rawRequest: req, rawResponse: res };
|
|
28
|
-
const { session } = await shopify.auth.callback(authPayload);
|
|
29
|
-
await storeSession(session.toObject());
|
|
30
|
-
await shopify.webhooks.register({ session });
|
|
31
|
-
redirectUrl = await shopify.auth.getEmbeddedAppUrl(authPayload);
|
|
32
|
-
// TODO!!!!!: is this where we may actually need to fix???!?
|
|
33
|
-
if (PAYMENT_CONFIG === null || PAYMENT_CONFIG === void 0 ? void 0 : PAYMENT_CONFIG.required) {
|
|
34
|
-
const confirmationUrl = await ensureBilling(session);
|
|
35
|
-
if (utils_1.stringNotEmpty(confirmationUrl)) {
|
|
36
|
-
redirectUrl = confirmationUrl;
|
|
37
|
-
}
|
|
38
|
-
}
|
|
39
|
-
}
|
|
40
|
-
catch (error) {
|
|
41
|
-
console.error('Error handling offline route', error);
|
|
42
|
-
const errorMessage = 'Error handling offline route';
|
|
43
|
-
switch (true) {
|
|
44
|
-
// TODO implement a custom SessionNotFound error
|
|
45
|
-
case error instanceof shopify_api_1.InvalidHmacError: {
|
|
46
|
-
console.warn(`${errorMessage}. InvalidHmac Error ${error.message}`);
|
|
47
|
-
// TODO: explore objectToQuerystring
|
|
48
|
-
const queryParams = new URLSearchParams({ host, shop }).toString();
|
|
49
|
-
redirectUrl = `${API_PATHS[utils_1.API_ROUTE_NAMES.AUTH]}?${queryParams}`;
|
|
50
|
-
break;
|
|
51
|
-
}
|
|
52
|
-
case error instanceof shopify_api_1.CookieNotFound: {
|
|
53
|
-
console.warn(`${errorMessage}. This may occur if Cookie is already deleted. CookieNotFound Error ${error.message}`);
|
|
54
|
-
// TODO: explore objectToQuerystring
|
|
55
|
-
const queryParams = new URLSearchParams({ host, shop }).toString();
|
|
56
|
-
redirectUrl = `${API_PATHS[utils_1.API_ROUTE_NAMES.AUTH]}?${queryParams}`;
|
|
57
|
-
break;
|
|
58
|
-
}
|
|
59
|
-
// getEmbeddedAppUrl??
|
|
60
|
-
// TODO: fix these to not just redirect as standalone route (as app already installed)
|
|
61
|
-
case error instanceof shopify_api_1.BillingError: {
|
|
62
|
-
console.error(`${errorMessage}. Billing Error ${error.message}`, error.errorData);
|
|
63
|
-
redirectUrl = `${errorPath}?code=${utils_1.ERROR_CODES.BILLING}`;
|
|
64
|
-
break;
|
|
65
|
-
}
|
|
66
|
-
// TODO: fix these to not just redirect as standalone route (as app already installed)
|
|
67
|
-
case error instanceof shopify_api_1.GraphqlQueryError: {
|
|
68
|
-
const errorMessages = utils_1.ensureArray((_a = error.response) === null || _a === void 0 ? void 0 : _a.errors).map(({ message }) => utils_1.ensureString(message));
|
|
69
|
-
console.error(`${errorMessage}. GraphqlQuery Error ${errorMessages.join('. ')}`);
|
|
70
|
-
redirectUrl = `${errorPath}?code=${utils_1.ERROR_CODES.QUERY}`;
|
|
71
|
-
break;
|
|
72
|
-
}
|
|
73
|
-
// TODO: fix these to not just redirect as standalone route (as app already installed)
|
|
74
|
-
case error instanceof shopify_api_1.InvalidOAuthError: {
|
|
75
|
-
console.error(`${errorMessage}. InvalidOAuth Error`, error);
|
|
76
|
-
redirectUrl = `${errorPath}?code=${utils_1.ERROR_CODES.OAUTH}`;
|
|
77
|
-
break;
|
|
78
|
-
}
|
|
79
|
-
// TODO: fix these to not just redirect as standalone route (as app already installed)
|
|
80
|
-
default: {
|
|
81
|
-
console.error(errorMessage, error);
|
|
82
|
-
redirectUrl = `${errorPath}?code=${utils_1.ERROR_CODES.CALLBACK}`;
|
|
83
|
-
}
|
|
84
|
-
}
|
|
85
|
-
}
|
|
86
|
-
return res.redirect(302, redirectUrl);
|
|
87
|
-
};
|
|
88
|
-
exports.handleCallbackOffline = handleCallbackOffline;
|
|
89
|
-
//# sourceMappingURL=offline.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"offline.js","sourceRoot":"","sources":["../../../src/handlers/api/offline.js"],"names":[],"mappings":";;;AAAA,sDAM6B;AAE7B,uCASoB;AAEpB,0DAA0D;AACnD,MAAM,qBAAqB,GAAG,CAAC,mBAAmB,EAAE,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;;IAC/E,OAAO,CAAC,GAAG,CAAC,gCAAgC,CAAC,CAAA;IAC7C,OAAO,CAAC,GAAG,CAAC,gCAAgC,CAAC,CAAA;IAC7C,OAAO,CAAC,GAAG,CAAC,gCAAgC,CAAC,CAAA;IAC7C,OAAO,CAAC,GAAG,CAAC,gCAAgC,CAAC,CAAA;IAC7C,OAAO,CAAC,GAAG,CAAC,gCAAgC,CAAC,CAAA;IAC7C,OAAO,CAAC,GAAG,CAAC,gCAAgC,CAAC,CAAA;IAC7C,OAAO,CAAC,GAAG,CAAC,gCAAgC,CAAC,CAAA;IAC7C,OAAO,CAAC,GAAG,CAAC,gCAAgC,CAAC,CAAA;IAC7C,MAAM,EAAE,UAAU,EAAE,cAAc,EAAE,SAAS,EAAE,GAAG,mBAAmB,CAAA;IACrE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,GAAG,CAAC,KAAK,CAAA;IAEhC,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,MAAM,EAAE,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,GAAG,MAAM,yBAAiB,CAAC,mBAAmB,EAAE,EAAE,IAAI,EAAE,CAAC,CAAA;QACvG,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;QAE5D,MAAM,YAAY,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAA;QACtC,MAAM,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,CAAC,CAAA;QAE5C,WAAW,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAA;QAE/D,4DAA4D;QAC5D,IAAI,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,QAAQ,EAAE;YAC5B,MAAM,eAAe,GAAG,MAAM,aAAa,CAAC,OAAO,CAAC,CAAA;YAEpD,IAAI,sBAAc,CAAC,eAAe,CAAC,EAAE;gBACnC,WAAW,GAAG,eAAe,CAAA;aAC9B;SACF;KACF;IAAC,OAAO,KAAK,EAAE;QACd,OAAO,CAAC,KAAK,CAAC,8BAA8B,EAAE,KAAK,CAAC,CAAA;QACpD,MAAM,YAAY,GAAG,8BAA8B,CAAA;QAEnD,QAAQ,IAAI,EAAE;YACZ,gDAAgD;YAChD,KAAK,KAAK,YAAY,8BAAgB,CAAC,CAAC;gBACtC,OAAO,CAAC,IAAI,CAAC,GAAG,YAAY,uBAAuB,KAAK,CAAC,OAAO,EAAE,CAAC,CAAA;gBAEnE,oCAAoC;gBACpC,MAAM,WAAW,GAAG,IAAI,eAAe,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAA;gBAElE,WAAW,GAAG,GAAG,SAAS,CAAC,uBAAe,CAAC,IAAI,CAAC,IAAI,WAAW,EAAE,CAAA;gBACjE,MAAK;aACN;YAED,KAAK,KAAK,YAAY,4BAAc,CAAC,CAAC;gBACpC,OAAO,CAAC,IAAI,CAAC,GAAG,YAAY,uEAAuE,KAAK,CAAC,OAAO,EAAE,CAAC,CAAA;gBAEnH,oCAAoC;gBACpC,MAAM,WAAW,GAAG,IAAI,eAAe,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAA;gBAElE,WAAW,GAAG,GAAG,SAAS,CAAC,uBAAe,CAAC,IAAI,CAAC,IAAI,WAAW,EAAE,CAAA;gBACjE,MAAK;aACN;YAED,sBAAsB;YACtB,sFAAsF;YACtF,KAAK,KAAK,YAAY,0BAAY,CAAC,CAAC;gBAClC,OAAO,CAAC,KAAK,CAAC,GAAG,YAAY,mBAAmB,KAAK,CAAC,OAAO,EAAE,EAAE,KAAK,CAAC,SAAS,CAAC,CAAA;gBACjF,WAAW,GAAG,GAAG,SAAS,SAAS,mBAAW,CAAC,OAAO,EAAE,CAAA;gBACxD,MAAK;aACN;YAED,sFAAsF;YACtF,KAAK,KAAK,YAAY,+BAAiB,CAAC,CAAC;gBACvC,MAAM,aAAa,GAAG,mBAAW,CAAC,MAAA,KAAK,CAAC,QAAQ,0CAAE,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,oBAAY,CAAC,OAAO,CAAC,CAAC,CAAA;gBACrG,OAAO,CAAC,KAAK,CAAC,GAAG,YAAY,wBAAwB,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;gBAChF,WAAW,GAAG,GAAG,SAAS,SAAS,mBAAW,CAAC,KAAK,EAAE,CAAA;gBACtD,MAAK;aACN;YAED,sFAAsF;YACtF,KAAK,KAAK,YAAY,+BAAiB,CAAC,CAAC;gBACvC,OAAO,CAAC,KAAK,CAAC,GAAG,YAAY,sBAAsB,EAAE,KAAK,CAAC,CAAA;gBAC3D,WAAW,GAAG,GAAG,SAAS,SAAS,mBAAW,CAAC,KAAK,EAAE,CAAA;gBACtD,MAAK;aACN;YAED,sFAAsF;YACtF,OAAO,CAAC,CAAC;gBACP,OAAO,CAAC,KAAK,CAAC,YAAY,EAAE,KAAK,CAAC,CAAA;gBAClC,WAAW,GAAG,GAAG,SAAS,SAAS,mBAAW,CAAC,QAAQ,EAAE,CAAA;aAC1D;SACF;KACF;IAED,OAAO,GAAG,CAAC,QAAQ,CAAC,GAAG,EAAE,WAAW,CAAC,CAAA;AACvC,CAAC,CAAA;AAhGY,QAAA,qBAAqB,yBAgGjC"}
|