@agnostack/next-shopify 1.8.1-beta.13 → 1.8.1-beta.14
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.
|
@@ -25,12 +25,11 @@ const handleCallback = (serverRuntimeConfig) => async (req, res, params) => {
|
|
|
25
25
|
const { shop, host, isOnline: _isOnlineQuery } = req.query;
|
|
26
26
|
const { isOnline: _isOnlineParam } = params !== null && params !== void 0 ? params : {};
|
|
27
27
|
const errorPath = PAGE_PATHS[utils_1.PAGE_ROUTE_NAMES.ERROR];
|
|
28
|
-
console.log(`>>> > handleCallback > errorPath:`, errorPath);
|
|
29
28
|
if (utils_1.stringEmpty(shop) || utils_1.stringEmpty(host)) {
|
|
30
29
|
// HMMM: why is this a 303 (rather than a 302 or or anything)??
|
|
31
|
-
return res.redirect(303, `${
|
|
30
|
+
return res.redirect(303, `${errorPath}?code=${utils_1.ERROR_CODES.INVALID_CALLBACK}`);
|
|
32
31
|
}
|
|
33
|
-
let redirectUrl = `${
|
|
32
|
+
let redirectUrl = `${errorPath}?invalid_callback_response`;
|
|
34
33
|
try {
|
|
35
34
|
const { shopify, storeSession, ensureBilling } = await utils_1.getShopifyHelpers(serverRuntimeConfig, { shop });
|
|
36
35
|
const authPayload = { rawRequest: req, rawResponse: res };
|
|
@@ -82,26 +81,26 @@ const handleCallback = (serverRuntimeConfig) => async (req, res, params) => {
|
|
|
82
81
|
// TODO: fix these to not just redirect as standalone route (as app already installed)
|
|
83
82
|
case error instanceof shopify_api_1.BillingError: {
|
|
84
83
|
console.error(`${errorMessage}. Billing Error ${error.message}`, error.errorData);
|
|
85
|
-
redirectUrl = `${
|
|
84
|
+
redirectUrl = `${errorPath}?code=${utils_1.ERROR_CODES.BILLING}`;
|
|
86
85
|
break;
|
|
87
86
|
}
|
|
88
87
|
// TODO: fix these to not just redirect as standalone route (as app already installed)
|
|
89
88
|
case error instanceof shopify_api_1.GraphqlQueryError: {
|
|
90
89
|
const errorMessages = utils_1.ensureArray((_b = error.response) === null || _b === void 0 ? void 0 : _b.errors).map(({ message }) => utils_1.ensureString(message));
|
|
91
90
|
console.error(`${errorMessage}. GraphqlQuery Error ${errorMessages.join('. ')}`);
|
|
92
|
-
redirectUrl = `${
|
|
91
|
+
redirectUrl = `${errorPath}?code=${utils_1.ERROR_CODES.QUERY}`;
|
|
93
92
|
break;
|
|
94
93
|
}
|
|
95
94
|
// TODO: fix these to not just redirect as standalone route (as app already installed)
|
|
96
95
|
case error instanceof shopify_api_1.InvalidOAuthError: {
|
|
97
96
|
console.error(`${errorMessage}. InvalidOAuth Error`, error);
|
|
98
|
-
redirectUrl = `${
|
|
97
|
+
redirectUrl = `${errorPath}?code=${utils_1.ERROR_CODES.OAUTH}`;
|
|
99
98
|
break;
|
|
100
99
|
}
|
|
101
100
|
// TODO: fix these to not just redirect as standalone route (as app already installed)
|
|
102
101
|
default: {
|
|
103
102
|
console.error(errorMessage, error);
|
|
104
|
-
redirectUrl = `${
|
|
103
|
+
redirectUrl = `${errorPath}?code=${utils_1.ERROR_CODES.CALLBACK}`;
|
|
105
104
|
}
|
|
106
105
|
}
|
|
107
106
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"callback.js","sourceRoot":"","sources":["../../../src/handlers/api/callback.js"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,sDAM6B;AAE7B,uCAYoB;AAEpB,iDAAiD;AAC1C,MAAM,cAAc,GAAG,CAAC,mBAAmB,EAAE,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,EAAE;;IAChF,MASI,KAAA,mBAAmB,aAAnB,mBAAmB,cAAnB,mBAAmB,GAAI,EAAE,EATvB,EACJ,cAAc,EACd,UAAU,EACV,SAAS,OAMkB,EAL3B,oBAIM,EAJN,qBAII,EAAE,KAAA;IAHJ,6DAA6D;IAC7D,KAAC,0BAAkB,CAAC,eAAgB;IADpC,6DAA6D;IACvB,mBAAmB,SAAA,EACtD,QAAQ,cAHC,uCAIb,CAC0B,CAAA;IAC7B,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,cAAc,EAAE,GAAG,GAAG,CAAC,KAAK,CAAA;IAC1D,MAAM,EAAE,QAAQ,EAAE,cAAc,EAAE,GAAG,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,EAAE,CAAA;
|
|
1
|
+
{"version":3,"file":"callback.js","sourceRoot":"","sources":["../../../src/handlers/api/callback.js"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@agnostack/next-shopify",
|
|
3
|
-
"version": "1.8.1-beta.
|
|
3
|
+
"version": "1.8.1-beta.14",
|
|
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",
|