@agnostack/next-shopify 1.7.0-alpha.21 → 1.7.0-alpha.22
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.js +10 -14
- package/dist/handlers/api.js.map +1 -1
- package/dist/handlers/ssr.d.ts +10 -1
- package/dist/handlers/ssr.js +11 -16
- package/dist/handlers/ssr.js.map +1 -1
- package/dist/helpers/auth.js +9 -17
- package/dist/helpers/auth.js.map +1 -1
- package/dist/helpers/callback.d.ts +4 -1
- package/dist/helpers/callback.js +19 -18
- package/dist/helpers/callback.js.map +1 -1
- package/package.json +1 -1
package/dist/handlers/api.js
CHANGED
|
@@ -69,7 +69,11 @@ exports.handleAuth = handleAuth;
|
|
|
69
69
|
// message,
|
|
70
70
|
// statusCode = 302,
|
|
71
71
|
// redirectUrl = `${PAGE_PATHS[PAGE_ROUTE_NAMES.ERROR]}?invalid_auth_response`,
|
|
72
|
+
// response,
|
|
72
73
|
// } = await authHelper({ req, res, serverRuntimeConfig })
|
|
74
|
+
// if (response) {
|
|
75
|
+
// return response
|
|
76
|
+
// }
|
|
73
77
|
// if (statusCode >= 300 && statusCode < 400) {
|
|
74
78
|
// return res.redirect(statusCode, redirectUrl)
|
|
75
79
|
// }
|
|
@@ -77,22 +81,14 @@ exports.handleAuth = handleAuth;
|
|
|
77
81
|
// }
|
|
78
82
|
// NOTE: typically handling: "/api/auth/callback"
|
|
79
83
|
const handleCallback = (serverRuntimeConfig) => async (req, res) => {
|
|
80
|
-
|
|
81
|
-
|
|
84
|
+
const { PAGE_PATHS } = serverRuntimeConfig;
|
|
85
|
+
const { message, statusCode = 302, redirectUrl = `${PAGE_PATHS[utils_1.PAGE_ROUTE_NAMES.ERROR]}?invalid_callback_response`, } = await helpers_1.callbackHelper({ req, res, serverRuntimeConfig });
|
|
86
|
+
if (statusCode >= 300 && statusCode < 400) {
|
|
87
|
+
return res.redirect(statusCode, redirectUrl);
|
|
88
|
+
}
|
|
89
|
+
return res.status(statusCode).send(message);
|
|
82
90
|
};
|
|
83
91
|
exports.handleCallback = handleCallback;
|
|
84
|
-
// export const handleCallback = (serverRuntimeConfig) => async (req, res) => {
|
|
85
|
-
// const { PAGE_PATHS } = serverRuntimeConfig
|
|
86
|
-
// const {
|
|
87
|
-
// message,
|
|
88
|
-
// statusCode = 302,
|
|
89
|
-
// redirectUrl = `${PAGE_PATHS[PAGE_ROUTE_NAMES.ERROR]}?invalid_callback_response`,
|
|
90
|
-
// } = await callbackHelper({ req, res, serverRuntimeConfig })
|
|
91
|
-
// if (statusCode >= 300 && statusCode < 400) {
|
|
92
|
-
// return res.redirect(statusCode, redirectUrl)
|
|
93
|
-
// }
|
|
94
|
-
// return res.status(statusCode).send(message)
|
|
95
|
-
// }
|
|
96
92
|
// NOTE: typically handling: "/api/webhooks/app/uninstalled"
|
|
97
93
|
const handleAppUninstalled = (serverRuntimeConfig) => async (req, res) => {
|
|
98
94
|
// NOTE raw request body is required for Shopify webhook validation
|
package/dist/handlers/api.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api.js","sourceRoot":"","sources":["../../src/handlers/api.js"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"api.js","sourceRoot":"","sources":["../../src/handlers/api.js"],"names":[],"mappings":"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"}
|
package/dist/handlers/ssr.d.ts
CHANGED
|
@@ -10,4 +10,13 @@ export function protectRoute(props: any): ({ req, res, query, locale }: {
|
|
|
10
10
|
res: any;
|
|
11
11
|
query: any;
|
|
12
12
|
locale: any;
|
|
13
|
-
}, data: any) => Promise<
|
|
13
|
+
}, data: any) => Promise<{
|
|
14
|
+
redirect: {
|
|
15
|
+
destination: any;
|
|
16
|
+
permanent: boolean;
|
|
17
|
+
};
|
|
18
|
+
props?: undefined;
|
|
19
|
+
} | {
|
|
20
|
+
props: any;
|
|
21
|
+
redirect?: undefined;
|
|
22
|
+
}>;
|
package/dist/handlers/ssr.js
CHANGED
|
@@ -14,16 +14,14 @@ const wrapRoute = () => ({ res, query, locale } = {}, data) => {
|
|
|
14
14
|
exports.wrapRoute = wrapRoute;
|
|
15
15
|
const protectRoute = (props) => async ({ req, res, query, locale } = {}, data) => {
|
|
16
16
|
var _a, _b, _c, _d;
|
|
17
|
-
const { PAGE_PATHS } = props;
|
|
17
|
+
const { PAGE_PATHS, API_PATHS } = props;
|
|
18
18
|
const shop = (_a = query === null || query === void 0 ? void 0 : query.shop) !== null && _a !== void 0 ? _a : (_b = req.query) === null || _b === void 0 ? void 0 : _b.shop;
|
|
19
19
|
const embedded = (_c = query === null || query === void 0 ? void 0 : query.embedded) !== null && _c !== void 0 ? _c : (_d = req.query) === null || _d === void 0 ? void 0 : _d.embedded;
|
|
20
|
+
res.setHeader('Content-Security-Policy', getSecurityHeader(shop));
|
|
20
21
|
if (utils_1.stringEmpty(shop)) {
|
|
21
|
-
// NOTE this header should not be set prior to calling getRedirectUrl
|
|
22
|
-
res.setHeader('Content-Security-Policy', getSecurityHeader(shop));
|
|
23
|
-
const noShopUrl = `${PAGE_PATHS[utils_1.PAGE_ROUTE_NAMES.ERROR]}?code=no_shop_provided&type=protectRoute`;
|
|
24
22
|
return {
|
|
25
23
|
redirect: {
|
|
26
|
-
destination:
|
|
24
|
+
destination: `${PAGE_PATHS[utils_1.PAGE_ROUTE_NAMES.ERROR]}?code=no_shop_provided&type=protectRoute`,
|
|
27
25
|
permanent: false,
|
|
28
26
|
},
|
|
29
27
|
};
|
|
@@ -31,26 +29,23 @@ const protectRoute = (props) => async ({ req, res, query, locale } = {}, data) =
|
|
|
31
29
|
const { shopify, findSession } = await utils_1.getShopifyHelpers(props, { shop });
|
|
32
30
|
const existingSessions = await findSession(shop);
|
|
33
31
|
if (utils_1.arrayEmpty(existingSessions)) {
|
|
34
|
-
return
|
|
32
|
+
// return getRedirectUrl(props, { req, res, query, id: 'SSR' })
|
|
35
33
|
// const emptySessionUrl = await getRedirectUrl(props, {
|
|
36
34
|
// req,
|
|
37
35
|
// res,
|
|
38
36
|
// query,
|
|
39
37
|
// })
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
38
|
+
return {
|
|
39
|
+
redirect: {
|
|
40
|
+
destination: API_PATHS[utils_1.API_ROUTE_NAMES.AUTH],
|
|
41
|
+
permanent: false,
|
|
42
|
+
},
|
|
43
|
+
};
|
|
46
44
|
}
|
|
47
|
-
// NOTE this header should not be set prior to calling getRedirectUrl
|
|
48
|
-
res.setHeader('Content-Security-Policy', getSecurityHeader(shop));
|
|
49
45
|
if (embedded !== '1') {
|
|
50
|
-
const embeddedappUrl = await shopify.auth.getEmbeddedAppUrl({ rawRequest: req, rawResponse: res });
|
|
51
46
|
return {
|
|
52
47
|
redirect: {
|
|
53
|
-
destination:
|
|
48
|
+
destination: await shopify.auth.getEmbeddedAppUrl({ rawRequest: req, rawResponse: res }),
|
|
54
49
|
permanent: false,
|
|
55
50
|
},
|
|
56
51
|
};
|
package/dist/handlers/ssr.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ssr.js","sourceRoot":"","sources":["../../src/handlers/ssr.js"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"ssr.js","sourceRoot":"","sources":["../../src/handlers/ssr.js"],"names":[],"mappings":";;;AAAA,oCASiB;AAEjB,MAAM,iBAAiB,GAAG,CAAC,IAAI,EAAE,EAAE,CAAC,CAClC,sBAAc,CAAC,IAAI,CAAC;IAClB,CAAC,CAAC,0DAA0D,IAAI,GAAG;IACnE,CAAC,CAAC,yBAAyB,CAC9B,CAAA;AAEM,MAAM,SAAS,GAAG,GAAG,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,EAAE,IAAI,EAAE,EAAE;IACnE,GAAG,CAAC,SAAS,CAAC,yBAAyB,EAAE,iBAAiB,CAAC,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,IAAI,CAAC,CAAC,CAAA;IAExE,OAAO;QACL,KAAK,EAAE,mBAAW,iBAChB,MAAM,IACH,IAAI,EACP;KACH,CAAA;AACH,CAAC,CAAA;AATY,QAAA,SAAS,aASrB;AAEM,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,GAAG,CAAC,SAAS,CAAC,yBAAyB,EAAE,iBAAiB,CAAC,IAAI,CAAC,CAAC,CAAA;IAEjE,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,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,GAAG,MAAM,yBAAiB,CAAC,KAAK,EAAE,EAAE,IAAI,EAAE,CAAC,CAAA;IACzE,MAAM,gBAAgB,GAAG,MAAM,WAAW,CAAC,IAAI,CAAC,CAAA;IAEhD,IAAI,kBAAU,CAAC,gBAAgB,CAAC,EAAE;QAChC,+DAA+D;QAC/D,wDAAwD;QACxD,SAAS;QACT,SAAS;QACT,WAAW;QACX,KAAK;QAEL,OAAO;YACL,QAAQ,EAAE;gBACR,WAAW,EAAE,SAAS,CAAC,uBAAe,CAAC,IAAI,CAAC;gBAC5C,SAAS,EAAE,KAAK;aACjB;SACF,CAAA;KACF;IAED,IAAI,QAAQ,KAAK,GAAG,EAAE;QACpB,OAAO;YACL,QAAQ,EAAE;gBACR,WAAW,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,iBAAiB,CAAC,EAAE,UAAU,EAAE,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,CAAC;gBACxF,SAAS,EAAE,KAAK;aACjB;SACF,CAAA;KACF;IAED,OAAO;QACL,KAAK,EAAE,mBAAW,iBAChB,MAAM,IACH,IAAI,EACP;KACH,CAAA;AACH,CAAC,CAAA;AAlDY,QAAA,YAAY,gBAkDxB"}
|
package/dist/helpers/auth.js
CHANGED
|
@@ -2,29 +2,21 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const utils_1 = require("../utils");
|
|
4
4
|
const authHelper = async ({ req, res, serverRuntimeConfig }) => {
|
|
5
|
-
console.log(`>>> ~ authHelper`);
|
|
6
5
|
let response;
|
|
7
6
|
try {
|
|
8
|
-
response = await utils_1.getRedirectUrl(serverRuntimeConfig, { req, res
|
|
7
|
+
response = await utils_1.getRedirectUrl(serverRuntimeConfig, { req, res });
|
|
9
8
|
}
|
|
10
9
|
catch (error) {
|
|
11
|
-
|
|
10
|
+
console.log(`>>> ~ error`, error);
|
|
11
|
+
response = error.response;
|
|
12
|
+
// const errorMessage = 'Error handling auth route'
|
|
13
|
+
// console.error(errorMessage, error)
|
|
14
|
+
// return {
|
|
15
|
+
// statusCode: 500,
|
|
16
|
+
// message: errorMessage,
|
|
17
|
+
// }
|
|
12
18
|
}
|
|
13
19
|
return response;
|
|
14
|
-
// try {
|
|
15
|
-
// const redirectUrl = await getRedirectUrl(serverRuntimeConfig, { req, res })
|
|
16
|
-
// return {
|
|
17
|
-
// statusCode: 302,
|
|
18
|
-
// redirectUrl,
|
|
19
|
-
// }
|
|
20
|
-
// } catch (error) {
|
|
21
|
-
// const errorMessage = 'Error handling auth route'
|
|
22
|
-
// console.error(errorMessage, error)
|
|
23
|
-
// return {
|
|
24
|
-
// statusCode: 500,
|
|
25
|
-
// message: errorMessage,
|
|
26
|
-
// }
|
|
27
|
-
// }
|
|
28
20
|
};
|
|
29
21
|
exports.default = authHelper;
|
|
30
22
|
//# sourceMappingURL=auth.js.map
|
package/dist/helpers/auth.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../src/helpers/auth.js"],"names":[],"mappings":";;AAAA,oCAAyC;AAEzC,MAAM,UAAU,GAAG,KAAK,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,mBAAmB,EAAE,EAAE,EAAE;IAC7D,
|
|
1
|
+
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../src/helpers/auth.js"],"names":[],"mappings":";;AAAA,oCAAyC;AAEzC,MAAM,UAAU,GAAG,KAAK,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,mBAAmB,EAAE,EAAE,EAAE;IAC7D,IAAI,QAAQ,CAAA;IACZ,IAAI;QACF,QAAQ,GAAG,MAAM,sBAAc,CAAC,mBAAmB,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAA;KACnE;IAAC,OAAO,KAAK,EAAE;QACd,OAAO,CAAC,GAAG,CAAC,aAAa,EAAE,KAAK,CAAC,CAAA;QACjC,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAA;QACzB,mDAAmD;QACnD,qCAAqC;QAErC,WAAW;QACX,qBAAqB;QACrB,2BAA2B;QAC3B,IAAI;KACL;IAED,OAAO,QAAQ,CAAA;AACjB,CAAC,CAAA;AAED,kBAAe,UAAU,CAAA"}
|
package/dist/helpers/callback.js
CHANGED
|
@@ -5,19 +5,16 @@ const utils_1 = require("../utils");
|
|
|
5
5
|
const callbackHelper = async ({ req, res, serverRuntimeConfig }) => {
|
|
6
6
|
var _a;
|
|
7
7
|
console.log(`>>> ~ callbackHelper`);
|
|
8
|
-
const { PAGE_PATHS, PAYMENT_CONFIG } = serverRuntimeConfig;
|
|
8
|
+
const { PAGE_PATHS, PAYMENT_CONFIG, API_PATHS } = serverRuntimeConfig;
|
|
9
9
|
const { shop, host } = req.query;
|
|
10
|
-
// let response
|
|
11
|
-
// let statusCode
|
|
12
|
-
let redirectUrl;
|
|
13
10
|
if (utils_1.stringEmpty(shop) || utils_1.stringEmpty(host)) {
|
|
14
|
-
return res.redirect(`${PAGE_PATHS[
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
11
|
+
// return res.redirect(`${PAGE_PATHS[PAGE_ROUTE_NAMES.ERROR]}?code=${ERROR_CODES.INVALID_CALLBACK}`)
|
|
12
|
+
return {
|
|
13
|
+
statusCode: 303,
|
|
14
|
+
redirectUrl: `${PAGE_PATHS[utils_1.PAGE_ROUTE_NAMES.ERROR]}?code=${utils_1.ERROR_CODES.INVALID_CALLBACK}`,
|
|
15
|
+
};
|
|
19
16
|
}
|
|
20
|
-
|
|
17
|
+
let redirectUrl;
|
|
21
18
|
try {
|
|
22
19
|
const { shopify, storeSession } = await utils_1.getShopifyHelpers(serverRuntimeConfig, { shop });
|
|
23
20
|
const authPayload = { rawRequest: req, rawResponse: res };
|
|
@@ -37,7 +34,10 @@ const callbackHelper = async ({ req, res, serverRuntimeConfig }) => {
|
|
|
37
34
|
redirectUrl = confirmationUrl;
|
|
38
35
|
}
|
|
39
36
|
}
|
|
40
|
-
return
|
|
37
|
+
return {
|
|
38
|
+
statusCode: 302,
|
|
39
|
+
redirectUrl,
|
|
40
|
+
};
|
|
41
41
|
}
|
|
42
42
|
catch (error) {
|
|
43
43
|
const errorMessage = 'Error handling callback route';
|
|
@@ -45,12 +45,13 @@ const callbackHelper = async ({ req, res, serverRuntimeConfig }) => {
|
|
|
45
45
|
// TODO implement a custom SessionNotFound error
|
|
46
46
|
case error instanceof shopify_api_1.CookieNotFound: {
|
|
47
47
|
console.error(`${errorMessage}. Cookie Error`, error);
|
|
48
|
-
|
|
48
|
+
redirectUrl = API_PATHS[utils_1.API_ROUTE_NAMES.AUTH];
|
|
49
|
+
// response = await getRedirectUrl(serverRuntimeConfig, { req, res, id: 'CALLBACK' })
|
|
49
50
|
// redirectUrl = await getRedirectUrl(serverRuntimeConfig, {
|
|
50
51
|
// req,
|
|
51
52
|
// res,
|
|
52
53
|
// })
|
|
53
|
-
|
|
54
|
+
break;
|
|
54
55
|
}
|
|
55
56
|
case error instanceof shopify_api_1.BillingError: {
|
|
56
57
|
console.error(`${errorMessage}. Billing Error ${error.message}`, error.errorData);
|
|
@@ -74,11 +75,11 @@ const callbackHelper = async ({ req, res, serverRuntimeConfig }) => {
|
|
|
74
75
|
}
|
|
75
76
|
}
|
|
76
77
|
}
|
|
77
|
-
return res.redirect(redirectUrl)
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
78
|
+
// return res.redirect(redirectUrl)
|
|
79
|
+
return {
|
|
80
|
+
statusCode: 302,
|
|
81
|
+
redirectUrl,
|
|
82
|
+
};
|
|
82
83
|
};
|
|
83
84
|
exports.default = callbackHelper;
|
|
84
85
|
//# sourceMappingURL=callback.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"callback.js","sourceRoot":"","sources":["../../src/helpers/callback.js"],"names":[],"mappings":";;AAAA,sDAAyG;AAEzG,
|
|
1
|
+
{"version":3,"file":"callback.js","sourceRoot":"","sources":["../../src/helpers/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.7.0-alpha.
|
|
3
|
+
"version": "1.7.0-alpha.22",
|
|
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",
|