@agnostack/next-shopify 1.8.1-beta.8 → 1.8.1
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 +16 -11
- package/dist/handlers/api/auth.js.map +1 -1
- package/dist/handlers/api/billing.js +13 -5
- package/dist/handlers/api/billing.js.map +1 -1
- package/dist/handlers/api/callback.d.ts +1 -1
- package/dist/handlers/api/callback.js +37 -35
- package/dist/handlers/api/callback.js.map +1 -1
- package/dist/handlers/api/graph.js +5 -4
- package/dist/handlers/api/graph.js.map +1 -1
- package/dist/handlers/api/rest.js +5 -4
- package/dist/handlers/api/rest.js.map +1 -1
- package/dist/handlers/ssr/protect.js +5 -3
- package/dist/handlers/ssr/protect.js.map +1 -1
- package/dist/utils/billing.d.ts +1 -1
- package/dist/utils/billing.js +1 -2
- package/dist/utils/billing.js.map +1 -1
- package/dist/utils/constants.d.ts +8 -2
- package/dist/utils/constants.js +9 -3
- package/dist/utils/constants.js.map +1 -1
- package/dist/utils/errors.d.ts +1 -2
- package/dist/utils/errors.js +2 -2
- package/dist/utils/errors.js.map +1 -1
- package/dist/utils/firebase.d.ts +1 -1
- package/dist/utils/firebase.js +1 -1
- package/dist/utils/firebase.js.map +1 -1
- package/dist/utils/session.d.ts +1 -1
- package/dist/utils/session.js +10 -9
- package/dist/utils/session.js.map +1 -1
- package/dist/utils/shopify.js +2 -1
- package/dist/utils/shopify.js.map +1 -1
- package/dist/withShopify.js +52 -43
- package/dist/withShopify.js.map +1 -1
- package/package.json +2 -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>;
|
|
@@ -2,33 +2,38 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.handleAuth = void 0;
|
|
4
4
|
const utils_1 = require("../../utils");
|
|
5
|
-
// NOTE: typically handling: "/api/auth"
|
|
6
|
-
const handleAuth = (serverRuntimeConfig) => async (req, res) => {
|
|
5
|
+
// NOTE: typically handling: "/api/auth/online" and "/api/auth/offline"
|
|
6
|
+
const handleAuth = (serverRuntimeConfig) => async (req, res, params) => {
|
|
7
7
|
var _a;
|
|
8
|
-
const { API_URLS, API_PATHS, PAGE_PATHS } = serverRuntimeConfig;
|
|
9
8
|
const query = (_a = req.query) !== null && _a !== void 0 ? _a : {};
|
|
10
|
-
const {
|
|
9
|
+
const { PAGE_PATHS, API_PATHS, API_URLS, } = serverRuntimeConfig;
|
|
10
|
+
const { isOnline } = params !== null && params !== void 0 ? params : {};
|
|
11
|
+
const { embedded, host, shop: _shop } = query !== null && query !== void 0 ? query : {};
|
|
11
12
|
const shopify = await utils_1.getInitializedShopify(serverRuntimeConfig);
|
|
12
13
|
const shop = shopify.utils.sanitizeShop(_shop);
|
|
13
14
|
if (utils_1.stringEmpty(shop)) {
|
|
14
15
|
return res.redirect(`${PAGE_PATHS[utils_1.PAGE_ROUTE_NAMES.ERROR]}?code=no_shop_provided&type=handleAuth`);
|
|
15
16
|
}
|
|
16
17
|
if (embedded === '1') {
|
|
18
|
+
const authCallbackOnlineUrl = API_URLS[utils_1.API_ROUTE_NAMES.AUTH_ONLINE_CALLBACK];
|
|
19
|
+
const callbackURL = isOnline
|
|
20
|
+
? authCallbackOnlineUrl
|
|
21
|
+
: API_URLS[utils_1.API_ROUTE_NAMES.AUTH_OFFLINE_CALLBACK] || authCallbackOnlineUrl;
|
|
17
22
|
// TODO: explore objectToQuerystring
|
|
18
|
-
const redirectUriParams = new URLSearchParams({
|
|
19
|
-
|
|
20
|
-
host,
|
|
21
|
-
}).toString();
|
|
22
|
-
const queryParams = new URLSearchParams(Object.assign(Object.assign({}, query), { shop, redirectUri: `${API_URLS[utils_1.API_ROUTE_NAMES.AUTH_CALLBACK]}?${redirectUriParams}` })).toString();
|
|
23
|
+
const redirectUriParams = new URLSearchParams({ shop, host }).toString();
|
|
24
|
+
const queryParams = new URLSearchParams(Object.assign(Object.assign({}, query), { shop, redirectUri: `${callbackURL}?${redirectUriParams}` })).toString();
|
|
23
25
|
return res.redirect(`${PAGE_PATHS[utils_1.PAGE_ROUTE_NAMES.EXIT]}?${queryParams}`);
|
|
24
26
|
}
|
|
25
|
-
const
|
|
27
|
+
const authCallbackOnlinePath = API_PATHS[utils_1.API_ROUTE_NAMES.AUTH_ONLINE_CALLBACK];
|
|
28
|
+
const callbackPath = isOnline
|
|
29
|
+
? authCallbackOnlinePath
|
|
30
|
+
: API_PATHS[utils_1.API_ROUTE_NAMES.AUTH_OFFLINE_CALLBACK] || authCallbackOnlinePath;
|
|
26
31
|
return shopify.auth.begin({
|
|
27
32
|
shop,
|
|
28
33
|
isOnline,
|
|
34
|
+
callbackPath,
|
|
29
35
|
rawRequest: req,
|
|
30
36
|
rawResponse: res,
|
|
31
|
-
callbackPath: `${API_PATHS[utils_1.API_ROUTE_NAMES.AUTH_CALLBACK]}?isOnline=${isOnline}`,
|
|
32
37
|
});
|
|
33
38
|
};
|
|
34
39
|
exports.handleAuth = handleAuth;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../../src/handlers/api/auth.js"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../../src/handlers/api/auth.js"],"names":[],"mappings":";;;AAAA,uCAKoB;AAEpB,wEAAwE;AACjE,MAAM,UAAU,GAAG,CAAC,mBAAmB,EAAE,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,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,GAAG,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,EAAE,CAAA;IACjC,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,KAAK,aAAL,KAAK,cAAL,KAAK,GAAI,EAAE,CAAA;IAEnD,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,qBAAqB,GAAG,QAAQ,CAAC,uBAAe,CAAC,oBAAoB,CAAC,CAAA;QAC5E,MAAM,WAAW,GAAG,QAAQ;YAC1B,CAAC,CAAC,qBAAqB;YACvB,CAAC,CAAC,QAAQ,CAAC,uBAAe,CAAC,qBAAqB,CAAC,IAAI,qBAAqB,CAAA;QAE5E,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,sBAAsB,GAAG,SAAS,CAAC,uBAAe,CAAC,oBAAoB,CAAC,CAAA;IAC9E,MAAM,YAAY,GAAG,QAAQ;QAC3B,CAAC,CAAC,sBAAsB;QACxB,CAAC,CAAC,SAAS,CAAC,uBAAe,CAAC,qBAAqB,CAAC,IAAI,sBAAsB,CAAA;IAE9E,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;AA9CY,QAAA,UAAU,cA8CtB"}
|
|
@@ -26,18 +26,26 @@ const handleAppBilling = (serverRuntimeConfig) => async (req, res) => {
|
|
|
26
26
|
return res.status(200).json({ handler: 'billing', error: 'Missing shop' });
|
|
27
27
|
}
|
|
28
28
|
const { shopify } = await utils_1.getShopifyHelpers(serverRuntimeConfig, { shop });
|
|
29
|
-
console.log(`>>> > handleAppBilling > req.body`, req.body);
|
|
30
29
|
// NOTE raw request body is required for Shopify webhook validation
|
|
31
|
-
const
|
|
30
|
+
const _rawBody = await raw_body_1.default(req);
|
|
31
|
+
const rawBody = _rawBody.toString();
|
|
32
32
|
const _b = await shopify.webhooks.validate({
|
|
33
|
-
rawBody
|
|
33
|
+
rawBody,
|
|
34
34
|
rawRequest: req,
|
|
35
35
|
rawResponse: res,
|
|
36
36
|
}), { valid } = _b, webhookCheck = __rest(_b, ["valid"]);
|
|
37
37
|
if (valid) {
|
|
38
38
|
try {
|
|
39
|
-
|
|
40
|
-
|
|
39
|
+
const { Rest } = await utils_1.getVerifiedClients(serverRuntimeConfig, { shop });
|
|
40
|
+
const [type, { status } = {}] = Object.entries(JSON.parse(rawBody))[0];
|
|
41
|
+
// TODO convert to constants
|
|
42
|
+
// TODO handle subscriptions
|
|
43
|
+
// TODO only revoke installation if there are previous plans
|
|
44
|
+
if (type === 'app_purchase_one_time' && status === 'DECLINED') {
|
|
45
|
+
await Rest.delete({
|
|
46
|
+
path: '/admin/api_permissions/current.json',
|
|
47
|
+
});
|
|
48
|
+
}
|
|
41
49
|
return res.status(200).json({ handler: 'billing', message: 'success' });
|
|
42
50
|
}
|
|
43
51
|
catch (error) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"billing.js","sourceRoot":"","sources":["../../../src/handlers/api/billing.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,wDAAiC;AAEjC,
|
|
1
|
+
{"version":3,"file":"billing.js","sourceRoot":"","sources":["../../../src/handlers/api/billing.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,wDAAiC;AAEjC,uCAIoB;AAEpB,wDAAwD;AACjD,MAAM,gBAAgB,GAAG,CAAC,mBAAmB,EAAE,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;;IAC1E,IAAI;QACF,MAAM,EAAE,uBAAuB,EAAE,IAAI,EAAE,GAAG,MAAA,GAAG,CAAC,OAAO,mCAAI,EAAE,CAAA;QAE3D,IAAI,mBAAW,CAAC,IAAI,CAAC,EAAE;YACrB,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,cAAc,EAAE,CAAC,CAAA;SAC3E;QAED,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,yBAAiB,CAAC,mBAAmB,EAAE,EAAE,IAAI,EAAE,CAAC,CAAA;QAE1E,mEAAmE;QACnE,MAAM,QAAQ,GAAG,MAAM,kBAAU,CAAC,GAAG,CAAC,CAAA;QACtC,MAAM,OAAO,GAAG,QAAQ,CAAC,QAAQ,EAAE,CAAA;QACnC,MAAM,KAA6B,MAAM,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC;YACjE,OAAO;YACP,UAAU,EAAE,GAAG;YACf,WAAW,EAAE,GAAG;SACjB,CAAC,EAJI,EAAE,KAAK,OAIX,EAJgB,YAAY,cAAxB,SAA0B,CAI9B,CAAA;QAEF,IAAI,KAAK,EAAE;YACT,IAAI;gBACF,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,0BAAkB,CAAC,mBAAmB,EAAE,EAAE,IAAI,EAAE,CAAC,CAAA;gBAExE,MAAM,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,GAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;gBAEvE,4BAA4B;gBAC5B,4BAA4B;gBAC5B,4DAA4D;gBAC5D,IAAI,IAAI,KAAK,uBAAuB,IAAI,MAAM,KAAK,UAAU,EAAE;oBAC7D,MAAM,IAAI,CAAC,MAAM,CAAC;wBAChB,IAAI,EAAE,qCAAqC;qBAC5C,CAAC,CAAA;iBACH;gBAED,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,SAAS,EAAE,CAAC,CAAA;aACxE;YAAC,OAAO,KAAK,EAAE;gBACd,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,OAAO,EAAE,CAAC,CAAA;aAC3E;SACF;QAED,OAAO,CAAC,IAAI,CAAC,oCAAoC,EAAE,YAAY,CAAC,CAAA;QAChE,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,oCAAoC,EAAE,CAAC,CAAA;KACjG;IAAC,OAAO,KAAK,EAAE;QACd,OAAO,CAAC,KAAK,CAAC,wBAAwB,EAAE,KAAK,CAAC,CAAA;QAC9C,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,wBAAwB,EAAE,CAAC,CAAA;KACrF;AACH,CAAC,CAAA;AA9CY,QAAA,gBAAgB,oBA8C5B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
export function handleCallback(serverRuntimeConfig: any): (req: any, res: any) => Promise<any>;
|
|
1
|
+
export function handleCallback(serverRuntimeConfig: any): (req: any, res: any, params: any) => Promise<any>;
|
|
@@ -14,45 +14,39 @@ 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/callback"
|
|
18
|
-
const handleCallback = (serverRuntimeConfig) => async (req, res) => {
|
|
19
|
-
var _a;
|
|
20
|
-
const
|
|
21
|
-
// API_URLS,
|
|
22
|
-
_c = _b.APP_WEBHOOKS,
|
|
23
|
-
// API_URLS,
|
|
24
|
-
_d = _c === void 0 ? {} : _c,
|
|
17
|
+
// NOTE: typically handling: "/api/auth/online/callback" and "/api/auth/offline/callback"
|
|
18
|
+
const handleCallback = (serverRuntimeConfig) => async (req, res, params) => {
|
|
19
|
+
var _a, _b;
|
|
20
|
+
const _c = serverRuntimeConfig, { PAYMENT_CONFIG, PAGE_PATHS, API_PATHS } = _c, _d = _c.APP_WEBHOOKS, _e = _d === void 0 ? {} : _d,
|
|
25
21
|
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
|
26
|
-
|
|
22
|
+
_f = utils_1.API_WEBHOOK_TOPICS.APP_UNINSTALLED,
|
|
27
23
|
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
|
28
|
-
_uninstalledWebhook =
|
|
29
|
-
const
|
|
30
|
-
|
|
31
|
-
const { shop, host } = queryParams;
|
|
24
|
+
_uninstalledWebhook = _e[_f], webhooks = __rest(_e, [typeof _f === "symbol" ? _f : _f + ""]);
|
|
25
|
+
const { isOnline } = params !== null && params !== void 0 ? params : {};
|
|
26
|
+
const { shop, host } = (_a = req.query) !== null && _a !== void 0 ? _a : {};
|
|
32
27
|
const errorPath = PAGE_PATHS[utils_1.PAGE_ROUTE_NAMES.ERROR];
|
|
33
|
-
console.log(`>>> > handleCallback > errorPath:`, errorPath);
|
|
34
28
|
if (utils_1.stringEmpty(shop) || utils_1.stringEmpty(host)) {
|
|
35
29
|
// HMMM: why is this a 303 (rather than a 302 or or anything)??
|
|
36
|
-
return res.redirect(303, `${
|
|
30
|
+
return res.redirect(303, `${errorPath}?code=${utils_1.ERROR_CODES.INVALID_CALLBACK}`);
|
|
37
31
|
}
|
|
38
|
-
let redirectUrl = `${
|
|
32
|
+
let redirectUrl = `${errorPath}?invalid_callback_response`;
|
|
39
33
|
try {
|
|
34
|
+
// const { shopify, storeSession } = await getShopifyHelpers(serverRuntimeConfig, { shop })
|
|
40
35
|
const { shopify, storeSession, ensureBilling } = await utils_1.getShopifyHelpers(serverRuntimeConfig, { shop });
|
|
41
36
|
const authPayload = { rawRequest: req, rawResponse: res };
|
|
42
37
|
const { session } = await shopify.auth.callback(authPayload);
|
|
43
|
-
// TODO clear sessions if undefined???
|
|
44
38
|
await storeSession(session.toObject());
|
|
45
|
-
|
|
46
|
-
if (isOnline && utils_1.objectNotEmpty(webhooks)) {
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
39
|
+
// NOTE: return early to set up an offline token as webhooks cannot use the online one to make API calls
|
|
40
|
+
if (isOnline && utils_1.objectNotEmpty(webhooks) && API_PATHS[utils_1.API_ROUTE_NAMES.AUTH_OFFLINE]) {
|
|
41
|
+
// TODO: explore objectToQuerystring
|
|
42
|
+
const queryParams = new URLSearchParams({ host, shop, isOnline: false }).toString();
|
|
43
|
+
return res.redirect(302, `${API_PATHS[utils_1.API_ROUTE_NAMES.AUTH_OFFLINE]}?${queryParams}`);
|
|
44
|
+
}
|
|
45
|
+
if (!utils_1.isTrue(session === null || session === void 0 ? void 0 : session.isOnline) || !API_PATHS[utils_1.API_ROUTE_NAMES.AUTH_OFFLINE]) {
|
|
46
|
+
// NOTE: webhooks cannot use an online session to make API calls to Shopify (but not all webooks may be doing that for all apps)
|
|
47
|
+
await shopify.webhooks.register({ session });
|
|
53
48
|
}
|
|
54
49
|
redirectUrl = await shopify.auth.getEmbeddedAppUrl(authPayload);
|
|
55
|
-
// TODO!!!!!: is this where we may actually need to fix???!?
|
|
56
50
|
if (PAYMENT_CONFIG === null || PAYMENT_CONFIG === void 0 ? void 0 : PAYMENT_CONFIG.required) {
|
|
57
51
|
const confirmationUrl = await ensureBilling(session);
|
|
58
52
|
if (utils_1.stringNotEmpty(confirmationUrl)) {
|
|
@@ -67,44 +61,52 @@ const handleCallback = (serverRuntimeConfig) => async (req, res) => {
|
|
|
67
61
|
// TODO implement a custom SessionNotFound error
|
|
68
62
|
case error instanceof shopify_api_1.InvalidHmacError: {
|
|
69
63
|
console.warn(`${errorMessage}. InvalidHmac Error ${error.message}`);
|
|
64
|
+
// HMMMM: not sure
|
|
65
|
+
const authOnlinePath = API_PATHS[utils_1.API_ROUTE_NAMES.AUTH_ONLINE];
|
|
66
|
+
const authPath = isOnline
|
|
67
|
+
? authOnlinePath
|
|
68
|
+
: API_PATHS[utils_1.API_ROUTE_NAMES.AUTH_OFFLINE] || authOnlinePath;
|
|
70
69
|
// TODO: explore objectToQuerystring
|
|
71
70
|
const queryParams = new URLSearchParams({ host, shop }).toString();
|
|
72
|
-
|
|
73
|
-
redirectUrl = `${API_PATHS[utils_1.API_ROUTE_NAMES.AUTH]}?${queryParams}`;
|
|
71
|
+
redirectUrl = `${authPath}?${queryParams}`;
|
|
74
72
|
break;
|
|
75
73
|
}
|
|
76
74
|
case error instanceof shopify_api_1.CookieNotFound: {
|
|
77
75
|
console.warn(`${errorMessage}. This may occur if Cookie is already deleted. CookieNotFound Error ${error.message}`);
|
|
76
|
+
// HMMMM: not sure
|
|
77
|
+
const authOnlinePath = API_PATHS[utils_1.API_ROUTE_NAMES.AUTH_ONLINE];
|
|
78
|
+
const authPath = isOnline
|
|
79
|
+
? authOnlinePath
|
|
80
|
+
: API_PATHS[utils_1.API_ROUTE_NAMES.AUTH_OFFLINE] || authOnlinePath;
|
|
78
81
|
// TODO: explore objectToQuerystring
|
|
79
82
|
const queryParams = new URLSearchParams({ host, shop }).toString();
|
|
80
|
-
|
|
81
|
-
redirectUrl = `${API_PATHS[utils_1.API_ROUTE_NAMES.AUTH]}?${queryParams}`;
|
|
83
|
+
redirectUrl = `${authPath}?${queryParams}`;
|
|
82
84
|
break;
|
|
83
85
|
}
|
|
84
86
|
// getEmbeddedAppUrl??
|
|
85
87
|
// TODO: fix these to not just redirect as standalone route (as app already installed)
|
|
86
88
|
case error instanceof shopify_api_1.BillingError: {
|
|
87
89
|
console.error(`${errorMessage}. Billing Error ${error.message}`, error.errorData);
|
|
88
|
-
redirectUrl = `${
|
|
90
|
+
redirectUrl = `${errorPath}?code=${utils_1.ERROR_CODES.BILLING}`;
|
|
89
91
|
break;
|
|
90
92
|
}
|
|
91
93
|
// TODO: fix these to not just redirect as standalone route (as app already installed)
|
|
92
94
|
case error instanceof shopify_api_1.GraphqlQueryError: {
|
|
93
|
-
const errorMessages = utils_1.ensureArray((
|
|
95
|
+
const errorMessages = utils_1.ensureArray((_b = error.response) === null || _b === void 0 ? void 0 : _b.errors).map(({ message }) => utils_1.ensureString(message));
|
|
94
96
|
console.error(`${errorMessage}. GraphqlQuery Error ${errorMessages.join('. ')}`);
|
|
95
|
-
redirectUrl = `${
|
|
97
|
+
redirectUrl = `${errorPath}?code=${utils_1.ERROR_CODES.QUERY}`;
|
|
96
98
|
break;
|
|
97
99
|
}
|
|
98
100
|
// TODO: fix these to not just redirect as standalone route (as app already installed)
|
|
99
101
|
case error instanceof shopify_api_1.InvalidOAuthError: {
|
|
100
102
|
console.error(`${errorMessage}. InvalidOAuth Error`, error);
|
|
101
|
-
redirectUrl = `${
|
|
103
|
+
redirectUrl = `${errorPath}?code=${utils_1.ERROR_CODES.OAUTH}`;
|
|
102
104
|
break;
|
|
103
105
|
}
|
|
104
106
|
// TODO: fix these to not just redirect as standalone route (as app already installed)
|
|
105
107
|
default: {
|
|
106
108
|
console.error(errorMessage, error);
|
|
107
|
-
redirectUrl = `${
|
|
109
|
+
redirectUrl = `${errorPath}?code=${utils_1.ERROR_CODES.CALLBACK}`;
|
|
108
110
|
}
|
|
109
111
|
}
|
|
110
112
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"callback.js","sourceRoot":"","sources":["../../../src/handlers/api/callback.js"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,sDAM6B;AAE7B,
|
|
1
|
+
{"version":3,"file":"callback.js","sourceRoot":"","sources":["../../../src/handlers/api/callback.js"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,sDAM6B;AAE7B,uCAYoB;AAEpB,0FAA0F;AACnF,MAAM,cAAc,GAAG,CAAC,mBAAmB,EAAE,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,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;IAEtC,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,YAAY,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAA;QAEtC,wGAAwG;QACxG,IAAI,QAAQ,IAAI,sBAAc,CAAC,QAAQ,CAAC,IAAI,SAAS,CAAC,uBAAe,CAAC,YAAY,CAAC,EAAE;YACnF,oCAAoC;YACpC,MAAM,WAAW,GAAG,IAAI,eAAe,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAA;YACnF,OAAO,GAAG,CAAC,QAAQ,CAAC,GAAG,EAAE,GAAG,SAAS,CAAC,uBAAe,CAAC,YAAY,CAAC,IAAI,WAAW,EAAE,CAAC,CAAA;SACtF;QAED,IAAI,CAAC,cAAM,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,uBAAe,CAAC,YAAY,CAAC,EAAE;YAC1E,gIAAgI;YAChI,MAAM,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,CAAC,CAAA;SAC7C;QAED,WAAW,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAA;QAC/D,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,+BAA+B,EAAE,KAAK,CAAC,CAAA;QACrD,MAAM,YAAY,GAAG,+BAA+B,CAAA;QAEpD,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,kBAAkB;gBAClB,MAAM,cAAc,GAAG,SAAS,CAAC,uBAAe,CAAC,WAAW,CAAC,CAAA;gBAC7D,MAAM,QAAQ,GAAG,QAAQ;oBACvB,CAAC,CAAC,cAAc;oBAChB,CAAC,CAAC,SAAS,CAAC,uBAAe,CAAC,YAAY,CAAC,IAAI,cAAc,CAAA;gBAE7D,oCAAoC;gBACpC,MAAM,WAAW,GAAG,IAAI,eAAe,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAA;gBAClE,WAAW,GAAG,GAAG,QAAQ,IAAI,WAAW,EAAE,CAAA;gBAC1C,MAAK;aACN;YAED,KAAK,KAAK,YAAY,4BAAc,CAAC,CAAC;gBACpC,OAAO,CAAC,IAAI,CAAC,GAAG,YAAY,uEAAuE,KAAK,CAAC,OAAO,EAAE,CAAC,CAAA;gBAEnH,kBAAkB;gBAClB,MAAM,cAAc,GAAG,SAAS,CAAC,uBAAe,CAAC,WAAW,CAAC,CAAA;gBAC7D,MAAM,QAAQ,GAAG,QAAQ;oBACvB,CAAC,CAAC,cAAc;oBAChB,CAAC,CAAC,SAAS,CAAC,uBAAe,CAAC,YAAY,CAAC,IAAI,cAAc,CAAA;gBAE7D,oCAAoC;gBACpC,MAAM,WAAW,GAAG,IAAI,eAAe,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAA;gBAClE,WAAW,GAAG,GAAG,QAAQ,IAAI,WAAW,EAAE,CAAA;gBAC1C,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;AAtHY,QAAA,cAAc,kBAsH1B"}
|
|
@@ -39,15 +39,16 @@ const handleGraph = (serverRuntimeConfig) => async (req, res, params) => {
|
|
|
39
39
|
}
|
|
40
40
|
catch (error) {
|
|
41
41
|
statusCode = 500;
|
|
42
|
+
// TODO: clean up to share between rest and graph (pr at least keep in sync)
|
|
42
43
|
switch (true) {
|
|
43
44
|
case error instanceof utils_1.ShopifyAuthenticationError: {
|
|
44
45
|
console.error(`${message}. Authentication Error.`, error);
|
|
45
|
-
const
|
|
46
|
-
statusCode =
|
|
47
|
-
message =
|
|
46
|
+
const errorResponse = utils_1.getAuthErrorResponse(serverRuntimeConfig, { error, shop });
|
|
47
|
+
statusCode = errorResponse.statusCode;
|
|
48
|
+
message = errorResponse.message;
|
|
48
49
|
// HMMMM, should this be:
|
|
49
50
|
// message = `${message}. Authentication Error - ${errroResponse.message}.`
|
|
50
|
-
headers =
|
|
51
|
+
headers = errorResponse.headers;
|
|
51
52
|
break;
|
|
52
53
|
}
|
|
53
54
|
case error instanceof shopify_api_1.BillingError: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"graph.js","sourceRoot":"","sources":["../../../src/handlers/api/graph.js"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,sDAAsE;AAEtE,uCAYoB;AAEb,MAAM,WAAW,GAAG,CAAC,mBAAmB,EAAE,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,EAAE;;IAC7E,MAAM,EAAE,IAAI,GAAG,IAAI,KAAkD,GAAG,EAAnD,KAAgD,GAAG,MAAR,EAA3C,qBAAyC,EAAE,KAAA,EAA3C,EAAS,IAAI,EAAE,UAAU,OAAkB,EAAb,MAAM,cAA7B,sBAA+B,CAAa,CAAA;IACxE,MAAM,KAKF,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EALxB,EACJ,KAAK,EAAE,UAAU,EACjB,SAAS,EAAE,cAAc,EACzB,SAAS,GAAG,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,OAEA,EADzB,WAAW,cAJV,mCAKL,CAA6B,CAAA;IAE9B,IAAI,KAAK,GAAG,MAAM,CAAA;IAClB,IAAI,cAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,EAAE;QAC3B,KAAK,GAAG,2BAAmB,CAAC,KAAK,CAAC,CAAA;KACnC;IAED,IAAI,mBAAW,CAAC,IAAI,CAAC,IAAI,mBAAW,CAAC,UAAU,CAAC,EAAE;QAChD,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,mBAAmB,EAAE,CAAC,CAAA;KAC9D;IAED,IAAI,UAAU,CAAA;IACd,IAAI,QAAQ,CAAA;IACZ,IAAI,OAAO,GAAG,EAAE,CAAA;IAChB,IAAI,OAAO,GAAG,2BAA2B,CAAA;IAEzC,IAAI;QACF,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,0BAAkB,CAAC,mBAAmB,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC,CAAA;QAEjG,QAAQ,GAAG,MAAM,OAAO,CAAC,KAAK,+BAC5B,IAAI,EAAE,cAAc,CAAC,CAAC,CAAC;gBACrB,KAAK,EAAE,UAAU;gBACjB,SAAS,EAAE,cAAc;aAC1B,CAAC,CAAC,CAAC,UAAU,IACX,sBAAc,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,EAAE,GAClC,WAAW,EACd,CAAA;QAEF,UAAU,GAAG,GAAG,CAAA;KACjB;IAAC,OAAO,KAAK,EAAE;QACd,UAAU,GAAG,GAAG,CAAA;QAEhB,QAAQ,IAAI,EAAE;YACZ,KAAK,KAAK,YAAY,kCAA0B,CAAC,CAAC;gBAChD,OAAO,CAAC,KAAK,CAAC,GAAG,OAAO,yBAAyB,EAAE,KAAK,CAAC,CAAA;gBACzD,MAAM,aAAa,GAAG,4BAAoB,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,
|
|
1
|
+
{"version":3,"file":"graph.js","sourceRoot":"","sources":["../../../src/handlers/api/graph.js"],"names":[],"mappings":"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"}
|
|
@@ -46,13 +46,14 @@ const handleRest = (serverRuntimeConfig) => async (req, res, _params) => {
|
|
|
46
46
|
catch (error) {
|
|
47
47
|
message = 'Error handling rest call';
|
|
48
48
|
statusCode = 500;
|
|
49
|
+
// TODO: clean up to share between rest and graph (pr at least keep in sync)
|
|
49
50
|
switch (true) {
|
|
50
51
|
case error instanceof utils_1.ShopifyAuthenticationError: {
|
|
51
52
|
console.error(`${message}. Authentication Error.`, error);
|
|
52
|
-
const
|
|
53
|
-
statusCode =
|
|
54
|
-
message =
|
|
55
|
-
headers =
|
|
53
|
+
const errorResponse = utils_1.getAuthErrorResponse(serverRuntimeConfig, { error, shop });
|
|
54
|
+
statusCode = errorResponse.statusCode;
|
|
55
|
+
message = errorResponse.message;
|
|
56
|
+
headers = errorResponse.headers;
|
|
56
57
|
break;
|
|
57
58
|
}
|
|
58
59
|
case error instanceof shopify_api_1.BillingError: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rest.js","sourceRoot":"","sources":["../../../src/handlers/api/rest.js"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,gDAAgD;AAChD,sDAA6D;AAE7D,uCASoB;AAEb,MAAM,UAAU,GAAG,CAAC,mBAAmB,EAAE,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,OAAO,EAAE,EAAE;IAC7E,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,GAAG,CAAA;IAC3D,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,EAAE,CAAA;IAC7B,MAAM,KAOF,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI,EAAE,EAPX,EACJ,MAAM,EAAE,WAAW,EACnB,KAAK,EAAE,UAAU,EACjB,IAAI,EAAE,SAAS,EACf,IAAI,EACJ,SAAS,GAAG,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,OAEb,EADZ,MAAM,cANL,gDAOL,CAAgB,CAAA;IAEjB,IAAI,mBAAW,CAAC,IAAI,CAAC,IAAI,mBAAW,CAAC,IAAI,CAAC,EAAE;QAC1C,OAAO;YACL,UAAU,EAAE,GAAG;YACf,OAAO,EAAE,mBAAmB;SAC7B,CAAA;KACF;IAED,IAAI,UAAU,CAAA;IACd,IAAI,QAAQ,CAAA;IACZ,IAAI,OAAO,CAAA;IACX,IAAI,OAAO,GAAG,EAAE,CAAA;IAEhB,IAAI;QACF,IAAI,SAAS,GAAG,UAAU,aAAV,UAAU,cAAV,UAAU,GAAI,MAAM,CAAA;QACpC,IAAI,cAAM,CAAC,SAAS,EAAE,QAAQ,CAAC,EAAE;YAC/B,SAAS,GAAG,2BAAmB,CAAC,SAAS,CAAC,CAAA;SAC3C;QAED,MAAM,KAA2B,oBAAY,CAAC,SAAS,CAAC,EAAlD,EAAE,UAAU,OAAsC,EAAjC,KAAK,cAAtB,cAAwB,CAA0B,CAAA;QACxD,MAAM,IAAI,GAAG,SAAS,aAAT,SAAS,cAAT,SAAS,GAAI,KAAK,CAAA;QAC/B,MAAM,MAAM,GAAG,oBAAY,CAAC,WAAW,aAAX,WAAW,cAAX,WAAW,GAAI,OAAO,CAAC,CAAC,WAAW,EAAE,CAAA;QAEjE,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,0BAAkB,CAAC,mBAAmB,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC,CAAA;QAE9F,QAAQ,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,iBAC3B,IAAI;YACJ,KAAK;YACL,IAAI,EACJ,IAAI,EAAE,sBAAQ,CAAC,IAAI,IAChB,MAAM,EACT,CAAA;QAEF,UAAU,GAAG,GAAG,CAAA;KACjB;IAAC,OAAO,KAAK,EAAE;QACd,OAAO,GAAG,0BAA0B,CAAA;QACpC,UAAU,GAAG,GAAG,CAAA;QAEhB,QAAQ,IAAI,EAAE;YACZ,KAAK,KAAK,YAAY,kCAA0B,CAAC,CAAC;gBAChD,OAAO,CAAC,KAAK,CAAC,GAAG,OAAO,yBAAyB,EAAE,KAAK,CAAC,CAAA;gBACzD,MAAM,aAAa,GAAG,4BAAoB,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,
|
|
1
|
+
{"version":3,"file":"rest.js","sourceRoot":"","sources":["../../../src/handlers/api/rest.js"],"names":[],"mappings":"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"}
|
|
@@ -29,13 +29,14 @@ const protectRoute = (props) => async ({ req, res, query, locale } = {}, data) =
|
|
|
29
29
|
const queryParams = new URLSearchParams(Object.assign(Object.assign({}, query), { shop })).toString();
|
|
30
30
|
return {
|
|
31
31
|
redirect: {
|
|
32
|
-
destination: `${API_PATHS[utils_1.API_ROUTE_NAMES.
|
|
32
|
+
destination: `${API_PATHS[utils_1.API_ROUTE_NAMES.AUTH_ONLINE]}?${queryParams}`,
|
|
33
33
|
permanent: false,
|
|
34
34
|
},
|
|
35
35
|
};
|
|
36
36
|
}
|
|
37
37
|
if (embedded !== '1') {
|
|
38
38
|
try {
|
|
39
|
+
// NOTE: this does not work if called outside of embedded
|
|
39
40
|
await loadSession({ req, res });
|
|
40
41
|
const destination = await shopify.auth.getEmbeddedAppUrl({
|
|
41
42
|
rawRequest: req,
|
|
@@ -50,15 +51,16 @@ const protectRoute = (props) => async ({ req, res, query, locale } = {}, data) =
|
|
|
50
51
|
}
|
|
51
52
|
catch (error) {
|
|
52
53
|
if (error instanceof utils_1.ShopifyAuthenticationError) {
|
|
53
|
-
// TODO
|
|
54
|
+
// TODO: explore objectToQuerystring
|
|
54
55
|
const queryParams = new URLSearchParams(Object.assign(Object.assign({}, query), { shop })).toString();
|
|
55
56
|
return {
|
|
56
57
|
redirect: {
|
|
57
|
-
destination: `${API_PATHS[utils_1.API_ROUTE_NAMES.
|
|
58
|
+
destination: `${API_PATHS[utils_1.API_ROUTE_NAMES.AUTH_ONLINE]}?${queryParams}`,
|
|
58
59
|
permanent: false,
|
|
59
60
|
},
|
|
60
61
|
};
|
|
61
62
|
}
|
|
63
|
+
console.error('Error protecting route.', error);
|
|
62
64
|
throw error;
|
|
63
65
|
}
|
|
64
66
|
}
|
|
@@ -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;QAEtE,OAAO;YACL,QAAQ,EAAE;gBACR,WAAW,EAAE,GAAG,SAAS,CAAC,uBAAe,CAAC,
|
|
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"}
|
package/dist/utils/billing.d.ts
CHANGED
package/dist/utils/billing.js
CHANGED
|
@@ -46,8 +46,7 @@ const generatePaymentConfig = ({ appName, debugMode, environment, paymentConfig,
|
|
|
46
46
|
const notProduction = !isProduction;
|
|
47
47
|
const billingName = `${appTitle}${notProduction ? ` - ${environment}` : ''} - ${display_1.unsnakecase(type)}`;
|
|
48
48
|
return {
|
|
49
|
-
required: (isProduction || (SHOPIFY_RUN_MODE === 'cli')),
|
|
50
|
-
// required: (isProduction || debugMode || (SHOPIFY_RUN_MODE === 'cli')), // HMMMM: what should we do here for staging??
|
|
49
|
+
required: (isProduction || debugMode || (SHOPIFY_RUN_MODE === 'cli')),
|
|
51
50
|
test: (notProduction || debugMode),
|
|
52
51
|
name: billingName,
|
|
53
52
|
config: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"billing.js","sourceRoot":"","sources":["../../src/utils/billing.js"],"names":[],"mappings":";;;AAAA,sDAAmD;AAEnD,uCAQkB;AAClB,2CAA+C;AAExC,MAAM,aAAa,GAAG,KAAK,EAAE,aAAa,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE;IACzE,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,GAAG,sBAAY,CAAC,OAAO,CAAC,CAAA;IACnD,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,sBAAY,CAAC,aAAa,CAAC,CAAA;IAE1E,IAAI,CAAC,QAAQ,EAAE;QACb,OAAO,SAAS,CAAA;KACjB;IAED,MAAM,MAAM,GAAG,gBAAM,CAAC,IAAI,CAAC,CAAA;IAE3B,MAAM,eAAe,GAAG,CACtB,wBAAc,CAAC,IAAI,CAAC;QACpB,wBAAc,CAAC,WAAW,CAAC;QAC3B,wBAAc,CAAC,IAAI,CAAC;QACpB,wBAAc,CAAC,MAAM,CAAC;QACtB,MAAM,CAAC,MAAM,CAAC,6BAAiB,CAAC,CAAC,QAAQ,CAAC,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,QAAQ,CAAC,CAC5D,CAAA;IAED,IAAI,CAAC,eAAe,EAAE;QACpB,MAAM,IAAI,0BAAY,CAAC;YACrB,OAAO,EAAE,+BAA+B;SACzC,CAAC,CAAA;KACH;IAED,IAAI;QACF,IAAI,gBAAM,CAAC,MAAM,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,CAAC,EAAE;YAC3E,OAAO,SAAS,CAAA;SACjB;QAED,OAAO,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,CAAA;KAC1D;IAAC,OAAO,KAAK,EAAE;QACd,OAAO,CAAC,KAAK,CAAC,wCAAwC,EAAE,KAAK,CAAC,CAAA;QAC9D,MAAM,IAAI,0BAAY,CAAC;YACrB,OAAO,EAAE,wCAAwC;SAClD,CAAC,CAAA;KACH;AACH,CAAC,CAAA;AApCY,QAAA,aAAa,iBAoCzB;AAED,4CAA4C;AACrC,MAAM,qBAAqB,GAAG,CAAC,EACpC,OAAO,EACP,SAAS,EACT,WAAW,EACX,aAAa,EACb,gBAAgB,GACjB,EAAE,EAAE;IAEH,IAAI,qBAAW,CAAC,aAAa,CAAC,IAAI,qBAAW,CAAC,WAAW,CAAC,EAAE;QAC1D,OAAO,SAAS,CAAA;KACjB;IAED,MAAM,EACJ,IAAI,EACJ,KAAK,EACL,QAAQ,GAAG,KAAK,EAChB,IAAI,GAAG,6BAAiB,CAAC,QAAQ,GAClC,GAAG,sBAAY,CAAC,aAAa,CAAC,CAAA;IAE/B,MAAM,QAAQ,GAAG,IAAI,IAAI,OAAO,CAAA;IAEhC,MAAM,YAAY,GAAG,CAAC,WAAW,KAAK,YAAY,CAAC,CAAA;IACnD,MAAM,aAAa,GAAG,CAAC,YAAY,CAAA;IACnC,MAAM,WAAW,GAAG,GAAG,QAAQ,GAAG,aAAa,CAAC,CAAC,CAAC,MAAM,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,MAAM,qBAAW,CAAC,IAAI,CAAC,EAAE,CAAA;IAEnG,OAAO;QACL,QAAQ,EAAE,CAAC,YAAY,IAAI,CAAC,gBAAgB,KAAK,KAAK,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"billing.js","sourceRoot":"","sources":["../../src/utils/billing.js"],"names":[],"mappings":";;;AAAA,sDAAmD;AAEnD,uCAQkB;AAClB,2CAA+C;AAExC,MAAM,aAAa,GAAG,KAAK,EAAE,aAAa,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE;IACzE,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,GAAG,sBAAY,CAAC,OAAO,CAAC,CAAA;IACnD,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,sBAAY,CAAC,aAAa,CAAC,CAAA;IAE1E,IAAI,CAAC,QAAQ,EAAE;QACb,OAAO,SAAS,CAAA;KACjB;IAED,MAAM,MAAM,GAAG,gBAAM,CAAC,IAAI,CAAC,CAAA;IAE3B,MAAM,eAAe,GAAG,CACtB,wBAAc,CAAC,IAAI,CAAC;QACpB,wBAAc,CAAC,WAAW,CAAC;QAC3B,wBAAc,CAAC,IAAI,CAAC;QACpB,wBAAc,CAAC,MAAM,CAAC;QACtB,MAAM,CAAC,MAAM,CAAC,6BAAiB,CAAC,CAAC,QAAQ,CAAC,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,QAAQ,CAAC,CAC5D,CAAA;IAED,IAAI,CAAC,eAAe,EAAE;QACpB,MAAM,IAAI,0BAAY,CAAC;YACrB,OAAO,EAAE,+BAA+B;SACzC,CAAC,CAAA;KACH;IAED,IAAI;QACF,IAAI,gBAAM,CAAC,MAAM,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,CAAC,EAAE;YAC3E,OAAO,SAAS,CAAA;SACjB;QAED,OAAO,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,CAAA;KAC1D;IAAC,OAAO,KAAK,EAAE;QACd,OAAO,CAAC,KAAK,CAAC,wCAAwC,EAAE,KAAK,CAAC,CAAA;QAC9D,MAAM,IAAI,0BAAY,CAAC;YACrB,OAAO,EAAE,wCAAwC;SAClD,CAAC,CAAA;KACH;AACH,CAAC,CAAA;AApCY,QAAA,aAAa,iBAoCzB;AAED,4CAA4C;AACrC,MAAM,qBAAqB,GAAG,CAAC,EACpC,OAAO,EACP,SAAS,EACT,WAAW,EACX,aAAa,EACb,gBAAgB,GACjB,EAAE,EAAE;IAEH,IAAI,qBAAW,CAAC,aAAa,CAAC,IAAI,qBAAW,CAAC,WAAW,CAAC,EAAE;QAC1D,OAAO,SAAS,CAAA;KACjB;IAED,MAAM,EACJ,IAAI,EACJ,KAAK,EACL,QAAQ,GAAG,KAAK,EAChB,IAAI,GAAG,6BAAiB,CAAC,QAAQ,GAClC,GAAG,sBAAY,CAAC,aAAa,CAAC,CAAA;IAE/B,MAAM,QAAQ,GAAG,IAAI,IAAI,OAAO,CAAA;IAEhC,MAAM,YAAY,GAAG,CAAC,WAAW,KAAK,YAAY,CAAC,CAAA;IACnD,MAAM,aAAa,GAAG,CAAC,YAAY,CAAA;IACnC,MAAM,WAAW,GAAG,GAAG,QAAQ,GAAG,aAAa,CAAC,CAAC,CAAC,MAAM,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,MAAM,qBAAW,CAAC,IAAI,CAAC,EAAE,CAAA;IAEnG,OAAO;QACL,QAAQ,EAAE,CAAC,YAAY,IAAI,SAAS,IAAI,CAAC,gBAAgB,KAAK,KAAK,CAAC,CAAC;QACrE,IAAI,EAAE,CAAC,aAAa,IAAI,SAAS,CAAC;QAClC,IAAI,EAAE,WAAW;QACjB,MAAM,EAAE;YACN,QAAQ,EAAE,IAAI;YACd,MAAM,EAAE,KAAK;YACb,YAAY,EAAE,QAAQ;SACvB;KACF,CAAA;AACH,CAAC,CAAA;AAnCY,QAAA,qBAAqB,yBAmCjC"}
|
|
@@ -184,11 +184,17 @@ 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
|
-
|
|
187
|
+
AUTH_ONLINE: string;
|
|
188
|
+
AUTH_OFFLINE: string;
|
|
189
|
+
AUTH_ONLINE_CALLBACK: string;
|
|
190
|
+
AUTH_OFFLINE_CALLBACK: string;
|
|
189
191
|
};
|
|
190
192
|
export namespace BILLING_INTERVALS {
|
|
191
193
|
const ONE_TIME: string;
|
|
192
194
|
const EVERY_30_DAYS: string;
|
|
193
195
|
const ANNUAL: string;
|
|
194
196
|
}
|
|
197
|
+
export namespace AUTH_TYPES {
|
|
198
|
+
const OFFLINE: string;
|
|
199
|
+
const ONLINE: string;
|
|
200
|
+
}
|
package/dist/utils/constants.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.BILLING_INTERVALS = exports.API_ROUTE_NAMES = exports.convertEventTopic = exports.API_WEBHOOK_TOPICS = exports.PAGE_ROUTE_NAMES = exports.COLLECTION_ROOT = void 0;
|
|
3
|
+
exports.AUTH_TYPES = exports.BILLING_INTERVALS = exports.API_ROUTE_NAMES = exports.convertEventTopic = exports.API_WEBHOOK_TOPICS = exports.PAGE_ROUTE_NAMES = exports.COLLECTION_ROOT = void 0;
|
|
4
4
|
exports.COLLECTION_ROOT = 'oauth-data';
|
|
5
5
|
exports.PAGE_ROUTE_NAMES = {
|
|
6
6
|
EXIT: 'pageRouteExit',
|
|
@@ -189,8 +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
|
-
|
|
192
|
+
AUTH_ONLINE: 'apiRouteAuthOnline',
|
|
193
|
+
AUTH_OFFLINE: 'apiRouteAuthOffline',
|
|
194
|
+
AUTH_ONLINE_CALLBACK: 'apiRouteAuthOnlineCallback',
|
|
195
|
+
AUTH_OFFLINE_CALLBACK: 'apiRouteAuthOfflineCallback',
|
|
194
196
|
[exports.API_WEBHOOK_TOPICS.APP_UNINSTALLED]: 'apiRouteAppUninstalled',
|
|
195
197
|
[exports.API_WEBHOOK_TOPICS.APP_PURCHASES_ONE_TIME_UPDATE]: 'apiRouteAppOneTimeBilling',
|
|
196
198
|
[exports.API_WEBHOOK_TOPICS.APP_SUBSCRIPTIONS_UPDATE]: 'apiRouteAppSubscriptionBilling',
|
|
@@ -200,4 +202,8 @@ exports.BILLING_INTERVALS = {
|
|
|
200
202
|
EVERY_30_DAYS: 'EVERY_30_DAYS',
|
|
201
203
|
ANNUAL: 'ANNUAL',
|
|
202
204
|
};
|
|
205
|
+
exports.AUTH_TYPES = {
|
|
206
|
+
OFFLINE: 'offline',
|
|
207
|
+
ONLINE: 'online',
|
|
208
|
+
};
|
|
203
209
|
//# sourceMappingURL=constants.js.map
|
|
@@ -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.d.ts
CHANGED
|
@@ -10,10 +10,9 @@ export namespace ERROR_CODES {
|
|
|
10
10
|
const MISSING_SHOP: string;
|
|
11
11
|
const INVALID_CALLBACK: string;
|
|
12
12
|
}
|
|
13
|
-
export function getAuthErrorResponse({ error, shop
|
|
13
|
+
export function getAuthErrorResponse(serverRuntimeConfig: any, { error, shop }: {
|
|
14
14
|
error: any;
|
|
15
15
|
shop: any;
|
|
16
|
-
serverRuntimeConfig: any;
|
|
17
16
|
}): {
|
|
18
17
|
statusCode: number;
|
|
19
18
|
message: any;
|
package/dist/utils/errors.js
CHANGED
|
@@ -19,10 +19,10 @@ exports.ERROR_CODES = {
|
|
|
19
19
|
MISSING_SHOP: 'no_shop_provided',
|
|
20
20
|
INVALID_CALLBACK: 'invalid_callback',
|
|
21
21
|
};
|
|
22
|
-
const getAuthErrorResponse = ({ error, shop
|
|
22
|
+
const getAuthErrorResponse = (serverRuntimeConfig, { error, shop }) => {
|
|
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}`; // HMMMMM: do we not need host here??
|
|
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,
|
|
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,mBAAmB,EAAE,EAAE,KAAK,EAAE,IAAI,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,CAAC,qCAAqC;IAE7I,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/utils/firebase.d.ts
CHANGED
|
@@ -15,7 +15,7 @@ export class FirebaseSessionHandler {
|
|
|
15
15
|
firestore: any;
|
|
16
16
|
[singleton]: FirebaseSessionHandler;
|
|
17
17
|
}
|
|
18
|
-
export function storeCallback(instance: any, session: any): Promise<
|
|
18
|
+
export function storeCallback(instance: any, session: any): Promise<any>;
|
|
19
19
|
export function loadCallback(instance: any, sessionId: any): Promise<any>;
|
|
20
20
|
export function deleteSessionsCallback(instance: any, sessionIds: any): Promise<any[]>;
|
|
21
21
|
export function findSessionIdsByShop(instance: any, shop: any): Promise<any[]>;
|
package/dist/utils/firebase.js
CHANGED
|
@@ -67,7 +67,7 @@ const storeCallback = async (instance, session) => {
|
|
|
67
67
|
const _b = _onlineAccessInfo !== null && _onlineAccessInfo !== void 0 ? _onlineAccessInfo : {}, { associated_user } = _b, onlineAccessInfo = __rest(_b, ["associated_user"]);
|
|
68
68
|
const payload = Object.assign({ onlineAccessInfo }, docData);
|
|
69
69
|
await docRef.set(payload);
|
|
70
|
-
return
|
|
70
|
+
return (await docRef.get()).data();
|
|
71
71
|
}
|
|
72
72
|
catch (error) {
|
|
73
73
|
console.error('FirebaseSessionHandler.storeCallback error', error);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"firebase.js","sourceRoot":"","sources":["../../src/utils/firebase.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,oEAAkC;AAElC,uCAAoE;AACpE,2CAA6C;AAE7C,MAAM,SAAS,GAAG,MAAM,CAAC,WAAW,CAAC,CAAA;AACrC,MAAM,iBAAiB,GAAG,MAAM,CAAC,mBAAmB,CAAC,CAAA;AAErD,MAAa,sBAAsB;IACjC,YAAY,QAAQ,EAAE,EAAE,MAAM,EAAE,UAAU,GAAG,2BAAe,EAAE;QAC5D,IAAI,QAAQ,KAAK,iBAAiB,EAAE;YAClC,MAAM,IAAI,KAAK,CAAC,8EAA8E,CAAC,CAAA;SAChG;QAED,IAAI,CAAC,IAAI,GAAG,wBAAwB,CAAA;QACpC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,UAAU,GAAG,UAAU,CAAA;IAC9B,CAAC;IAED,IAAI,aAAa;QACf,OAAO,CAAC,IAAI,CAAC,SAAS,IAAI,SAAS,CAAC,CAAA;IACtC,CAAC;IAED,mBAAmB,CAAE,cAAc;QACjC,IAAI,wBAAc,CAAC,cAAc,CAAC,EAAE;YAClC,MAAM,OAAO,GAAG,CAAC,wBAAK,CAAC,IAAI,CAAC,MAAM;gBAChC,CAAC,CAAC,wBAAK,CAAC,aAAa,CAAC;oBACpB,UAAU,EAAE,wBAAK,CAAC,UAAU,CAAC,IAAI,CAAC,cAAc,CAAC;oBACjD,WAAW,EAAE,WAAW,cAAc,CAAC,UAAU,iBAAiB;iBACnE,CAAC,CAAC,CAAC,CAAC,wBAAK,CAAC,GAAG,EAAE,CAAA;YAElB,IAAI,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,EAAE,CAAA;SACrC;IACH,CAAC;IAED,MAAM,CAAC,WAAW,CAAE,cAAc,EAAE,EAAE,UAAU,EAAE,MAAM,EAAE;QACxD,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE;YACpB,IAAI,CAAC,SAAS,CAAC,GAAG,IAAI,sBAAsB,CAAC,iBAAiB,EAAE,EAAE,UAAU,EAAE,MAAM,EAAE,CAAC,CAAA;SACxF;QAED,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,aAAa,EAAE;YAClC,IAAI,CAAC,SAAS,CAAC,CAAC,mBAAmB,CAAC,cAAc,CAAC,CAAA;SACpD;QAED,OAAO,IAAI,CAAC,SAAS,CAAC,CAAA;IACxB,CAAC;CACF;AAtCD,wDAsCC;AAEM,MAAM,aAAa,GAAG,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,EAAE;IACvD,IAAI;QACF,MAAM,MAAM,GAAG,QAAQ,CAAC,SAAS;aAC9B,UAAU,CAAC,QAAQ,CAAC,UAAU,CAAC;aAC/B,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC;aACzB,UAAU,CAAC,QAAQ,CAAC,MAAM,CAAC,eAAe,CAAC;aAC3C,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;QAElB,6DAA6D;QAC7D,MAAM,KAAsD,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,EAAzF,EAAE,gBAAgB,EAAE,iBAAiB,OAAoD,EAA/C,OAAO,cAAjD,oBAAmD,CAAsC,CAAA;QAC/F,6DAA6D;QAC7D,6DAA6D;QAC7D,MAAM,KAA2C,iBAAiB,aAAjB,iBAAiB,cAAjB,iBAAiB,GAAI,EAAE,EAAlE,EAAE,eAAe,OAAiD,EAA5C,gBAAgB,cAAtC,mBAAwC,CAA0B,CAAA;QAExE,MAAM,OAAO,mBACX,gBAAgB,IACb,OAAO,CACX,CAAA;QAED,MAAM,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;QACzB,OAAO,IAAI,CAAA;
|
|
1
|
+
{"version":3,"file":"firebase.js","sourceRoot":"","sources":["../../src/utils/firebase.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,oEAAkC;AAElC,uCAAoE;AACpE,2CAA6C;AAE7C,MAAM,SAAS,GAAG,MAAM,CAAC,WAAW,CAAC,CAAA;AACrC,MAAM,iBAAiB,GAAG,MAAM,CAAC,mBAAmB,CAAC,CAAA;AAErD,MAAa,sBAAsB;IACjC,YAAY,QAAQ,EAAE,EAAE,MAAM,EAAE,UAAU,GAAG,2BAAe,EAAE;QAC5D,IAAI,QAAQ,KAAK,iBAAiB,EAAE;YAClC,MAAM,IAAI,KAAK,CAAC,8EAA8E,CAAC,CAAA;SAChG;QAED,IAAI,CAAC,IAAI,GAAG,wBAAwB,CAAA;QACpC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,UAAU,GAAG,UAAU,CAAA;IAC9B,CAAC;IAED,IAAI,aAAa;QACf,OAAO,CAAC,IAAI,CAAC,SAAS,IAAI,SAAS,CAAC,CAAA;IACtC,CAAC;IAED,mBAAmB,CAAE,cAAc;QACjC,IAAI,wBAAc,CAAC,cAAc,CAAC,EAAE;YAClC,MAAM,OAAO,GAAG,CAAC,wBAAK,CAAC,IAAI,CAAC,MAAM;gBAChC,CAAC,CAAC,wBAAK,CAAC,aAAa,CAAC;oBACpB,UAAU,EAAE,wBAAK,CAAC,UAAU,CAAC,IAAI,CAAC,cAAc,CAAC;oBACjD,WAAW,EAAE,WAAW,cAAc,CAAC,UAAU,iBAAiB;iBACnE,CAAC,CAAC,CAAC,CAAC,wBAAK,CAAC,GAAG,EAAE,CAAA;YAElB,IAAI,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,EAAE,CAAA;SACrC;IACH,CAAC;IAED,MAAM,CAAC,WAAW,CAAE,cAAc,EAAE,EAAE,UAAU,EAAE,MAAM,EAAE;QACxD,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE;YACpB,IAAI,CAAC,SAAS,CAAC,GAAG,IAAI,sBAAsB,CAAC,iBAAiB,EAAE,EAAE,UAAU,EAAE,MAAM,EAAE,CAAC,CAAA;SACxF;QAED,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,aAAa,EAAE;YAClC,IAAI,CAAC,SAAS,CAAC,CAAC,mBAAmB,CAAC,cAAc,CAAC,CAAA;SACpD;QAED,OAAO,IAAI,CAAC,SAAS,CAAC,CAAA;IACxB,CAAC;CACF;AAtCD,wDAsCC;AAEM,MAAM,aAAa,GAAG,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,EAAE;IACvD,IAAI;QACF,MAAM,MAAM,GAAG,QAAQ,CAAC,SAAS;aAC9B,UAAU,CAAC,QAAQ,CAAC,UAAU,CAAC;aAC/B,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC;aACzB,UAAU,CAAC,QAAQ,CAAC,MAAM,CAAC,eAAe,CAAC;aAC3C,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;QAElB,6DAA6D;QAC7D,MAAM,KAAsD,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,EAAzF,EAAE,gBAAgB,EAAE,iBAAiB,OAAoD,EAA/C,OAAO,cAAjD,oBAAmD,CAAsC,CAAA;QAC/F,6DAA6D;QAC7D,6DAA6D;QAC7D,MAAM,KAA2C,iBAAiB,aAAjB,iBAAiB,cAAjB,iBAAiB,GAAI,EAAE,EAAlE,EAAE,eAAe,OAAiD,EAA5C,gBAAgB,cAAtC,mBAAwC,CAA0B,CAAA;QAExE,MAAM,OAAO,mBACX,gBAAgB,IACb,OAAO,CACX,CAAA;QAED,MAAM,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;QACzB,OAAO,CAAC,MAAM,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC,IAAI,EAAE,CAAA;KACnC;IAAC,OAAO,KAAK,EAAE;QACd,OAAO,CAAC,KAAK,CAAC,4CAA4C,EAAE,KAAK,CAAC,CAAA;QAClE,MAAM,KAAK,CAAA;KACZ;AACH,CAAC,CAAA;AAzBY,QAAA,aAAa,iBAyBzB;AAEM,MAAM,YAAY,GAAG,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,EAAE;IACxD,IAAI,qBAAW,CAAC,SAAS,CAAC,EAAE;QAC1B,OAAO,SAAS,CAAA;KACjB;IAED,IAAI;QACF,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC,SAAS;aACtC,UAAU,CAAC,QAAQ,CAAC,UAAU,CAAC;aAC/B,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC;aACzB,UAAU,CAAC,QAAQ,CAAC,MAAM,CAAC,eAAe,CAAC;aAC3C,GAAG,CAAC,SAAS,CAAC;aACd,GAAG,EAAE,CAAA;QAER,IAAI,QAAQ,CAAC,MAAM,EAAE;YACnB,OAAO,QAAQ,CAAC,IAAI,EAAE,CAAA;SACvB;QACD,OAAO,SAAS,CAAA;KACjB;IAAC,OAAO,KAAK,EAAE;QACd,OAAO,CAAC,KAAK,CAAC,2CAA2C,EAAE,KAAK,CAAC,CAAA;QACjE,MAAM,KAAK,CAAA;KACZ;AACH,CAAC,CAAA;AArBY,QAAA,YAAY,gBAqBxB;AAEM,MAAM,sBAAsB,GAAG,KAAK,EAAE,QAAQ,EAAE,UAAU,EAAE,EAAE;IACnE,MAAM,qBAAqB,GAAG,KAAK,EAAE,cAAc,EAAE,UAAU,EAAE,EAAE;QACjE,IAAI;YACF,OAAO,cAAc,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,MAAM,EAAE,CAAA;SAC/C;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,CAAC,KAAK,CAAC,oDAAoD,EAAE,KAAK,CAAC,CAAA;YAC1E,MAAM,KAAK,CAAA;SACZ;IACH,CAAC,CAAA;IAED,IAAI;QACF,MAAM,aAAa,GAAG,QAAQ,CAAC,SAAS;aACrC,UAAU,CAAC,QAAQ,CAAC,UAAU,CAAC;aAC/B,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC;aACzB,UAAU,CAAC,QAAQ,CAAC,MAAM,CAAC,eAAe,CAAC,CAAA;QAE9C,OAAO,OAAO,CAAC,GAAG,CAChB,qBAAW,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,qBAAqB,CAAC,aAAa,EAAE,SAAS,CAAC,CAAC,CAC5F,CAAA;KACF;IAAC,OAAO,KAAK,EAAE;QACd,OAAO,CAAC,KAAK,CAAC,qDAAqD,EAAE,KAAK,CAAC,CAAA;QAC3E,MAAM,KAAK,CAAA;KACZ;AACH,CAAC,CAAA;AAvBY,QAAA,sBAAsB,0BAuBlC;AAEM,MAAM,oBAAoB,GAAG,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE;IAC3D,IAAI,qBAAW,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE;QACxD,OAAO,CAAC,IAAI,CAAC,kDAAkD,EAAE,IAAI,CAAC,CAAA;QACtE,OAAO,EAAE,CAAA;KACV;IAED,IAAI;QACF,MAAM,UAAU,GAAG,MAAM,QAAQ,CAAC,SAAS;aACxC,UAAU,CAAC,QAAQ,CAAC,UAAU,CAAC;aAC/B,GAAG,CAAC,IAAI,CAAC;aACT,UAAU,CAAC,QAAQ,CAAC,MAAM,CAAC,eAAe,CAAC;aAC3C,GAAG,EAAE,CAAA;QAER,MAAM,UAAU,GAAG,EAAE,CAAA;QACrB,UAAU,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;YAC1B,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;QAC1B,CAAC,CAAC,CAAA;QAEF,OAAO,UAAU,CAAA;KAClB;IAAC,OAAO,KAAK,EAAE;QACd,OAAO,CAAC,KAAK,CAAC,mDAAmD,EAAE,KAAK,CAAC,CAAA;QACzE,MAAM,KAAK,CAAA;KACZ;AACH,CAAC,CAAA;AAvBY,QAAA,oBAAoB,wBAuBhC"}
|
package/dist/utils/session.d.ts
CHANGED
|
@@ -5,7 +5,7 @@ export function getShopifyHelpers(serverRuntimeConfig: any, { shop }: {
|
|
|
5
5
|
req: any;
|
|
6
6
|
res: any;
|
|
7
7
|
}) => Promise<any>;
|
|
8
|
-
storeSession: (_session: any) => Promise<
|
|
8
|
+
storeSession: (_session: any) => Promise<any>;
|
|
9
9
|
deleteSessions: (sessionIds: any) => Promise<any[]>;
|
|
10
10
|
findSessionIds: (_shop: any) => Promise<any[]>;
|
|
11
11
|
ensureBilling: (session: any) => Promise<any>;
|
package/dist/utils/session.js
CHANGED
|
@@ -30,23 +30,23 @@ const getShopifyHelpers = async (serverRuntimeConfig, { shop }) => {
|
|
|
30
30
|
config: { configurationId: APP_ID, shop: (_a = shopify === null || shopify === void 0 ? void 0 : shopify.utils) === null || _a === void 0 ? void 0 : _a.sanitizeShop(shop) },
|
|
31
31
|
});
|
|
32
32
|
const decryptVerifySession = async ({ req, res } = {}) => {
|
|
33
|
-
var _a, _b;
|
|
33
|
+
var _a, _b, _c;
|
|
34
34
|
try {
|
|
35
|
-
const
|
|
35
|
+
const isOnline = ((req != undefined) && (res != undefined));
|
|
36
|
+
const sessionId = (isOnline)
|
|
36
37
|
? (await shopify.session.getCurrentId({
|
|
37
|
-
isOnline
|
|
38
|
+
isOnline,
|
|
38
39
|
rawRequest: req,
|
|
39
40
|
rawResponse: res,
|
|
40
41
|
})) : (await shopify.session.getOfflineId(shop) // NOTE: not sure if this is working yet?
|
|
41
42
|
);
|
|
42
|
-
const
|
|
43
|
-
// TODO clear sessions if undefined???
|
|
43
|
+
const _d = (_a = (await firebase_1.loadCallback(sessionHandler, sessionId))) !== null && _a !== void 0 ? _a : {}, { accessToken: encryptedAccessToken } = _d, session = __rest(_d, ["accessToken"]);
|
|
44
44
|
if (display_1.stringNotEmpty(session === null || session === void 0 ? void 0 : session.shop) && (session.shop !== shop)) {
|
|
45
45
|
throw new Error('Invalid shop');
|
|
46
46
|
}
|
|
47
|
-
|
|
48
|
-
const sessionExpired = !(session === null || session === void 0 ? void 0 : session.expires) || (luxon_1.DateTime.fromISO(session.expires) < luxon_1.DateTime.now());
|
|
49
|
-
const sessionActive = (
|
|
47
|
+
// NOTE only online sessions have expirations
|
|
48
|
+
const sessionExpired = isOnline && (!(session === null || session === void 0 ? void 0 : session.expires) || (luxon_1.DateTime.fromISO(session.expires) < luxon_1.DateTime.now()));
|
|
49
|
+
const sessionActive = (!sessionExpired && display_1.arraysMatch(display_1.splitCommas((_c = (_b = shopify.config) === null || _b === void 0 ? void 0 : _b.scopes) === null || _c === void 0 ? void 0 : _c.toString()), display_1.splitCommas(session === null || session === void 0 ? void 0 : session.scope)));
|
|
50
50
|
if (!sessionActive) {
|
|
51
51
|
throw new Error('Inactive session');
|
|
52
52
|
}
|
|
@@ -72,10 +72,11 @@ exports.getShopifyHelpers = getShopifyHelpers;
|
|
|
72
72
|
const getVerifiedClients = async (serverRuntimeConfig, { req, res, shop, apiVersion }) => {
|
|
73
73
|
var _a;
|
|
74
74
|
try {
|
|
75
|
+
const isOnline = (req != undefined) && (res != undefined);
|
|
75
76
|
const { shopify, loadSession, ensureBilling } = await exports.getShopifyHelpers(serverRuntimeConfig, { shop });
|
|
76
77
|
const session = await loadSession({ req, res });
|
|
77
78
|
const Graphql = new shopify.clients.Graphql(Object.assign({ session }, apiVersion && { apiVersion }));
|
|
78
|
-
if (display_1.isTrue((_a = serverRuntimeConfig === null || serverRuntimeConfig === void 0 ? void 0 : serverRuntimeConfig.PAYMENT_CONFIG) === null || _a === void 0 ? void 0 : _a.required)) {
|
|
79
|
+
if (isOnline && display_1.isTrue((_a = serverRuntimeConfig === null || serverRuntimeConfig === void 0 ? void 0 : serverRuntimeConfig.PAYMENT_CONFIG) === null || _a === void 0 ? void 0 : _a.required)) {
|
|
79
80
|
const confirmationUrl = await ensureBilling(session);
|
|
80
81
|
if (display_1.stringNotEmpty(confirmationUrl)) {
|
|
81
82
|
throw new errors_1.ShopifyAuthenticationError('Invalid payment status', { redirectUrl: confirmationUrl });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../src/utils/session.js"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,sDAAwD;AACxD,iCAAgC;AAEhC,uCAAyC;AACzC,uCAA4E;AAC5E,uCAA6D;AAC7D,yCAMmB;AACnB,qCAAwC;AACxC,qCAAqD;AAE9C,MAAM,iBAAiB,GAAG,KAAK,EAAE,mBAAmB,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE;;IACvE,MAAM,OAAO,GAAG,MAAM,+BAAqB,CAAC,mBAAmB,CAAC,CAAA;IAChE,MAAM,EAAE,SAAS,EAAE,kBAAkB,EAAE,cAAc,EAAE,MAAM,EAAE,cAAc,EAAE,GAAG,mBAAmB,CAAA;IAErG,MAAM,aAAa,GAAG,sBAAa,CAAC,WAAW,CAAC,cAAc,CAAC,CAAA;IAC/D,MAAM,cAAc,GAAG,iCAAsB,CAAC,WAAW,CACvD,SAAS,EACT;QACE,UAAU,EAAE,kBAAkB;QAC9B,MAAM,EAAE,EAAE,eAAe,EAAE,MAAM,EAAE,IAAI,EAAE,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,KAAK,0CAAE,YAAY,CAAC,IAAI,CAAC,EAAE;KAC9E,CACF,CAAA;IAED,MAAM,oBAAoB,GAAG,KAAK,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,EAAE;;QACvD,IAAI;YACF,MAAM,
|
|
1
|
+
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../src/utils/session.js"],"names":[],"mappings":"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"}
|
package/dist/utils/shopify.js
CHANGED
|
@@ -15,6 +15,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
15
15
|
};
|
|
16
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
17
|
exports.SHOP_QUERY = exports.getInitializedShopify = exports.decodeShopData = exports.getSanitizedShopData = exports.allowLocalBypass = exports.getSecurityHeader = void 0;
|
|
18
|
+
const chalk_1 = __importDefault(require("chalk"));
|
|
18
19
|
require("@shopify/shopify-api/adapters/node");
|
|
19
20
|
const shopify_api_1 = require("@shopify/shopify-api");
|
|
20
21
|
const jwt_decode_1 = __importDefault(require("jwt-decode"));
|
|
@@ -105,7 +106,7 @@ const getInitializedShopify = async (props) => {
|
|
|
105
106
|
// NOTE: this lets us support more advanced webhook types (EventBridgeWebhookHandler or PubSubWebhookHandler)
|
|
106
107
|
webhookConfig = __rest(_a, ["url", "path", "callback", "callbackUrl", "deliveryMethod"]);
|
|
107
108
|
const callbackUrl = _callbackUrl || url || path;
|
|
108
|
-
console.
|
|
109
|
+
console.info(`${chalk_1.default.yellowBright('next-shopify')} - [${chalk_1.default.bold(webhookTopic)}]: ${`Adding webhook handler [${deliveryMethod}]${callbackUrl ? ` using callbackUrl: ${callbackUrl}` : ''}`}`);
|
|
109
110
|
return [
|
|
110
111
|
..._topicWebhooks,
|
|
111
112
|
Object.assign(Object.assign(Object.assign({ deliveryMethod }, webhookConfig), callbackUrl && { callbackUrl }), (callbackUrl || _callback) && {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shopify.js","sourceRoot":"","sources":["../../src/utils/shopify.js"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"shopify.js","sourceRoot":"","sources":["../../src/utils/shopify.js"],"names":[],"mappings":"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"}
|
package/dist/withShopify.js
CHANGED
|
@@ -25,7 +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.
|
|
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_BILLING_SUBSCRIPTION: _apiRouteParamAppSubscriptionBilling, NEXT_PUBLIC_APP_ROUTE_API_APP_BILLING_ONE_TIME: _apiRouteParamAppOneTimeBilling, NEXT_PUBLIC_APP_ROUTE_API_APP_UNINSTALLED: _apiRouteParamAppUninstalled, 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_BILLING_SUBSCRIPTION", "NEXT_PUBLIC_APP_ROUTE_API_APP_BILLING_ONE_TIME", "NEXT_PUBLIC_APP_ROUTE_API_APP_UNINSTALLED", "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"]);
|
|
29
30
|
const SHOPIFY_API_PUBLIC_KEY = NEXT_PUBLIC_SHOPIFY_API_KEY || _shopifyPublicAPIKey;
|
|
30
31
|
// NOTE APP_ID in shopify cli defaults to client id/SHOPIFY_API_PUBLIC_KEY
|
|
31
32
|
const APP_ID = NEXT_PUBLIC_SHOPIFY_API_ID || _appId || SHOPIFY_API_PUBLIC_KEY;
|
|
@@ -35,43 +36,54 @@ const withShopify = async (nextPhase, _a) => {
|
|
|
35
36
|
if ((SHOPIFY_RUN_MODE === 'cli') && !appUrl) {
|
|
36
37
|
throw new Error('Error initializing with Shopify');
|
|
37
38
|
}
|
|
38
|
-
const
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
name: 'appTitle',
|
|
42
|
-
message: 'App Title',
|
|
43
|
-
initial: [_appTitleParam, paymentConfig === null || paymentConfig === void 0 ? void 0 : paymentConfig.name, data === null || data === void 0 ? void 0 : data.appName].find(utils_1.stringNotEmpty),
|
|
44
|
-
},
|
|
39
|
+
const appTitle = _appTitleParam || (data === null || data === void 0 ? void 0 : data.appName);
|
|
40
|
+
const PAYMENT_CONFIG = utils_1.generatePaymentConfig(Object.assign(Object.assign({}, data), { appTitle, paymentConfig, SHOPIFY_RUN_MODE }));
|
|
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([
|
|
45
42
|
{
|
|
46
43
|
type: 'text',
|
|
47
|
-
name: utils_1.API_ROUTE_NAMES.
|
|
48
|
-
message: 'API Route: Auth
|
|
49
|
-
initial: [
|
|
44
|
+
name: utils_1.API_ROUTE_NAMES.AUTH_ONLINE,
|
|
45
|
+
message: 'API Route: Auth (Online)',
|
|
46
|
+
initial: [_apiRouteParamAuthOnline, _apiRouteAuthOnline].find(utils_1.stringNotEmpty),
|
|
50
47
|
},
|
|
51
48
|
{
|
|
52
49
|
type: 'text',
|
|
53
|
-
name: utils_1.API_ROUTE_NAMES.
|
|
54
|
-
message: 'API Route: Auth',
|
|
55
|
-
initial: [
|
|
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),
|
|
56
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_OFFLINE,
|
|
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
|
+
] : [],
|
|
57
68
|
{
|
|
58
69
|
type: 'text',
|
|
59
70
|
name: utils_1.API_ROUTE_NAMES.APP_UNINSTALLED,
|
|
60
71
|
message: 'API Route: App Uninstalled Webhook',
|
|
61
72
|
initial: [_apiRouteParamAppUninstalled, _apiRouteAppUninstalled].find(utils_1.stringNotEmpty),
|
|
62
73
|
},
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
74
|
+
...(PAYMENT_CONFIG === null || PAYMENT_CONFIG === void 0 ? void 0 : PAYMENT_CONFIG.required) ? [
|
|
75
|
+
...(((_b = PAYMENT_CONFIG === null || PAYMENT_CONFIG === void 0 ? void 0 : PAYMENT_CONFIG.config) === null || _b === void 0 ? void 0 : _b.interval) === utils_1.BILLING_INTERVALS.ONE_TIME) ? [{
|
|
76
|
+
type: 'text',
|
|
77
|
+
name: utils_1.API_ROUTE_NAMES.APP_PURCHASES_ONE_TIME_UPDATE,
|
|
78
|
+
message: 'API Route: App Billing Webhook (One Time)',
|
|
79
|
+
initial: [_apiRouteParamAppOneTimeBilling, _apiRouteAppOneTimeBilling].find(utils_1.stringNotEmpty),
|
|
80
|
+
}] : [{
|
|
81
|
+
type: 'text',
|
|
82
|
+
name: utils_1.API_ROUTE_NAMES.APP_SUBSCRIPTIONS_UPDATE,
|
|
83
|
+
message: 'API Route: App Billing Webhook (Subscription)',
|
|
84
|
+
initial: [_apiRouteParamAppSubscriptionBilling, _apiRouteAppSubscriptionBilling].find(utils_1.stringNotEmpty),
|
|
85
|
+
}]
|
|
86
|
+
] : [],
|
|
75
87
|
{
|
|
76
88
|
type: 'text',
|
|
77
89
|
name: utils_1.API_ROUTE_NAMES.WEBHOOK_EVENT,
|
|
@@ -96,19 +108,17 @@ const withShopify = async (nextPhase, _a) => {
|
|
|
96
108
|
[utils_1.PAGE_ROUTE_NAMES.ERROR]: pageRouteError,
|
|
97
109
|
};
|
|
98
110
|
const PAGE_PATHS = Object.entries(PAGE_ROUTES).reduce((_pagePaths, [routeName, routePath]) => (Object.assign(Object.assign({}, _pagePaths), { [routeName]: `${basePath}${routePath}` })), {});
|
|
99
|
-
const API_ROUTES = {
|
|
100
|
-
[utils_1.API_ROUTE_NAMES.
|
|
101
|
-
|
|
102
|
-
[utils_1.API_ROUTE_NAMES.APP_UNINSTALLED]: apiRouteAppUninstalled,
|
|
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 && {
|
|
103
114
|
[utils_1.API_ROUTE_NAMES.APP_PURCHASES_ONE_TIME_UPDATE]: apiRouteAppOneTimeBilling,
|
|
115
|
+
}), apiRouteAppSubscriptionBilling && {
|
|
104
116
|
[utils_1.API_ROUTE_NAMES.APP_SUBSCRIPTIONS_UPDATE]: apiRouteAppSubscriptionBilling,
|
|
105
|
-
|
|
106
|
-
};
|
|
117
|
+
})), { [utils_1.API_ROUTE_NAMES.APP_UNINSTALLED]: apiRouteAppUninstalled, [utils_1.API_ROUTE_NAMES.WEBHOOK_EVENT]: apiRouteWebhookEvent });
|
|
107
118
|
const API_PATHS = Object.entries(API_ROUTES).reduce((_apiPaths, [routeName, route]) => (Object.assign(Object.assign({}, _apiPaths), { [routeName]: `${basePath}${route}` })), {});
|
|
108
119
|
const API_URLS = Object.entries(API_PATHS).reduce((_apiUrls, [routeName, routePath]) => (Object.assign(Object.assign({}, _apiUrls), { [routeName]: `${appBaseUrl}${routePath}` })), {});
|
|
109
|
-
const PAYMENT_CONFIG = utils_1.generatePaymentConfig(Object.assign(Object.assign({}, data), { appTitle, paymentConfig, SHOPIFY_RUN_MODE }));
|
|
110
120
|
const { name: billingName, config: billingConfig } = utils_1.ensureObject(PAYMENT_CONFIG);
|
|
111
|
-
const APP_CONFIG = Object.assign({ isEmbeddedApp: true, apiVersion: SHOPIFY_API_VERSION, apiKey: SHOPIFY_API_PUBLIC_KEY, apiSecretKey: SHOPIFY_API_KEY, hostName: appUrl === null || appUrl === void 0 ? void 0 : appUrl.hostname, hostScheme: (
|
|
121
|
+
const APP_CONFIG = Object.assign({ isEmbeddedApp: true, apiVersion: SHOPIFY_API_VERSION, apiKey: SHOPIFY_API_PUBLIC_KEY, apiSecretKey: SHOPIFY_API_KEY, hostName: appUrl === null || appUrl === void 0 ? void 0 : appUrl.hostname, hostScheme: (_c = appUrl === null || appUrl === void 0 ? void 0 : appUrl.protocol) === null || _c === void 0 ? void 0 : _c.replace(':', ''), scopes: (_d = SHOPIFY_API_SCOPES === null || SHOPIFY_API_SCOPES === void 0 ? void 0 : SHOPIFY_API_SCOPES.replace(/, /g, ',')) === null || _d === void 0 ? void 0 : _d.split(',') }, (utils_1.stringNotEmpty(billingName) && utils_1.objectNotEmpty(billingConfig)) && {
|
|
112
122
|
billing: {
|
|
113
123
|
[billingName]: billingConfig,
|
|
114
124
|
},
|
|
@@ -135,17 +145,17 @@ const withShopify = async (nextPhase, _a) => {
|
|
|
135
145
|
};
|
|
136
146
|
}, {
|
|
137
147
|
APP_WEBHOOK_TOPICS: [],
|
|
138
|
-
APP_WEBHOOKS: Object.assign({ [utils_1.API_WEBHOOK_TOPICS.APP_UNINSTALLED]: [{
|
|
148
|
+
APP_WEBHOOKS: Object.assign(Object.assign({ [utils_1.API_WEBHOOK_TOPICS.APP_UNINSTALLED]: [{
|
|
139
149
|
callbackUrl: API_URLS[utils_1.API_ROUTE_NAMES.APP_UNINSTALLED],
|
|
140
|
-
}] },
|
|
150
|
+
}] }, API_URLS[utils_1.API_ROUTE_NAMES.APP_PURCHASES_ONE_TIME_UPDATE] && {
|
|
141
151
|
[utils_1.API_WEBHOOK_TOPICS.APP_PURCHASES_ONE_TIME_UPDATE]: [{
|
|
142
152
|
callbackUrl: API_URLS[utils_1.API_ROUTE_NAMES.APP_PURCHASES_ONE_TIME_UPDATE],
|
|
143
153
|
}],
|
|
144
|
-
}
|
|
154
|
+
}), API_URLS[utils_1.API_ROUTE_NAMES.APP_SUBSCRIPTIONS_UPDATE] && {
|
|
145
155
|
[utils_1.API_WEBHOOK_TOPICS.APP_SUBSCRIPTIONS_UPDATE]: [{
|
|
146
156
|
callbackUrl: API_URLS[utils_1.API_ROUTE_NAMES.APP_SUBSCRIPTIONS_UPDATE],
|
|
147
157
|
}],
|
|
148
|
-
})
|
|
158
|
+
}),
|
|
149
159
|
});
|
|
150
160
|
const hashedEnvironment = utils_1.generateHMAC(__serverRuntimeConfig.environment, FIREBASE_SESSION_SK);
|
|
151
161
|
const encryptedPrivateKey = (_f = (_e = CONFIG_DATA.encryptedConfig) === null || _e === void 0 ? void 0 : _e.session_4096) === null || _f === void 0 ? void 0 : _f[hashedEnvironment];
|
|
@@ -161,8 +171,9 @@ const withShopify = async (nextPhase, _a) => {
|
|
|
161
171
|
SHOPIFY_API_PUBLIC_KEY,
|
|
162
172
|
APP_WEBHOOK_TOPICS,
|
|
163
173
|
APP_BASE_URL,
|
|
174
|
+
API_URLS,
|
|
164
175
|
API_PATHS,
|
|
165
|
-
|
|
176
|
+
PAGE_PATHS });
|
|
166
177
|
const _serverRuntimeConfig = Object.assign(Object.assign(Object.assign(Object.assign({}, __serverRuntimeConfig), params), SETTING_REPLACEMENTS && {
|
|
167
178
|
SETTING_REPLACEMENTS: JSON.parse(SETTING_REPLACEMENTS),
|
|
168
179
|
}), { FB_CONFIG: firebaseConfig, FB_ROOT_COLLECTION,
|
|
@@ -173,13 +184,11 @@ const withShopify = async (nextPhase, _a) => {
|
|
|
173
184
|
APP_CONFIG,
|
|
174
185
|
APP_WEBHOOKS,
|
|
175
186
|
APP_WEBHOOK_TOPICS,
|
|
176
|
-
PAGE_ROUTES,
|
|
177
187
|
PAGE_PATHS,
|
|
178
|
-
APP_ID,
|
|
179
|
-
APP_BASE_URL,
|
|
180
188
|
API_PATHS,
|
|
189
|
+
APP_ID,
|
|
181
190
|
API_URLS,
|
|
182
|
-
|
|
191
|
+
APP_BASE_URL });
|
|
183
192
|
const INITIALIZED_SHOPIFY = await utils_1.getInitializedShopify(_serverRuntimeConfig);
|
|
184
193
|
const serverRuntimeConfig = Object.assign(Object.assign({}, _serverRuntimeConfig), { INITIALIZED_SHOPIFY });
|
|
185
194
|
return Object.assign(Object.assign({}, _nextConfig), { basePath: _basePath, publicRuntimeConfig,
|
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":";;;;;;;;;;;;;;AAAA,sDAAyD;AAEzD,0DAAiE;AAEjE,mCAegB;AAEhB,MAAM,oBAAoB,GAAG,MAAM,CAAC,MAAM,CAAC,0BAAkB,CAAC,CAAA;AAEvD,MAAM,WAAW,GAAG,KAAK,EAAE,SAAS,EAAE,EAAyB,EAAE,EAAE;;QAA7B,EAAE,UAAU,OAAa,EAAR,MAAM,cAAvB,cAAyB,CAAF;IAClE,MAAM,KAKF,UAAU,aAAV,UAAU,cAAV,UAAU,GAAI,EAAE,EALd,EACJ,QAAQ,EAAE,SAAS,EACnB,mBAAmB,EAAE,oBAAoB,GAAG,EAAE,EAC9C,mBAAmB,EAAE,qBAAqB,GAAG,EAAE,OAE7B,EADf,WAAW,cAJV,0DAKL,CAAmB,CAAA;IAEpB,MAAM,KAIF,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,EAAE,EAJV;IACJ,6DAA6D;IAC7D,aAAa,OAEC,EAFC,sDAAsD;IAClE,YAAY,cAHX,iBAIL,CAAe,CAAA;IAEhB,MAAM,QAAQ,GAAG,oBAAY,CAAC,SAAS,CAAC,CAAA;IAExC,MAqDI,KAAA,YAAY,aAAZ,YAAY,cAAZ,YAAY,GAAI,EAAE,EArDhB,EACJ,IAAI,EACJ,WAAW,EACX,aAAa,EACb,cAAc,EACd,WAAW,EACX,SAAS,EAAE,EACT,CAAC,uBAAe,CAAC,WAAW,CAAC,EAAE,mBAAmB,GAAG,kBAAkB,EACvE,CAAC,uBAAe,CAAC,YAAY,CAAC,EAAE,oBAAoB,GAAG,mBAAmB,EAC1E,CAAC,uBAAe,CAAC,oBAAoB,CAAC,EAAE,2BAA2B,GAAG,2BAA2B,EACjG,CAAC,uBAAe,CAAC,qBAAqB,CAAC,EAAE,4BAA4B,EAAE,qDAAqD;IAC5H,CAAC,uBAAe,CAAC,6BAA6B,CAAC,EAAE,0BAA0B,GAAG,2BAA2B,EACzG,CAAC,uBAAe,CAAC,wBAAwB,CAAC,EAAE,+BAA+B,GAAG,2BAA2B,EACzG,CAAC,uBAAe,CAAC,eAAe,CAAC,EAAE,uBAAuB,GAAG,+BAA+B,EAC5F,CAAC,uBAAe,CAAC,aAAa,CAAC,EAAE,qBAAqB,GAAG,qBAAqB,GAC/E,GAAG,EAAE,EACN,UAAU,EAAE,EACV,CAAC,wBAAgB,CAAC,IAAI,CAAC,EAAE,cAAc,GAAG,OAAO,EACjD,CAAC,wBAAgB,CAAC,KAAK,CAAC,EAAE,eAAe,GAAG,QAAQ,GACrD,GAAG,EAAE,OAkCc,EAjCpB,cAgCM,EAhCN,qBAgCI,EAAE,KAAA,EAhCN,EACE,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,QAAQ,EAClB,SAAS,EAAE,SAAS,GAAG,QAAQ,EAC/B,GAAG,EAAE,UAAU,EACf,IAAI,EAAE,aAAa,EACnB,mBAAmB,EACnB,mBAAmB,EACnB,wBAAwB,EACxB,0BAA0B,EAC1B,2BAA2B,EAC3B,+BAA+B,EAAE,mBAAmB,EACpD,gCAAgC,EAAE,oBAAoB,EACtD,qCAAqC,EAAE,wBAAwB,EAC/D,sCAAsC,EAAE,yBAAyB,EACjE,8CAA8C,EAAE,gCAAgC,EAChF,+CAA+C,EAAE,iCAAiC,EAClF,kDAAkD,EAAE,oCAAoC,EACxF,8CAA8C,EAAE,+BAA+B,EAC/E,yCAAyC,EAAE,4BAA4B,EACvE,mCAAmC,EAAE,0BAA0B,EAC/D,8BAA8B,EAAE,kBAAkB,EAClD,oBAAoB,EAAE,aAAa,GAAG,SAAS,EAC/C,qBAAqB,EAAE,cAAc,GAAG,aAAa,EACrD,sBAAsB,EAAE,oBAAoB,EAC5C,mBAAmB,GAAG,gCAAkB,EACxC,kBAAkB,EAClB,eAAe,EACf,gBAAgB,EAChB,oBAAoB,EACpB,WAAW,OAEP,EADD,MAAM,cA/BH,41BAgCP,CACmB,CAAA;IAEtB,MAAM,sBAAsB,GAAG,2BAA2B,IAAI,oBAAoB,CAAA;IACjF,0EAA0E;IAC3E,MAAM,MAAM,GAAG,0BAA0B,IAAI,MAAM,IAAI,sBAAsB,CAAA;IAE7E,MAAM,UAAU,GAAG,wBAAwB,IAAI,UAAU,IAAI,aAAa,CAAA;IAC1E,MAAM,YAAY,GAAG,GAAG,UAAU,GAAG,QAAQ,EAAE,CAAA;IAE/C,MAAM,MAAM,GAAG,UAAU,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;IAE3D,IAAI,CAAC,gBAAgB,KAAK,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE;QAC3C,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAA;KACnD;IAED,MAAM,QAAQ,GAAG,cAAc,KAAI,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,OAAO,CAAA,CAAA;IAChD,MAAM,cAAc,GAAG,6BAAqB,iCAAM,IAAI,KAAE,QAAQ,EAAE,aAAa,EAAE,gBAAgB,IAAG,CAAA;IAEpG,MAAM,EACJ,CAAC,wBAAgB,CAAC,IAAI,CAAC,EAAE,aAAa,EACtC,CAAC,wBAAgB,CAAC,KAAK,CAAC,EAAE,cAAc,EACxC,CAAC,uBAAe,CAAC,WAAW,CAAC,EAAE,kBAAkB,EACjD,CAAC,uBAAe,CAAC,YAAY,CAAC,EAAE,mBAAmB,EACnD,CAAC,uBAAe,CAAC,oBAAoB,CAAC,EAAE,0BAA0B,EAClE,CAAC,uBAAe,CAAC,qBAAqB,CAAC,EAAE,2BAA2B,EACpE,CAAC,uBAAe,CAAC,eAAe,CAAC,EAAE,sBAAsB,EACzD,CAAC,uBAAe,CAAC,6BAA6B,CAAC,EAAE,yBAAyB,EAC1E,CAAC,uBAAe,CAAC,wBAAwB,CAAC,EAAE,8BAA8B,EAC1E,CAAC,uBAAe,CAAC,aAAa,CAAC,EAAE,oBAAoB,GACtD,GAAG,MAAM,yBAAU,CAAC;QACnB;YACE,IAAI,EAAE,MAAM;YACZ,IAAI,EAAE,uBAAe,CAAC,WAAW;YACjC,OAAO,EAAE,0BAA0B;YACnC,OAAO,EAAE,CAAC,wBAAwB,EAAE,mBAAmB,CAAC,CAAC,IAAI,CAAC,sBAAc,CAAC;SAC9E;QACD;YACE,IAAI,EAAE,MAAM;YACZ,IAAI,EAAE,uBAAe,CAAC,oBAAoB;YAC1C,OAAO,EAAE,mCAAmC;YAC5C,OAAO,EAAE,CAAC,gCAAgC,EAAE,2BAA2B,CAAC,CAAC,IAAI,CAAC,sBAAc,CAAC;SAC9F;QACD,GAAG,CAAC,CAAA,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,QAAQ,KAAI,qBAAa,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC;YAC5D;gBACE,IAAI,EAAE,MAAM;gBACZ,IAAI,EAAE,uBAAe,CAAC,YAAY;gBAClC,OAAO,EAAE,2BAA2B;gBACpC,OAAO,EAAE,CAAC,yBAAyB,EAAE,oBAAoB,CAAC,CAAC,IAAI,CAAC,sBAAc,CAAC;aAChF;YACD;gBACE,IAAI,EAAE,MAAM;gBACZ,IAAI,EAAE,uBAAe,CAAC,qBAAqB;gBAC3C,OAAO,EAAE,oCAAoC;gBAC7C,OAAO,EAAE,CAAC,iCAAiC,EAAE,4BAA4B,CAAC,CAAC,IAAI,CAAC,sBAAc,CAAC;aAChG;SACF,CAAC,CAAC,CAAC,EAAE;QACN;YACE,IAAI,EAAE,MAAM;YACZ,IAAI,EAAE,uBAAe,CAAC,eAAe;YACrC,OAAO,EAAE,oCAAoC;YAC7C,OAAO,EAAE,CAAC,4BAA4B,EAAE,uBAAuB,CAAC,CAAC,IAAI,CAAC,sBAAc,CAAC;SACtF;QACD,GAAG,CAAA,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,QAAQ,EAAC,CAAC,CAAC;YAC5B,GAAG,CAAC,CAAA,MAAA,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,MAAM,0CAAE,QAAQ,MAAK,yBAAiB,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;oBACtE,IAAI,EAAE,MAAM;oBACZ,IAAI,EAAE,uBAAe,CAAC,6BAA6B;oBACnD,OAAO,EAAE,2CAA2C;oBACpD,OAAO,EAAE,CAAC,+BAA+B,EAAE,0BAA0B,CAAC,CAAC,IAAI,CAAC,sBAAc,CAAC;iBAC5F,CAAC,CAAC,CAAC,CAAC,CAAC;oBACJ,IAAI,EAAE,MAAM;oBACZ,IAAI,EAAE,uBAAe,CAAC,wBAAwB;oBAC9C,OAAO,EAAE,+CAA+C;oBACxD,OAAO,EAAE,CAAC,oCAAoC,EAAE,+BAA+B,CAAC,CAAC,IAAI,CAAC,sBAAc,CAAC;iBACtG,CAAC;SACH,CAAC,CAAC,CAAC,EAAE;QACN;YACE,IAAI,EAAE,MAAM;YACZ,IAAI,EAAE,uBAAe,CAAC,aAAa;YACnC,OAAO,EAAE,0BAA0B;YACnC,OAAO,EAAE,CAAC,0BAA0B,EAAE,qBAAqB,CAAC,CAAC,IAAI,CAAC,sBAAc,CAAC;SAClF;QACD;YACE,IAAI,EAAE,MAAM;YACZ,IAAI,EAAE,wBAAgB,CAAC,IAAI;YAC3B,OAAO,EAAE,kBAAkB;YAC3B,OAAO,EAAE,CAAC,mBAAmB,EAAE,cAAc,CAAC,CAAC,IAAI,CAAC,sBAAc,CAAC;SACpE;QACD;YACE,IAAI,EAAE,MAAM;YACZ,IAAI,EAAE,wBAAgB,CAAC,KAAK;YAC5B,OAAO,EAAE,mBAAmB;YAC5B,OAAO,EAAE,CAAC,oBAAoB,EAAE,eAAe,CAAC,CAAC,IAAI,CAAC,sBAAc,CAAC;SACtE;KACF,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,CAAC,cAAM,CAAC,WAAW,CAAC,EAAE,CAAC,CAAA;IAExD,MAAM,WAAW,GAAG;QAClB,CAAC,wBAAgB,CAAC,IAAI,CAAC,EAAE,aAAa;QACtC,CAAC,wBAAgB,CAAC,KAAK,CAAC,EAAE,cAAc;KACzC,CAAA;IAED,MAAM,UAAU,GAAG,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC,CAAC,UAAU,EAAE,CAAC,SAAS,EAAE,SAAS,CAAC,EAAE,EAAE,CAAC,iCACzF,UAAU,KACb,CAAC,SAAS,CAAC,EAAE,GAAG,QAAQ,GAAG,SAAS,EAAE,IACtC,EAAE,EAAE,CAAC,CAAA;IAEP,MAAM,UAAU,+CACd,CAAC,uBAAe,CAAC,WAAW,CAAC,EAAE,kBAAkB,EACjD,CAAC,uBAAe,CAAC,oBAAoB,CAAC,EAAE,0BAA0B,IAC/D,mBAAmB,oBACpB,CAAC,uBAAe,CAAC,YAAY,CAAC,EAAE,mBAAmB,IAChD,2BAA2B,IAAI;QAChC,CAAC,uBAAe,CAAC,qBAAqB,CAAC,EAAE,2BAA2B;KACrE,CACF,GACE,cAAc,CAAC,QAAQ,oCACrB,yBAAyB,IAAI;QAC9B,CAAC,uBAAe,CAAC,6BAA6B,CAAC,EAAE,yBAAyB;KAC3E,GACE,8BAA8B,IAAI;QACnC,CAAC,uBAAe,CAAC,wBAAwB,CAAC,EAAE,8BAA8B;KAC3E,CACF,KACD,CAAC,uBAAe,CAAC,eAAe,CAAC,EAAE,sBAAsB,EACzD,CAAC,uBAAe,CAAC,aAAa,CAAC,EAAE,oBAAoB,GACtD,CAAA;IAED,MAAM,SAAS,GAAG,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,CAAC,SAAS,EAAE,CAAC,SAAS,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,iCAClF,SAAS,KACZ,CAAC,SAAS,CAAC,EAAE,GAAG,QAAQ,GAAG,KAAK,EAAE,IAClC,EAAE,EAAE,CAAC,CAAA;IAEP,MAAM,QAAQ,GAAG,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,CAAC,SAAS,EAAE,SAAS,CAAC,EAAE,EAAE,CAAC,iCACnF,QAAQ,KACX,CAAC,SAAS,CAAC,EAAE,GAAG,UAAU,GAAG,SAAS,EAAE,IACxC,EAAE,EAAE,CAAC,CAAA;IAEP,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,EAAE,aAAa,EAAE,GAAG,oBAAY,CAAC,cAAc,CAAC,CAAA;IAEjF,MAAM,UAAU,mBACd,aAAa,EAAE,IAAI,EACnB,UAAU,EAAE,mBAAmB,EAC/B,MAAM,EAAE,sBAAsB,EAC9B,YAAY,EAAE,eAAe,EAC7B,QAAQ,EAAE,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,QAAQ,EAC1B,UAAU,EAAE,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,QAAQ,0CAAE,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,EAC9C,MAAM,EAAE,MAAA,kBAAkB,aAAlB,kBAAkB,uBAAlB,kBAAkB,CAAE,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,0CAAE,KAAK,CAAC,GAAG,CAAC,IACxD,CAAC,sBAAc,CAAC,WAAW,CAAC,IAAI,sBAAc,CAAC,aAAa,CAAC,CAAC,IAAI;QACnE,OAAO,EAAE;YACP,CAAC,WAAW,CAAC,EAAE,aAAa;SAC7B;KACF,CACF,CAAA;IAED,MAAM,EAAE,YAAY,EAAE,kBAAkB,EAAE,GAAG,0BAAW,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC,CAC3E,UAAU,EACV,UAAU,EACV,EAAE;QACF,MAAM,CAAC,YAAY,EAAE,cAAc,CAAC,GAAG,0BAAW,CAAC,UAAU,CAAC,CAAA;QAC9D,IAAI,CAAC,oBAAoB,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE;YAChD,OAAO,CAAC,IAAI,CAAC,6CAA6C,YAAY,EAAE,CAAC,CAAA;YACzE,OAAO,UAAU,CAAA;SAClB;QAED,MAAM,kBAAkB,GAAG,kBAAU,CAAC,cAAc,CAAC;YACnD,CAAC,CAAC,CAAC;oBACD,WAAW,EAAE,QAAQ,CAAC,uBAAe,CAAC,aAAa,CAAC;iBACrD,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,aAAa,EAAE,EAAE,CAAC,iBACzC,WAAW,EAAE,QAAQ,CAAC,uBAAe,CAAC,aAAa,CAAC,IACjD,aAAa,EAChB,CAAC,CAAA;QAEL,OAAO;YACL,kBAAkB,EAAE;gBAClB,GAAG,UAAU,CAAC,kBAAkB;gBAChC,YAAY;aACb;YACD,YAAY,kCACP,UAAU,CAAC,YAAY,KAC1B,CAAC,YAAY,CAAC,EAAE;oBACd,GAAG,0BAAW,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC;oBACxC,GAAG,kBAAkB;iBACtB,GACF;SACF,CAAA;IACH,CAAC,EAAE;QACD,kBAAkB,EAAE,EAAE;QACtB,YAAY,gCACV,CAAC,0BAAkB,CAAC,eAAe,CAAC,EAAE,CAAC;oBACrC,WAAW,EAAE,QAAQ,CAAC,uBAAe,CAAC,eAAe,CAAC;iBACvD,CAAC,IACC,QAAQ,CAAC,uBAAe,CAAC,6BAA6B,CAAC,IAAI;YAC5D,CAAC,0BAAkB,CAAC,6BAA6B,CAAC,EAAE,CAAC;oBACnD,WAAW,EAAE,QAAQ,CAAC,uBAAe,CAAC,6BAA6B,CAAC;iBACrE,CAAC;SACH,GACE,QAAQ,CAAC,uBAAe,CAAC,wBAAwB,CAAC,IAAI;YACvD,CAAC,0BAAkB,CAAC,wBAAwB,CAAC,EAAE,CAAC;oBAC9C,WAAW,EAAE,QAAQ,CAAC,uBAAe,CAAC,wBAAwB,CAAC;iBAChE,CAAC;SACH,CACF;KACF,CAAC,CAAA;IAEF,MAAM,iBAAiB,GAAG,oBAAY,CAAC,qBAAqB,CAAC,WAAW,EAAE,mBAAmB,CAAC,CAAA;IAC9F,MAAM,mBAAmB,GAAG,MAAA,MAAA,WAAW,CAAC,eAAe,0CAAE,YAAY,0CAAG,iBAAiB,CAAC,CAAA;IAC1F,IAAI,CAAC,mBAAmB,EAAE;QACxB,MAAM,IAAI,KAAK,CAAC,qCAAqC,qBAAqB,CAAC,WAAW,EAAE,CAAC,CAAA;KAC1F;IAED,MAAM,cAAc,GAAG;QACrB,mBAAmB;QACnB,YAAY,EAAE,mBAAmB;QACjC,kBAAkB,EAAE,mBAAmB;KACxC,CAAA;IAED,MAAM,mBAAmB,mCACpB,oBAAoB,KACvB,gBAAgB;QAChB,sBAAsB;QACtB,kBAAkB;QAClB,YAAY;QACZ,QAAQ;QACR,SAAS;QACT,UAAU,GACX,CAAA;IAED,MAAM,oBAAoB,+DACrB,qBAAqB,GACrB,MAAM,GACN,oBAAoB,IAAI;QACzB,oBAAoB,EAAE,IAAI,CAAC,KAAK,CAAC,oBAAoB,CAAC;KACvD,KACD,SAAS,EAAE,cAAc,EACzB,kBAAkB;QAClB,sBAAsB;QACtB,gBAAgB;QAChB,cAAc;QACd,cAAc;QACd,UAAU;QACV,YAAY;QACZ,kBAAkB;QAClB,UAAU;QACV,SAAS;QACT,MAAM;QACN,QAAQ;QACR,YAAY,GACb,CAAA;IAED,MAAM,mBAAmB,GAAG,MAAM,6BAAqB,CAAC,oBAAoB,CAAC,CAAA;IAC7E,MAAM,mBAAmB,mCACpB,oBAAoB,KACvB,mBAAmB,GACpB,CAAA;IAED,uCACK,WAAW,KACd,QAAQ,EAAE,SAAS,EACnB,mBAAmB;QACnB,mBAAmB,IACpB;AACH,CAAC,CAAA;AAzUY,QAAA,WAAW,eAyUvB"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@agnostack/next-shopify",
|
|
3
|
-
"version": "1.8.1
|
|
3
|
+
"version": "1.8.1",
|
|
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",
|
|
@@ -74,6 +74,7 @@
|
|
|
74
74
|
"@typescript-eslint/parser": "5.36.1",
|
|
75
75
|
"chai": "4.3.6",
|
|
76
76
|
"chai-as-promised": "7.1.1",
|
|
77
|
+
"chalk": "4.1.2",
|
|
77
78
|
"chance": "1.1.8",
|
|
78
79
|
"eslint": "8.23.0",
|
|
79
80
|
"eslint-plugin-import": "2.26.0",
|