@agnostack/next-shopify 1.1.1-alpha.8 → 1.1.1-alpha.9
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/apiHandlers.d.ts +5 -5
- package/dist/apiHandlers.js +23 -18
- package/dist/apiHandlers.js.map +1 -1
- package/dist/apiHelpers.d.ts +10 -10
- package/dist/apiHelpers.js +20 -25
- package/dist/apiHelpers.js.map +1 -1
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,10 @@
|
|
|
1
|
+
## [1.1.1-alpha.9](https://github.com/agnostack/next-shopify/compare/v1.1.1-alpha.8...v1.1.1-alpha.9) (2022-11-10)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### Bug Fixes
|
|
5
|
+
|
|
6
|
+
* updated method signatures ([26316c8](https://github.com/agnostack/next-shopify/commit/26316c80d1a9a9b8663dd864a2270b2617c0492b))
|
|
7
|
+
|
|
1
8
|
## [1.1.1-alpha.8](https://github.com/agnostack/next-shopify/compare/v1.1.1-alpha.7...v1.1.1-alpha.8) (2022-11-10)
|
|
2
9
|
|
|
3
10
|
|
package/dist/apiHandlers.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
export function handleRest(
|
|
2
|
-
export function handleGraph(
|
|
3
|
-
export function handleAuth(
|
|
4
|
-
export function handleCallback(
|
|
5
|
-
export function handleAppUninstalled(
|
|
1
|
+
export function handleRest(serverRuntimeConfig: any): (req: any, res: any, params: any) => Promise<any>;
|
|
2
|
+
export function handleGraph(serverRuntimeConfig: any): (req: any, res: any, params: any) => Promise<any>;
|
|
3
|
+
export function handleAuth(serverRuntimeConfig: any): (req: any, res: any) => Promise<any>;
|
|
4
|
+
export function handleCallback(serverRuntimeConfig: any): (req: any, res: any) => Promise<any>;
|
|
5
|
+
export function handleAppUninstalled(serverRuntimeConfig: any): (req: any, res: any) => Promise<any>;
|
package/dist/apiHandlers.js
CHANGED
|
@@ -4,13 +4,15 @@ exports.handleAppUninstalled = exports.handleCallback = exports.handleAuth = exp
|
|
|
4
4
|
// NOTE: api routes do NOT work in `next export`
|
|
5
5
|
const shopify_api_1 = require("@shopify/shopify-api");
|
|
6
6
|
const utils_1 = require("./utils");
|
|
7
|
-
const handleRest = (
|
|
7
|
+
const handleRest = (serverRuntimeConfig) => async (req, res, params) => {
|
|
8
8
|
console.warn(`>>> > handleRest > params`, params);
|
|
9
|
-
const { PAGE_PATHS } =
|
|
10
|
-
|
|
11
|
-
|
|
9
|
+
const { PAGE_PATHS } = serverRuntimeConfig;
|
|
10
|
+
const { message, response, statusCode = 302, redirectUrl = `${PAGE_PATHS[utils_1.PAGE_ROUTE_NAMES.ERROR]}?invalid_rest_response`, } = await utils_1.restHelper({
|
|
11
|
+
req,
|
|
12
12
|
res,
|
|
13
|
-
params
|
|
13
|
+
params,
|
|
14
|
+
serverRuntimeConfig,
|
|
15
|
+
});
|
|
14
16
|
console.warn(`>>> > handleRest > response`, response);
|
|
15
17
|
if (statusCode >= 300 && statusCode < 400) {
|
|
16
18
|
return res.redirect(statusCode, redirectUrl);
|
|
@@ -24,13 +26,16 @@ const handleRest = (props) => async (req, res, params) => {
|
|
|
24
26
|
return res.status(statusCode).json(response);
|
|
25
27
|
};
|
|
26
28
|
exports.handleRest = handleRest;
|
|
27
|
-
const handleGraph = (
|
|
29
|
+
const handleGraph = (serverRuntimeConfig) => async (req, res, params) => {
|
|
28
30
|
console.warn(`>>> > handleGraph > res`, res);
|
|
29
31
|
console.warn(`>>> > handleGraph > params`, params);
|
|
30
|
-
const { PAGE_PATHS } =
|
|
31
|
-
const { message, response, statusCode = 302, redirectUrl = `${PAGE_PATHS[utils_1.PAGE_ROUTE_NAMES.ERROR]}?invalid_query_response`, } = await utils_1.graphHelper(
|
|
32
|
+
const { PAGE_PATHS } = serverRuntimeConfig;
|
|
33
|
+
const { message, response, statusCode = 302, redirectUrl = `${PAGE_PATHS[utils_1.PAGE_ROUTE_NAMES.ERROR]}?invalid_query_response`, } = await utils_1.graphHelper({
|
|
34
|
+
req,
|
|
32
35
|
res,
|
|
33
|
-
params
|
|
36
|
+
params,
|
|
37
|
+
serverRuntimeConfig,
|
|
38
|
+
});
|
|
34
39
|
console.warn(`>>> > handleGraph > response`, response);
|
|
35
40
|
if (statusCode >= 300 && statusCode < 400) {
|
|
36
41
|
return res.redirect(statusCode, redirectUrl);
|
|
@@ -42,9 +47,9 @@ const handleGraph = (props) => async (req, res, params) => {
|
|
|
42
47
|
};
|
|
43
48
|
exports.handleGraph = handleGraph;
|
|
44
49
|
// NOTE: typically handling: "/api/auth"
|
|
45
|
-
const handleAuth = (
|
|
46
|
-
const { PAGE_PATHS } =
|
|
47
|
-
const { message, statusCode = 302, redirectUrl = `${PAGE_PATHS[utils_1.PAGE_ROUTE_NAMES.ERROR]}?invalid_auth_response`, } = await utils_1.authHelper(
|
|
50
|
+
const handleAuth = (serverRuntimeConfig) => async (req, res) => {
|
|
51
|
+
const { PAGE_PATHS } = serverRuntimeConfig;
|
|
52
|
+
const { message, statusCode = 302, redirectUrl = `${PAGE_PATHS[utils_1.PAGE_ROUTE_NAMES.ERROR]}?invalid_auth_response`, } = await utils_1.authHelper({ req, res, serverRuntimeConfig });
|
|
48
53
|
if (statusCode >= 300 && statusCode < 400) {
|
|
49
54
|
return res.redirect(statusCode, redirectUrl);
|
|
50
55
|
}
|
|
@@ -52,9 +57,9 @@ const handleAuth = (props) => async (req, res) => {
|
|
|
52
57
|
};
|
|
53
58
|
exports.handleAuth = handleAuth;
|
|
54
59
|
// NOTE: typically handling: "/api/auth/callback"
|
|
55
|
-
const handleCallback = (
|
|
56
|
-
const { PAGE_PATHS } =
|
|
57
|
-
const { message, statusCode = 302, redirectUrl = `${PAGE_PATHS[utils_1.PAGE_ROUTE_NAMES.ERROR]}?invalid_callback_response`, } = await utils_1.callbackHelper(
|
|
60
|
+
const handleCallback = (serverRuntimeConfig) => async (req, res) => {
|
|
61
|
+
const { PAGE_PATHS } = serverRuntimeConfig;
|
|
62
|
+
const { message, statusCode = 302, redirectUrl = `${PAGE_PATHS[utils_1.PAGE_ROUTE_NAMES.ERROR]}?invalid_callback_response`, } = await utils_1.callbackHelper({ req, res, serverRuntimeConfig });
|
|
58
63
|
if (statusCode >= 300 && statusCode < 400) {
|
|
59
64
|
return res.redirect(statusCode, redirectUrl);
|
|
60
65
|
}
|
|
@@ -62,9 +67,9 @@ const handleCallback = (props) => async (req, res) => {
|
|
|
62
67
|
};
|
|
63
68
|
exports.handleCallback = handleCallback;
|
|
64
69
|
// NOTE: typically handling: "/api/webhooks/app/uninstalled"
|
|
65
|
-
const handleAppUninstalled = (
|
|
66
|
-
const { PAGE_PATHS } =
|
|
67
|
-
const { message, statusCode = 302, redirectUrl = `${PAGE_PATHS[utils_1.PAGE_ROUTE_NAMES.ERROR]}?invalid_uninstall_response`, } = await utils_1.uninstallHelper(
|
|
70
|
+
const handleAppUninstalled = (serverRuntimeConfig) => async (req, res) => {
|
|
71
|
+
const { PAGE_PATHS } = serverRuntimeConfig;
|
|
72
|
+
const { message, statusCode = 302, redirectUrl = `${PAGE_PATHS[utils_1.PAGE_ROUTE_NAMES.ERROR]}?invalid_uninstall_response`, } = await utils_1.uninstallHelper({ req, serverRuntimeConfig });
|
|
68
73
|
if (statusCode >= 300 && statusCode < 400) {
|
|
69
74
|
return res.redirect(statusCode, redirectUrl);
|
|
70
75
|
}
|
package/dist/apiHandlers.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apiHandlers.js","sourceRoot":"","sources":["../src/apiHandlers.js"],"names":[],"mappings":";;;AAAA,gDAAgD;AAChD,sDAA+C;AAE/C,mCAOgB;AAET,MAAM,UAAU,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"apiHandlers.js","sourceRoot":"","sources":["../src/apiHandlers.js"],"names":[],"mappings":"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"}
|
package/dist/apiHelpers.d.ts
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
export function restHelper({ req, res, params: _params,
|
|
2
|
-
[x: string]: any;
|
|
1
|
+
export function restHelper({ req, res, params: _params, serverRuntimeConfig }: {
|
|
3
2
|
req: any;
|
|
4
3
|
res: any;
|
|
5
4
|
params: any;
|
|
5
|
+
serverRuntimeConfig: any;
|
|
6
6
|
}): Promise<{
|
|
7
7
|
statusCode: number;
|
|
8
8
|
message: string;
|
|
@@ -19,11 +19,11 @@ export function restHelper({ req, res, params: _params, ...props }: {
|
|
|
19
19
|
message?: undefined;
|
|
20
20
|
response?: undefined;
|
|
21
21
|
}>;
|
|
22
|
-
export function graphHelper({ req, res, params: _params,
|
|
23
|
-
[x: string]: any;
|
|
22
|
+
export function graphHelper({ req, res, params: _params, serverRuntimeConfig }: {
|
|
24
23
|
req: any;
|
|
25
24
|
res: any;
|
|
26
25
|
params: any;
|
|
26
|
+
serverRuntimeConfig: any;
|
|
27
27
|
}): Promise<{
|
|
28
28
|
statusCode: number;
|
|
29
29
|
message: string;
|
|
@@ -40,10 +40,10 @@ export function graphHelper({ req, res, params: _params, ...props }: {
|
|
|
40
40
|
message?: undefined;
|
|
41
41
|
response?: undefined;
|
|
42
42
|
}>;
|
|
43
|
-
export function authHelper({ req, res,
|
|
44
|
-
[x: string]: any;
|
|
43
|
+
export function authHelper({ req, res, serverRuntimeConfig }: {
|
|
45
44
|
req: any;
|
|
46
45
|
res: any;
|
|
46
|
+
serverRuntimeConfig: any;
|
|
47
47
|
}): Promise<{
|
|
48
48
|
statusCode: number;
|
|
49
49
|
redirectUrl: string;
|
|
@@ -53,10 +53,10 @@ export function authHelper({ req, res, ...props }: {
|
|
|
53
53
|
message: string;
|
|
54
54
|
redirectUrl?: undefined;
|
|
55
55
|
}>;
|
|
56
|
-
export function callbackHelper({ req, res,
|
|
57
|
-
[x: string]: any;
|
|
56
|
+
export function callbackHelper({ req, res, serverRuntimeConfig }: {
|
|
58
57
|
req: any;
|
|
59
58
|
res: any;
|
|
59
|
+
serverRuntimeConfig: any;
|
|
60
60
|
}): Promise<{
|
|
61
61
|
statusCode: number;
|
|
62
62
|
redirectUrl: string;
|
|
@@ -66,9 +66,9 @@ export function callbackHelper({ req, res, ...props }: {
|
|
|
66
66
|
message: string;
|
|
67
67
|
redirectUrl?: undefined;
|
|
68
68
|
}>;
|
|
69
|
-
export function uninstallHelper({ req,
|
|
70
|
-
[x: string]: any;
|
|
69
|
+
export function uninstallHelper({ req, serverRuntimeConfig }: {
|
|
71
70
|
req: any;
|
|
71
|
+
serverRuntimeConfig: any;
|
|
72
72
|
}): Promise<{
|
|
73
73
|
statusCode: number;
|
|
74
74
|
message: string;
|
package/dist/apiHelpers.js
CHANGED
|
@@ -14,11 +14,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
14
14
|
exports.uninstallHelper = exports.callbackHelper = exports.authHelper = exports.graphHelper = exports.restHelper = void 0;
|
|
15
15
|
const shopify_api_1 = require("@shopify/shopify-api");
|
|
16
16
|
const utils_1 = require("./utils");
|
|
17
|
-
const restHelper = async (
|
|
18
|
-
var { req, res, params: _params } = _a, props = __rest(_a, ["req", "res", "params"]);
|
|
17
|
+
const restHelper = async ({ req, res, params: _params, serverRuntimeConfig }) => {
|
|
19
18
|
const { query: _query, method: _method, body: _body } = req;
|
|
20
19
|
const { shop } = _query !== null && _query !== void 0 ? _query : {};
|
|
21
|
-
const
|
|
20
|
+
const _a = _params !== null && _params !== void 0 ? _params : {}, { method: methodParam, query: queryParam, body: bodyParam, path } = _a, params = __rest(_a, ["method", "query", "body", "path"]);
|
|
22
21
|
let query = queryParam !== null && queryParam !== void 0 ? queryParam : _query;
|
|
23
22
|
const body = bodyParam !== null && bodyParam !== void 0 ? bodyParam : _body;
|
|
24
23
|
const method = utils_1.ensureString(methodParam !== null && methodParam !== void 0 ? methodParam : _method).toLowerCase();
|
|
@@ -35,7 +34,7 @@ const restHelper = async (_a) => {
|
|
|
35
34
|
message: 'Invalid arguments',
|
|
36
35
|
};
|
|
37
36
|
}
|
|
38
|
-
const shopify = utils_1.getInitializedShopify(
|
|
37
|
+
const shopify = utils_1.getInitializedShopify(serverRuntimeConfig, shop);
|
|
39
38
|
console.warn(`>>> > restHelper > shopify`, shopify);
|
|
40
39
|
try {
|
|
41
40
|
const session = await shopify.Utils.loadCurrentSession(req, res);
|
|
@@ -66,7 +65,7 @@ const restHelper = async (_a) => {
|
|
|
66
65
|
case error instanceof shopify.Errors.SessionNotFound: {
|
|
67
66
|
return {
|
|
68
67
|
statusCode: 302,
|
|
69
|
-
redirectUrl: utils_1.getRedirectUrl(
|
|
68
|
+
redirectUrl: utils_1.getRedirectUrl(serverRuntimeConfig, {
|
|
70
69
|
req,
|
|
71
70
|
res,
|
|
72
71
|
shop,
|
|
@@ -84,12 +83,11 @@ const restHelper = async (_a) => {
|
|
|
84
83
|
}
|
|
85
84
|
};
|
|
86
85
|
exports.restHelper = restHelper;
|
|
87
|
-
const graphHelper = async (
|
|
88
|
-
var { req, res, params: _params } = _a, props = __rest(_a, ["req", "res", "params"]);
|
|
86
|
+
const graphHelper = async ({ req, res, params: _params, serverRuntimeConfig }) => {
|
|
89
87
|
const { body, query: _query } = req;
|
|
90
88
|
const { shop } = _query !== null && _query !== void 0 ? _query : {};
|
|
91
89
|
const { data: _data } = body !== null && body !== void 0 ? body : {};
|
|
92
|
-
const
|
|
90
|
+
const _a = _params !== null && _params !== void 0 ? _params : {}, { data: dataParam, query: queryParam } = _a, params = __rest(_a, ["data", "query"]);
|
|
93
91
|
const data = dataParam !== null && dataParam !== void 0 ? dataParam : _data;
|
|
94
92
|
let query = queryParam !== null && queryParam !== void 0 ? queryParam : _query;
|
|
95
93
|
console.warn(`>>> > graphHelper > params`, params);
|
|
@@ -104,7 +102,7 @@ const graphHelper = async (_a) => {
|
|
|
104
102
|
message: 'Invalid arguments',
|
|
105
103
|
};
|
|
106
104
|
}
|
|
107
|
-
const shopify = utils_1.getInitializedShopify(
|
|
105
|
+
const shopify = utils_1.getInitializedShopify(serverRuntimeConfig, shop);
|
|
108
106
|
try {
|
|
109
107
|
const session = await shopify.Utils.loadCurrentSession(req, res);
|
|
110
108
|
// TODO refactor
|
|
@@ -132,7 +130,7 @@ const graphHelper = async (_a) => {
|
|
|
132
130
|
case error instanceof shopify.Errors.SessionNotFound: {
|
|
133
131
|
return {
|
|
134
132
|
statusCode: 302,
|
|
135
|
-
redirectUrl: utils_1.getRedirectUrl(
|
|
133
|
+
redirectUrl: utils_1.getRedirectUrl(serverRuntimeConfig, {
|
|
136
134
|
req,
|
|
137
135
|
res,
|
|
138
136
|
shop,
|
|
@@ -150,14 +148,13 @@ const graphHelper = async (_a) => {
|
|
|
150
148
|
}
|
|
151
149
|
};
|
|
152
150
|
exports.graphHelper = graphHelper;
|
|
153
|
-
const authHelper = async (
|
|
154
|
-
var { req, res } = _a, props = __rest(_a, ["req", "res"]);
|
|
151
|
+
const authHelper = async ({ req, res, serverRuntimeConfig }) => {
|
|
155
152
|
const { query } = req;
|
|
156
153
|
const { shop } = query !== null && query !== void 0 ? query : {};
|
|
157
154
|
try {
|
|
158
155
|
return {
|
|
159
156
|
statusCode: 302,
|
|
160
|
-
redirectUrl: utils_1.getRedirectUrl(
|
|
157
|
+
redirectUrl: utils_1.getRedirectUrl(serverRuntimeConfig, {
|
|
161
158
|
req,
|
|
162
159
|
res,
|
|
163
160
|
query,
|
|
@@ -175,9 +172,8 @@ const authHelper = async (_a) => {
|
|
|
175
172
|
}
|
|
176
173
|
};
|
|
177
174
|
exports.authHelper = authHelper;
|
|
178
|
-
const callbackHelper = async (
|
|
179
|
-
|
|
180
|
-
const { PAGE_PATHS, APP_WEBHOOKS } = props;
|
|
175
|
+
const callbackHelper = async ({ req, res, serverRuntimeConfig }) => {
|
|
176
|
+
const { PAGE_PATHS, APP_WEBHOOKS } = serverRuntimeConfig;
|
|
181
177
|
const { shop, host } = req.query;
|
|
182
178
|
if (!shop || !host) {
|
|
183
179
|
return {
|
|
@@ -185,10 +181,10 @@ const callbackHelper = async (_a) => {
|
|
|
185
181
|
redirectUrl: `${PAGE_PATHS[utils_1.PAGE_ROUTE_NAMES.ERROR]}?code=invalid_callback`,
|
|
186
182
|
};
|
|
187
183
|
}
|
|
188
|
-
const shopify = utils_1.getInitializedShopify(
|
|
184
|
+
const shopify = utils_1.getInitializedShopify(serverRuntimeConfig, shop);
|
|
189
185
|
try {
|
|
190
186
|
const session = await shopify.Auth.validateAuthCallback(req, res, req.query);
|
|
191
|
-
await utils_1.registerWebhooks(
|
|
187
|
+
await utils_1.registerWebhooks(serverRuntimeConfig, APP_WEBHOOKS, session);
|
|
192
188
|
// TODO check for billing redirect
|
|
193
189
|
const redirectUrl = shopify.Utils.getEmbeddedAppUrl(req);
|
|
194
190
|
return {
|
|
@@ -211,7 +207,7 @@ const callbackHelper = async (_a) => {
|
|
|
211
207
|
case error instanceof shopify.Errors.SessionNotFound: {
|
|
212
208
|
return {
|
|
213
209
|
statusCode: 302,
|
|
214
|
-
redirectUrl: utils_1.getRedirectUrl(
|
|
210
|
+
redirectUrl: utils_1.getRedirectUrl(serverRuntimeConfig, {
|
|
215
211
|
req,
|
|
216
212
|
res,
|
|
217
213
|
shop,
|
|
@@ -229,15 +225,14 @@ const callbackHelper = async (_a) => {
|
|
|
229
225
|
}
|
|
230
226
|
};
|
|
231
227
|
exports.callbackHelper = callbackHelper;
|
|
232
|
-
const uninstallHelper = async (
|
|
233
|
-
var _b, _c, _d
|
|
234
|
-
var { req } = _a, props = __rest(_a, ["req"]);
|
|
228
|
+
const uninstallHelper = async ({ req, serverRuntimeConfig }) => {
|
|
229
|
+
var _a, _b, _c, _d;
|
|
235
230
|
try {
|
|
236
231
|
const { domain } = req.body;
|
|
237
|
-
const shopify = utils_1.getInitializedShopify(
|
|
238
|
-
const existingSessions = await ((
|
|
232
|
+
const shopify = utils_1.getInitializedShopify(serverRuntimeConfig, domain);
|
|
233
|
+
const existingSessions = await ((_b = (_a = shopify.Context.SESSION_STORAGE) === null || _a === void 0 ? void 0 : _a.findSessionsByShop) === null || _b === void 0 ? void 0 : _b.call(_a, domain));
|
|
239
234
|
if (utils_1.arrayNotEmpty(existingSessions)) {
|
|
240
|
-
await ((
|
|
235
|
+
await ((_d = (_c = shopify.Context.SESSION_STORAGE) === null || _c === void 0 ? void 0 : _c.deleteSessions) === null || _d === void 0 ? void 0 : _d.call(_c, existingSessions.map((session) => session.id)));
|
|
241
236
|
}
|
|
242
237
|
return {
|
|
243
238
|
statusCode: 200,
|
package/dist/apiHelpers.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apiHelpers.js","sourceRoot":"","sources":["../src/apiHelpers.js"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,sDAA+C;AAE/C,mCAUgB;AAET,MAAM,UAAU,GAAG,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"apiHelpers.js","sourceRoot":"","sources":["../src/apiHelpers.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.1.1-alpha.
|
|
3
|
+
"version": "1.1.1-alpha.9",
|
|
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",
|