@agnostack/next-shopify 1.6.0-alpha.21 → 1.6.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/CHANGELOG.md +7 -0
- package/dist/handlers/api.js +22 -30
- package/dist/handlers/api.js.map +1 -1
- package/dist/handlers/ssr.d.ts +10 -1
- package/dist/handlers/ssr.js +14 -13
- package/dist/handlers/ssr.js.map +1 -1
- package/dist/helpers/auth.d.ts +9 -1
- package/dist/helpers/auth.js +10 -10
- package/dist/helpers/auth.js.map +1 -1
- package/dist/helpers/callback.d.ts +4 -1
- package/dist/helpers/callback.js +12 -11
- package/dist/helpers/callback.js.map +1 -1
- package/dist/utils/shopify-api-node/beginAuth.d.ts +1 -4
- package/dist/utils/shopify-api-node/beginAuth.js +7 -3
- package/dist/utils/shopify-api-node/beginAuth.js.map +1 -1
- package/dist/utils/shopify.d.ts +1 -1
- package/dist/utils/shopify.js +13 -12
- package/dist/utils/shopify.js.map +1 -1
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,10 @@
|
|
|
1
|
+
# [1.6.0-alpha.22](https://github.com/agnostack/next-shopify/compare/v1.6.0-alpha.21...v1.6.0-alpha.22) (2023-05-18)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### Bug Fixes
|
|
5
|
+
|
|
6
|
+
* add logging ([f5f8808](https://github.com/agnostack/next-shopify/commit/f5f8808069be00a2e6406f72ef34606ded0685be))
|
|
7
|
+
|
|
1
8
|
# [1.6.0-alpha.21](https://github.com/agnostack/next-shopify/compare/v1.6.0-alpha.20...v1.6.0-alpha.21) (2023-05-18)
|
|
2
9
|
|
|
3
10
|
|
package/dist/handlers/api.js
CHANGED
|
@@ -54,43 +54,35 @@ const handleGraph = (serverRuntimeConfig) => async (req, res, params) => {
|
|
|
54
54
|
};
|
|
55
55
|
exports.handleGraph = handleGraph;
|
|
56
56
|
// NOTE: typically handling: "/api/auth"
|
|
57
|
+
// export const handleAuth = (serverRuntimeConfig) => async (req, res) => {
|
|
58
|
+
// console.log('handleAuth')
|
|
59
|
+
// return authHelper({ req, res, serverRuntimeConfig })
|
|
60
|
+
// }
|
|
61
|
+
// TODO OLD/Remove
|
|
57
62
|
const handleAuth = (serverRuntimeConfig) => async (req, res) => {
|
|
58
|
-
|
|
59
|
-
|
|
63
|
+
const { PAGE_PATHS } = serverRuntimeConfig;
|
|
64
|
+
const { message, statusCode = 302, redirectUrl = `${PAGE_PATHS[utils_1.PAGE_ROUTE_NAMES.ERROR]}?invalid_auth_response`, } = await helpers_1.authHelper({ req, res, serverRuntimeConfig });
|
|
65
|
+
if (statusCode >= 300 && statusCode < 400) {
|
|
66
|
+
return res.redirect(statusCode, redirectUrl);
|
|
67
|
+
}
|
|
68
|
+
return res.status(statusCode).send(message);
|
|
60
69
|
};
|
|
61
70
|
exports.handleAuth = handleAuth;
|
|
62
|
-
// TODO OLD/Remove
|
|
63
|
-
// export const handleAuth = (serverRuntimeConfig) => async (req, res) => {
|
|
64
|
-
// const { PAGE_PATHS } = serverRuntimeConfig
|
|
65
|
-
// const {
|
|
66
|
-
// message,
|
|
67
|
-
// statusCode = 302,
|
|
68
|
-
// redirectUrl = `${PAGE_PATHS[PAGE_ROUTE_NAMES.ERROR]}?invalid_auth_response`,
|
|
69
|
-
// } = await authHelper({ req, res, serverRuntimeConfig })
|
|
70
|
-
// if (statusCode >= 300 && statusCode < 400) {
|
|
71
|
-
// return res.redirect(statusCode, redirectUrl)
|
|
72
|
-
// }
|
|
73
|
-
// return res.status(statusCode).send(message)
|
|
74
|
-
// }
|
|
75
71
|
// NOTE: typically handling: "/api/auth/callback"
|
|
72
|
+
// export const handleCallback = (serverRuntimeConfig) => async (req, res) => {
|
|
73
|
+
// console.log('handleCallback')
|
|
74
|
+
// return callbackHelper({ req, res, serverRuntimeConfig })
|
|
75
|
+
// }
|
|
76
|
+
// TODO OLD/Remove
|
|
76
77
|
const handleCallback = (serverRuntimeConfig) => async (req, res) => {
|
|
77
|
-
|
|
78
|
-
|
|
78
|
+
const { PAGE_PATHS } = serverRuntimeConfig;
|
|
79
|
+
const { message, statusCode = 302, redirectUrl = `${PAGE_PATHS[utils_1.PAGE_ROUTE_NAMES.ERROR]}?invalid_callback_response`, } = await helpers_1.callbackHelper({ req, res, serverRuntimeConfig });
|
|
80
|
+
if (statusCode >= 300 && statusCode < 400) {
|
|
81
|
+
return res.redirect(statusCode, redirectUrl);
|
|
82
|
+
}
|
|
83
|
+
return res.status(statusCode).send(message);
|
|
79
84
|
};
|
|
80
85
|
exports.handleCallback = handleCallback;
|
|
81
|
-
// TODO OLD/Remove
|
|
82
|
-
// export const handleCallback = (serverRuntimeConfig) => async (req, res) => {
|
|
83
|
-
// const { PAGE_PATHS } = serverRuntimeConfig
|
|
84
|
-
// const {
|
|
85
|
-
// message,
|
|
86
|
-
// statusCode = 302,
|
|
87
|
-
// redirectUrl = `${PAGE_PATHS[PAGE_ROUTE_NAMES.ERROR]}?invalid_callback_response`,
|
|
88
|
-
// } = await callbackHelper({ req, res, serverRuntimeConfig })
|
|
89
|
-
// if (statusCode >= 300 && statusCode < 400) {
|
|
90
|
-
// return res.redirect(statusCode, redirectUrl)
|
|
91
|
-
// }
|
|
92
|
-
// return res.status(statusCode).send(message)
|
|
93
|
-
// }
|
|
94
86
|
// NOTE: typically handling: "/api/webhooks/app/uninstalled"
|
|
95
87
|
const handleAppUninstalled = (serverRuntimeConfig) => async (req, res) => {
|
|
96
88
|
console.log('handleAppUninstalled');
|
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: string;
|
|
16
|
+
permanent: boolean;
|
|
17
|
+
};
|
|
18
|
+
props?: undefined;
|
|
19
|
+
} | {
|
|
20
|
+
props: any;
|
|
21
|
+
redirect?: undefined;
|
|
22
|
+
}>;
|
package/dist/handlers/ssr.js
CHANGED
|
@@ -34,24 +34,25 @@ const protectRoute = (props) => async ({ req, res, query, locale } = {}, data) =
|
|
|
34
34
|
const existingSessions = await sessionStorage.find(shop);
|
|
35
35
|
if (utils_1.arrayEmpty(existingSessions)) {
|
|
36
36
|
// TODO validate this is correct
|
|
37
|
-
return
|
|
37
|
+
// return getRedirectUrl(props, {
|
|
38
|
+
// req,
|
|
39
|
+
// res,
|
|
40
|
+
// query,
|
|
41
|
+
// registerHandlers: true,
|
|
42
|
+
// })
|
|
43
|
+
// TODO OLD/Remove
|
|
44
|
+
const emptySessionUrl = await utils_1.getRedirectUrl(props, {
|
|
38
45
|
req,
|
|
39
46
|
res,
|
|
40
47
|
query,
|
|
41
48
|
registerHandlers: true,
|
|
42
49
|
});
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
// return {
|
|
50
|
-
// redirect: {
|
|
51
|
-
// destination: emptySessionUrl,
|
|
52
|
-
// permanent: false,
|
|
53
|
-
// },
|
|
54
|
-
// }
|
|
50
|
+
return {
|
|
51
|
+
redirect: {
|
|
52
|
+
destination: emptySessionUrl,
|
|
53
|
+
permanent: false,
|
|
54
|
+
},
|
|
55
|
+
};
|
|
55
56
|
}
|
|
56
57
|
if (embedded !== '1') {
|
|
57
58
|
const embeddedappUrl = await shopify.auth.getEmbeddedAppUrl({ rawRequest: req, rawResponse: res });
|
package/dist/handlers/ssr.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ssr.js","sourceRoot":"","sources":["../../src/handlers/ssr.js"],"names":[],"mappings":";;;AAAA,oCAQiB;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,kBACH,MAAM,IACH,IAAI,CACR;KACF,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,GAAG,KAAK,CAAA;IAC5B,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,MAAM,SAAS,GAAG,GAAG,UAAU,CAAC,wBAAgB,CAAC,KAAK,CAAC,0CAA0C,CAAA;QACjG,OAAO;YACL,QAAQ,EAAE;gBACR,WAAW,EAAE,SAAS;gBACtB,SAAS,EAAE,KAAK;aACjB;SACF,CAAA;KACF;IAED,MAAM,OAAO,GAAG,6BAAqB,CAAC,KAAK,EAAE,IAAI,CAAC,CAAA;IAClD,kBAAkB;IAClB,yFAAyF;IACzF,MAAM,cAAc,GAAG,yBAAiB,CAAC,KAAK,EAAE,IAAI,CAAC,CAAA;IACrD,MAAM,gBAAgB,GAAG,MAAM,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IAExD,IAAI,kBAAU,CAAC,gBAAgB,CAAC,EAAE;QAChC,gCAAgC;QAChC,
|
|
1
|
+
{"version":3,"file":"ssr.js","sourceRoot":"","sources":["../../src/handlers/ssr.js"],"names":[],"mappings":";;;AAAA,oCAQiB;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,kBACH,MAAM,IACH,IAAI,CACR;KACF,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,GAAG,KAAK,CAAA;IAC5B,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,MAAM,SAAS,GAAG,GAAG,UAAU,CAAC,wBAAgB,CAAC,KAAK,CAAC,0CAA0C,CAAA;QACjG,OAAO;YACL,QAAQ,EAAE;gBACR,WAAW,EAAE,SAAS;gBACtB,SAAS,EAAE,KAAK;aACjB;SACF,CAAA;KACF;IAED,MAAM,OAAO,GAAG,6BAAqB,CAAC,KAAK,EAAE,IAAI,CAAC,CAAA;IAClD,kBAAkB;IAClB,yFAAyF;IACzF,MAAM,cAAc,GAAG,yBAAiB,CAAC,KAAK,EAAE,IAAI,CAAC,CAAA;IACrD,MAAM,gBAAgB,GAAG,MAAM,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IAExD,IAAI,kBAAU,CAAC,gBAAgB,CAAC,EAAE;QAChC,gCAAgC;QAChC,iCAAiC;QACjC,SAAS;QACT,SAAS;QACT,WAAW;QACX,4BAA4B;QAC5B,KAAK;QAEL,kBAAkB;QAClB,MAAM,eAAe,GAAG,MAAM,sBAAc,CAAC,KAAK,EAAE;YAClD,GAAG;YACH,GAAG;YACH,KAAK;YACL,gBAAgB,EAAE,IAAI;SACvB,CAAC,CAAA;QAEF,OAAO;YACL,QAAQ,EAAE;gBACR,WAAW,EAAE,eAAe;gBAC5B,SAAS,EAAE,KAAK;aACjB;SACF,CAAA;KACF;IAED,IAAI,QAAQ,KAAK,GAAG,EAAE;QACpB,MAAM,cAAc,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,iBAAiB,CAAC,EAAE,UAAU,EAAE,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,CAAC,CAAA;QAClG,kBAAkB;QAClB,8DAA8D;QAE9D,OAAO;YACL,QAAQ,EAAE;gBACR,WAAW,EAAE,cAAc;gBAC3B,SAAS,EAAE,KAAK;aACjB;SACF,CAAA;KACF;IAED,OAAO;QACL,KAAK,kBACH,MAAM,IACH,IAAI,CACR;KACF,CAAA;AACH,CAAC,CAAA;AAnEY,QAAA,YAAY,gBAmExB"}
|
package/dist/helpers/auth.d.ts
CHANGED
|
@@ -3,4 +3,12 @@ declare function authHelper({ req, res, serverRuntimeConfig }: {
|
|
|
3
3
|
req: any;
|
|
4
4
|
res: any;
|
|
5
5
|
serverRuntimeConfig: any;
|
|
6
|
-
}): Promise<
|
|
6
|
+
}): Promise<{
|
|
7
|
+
statusCode: number;
|
|
8
|
+
redirectUrl: string;
|
|
9
|
+
message?: undefined;
|
|
10
|
+
} | {
|
|
11
|
+
statusCode: number;
|
|
12
|
+
message: string;
|
|
13
|
+
redirectUrl?: undefined;
|
|
14
|
+
}>;
|
package/dist/helpers/auth.js
CHANGED
|
@@ -3,26 +3,26 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
const utils_1 = require("../utils");
|
|
4
4
|
const authHelper = async ({ req, res, serverRuntimeConfig }) => {
|
|
5
5
|
try {
|
|
6
|
-
|
|
6
|
+
const redirectUrl = await utils_1.getRedirectUrl(serverRuntimeConfig, { req, res, registerHandlers: true });
|
|
7
7
|
// TODO OLD/Remove
|
|
8
8
|
// const authredurectUrl = getRedirectUrl(serverRuntimeConfig, {
|
|
9
9
|
// req,
|
|
10
10
|
// res,
|
|
11
11
|
// })
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
12
|
+
return {
|
|
13
|
+
statusCode: 302,
|
|
14
|
+
redirectUrl,
|
|
15
|
+
};
|
|
16
16
|
}
|
|
17
17
|
catch (error) {
|
|
18
18
|
const errorMessage = 'Error handling auth route';
|
|
19
19
|
console.error(errorMessage, error);
|
|
20
|
-
return res.status(500).send(errorMessage)
|
|
20
|
+
// return res.status(500).send(errorMessage)
|
|
21
21
|
// TODO OLD/Remove
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
22
|
+
return {
|
|
23
|
+
statusCode: 500,
|
|
24
|
+
message: errorMessage,
|
|
25
|
+
};
|
|
26
26
|
}
|
|
27
27
|
};
|
|
28
28
|
exports.default = authHelper;
|
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,IAAI;QACF,
|
|
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;QACF,MAAM,WAAW,GAAG,MAAM,sBAAc,CAAC,mBAAmB,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,gBAAgB,EAAE,IAAI,EAAE,CAAC,CAAA;QAEnG,kBAAkB;QAClB,gEAAgE;QAChE,SAAS;QACT,SAAS;QACT,KAAK;QAEL,OAAO;YACL,UAAU,EAAE,GAAG;YACf,WAAW;SACZ,CAAA;KACF;IAAC,OAAO,KAAK,EAAE;QACd,MAAM,YAAY,GAAG,2BAA2B,CAAA;QAChD,OAAO,CAAC,KAAK,CAAC,YAAY,EAAE,KAAK,CAAC,CAAA;QAElC,4CAA4C;QAE5C,kBAAkB;QAClB,OAAO;YACL,UAAU,EAAE,GAAG;YACf,OAAO,EAAE,YAAY;SACtB,CAAA;KACF;AACH,CAAC,CAAA;AAED,kBAAe,UAAU,CAAA"}
|
package/dist/helpers/callback.js
CHANGED
|
@@ -8,12 +8,12 @@ const callbackHelper = async ({ req, res, serverRuntimeConfig }) => {
|
|
|
8
8
|
const { shop, host } = req.query;
|
|
9
9
|
if (utils_1.stringEmpty(shop) || utils_1.stringEmpty(host)) {
|
|
10
10
|
// HMMM: why is this a 303 (rather than a 302 or or anything)??
|
|
11
|
-
return res.redirect(303, `${PAGE_PATHS[
|
|
11
|
+
// return res.redirect(303, `${PAGE_PATHS[PAGE_ROUTE_NAMES.ERROR]}?code=${ERROR_CODES.INVALID_CALLBACK}`)
|
|
12
12
|
// TODO OLD/Remove
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
13
|
+
return {
|
|
14
|
+
statusCode: 303,
|
|
15
|
+
redirectUrl: `${PAGE_PATHS[utils_1.PAGE_ROUTE_NAMES.ERROR]}?code=${utils_1.ERROR_CODES.INVALID_CALLBACK}`,
|
|
16
|
+
};
|
|
17
17
|
}
|
|
18
18
|
let redirectUrl;
|
|
19
19
|
try {
|
|
@@ -57,10 +57,11 @@ const callbackHelper = async ({ req, res, serverRuntimeConfig }) => {
|
|
|
57
57
|
// }
|
|
58
58
|
case error instanceof shopify_api_1.CookieNotFound: {
|
|
59
59
|
console.error(`${errorMessage}. Cookie Error`, error);
|
|
60
|
-
|
|
60
|
+
redirectUrl = await utils_1.getRedirectUrl(serverRuntimeConfig, {
|
|
61
61
|
req,
|
|
62
62
|
res,
|
|
63
63
|
});
|
|
64
|
+
break;
|
|
64
65
|
}
|
|
65
66
|
case error instanceof shopify_api_1.BillingError: {
|
|
66
67
|
console.error(`${errorMessage}. Billing Error ${error.message}`, error.errorData);
|
|
@@ -84,12 +85,12 @@ const callbackHelper = async ({ req, res, serverRuntimeConfig }) => {
|
|
|
84
85
|
}
|
|
85
86
|
}
|
|
86
87
|
}
|
|
87
|
-
return res.redirect(302, redirectUrl)
|
|
88
|
+
// return res.redirect(302, redirectUrl)
|
|
88
89
|
// TODO OLD/Remove
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
90
|
+
return {
|
|
91
|
+
statusCode: 302,
|
|
92
|
+
redirectUrl,
|
|
93
|
+
};
|
|
93
94
|
};
|
|
94
95
|
exports.default = callbackHelper;
|
|
95
96
|
//# sourceMappingURL=callback.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"callback.js","sourceRoot":"","sources":["../../src/helpers/callback.js"],"names":[],"mappings":";;AAAA,sDAAyG;AAEzG,oCAYiB;AAEjB,MAAM,cAAc,GAAG,KAAK,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,mBAAmB,EAAE,EAAE,EAAE;;IACjE,MAAM,EAAE,UAAU,EAAE,GAAG,mBAAmB,CAAA,CAAC,gCAAgC;IAC3E,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,GAAG,CAAC,KAAK,CAAA;IAEhC,IAAI,mBAAW,CAAC,IAAI,CAAC,IAAI,mBAAW,CAAC,IAAI,CAAC,EAAE;QAC1C,+DAA+D;QAC/D,
|
|
1
|
+
{"version":3,"file":"callback.js","sourceRoot":"","sources":["../../src/helpers/callback.js"],"names":[],"mappings":"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"}
|
|
@@ -8,16 +8,20 @@ const cookies_1 = __importDefault(require("cookies"));
|
|
|
8
8
|
const shopify_api_1 = require("@shopify/shopify-api");
|
|
9
9
|
const display_1 = require("../display");
|
|
10
10
|
const constants_1 = require("../constants");
|
|
11
|
+
const shopify_1 = require("../shopify");
|
|
11
12
|
// NOTE this is a custom implementation of the @shopify/shopify-api beginAuth method... see NOTE below
|
|
12
|
-
const beginAuth = (
|
|
13
|
+
const beginAuth = (props, { req, res, shop: shopProp, isOnline = true, }) => {
|
|
13
14
|
var _a;
|
|
14
|
-
const
|
|
15
|
+
const { APP_CONFIG, API_URLS } = props;
|
|
16
|
+
const _shop = shopProp || ((_a = req.query) === null || _a === void 0 ? void 0 : _a.shop);
|
|
17
|
+
const shopify = shopify_1.getInitializedShopify(props, _shop);
|
|
18
|
+
const shop = shopify.utils.sanitizeShop(_shop);
|
|
15
19
|
const state = `${isOnline ? 'online' : 'offline'}_${display_1.getGUID()}`;
|
|
16
20
|
const cookies = new cookies_1.default(req, res, {
|
|
17
21
|
keys: [APP_CONFIG.API_SECRET_KEY],
|
|
18
22
|
secure: true,
|
|
19
23
|
});
|
|
20
|
-
cookies.set(shopify_api_1.
|
|
24
|
+
cookies.set(shopify_api_1.STATE_COOKIE_NAME, state, {
|
|
21
25
|
sameSite: 'none',
|
|
22
26
|
expires: new Date(Date.now() + 60000),
|
|
23
27
|
signed: true,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"beginAuth.js","sourceRoot":"","sources":["../../../src/utils/shopify-api-node/beginAuth.js"],"names":[],"mappings":";;;;;;AAAA,sDAA6B;AAC7B,
|
|
1
|
+
{"version":3,"file":"beginAuth.js","sourceRoot":"","sources":["../../../src/utils/shopify-api-node/beginAuth.js"],"names":[],"mappings":";;;;;;AAAA,sDAA6B;AAC7B,sDAAwD;AAExD,wCAAoC;AACpC,4CAA8C;AAC9C,wCAAkD;AAElD,sGAAsG;AAC/F,MAAM,SAAS,GAAG,CAAC,KAAK,EAAE,EAC/B,GAAG,EACH,GAAG,EACH,IAAI,EAAE,QAAQ,EACd,QAAQ,GAAG,IAAI,GAChB,EAAE,EAAE;;IACH,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,GAAG,KAAK,CAAA;IACtC,MAAM,KAAK,GAAG,QAAQ,KAAI,MAAA,GAAG,CAAC,KAAK,0CAAE,IAAI,CAAA,CAAA;IACzC,MAAM,OAAO,GAAG,+BAAqB,CAAC,KAAK,EAAE,KAAK,CAAC,CAAA;IACnD,MAAM,IAAI,GAAG,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,KAAK,CAAC,CAAA;IAC9C,MAAM,KAAK,GAAG,GAAG,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,IAAI,iBAAO,EAAE,EAAE,CAAA;IAC/D,MAAM,OAAO,GAAG,IAAI,iBAAO,CAAC,GAAG,EAAE,GAAG,EAAE;QACpC,IAAI,EAAE,CAAC,UAAU,CAAC,cAAc,CAAC;QACjC,MAAM,EAAE,IAAI;KACb,CAAC,CAAA;IAEF,OAAO,CAAC,GAAG,CAAC,+BAAiB,EAAE,KAAK,EAAE;QACpC,QAAQ,EAAE,MAAM;QAChB,OAAO,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK,CAAC;QACrC,MAAM,EAAE,IAAI;QACZ,MAAM,EAAE,IAAI;KACb,CAAC,CAAA;IAEF,oCAAoC;IACpC,MAAM,WAAW,GAAG,IAAI,eAAe,CAAC;QACtC,SAAS,EAAE,UAAU,CAAC,OAAO;QAC7B,KAAK,EAAE,UAAU,CAAC,MAAM;QACxB,YAAY,EAAE,QAAQ,CAAC,2BAAe,CAAC,aAAa,CAAC;QACrD,KAAK;QACL,iBAAiB,EAAE,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE;KAC9C,CAAC,CAAC,QAAQ,EAAE,CAAA;IAEb,OAAO,WAAW,IAAI,0BAA0B,WAAW,EAAE,CAAA;AAC/D,CAAC,CAAA;AAjCY,QAAA,SAAS,aAiCrB"}
|
package/dist/utils/shopify.d.ts
CHANGED
|
@@ -19,7 +19,7 @@ export function getRedirectUrl(props: any, { req, res, query: _query, registerHa
|
|
|
19
19
|
res: any;
|
|
20
20
|
query: any;
|
|
21
21
|
registerHandlers?: boolean;
|
|
22
|
-
}): Promise<
|
|
22
|
+
}): Promise<string>;
|
|
23
23
|
export function getAuthErrorResponse({ error, shop, serverRuntimeConfig }: {
|
|
24
24
|
error: any;
|
|
25
25
|
shop: any;
|
package/dist/utils/shopify.js
CHANGED
|
@@ -4,7 +4,7 @@ exports.getAuthErrorResponse = exports.getRedirectUrl = exports.addWebhookHandle
|
|
|
4
4
|
require("@shopify/shopify-api/adapters/node");
|
|
5
5
|
const shopify_api_1 = require("@shopify/shopify-api");
|
|
6
6
|
// // TODO validate if we still need a custom/local beginAuth
|
|
7
|
-
|
|
7
|
+
const shopify_api_node_1 = require("./shopify-api-node");
|
|
8
8
|
const billing_1 = require("./billing");
|
|
9
9
|
const errors_1 = require("./errors");
|
|
10
10
|
const display_1 = require("./display");
|
|
@@ -90,12 +90,12 @@ const getVerifiedSession = async ({ req, res, shop, serverRuntimeConfig }) => {
|
|
|
90
90
|
rawResponse: res,
|
|
91
91
|
});
|
|
92
92
|
const session = await sessionStorage.load(sessionId);
|
|
93
|
+
if (!session || !session.isActive(shopify.config.scopes)) {
|
|
94
|
+
throw new errors_1.ShopifyAuthenticationError('Inactive session');
|
|
95
|
+
}
|
|
93
96
|
if (shop && (session === null || session === void 0 ? void 0 : session.shop) !== shop) {
|
|
94
97
|
throw new errors_1.ShopifyAuthenticationError('Invalid shop');
|
|
95
98
|
}
|
|
96
|
-
if (!session.isActive(shopify.config.scopes)) {
|
|
97
|
-
throw new errors_1.ShopifyAuthenticationError('Inactive session');
|
|
98
|
-
}
|
|
99
99
|
if (PAYMENT_CONFIG === null || PAYMENT_CONFIG === void 0 ? void 0 : PAYMENT_CONFIG.required) {
|
|
100
100
|
const billingManager = new billing_1.BillingManager(shopify, session, serverRuntimeConfig);
|
|
101
101
|
const confirmationUrl = await billingManager.ensureBilling();
|
|
@@ -175,7 +175,7 @@ exports.addWebhookHandlers = addWebhookHandlers;
|
|
|
175
175
|
const getRedirectUrl = async (props, { req, res, query: _query, registerHandlers = false, }) => {
|
|
176
176
|
var _a;
|
|
177
177
|
// console.log('getRedirectUrl')
|
|
178
|
-
const { API_URLS,
|
|
178
|
+
const { API_URLS, PAGE_PATHS } = props;
|
|
179
179
|
const query = (_a = _query !== null && _query !== void 0 ? _query : req.query) !== null && _a !== void 0 ? _a : {};
|
|
180
180
|
// console.log('query:', query)
|
|
181
181
|
const { embedded, host, shop: _shop } = query !== null && query !== void 0 ? query : {};
|
|
@@ -203,13 +203,14 @@ const getRedirectUrl = async (props, { req, res, query: _query, registerHandlers
|
|
|
203
203
|
}
|
|
204
204
|
// TODO validate if we still need a custom/local beginAuth
|
|
205
205
|
console.log('begin auth');
|
|
206
|
-
return
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
206
|
+
return shopify_api_node_1.beginAuth(props, { req, res, shop });
|
|
207
|
+
// return shopify.auth.begin({
|
|
208
|
+
// shop,
|
|
209
|
+
// callbackPath: API_PATHS[API_ROUTE_NAMES.AUTH_CALLBACK],
|
|
210
|
+
// isOnline: true,
|
|
211
|
+
// rawRequest: req,
|
|
212
|
+
// rawResponse: res,
|
|
213
|
+
// })
|
|
213
214
|
};
|
|
214
215
|
exports.getRedirectUrl = getRedirectUrl;
|
|
215
216
|
const getAuthErrorResponse = ({ error, shop, serverRuntimeConfig }) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shopify.js","sourceRoot":"","sources":["../../src/utils/shopify.js"],"names":[],"mappings":";;;AAAA,8CAA2C;AAC3C,sDAAoF;AAEpF,6DAA6D;AAC7D,
|
|
1
|
+
{"version":3,"file":"shopify.js","sourceRoot":"","sources":["../../src/utils/shopify.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.6.0-alpha.
|
|
3
|
+
"version": "1.6.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",
|