@agnostack/next-shopify 1.7.1-alpha.5 → 1.7.1-beta.10
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.js +2 -12
- package/dist/handlers/api/auth.js.map +1 -1
- package/dist/handlers/api/callback.js +6 -15
- package/dist/handlers/api/callback.js.map +1 -1
- package/dist/handlers/api/proxy.d.ts +1 -1
- package/dist/handlers/api/proxy.js +32 -4
- package/dist/handlers/api/proxy.js.map +1 -1
- package/dist/handlers/api/uninstall.js +23 -44
- package/dist/handlers/api/uninstall.js.map +1 -1
- package/dist/utils/shopify.js +9 -1
- package/dist/utils/shopify.js.map +1 -1
- package/dist/withShopify.js +10 -7
- package/dist/withShopify.js.map +1 -1
- package/package.json +2 -2
|
@@ -1,15 +1,13 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.handleAuth = void 0;
|
|
4
|
-
const runtime_1 = require("@shopify/shopify-api/runtime");
|
|
5
4
|
const utils_1 = require("../../utils");
|
|
6
5
|
// NOTE: typically handling: "/api/auth"
|
|
7
6
|
const handleAuth = (serverRuntimeConfig) => async (req, res) => {
|
|
8
7
|
var _a;
|
|
9
|
-
const {
|
|
8
|
+
const { API_URLS, API_PATHS, PAGE_PATHS } = serverRuntimeConfig;
|
|
10
9
|
const query = (_a = req.query) !== null && _a !== void 0 ? _a : {};
|
|
11
10
|
const { embedded, host, shop: _shop } = query !== null && query !== void 0 ? query : {};
|
|
12
|
-
console.log(`>>> ~ handleAuth query`, query);
|
|
13
11
|
const shopify = await utils_1.getInitializedShopify(serverRuntimeConfig);
|
|
14
12
|
const shop = shopify.utils.sanitizeShop(_shop);
|
|
15
13
|
if (utils_1.stringEmpty(shop)) {
|
|
@@ -22,16 +20,8 @@ const handleAuth = (serverRuntimeConfig) => async (req, res) => {
|
|
|
22
20
|
host,
|
|
23
21
|
}).toString();
|
|
24
22
|
const queryParams = new URLSearchParams(Object.assign(Object.assign({}, query), { shop, redirectUri: `${API_URLS[utils_1.API_ROUTE_NAMES.AUTH_CALLBACK]}?${redirectUriParams}` })).toString();
|
|
25
|
-
|
|
26
|
-
console.log(`>>> ~ handleAuth embedded url`, url);
|
|
27
|
-
return res.redirect(url);
|
|
23
|
+
return res.redirect(`${PAGE_PATHS[utils_1.PAGE_ROUTE_NAMES.EXIT]}?${queryParams}`);
|
|
28
24
|
}
|
|
29
|
-
const cookies = new runtime_1.Cookies(req, res, {
|
|
30
|
-
keys: [APP_CONFIG.apiSecretKey],
|
|
31
|
-
secure: true,
|
|
32
|
-
});
|
|
33
|
-
const stateFromCookie = await cookies.getAndVerify('shopify_app_state');
|
|
34
|
-
console.log(`>>> ~ handleAuth stateFromCookie`, stateFromCookie);
|
|
35
25
|
return shopify.auth.begin({
|
|
36
26
|
shop,
|
|
37
27
|
isOnline: true,
|
|
@@ -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,wCAAwC;AACjC,MAAM,UAAU,GAAG,CAAC,mBAAmB,EAAE,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;;IACpE,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,UAAU,EAAE,GAAG,mBAAmB,CAAA;IAC/D,MAAM,KAAK,GAAG,MAAA,GAAG,CAAC,KAAK,mCAAI,EAAE,CAAA;IAC7B,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;IAEhE,MAAM,IAAI,GAAG,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,KAAK,CAAC,CAAA;IAC9C,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,oCAAoC;QACpC,MAAM,iBAAiB,GAAG,IAAI,eAAe,CAAC;YAC5C,IAAI;YACJ,IAAI;SACL,CAAC,CAAC,QAAQ,EAAE,CAAA;QACb,MAAM,WAAW,GAAG,IAAI,eAAe,iCAClC,KAAK,KACR,IAAI,EACJ,WAAW,EAAE,GAAG,QAAQ,CAAC,uBAAe,CAAC,aAAa,CAAC,IAAI,iBAAiB,EAAE,IAC9E,CAAC,QAAQ,EAAE,CAAA;QAEb,OAAO,GAAG,CAAC,QAAQ,CAAC,GAAG,UAAU,CAAC,wBAAgB,CAAC,IAAI,CAAC,IAAI,WAAW,EAAE,CAAC,CAAA;KAC3E;IAED,OAAO,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC;QACxB,IAAI;QACJ,QAAQ,EAAE,IAAI;QACd,UAAU,EAAE,GAAG;QACf,WAAW,EAAE,GAAG;QAChB,YAAY,EAAE,SAAS,CAAC,uBAAe,CAAC,aAAa,CAAC;KACvD,CAAC,CAAA;AACJ,CAAC,CAAA;AAlCY,QAAA,UAAU,cAkCtB"}
|
|
@@ -2,12 +2,11 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.handleCallback = void 0;
|
|
4
4
|
const shopify_api_1 = require("@shopify/shopify-api");
|
|
5
|
-
const runtime_1 = require("@shopify/shopify-api/runtime");
|
|
6
5
|
const utils_1 = require("../../utils");
|
|
7
6
|
// NOTE: typically handling: "/api/auth/callback"
|
|
8
7
|
const handleCallback = (serverRuntimeConfig) => async (req, res) => {
|
|
9
8
|
var _a;
|
|
10
|
-
const {
|
|
9
|
+
const { PAGE_PATHS, PAYMENT_CONFIG, API_PATHS } = serverRuntimeConfig;
|
|
11
10
|
const { shop, host } = req.query;
|
|
12
11
|
if (utils_1.stringEmpty(shop) || utils_1.stringEmpty(host)) {
|
|
13
12
|
// HMMM: why is this a 303 (rather than a 302 or or anything)??
|
|
@@ -15,23 +14,15 @@ const handleCallback = (serverRuntimeConfig) => async (req, res) => {
|
|
|
15
14
|
}
|
|
16
15
|
let redirectUrl = `${PAGE_PATHS[utils_1.PAGE_ROUTE_NAMES.ERROR]}?invalid_callback_response`;
|
|
17
16
|
try {
|
|
18
|
-
const authPayload = { rawRequest: req, rawResponse: res };
|
|
19
17
|
const { shopify, storeSession } = await utils_1.getShopifyHelpers(serverRuntimeConfig, { shop });
|
|
20
|
-
const
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
});
|
|
24
|
-
const stateFromCookie = await cookies.getAndVerify('shopify_app_state');
|
|
25
|
-
console.log(`>>> ~ handleCallback stateFromCookie`, stateFromCookie);
|
|
26
|
-
const foo = await shopify.auth.callback(authPayload);
|
|
27
|
-
console.log(`>>> ~ handleCallback shopify.auth.callback`, foo);
|
|
28
|
-
const { session } = foo;
|
|
18
|
+
const authPayload = { rawRequest: req, rawResponse: res };
|
|
19
|
+
// TODO investigate Error handling callback route. Cookie Error CookieNotFound [Error]: Cannot complete OAuth process. Could not find an OAuth cookie for shop url:
|
|
20
|
+
const { session } = await shopify.auth.callback(authPayload);
|
|
29
21
|
await storeSession(session.toObject());
|
|
30
22
|
await shopify.webhooks.register({ session });
|
|
31
23
|
// TODO: explore objectToQuerystring
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
// redirectUrl = `${embeddedURL}?${new URLSearchParams(req.query).toString()}`
|
|
24
|
+
const embeddedURL = await shopify.auth.getEmbeddedAppUrl(authPayload);
|
|
25
|
+
redirectUrl = `${embeddedURL}?${new URLSearchParams(req.query).toString()}`;
|
|
35
26
|
if (PAYMENT_CONFIG === null || PAYMENT_CONFIG === void 0 ? void 0 : PAYMENT_CONFIG.required) {
|
|
36
27
|
const confirmationUrl = await utils_1.ensureBilling({
|
|
37
28
|
shopify,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"callback.js","sourceRoot":"","sources":["../../../src/handlers/api/callback.js"],"names":[],"mappings":";;;AAAA,sDAK6B;
|
|
1
|
+
{"version":3,"file":"callback.js","sourceRoot":"","sources":["../../../src/handlers/api/callback.js"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
export function handleProxy(): (req: any, res: any, _params: any) => Promise<any>;
|
|
1
|
+
export function handleProxy(serverRuntimeConfig: any): (req: any, res: any, _params: any) => Promise<any>;
|
|
@@ -10,10 +10,15 @@ var __rest = (this && this.__rest) || function (s, e) {
|
|
|
10
10
|
}
|
|
11
11
|
return t;
|
|
12
12
|
};
|
|
13
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
14
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
15
|
+
};
|
|
13
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
14
17
|
exports.handleProxy = void 0;
|
|
15
18
|
// NOTE: api routes do NOT work in `next export`
|
|
19
|
+
const nextjs_cors_1 = __importDefault(require("nextjs-cors"));
|
|
16
20
|
const shopify_api_1 = require("@shopify/shopify-api");
|
|
21
|
+
const utils_1 = require("../../utils");
|
|
17
22
|
// import {
|
|
18
23
|
// isType,
|
|
19
24
|
// stringEmpty,
|
|
@@ -24,10 +29,33 @@ const shopify_api_1 = require("@shopify/shopify-api");
|
|
|
24
29
|
// getAuthErrorResponse,
|
|
25
30
|
// ShopifyAuthenticationError,
|
|
26
31
|
// } from '../../utils'
|
|
27
|
-
const handleProxy = () => async (req, res, _params) => {
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
32
|
+
const handleProxy = (serverRuntimeConfig) => async (req, res, _params) => {
|
|
33
|
+
const { ORIGIN_SAFELIST } = serverRuntimeConfig;
|
|
34
|
+
await nextjs_cors_1.default(req, res, {
|
|
35
|
+
methods: ['PUT', 'PATCH', 'POST', 'DELETE'],
|
|
36
|
+
origin: (origin, callback) => {
|
|
37
|
+
console.log(`>>> > handleProxy > origin:`, origin);
|
|
38
|
+
if ([
|
|
39
|
+
...utils_1.ensureArray(ORIGIN_SAFELIST),
|
|
40
|
+
'https://cdn.shopify.com'
|
|
41
|
+
].includes(origin)) {
|
|
42
|
+
console.log(`>>> > NextCors: SUCCESS > origin:`, origin);
|
|
43
|
+
return callback(null, true);
|
|
44
|
+
}
|
|
45
|
+
else {
|
|
46
|
+
console.log(`>>> > NextCors: ERROR > origin:`, origin);
|
|
47
|
+
return callback(new Error('Invalid CORS origin'));
|
|
48
|
+
}
|
|
49
|
+
},
|
|
50
|
+
optionsSuccessStatus: 200, // some legacy browsers (IE11, various SmartTVs) choke on 204
|
|
51
|
+
});
|
|
52
|
+
// TODO: explore sessionToken middleware??
|
|
53
|
+
// TODO: explore hmac middleware?
|
|
54
|
+
const { query: _query, method: _method, body: _body, headers: _headers } = req;
|
|
55
|
+
console.log(`>>> ~ req`, { req, _query, _method, _body });
|
|
56
|
+
const { 'x-proxy-source': proxySource, authorization, } = _headers !== null && _headers !== void 0 ? _headers : {};
|
|
57
|
+
console.log(`>>> > handleProxy > proxySource:`, proxySource);
|
|
58
|
+
console.log(`>>> > handleProxy > authorization:`, authorization);
|
|
31
59
|
// const { shop } = _query ?? {}
|
|
32
60
|
const _a = _params !== null && _params !== void 0 ? _params : {}, {
|
|
33
61
|
// method: methodParam,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"proxy.js","sourceRoot":"","sources":["../../../src/handlers/api/proxy.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"proxy.js","sourceRoot":"","sources":["../../../src/handlers/api/proxy.js"],"names":[],"mappings":"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"}
|
|
@@ -5,10 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.handleAppUninstalled = exports.rawBodyConfig = void 0;
|
|
7
7
|
const raw_body_1 = __importDefault(require("raw-body"));
|
|
8
|
-
|
|
9
|
-
// setAbstractConvertResponseFunc,
|
|
10
|
-
// setAbstractConvertIncomingResponseFunc,
|
|
11
|
-
// } from '@shopify/shopify-api/runtime'
|
|
8
|
+
const runtime_1 = require("@shopify/shopify-api/runtime");
|
|
12
9
|
const utils_1 = require("../../utils");
|
|
13
10
|
// NOTE raw request body is required for Shopify webhook validation
|
|
14
11
|
exports.rawBodyConfig = {
|
|
@@ -30,50 +27,32 @@ const handleAppUninstalled = (serverRuntimeConfig) => async (req, res) => {
|
|
|
30
27
|
return res.status(400).send('Invalid shop');
|
|
31
28
|
}
|
|
32
29
|
const { shopify, findSession, deleteSessions } = await utils_1.getShopifyHelpers(serverRuntimeConfig, { shop });
|
|
33
|
-
|
|
30
|
+
// NOTE these methods will intercept the response from shopify.webhooks.process
|
|
31
|
+
// NOTE setAbstractConvertIncomingResponseFunc is required if using setAbstractConvertResponseFunc
|
|
32
|
+
runtime_1.setAbstractConvertIncomingResponseFunc(async (args) => args);
|
|
33
|
+
runtime_1.setAbstractConvertResponseFunc(async (response, adapterArgs) => {
|
|
34
|
+
const { statusCode, statusText } = utils_1.ensureObject(response);
|
|
35
|
+
const { type, rawResponse } = utils_1.ensureObject(adapterArgs);
|
|
36
|
+
// NOTE additional check (before removing sessions) to ensure this is the uninstall response scenario (although this nay not be needed)
|
|
37
|
+
if (type === utils_1.API_WEBHOOK_TOPICS.APP_UNINSTALLED && statusCode === 200) {
|
|
38
|
+
try {
|
|
39
|
+
const sessionsIds = await findSession(shop);
|
|
40
|
+
if (utils_1.arrayNotEmpty(sessionsIds)) {
|
|
41
|
+
await deleteSessions(sessionsIds.map(({ id }) => id));
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
catch (error) {
|
|
45
|
+
return rawResponse.status(500).send(error === null || error === void 0 ? void 0 : error.message);
|
|
46
|
+
}
|
|
47
|
+
}
|
|
48
|
+
return rawResponse.status(statusCode).send(statusText);
|
|
49
|
+
});
|
|
50
|
+
return shopify.webhooks.process({
|
|
34
51
|
rawBody: rawBody.toString(),
|
|
35
52
|
rawRequest: req,
|
|
36
53
|
rawResponse: res,
|
|
54
|
+
type: utils_1.API_WEBHOOK_TOPICS.APP_UNINSTALLED,
|
|
37
55
|
});
|
|
38
|
-
console.log(`>>> ~ handleAppUninstalled shopify.webhooks.validate`, foo);
|
|
39
|
-
const { valid } = foo;
|
|
40
|
-
if (valid) {
|
|
41
|
-
try {
|
|
42
|
-
const sessionsIds = await findSession(shop);
|
|
43
|
-
if (utils_1.arrayNotEmpty(sessionsIds)) {
|
|
44
|
-
await deleteSessions(sessionsIds.map(({ id }) => id));
|
|
45
|
-
}
|
|
46
|
-
return res.status(200).send('success');
|
|
47
|
-
}
|
|
48
|
-
catch (error) {
|
|
49
|
-
return res.status(500).send(error === null || error === void 0 ? void 0 : error.message);
|
|
50
|
-
}
|
|
51
|
-
}
|
|
52
|
-
// // NOTE these methods will intercept the response from shopify.webhooks.process
|
|
53
|
-
// // NOTE setAbstractConvertIncomingResponseFunc is required if using setAbstractConvertResponseFunc
|
|
54
|
-
// setAbstractConvertIncomingResponseFunc(async (args) => args)
|
|
55
|
-
// setAbstractConvertResponseFunc(async (response, adapterArgs) => {
|
|
56
|
-
// const { statusCode, statusText } = ensureObject(response)
|
|
57
|
-
// const { type, rawResponse } = ensureObject(adapterArgs)
|
|
58
|
-
// // NOTE additional check (before removing sessions) to ensure this is the uninstall response scenario (although this nay not be needed)
|
|
59
|
-
// if (type === API_WEBHOOK_TOPICS.APP_UNINSTALLED && statusCode === 200) {
|
|
60
|
-
// try {
|
|
61
|
-
// const sessionsIds = await findSession(shop)
|
|
62
|
-
// if (arrayNotEmpty(sessionsIds)) {
|
|
63
|
-
// await deleteSessions(sessionsIds.map(({ id }) => id))
|
|
64
|
-
// }
|
|
65
|
-
// } catch (error) {
|
|
66
|
-
// return rawResponse.status(500).send(error?.message)
|
|
67
|
-
// }
|
|
68
|
-
// }
|
|
69
|
-
// return rawResponse.status(statusCode).send(statusText)
|
|
70
|
-
// })
|
|
71
|
-
// return shopify.webhooks.process({
|
|
72
|
-
// rawBody: rawBody.toString(),
|
|
73
|
-
// rawRequest: req,
|
|
74
|
-
// rawResponse: res,
|
|
75
|
-
// type: API_WEBHOOK_TOPICS.APP_UNINSTALLED,
|
|
76
|
-
// })
|
|
77
56
|
}
|
|
78
57
|
catch (error) {
|
|
79
58
|
console.error('Error handling uninstall', error);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"uninstall.js","sourceRoot":"","sources":["../../../src/handlers/api/uninstall.js"],"names":[],"mappings":";;;;;;AAAA,wDAAiC;AACjC,
|
|
1
|
+
{"version":3,"file":"uninstall.js","sourceRoot":"","sources":["../../../src/handlers/api/uninstall.js"],"names":[],"mappings":";;;;;;AAAA,wDAAiC;AACjC,0DAGqC;AAErC,uCAMoB;AAEpB,mEAAmE;AACtD,QAAA,aAAa,GAAG;IAC3B,GAAG,EAAE;QACH,UAAU,EAAE,KAAK;KAClB;CACF,CAAA;AAED,4DAA4D;AACrD,MAAM,oBAAoB,GAAG,CAAC,mBAAmB,EAAE,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;IAC9E,mEAAmE;IACnE,MAAM,OAAO,GAAG,MAAM,kBAAU,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;QACpD,OAAO,CAAC,KAAK,CAAC,6CAA6C,EAAE,KAAK,CAAC,CAAA;QAEnE,2EAA2E;QAC3E,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,4BAA4B,CAAC,CAAA;IAC3D,CAAC,CAAC,CAAA;IAEF,IAAI;QACF,MAAM,IAAI,GAAG,GAAG,CAAC,OAAO,CAAC,uBAAuB,CAAC,CAAA;QAEjD,IAAI,mBAAW,CAAC,IAAI,CAAC,EAAE;YACrB,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,CAAA;SAC5C;QAED,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,GAAG,MAAM,yBAAiB,CAAC,mBAAmB,EAAE,EAAE,IAAI,EAAE,CAAC,CAAA;QAEvG,+EAA+E;QAC/E,kGAAkG;QAClG,gDAAsC,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,CAAA;QAC5D,wCAA8B,CAAC,KAAK,EAAE,QAAQ,EAAE,WAAW,EAAE,EAAE;YAC7D,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,GAAG,oBAAY,CAAC,QAAQ,CAAC,CAAA;YACzD,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,GAAG,oBAAY,CAAC,WAAW,CAAC,CAAA;YAEvD,uIAAuI;YACvI,IAAI,IAAI,KAAK,0BAAkB,CAAC,eAAe,IAAI,UAAU,KAAK,GAAG,EAAE;gBACrE,IAAI;oBACF,MAAM,WAAW,GAAG,MAAM,WAAW,CAAC,IAAI,CAAC,CAAA;oBAC3C,IAAI,qBAAa,CAAC,WAAW,CAAC,EAAE;wBAC9B,MAAM,cAAc,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,CAAA;qBACtD;iBACF;gBAAC,OAAO,KAAK,EAAE;oBACd,OAAO,WAAW,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,OAAO,CAAC,CAAA;iBACpD;aACF;YAED,OAAO,WAAW,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;QACxD,CAAC,CAAC,CAAA;QAEF,OAAO,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC;YAC9B,OAAO,EAAE,OAAO,CAAC,QAAQ,EAAE;YAC3B,UAAU,EAAE,GAAG;YACf,WAAW,EAAE,GAAG;YAChB,IAAI,EAAE,0BAAkB,CAAC,eAAe;SACzC,CAAC,CAAA;KACH;IAAC,OAAO,KAAK,EAAE;QACd,OAAO,CAAC,KAAK,CAAC,0BAA0B,EAAE,KAAK,CAAC,CAAA;QAChD,sFAAsF;QACtF,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAA;KACxD;AACH,CAAC,CAAA;AAnDY,QAAA,oBAAoB,wBAmDhC"}
|
package/dist/utils/shopify.js
CHANGED
|
@@ -11,7 +11,7 @@ const getSecurityHeader = (shop) => (display_1.stringNotEmpty(shop)
|
|
|
11
11
|
exports.getSecurityHeader = getSecurityHeader;
|
|
12
12
|
const getInitializedShopify = async (serverRuntimeConfig) => {
|
|
13
13
|
var _a, _b, _c;
|
|
14
|
-
const { APP_CONFIG, APP_WEBHOOKS, INITIALIZED_SHOPIFY } = serverRuntimeConfig;
|
|
14
|
+
const { APP_CONFIG, APP_WEBHOOKS, INITIALIZED_SHOPIFY, SHOPIFY_RUN_MODE } = serverRuntimeConfig;
|
|
15
15
|
let initializedShopify = INITIALIZED_SHOPIFY;
|
|
16
16
|
if (initializedShopify) {
|
|
17
17
|
const configurableWebhookTopics = Object.keys(APP_WEBHOOKS);
|
|
@@ -21,6 +21,14 @@ const getInitializedShopify = async (serverRuntimeConfig) => {
|
|
|
21
21
|
return initializedShopify;
|
|
22
22
|
}
|
|
23
23
|
}
|
|
24
|
+
if ((SHOPIFY_RUN_MODE !== 'cli') &&
|
|
25
|
+
(!APP_CONFIG.apiSecretKey ||
|
|
26
|
+
!APP_CONFIG.hostName ||
|
|
27
|
+
!APP_CONFIG.apiKey ||
|
|
28
|
+
!APP_CONFIG.scopes)) {
|
|
29
|
+
// NOTE: this should handle running in next to test non-shopify functionality
|
|
30
|
+
return initializedShopify;
|
|
31
|
+
}
|
|
24
32
|
initializedShopify = shopify_api_1.shopifyApi(APP_CONFIG);
|
|
25
33
|
initializedShopify.webhooks.addHandlers(Object.entries(APP_WEBHOOKS).reduce((_payload, [webhookTopic, webhooks]) => (Object.assign(Object.assign({}, _payload), { [webhookTopic]: display_1.ensureArray(webhooks).reduce((_topicWebhooks, { path, url }) => {
|
|
26
34
|
const callbackUrl = path || url;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shopify.js","sourceRoot":"","sources":["../../src/utils/shopify.js"],"names":[],"mappings":";;;AAAA,8CAA2C;AAC3C,sDAAiE;AAEjE,uCAAiF;AACjF,2CAAgD;AAEzC,MAAM,iBAAiB,GAAG,CAAC,IAAI,EAAE,EAAE,CAAC,CACzC,wBAAc,CAAC,IAAI,CAAC;IAClB,CAAC,CAAC,0DAA0D,IAAI,GAAG;IACnE,CAAC,CAAC,yBAAyB,CAC9B,CAAA;AAJY,QAAA,iBAAiB,qBAI7B;AAEM,MAAM,qBAAqB,GAAG,KAAK,EAAE,mBAAmB,EAAE,EAAE;;IACjE,MAAM,EAAE,UAAU,EAAE,YAAY,EAAE,mBAAmB,EAAE,GAAG,mBAAmB,CAAA;
|
|
1
|
+
{"version":3,"file":"shopify.js","sourceRoot":"","sources":["../../src/utils/shopify.js"],"names":[],"mappings":";;;AAAA,8CAA2C;AAC3C,sDAAiE;AAEjE,uCAAiF;AACjF,2CAAgD;AAEzC,MAAM,iBAAiB,GAAG,CAAC,IAAI,EAAE,EAAE,CAAC,CACzC,wBAAc,CAAC,IAAI,CAAC;IAClB,CAAC,CAAC,0DAA0D,IAAI,GAAG;IACnE,CAAC,CAAC,yBAAyB,CAC9B,CAAA;AAJY,QAAA,iBAAiB,qBAI7B;AAEM,MAAM,qBAAqB,GAAG,KAAK,EAAE,mBAAmB,EAAE,EAAE;;IACjE,MAAM,EAAE,UAAU,EAAE,YAAY,EAAE,mBAAmB,EAAE,gBAAgB,EAAE,GAAG,mBAAmB,CAAA;IAE/F,IAAI,kBAAkB,GAAG,mBAAmB,CAAA;IAE5C,IAAI,kBAAkB,EAAE;QACtB,MAAM,yBAAyB,GAAG,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAA;QAC3D,MAAM,eAAe,GAAG,MAAA,MAAM,CAAA,MAAA,MAAA,kBAAkB,aAAlB,kBAAkB,uBAAlB,kBAAkB,CAAE,QAAQ,0CAAE,cAAc,kDAAI,CAAA,mCAAI,EAAE,CAAA;QACpF,MAAM,WAAW,GAAG,qBAAW,CAAC,eAAe,EAAE,yBAAyB,CAAC,CAAA;QAE3E,IAAI,WAAW,IAAI,eAAe,CAAC,QAAQ,CAAC,8BAAkB,CAAC,eAAe,CAAC,EAAE;YAC/E,OAAO,kBAAkB,CAAA;SAC1B;KACF;IAED,IACE,CAAC,gBAAgB,KAAK,KAAK,CAAC;QAC5B,CACE,CAAC,UAAU,CAAC,YAAY;YACxB,CAAC,UAAU,CAAC,QAAQ;YACpB,CAAC,UAAU,CAAC,MAAM;YAClB,CAAC,UAAU,CAAC,MAAM,CACnB,EACD;QACA,6EAA6E;QAC7E,OAAO,kBAAkB,CAAA;KAC1B;IAED,kBAAkB,GAAG,wBAAU,CAAC,UAAU,CAAC,CAAA;IAC3C,kBAAkB,CAAC,QAAQ,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,MAAM,CAAC,CAC1E,QAAQ,EACR,CAAC,YAAY,EAAE,QAAQ,CAAC,EACxB,EAAE,CAAC,iCACA,QAAQ,KACX,CAAC,YAAY,CAAC,EAAE,qBAAW,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC,cAAc,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE,EAAE;YAC7E,MAAM,WAAW,GAAG,IAAI,IAAI,GAAG,CAAA;YAE/B,IAAI,qBAAW,CAAC,WAAW,CAAC,EAAE;gBAC5B,OAAO,cAAc,CAAA;aACtB;YAED,OAAO;gBACL,GAAG,cAAc;gBACjB;oBACE,cAAc,EAAE,4BAAc,CAAC,IAAI;oBACnC,WAAW;oBACX,QAAQ,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;wBAC9B,sDAAsD;wBACtD,OAAO,CAAC,GAAG,CAAC,+BAA+B,IAAI,IAAI,KAAK,EAAE,CAAC,CAAA;wBAE3D,OAAO,IAAI,CAAA;oBACb,CAAC;iBACF;aACF,CAAA;QACH,CAAC,EAAE,EAAE,CAAC,IACN,EAAE,EAAE,CAAC,CAAC,CAAA;IAER,OAAO,kBAAkB,CAAA;AAC3B,CAAC,CAAA;AA1DY,QAAA,qBAAqB,yBA0DjC"}
|
package/dist/withShopify.js
CHANGED
|
@@ -16,12 +16,13 @@ const shopify_api_1 = require("@shopify/shopify-api");
|
|
|
16
16
|
const next_plugins_1 = require("@agnostack/next-plugins");
|
|
17
17
|
const utils_1 = require("./utils");
|
|
18
18
|
const withShopify = async (nextPhase, _a) => {
|
|
19
|
+
var _b, _c;
|
|
19
20
|
var { nextConfig } = _a, config = __rest(_a, ["nextConfig"]);
|
|
20
|
-
const
|
|
21
|
-
const
|
|
21
|
+
const _d = nextConfig !== null && nextConfig !== void 0 ? nextConfig : {}, { basePath: _basePath, publicRuntimeConfig: _publicRuntimeConfig = {}, serverRuntimeConfig: __serverRuntimeConfig = {} } = _d, _nextConfig = __rest(_d, ["basePath", "publicRuntimeConfig", "serverRuntimeConfig"]);
|
|
22
|
+
const _e = config !== null && config !== void 0 ? config : {}, {
|
|
22
23
|
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
|
23
|
-
defaultConfig } =
|
|
24
|
-
pluginConfig = __rest(
|
|
24
|
+
defaultConfig } = _e, // NOTE: This is here in case we need anything from it
|
|
25
|
+
pluginConfig = __rest(_e, ["defaultConfig"]);
|
|
25
26
|
const basePath = utils_1.ensureString(_basePath);
|
|
26
27
|
const { data, interactive, paymentConfig, firebaseConfig, appWebhooks, apiRoutes: { [utils_1.API_ROUTE_NAMES.AUTH]: _apiRouteAuth = '/api/auth', [utils_1.API_ROUTE_NAMES.AUTH_CALLBACK]: _apiRouteAuthCallback = '/api/auth/callback', [utils_1.API_ROUTE_NAMES.APP_UNINSTALLED]: _apiRouteAppUninstalled = '/api/webhooks/app/uninstalled', } = {}, pageRoutes: { [utils_1.PAGE_ROUTE_NAMES.EXIT]: _pageRouteExit = '/exit', [utils_1.PAGE_ROUTE_NAMES.ERROR]: _pageRouteError = '/error', } = {}, params: { APP_ID: _appId, URL: netlifyUrl, HOST: shopifyCLIUrl, 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: _apiRouteParamAuth, NEXT_PUBLIC_APP_ROUTE_API_AUTH_CALLBACK: _apiRouteParamAuthCallback, NEXT_PUBLIC_APP_ROUTE_API_UNINSTALLED: _apiRouteParamAppUninstalled, NEXT_PUBLIC_FB_ROOT_COLLECTION: FB_ROOT_COLLECTION, SHOPIFY_API_PUBLIC_KEY: _shopifyPublicAPIKey, SHOPIFY_API_VERSION = shopify_api_1.LATEST_API_VERSION, SHOPIFY_API_SCOPES, SHOPIFY_API_KEY, SHOPIFY_RUN_MODE, } = {}, } = pluginConfig !== null && pluginConfig !== void 0 ? pluginConfig : {};
|
|
27
28
|
const SHOPIFY_API_PUBLIC_KEY = NEXT_PUBLIC_SHOPIFY_API_KEY || _shopifyPublicAPIKey;
|
|
@@ -29,7 +30,10 @@ const withShopify = async (nextPhase, _a) => {
|
|
|
29
30
|
const APP_ID = NEXT_PUBLIC_SHOPIFY_API_ID || _appId || SHOPIFY_API_PUBLIC_KEY;
|
|
30
31
|
const appBaseUrl = NEXT_PUBLIC_APP_BASE_URL || netlifyUrl || shopifyCLIUrl;
|
|
31
32
|
const APP_BASE_URL = `${appBaseUrl}${basePath}`;
|
|
32
|
-
const appUrl = new URL(appBaseUrl);
|
|
33
|
+
const appUrl = appBaseUrl ? new URL(appBaseUrl) : undefined;
|
|
34
|
+
if ((SHOPIFY_RUN_MODE === 'cli') && !appUrl) {
|
|
35
|
+
throw new Error('Error initializing with Shopify');
|
|
36
|
+
}
|
|
33
37
|
const { [utils_1.PAGE_ROUTE_NAMES.EXIT]: pageRouteExit, [utils_1.PAGE_ROUTE_NAMES.ERROR]: pageRouteError, [utils_1.API_ROUTE_NAMES.AUTH]: apiRouteAuth, [utils_1.API_ROUTE_NAMES.AUTH_CALLBACK]: apiRouteAuthCallback, [utils_1.API_ROUTE_NAMES.APP_UNINSTALLED]: apiRouteAppUninstalled, } = await next_plugins_1.getPrompts([
|
|
34
38
|
{
|
|
35
39
|
type: 'text',
|
|
@@ -74,10 +78,9 @@ const withShopify = async (nextPhase, _a) => {
|
|
|
74
78
|
};
|
|
75
79
|
const API_PATHS = Object.entries(API_ROUTES).reduce((_apiPaths, [routeName, route]) => (Object.assign(Object.assign({}, _apiPaths), { [routeName]: `${basePath}${route}` })), {});
|
|
76
80
|
const API_URLS = Object.entries(API_PATHS).reduce((_apiUrls, [routeName, routePath]) => (Object.assign(Object.assign({}, _apiUrls), { [routeName]: `${appBaseUrl}${routePath}` })), {});
|
|
77
|
-
const APP_HOST_NAME = appUrl.hostname;
|
|
78
81
|
const PAYMENT_CONFIG = utils_1.generatePaymentConfig(Object.assign(Object.assign({}, data), { paymentConfig, SHOPIFY_RUN_MODE }));
|
|
79
82
|
const { name: billingName, config: billingConfig } = utils_1.ensureObject(PAYMENT_CONFIG);
|
|
80
|
-
const APP_CONFIG = Object.assign({ apiVersion: SHOPIFY_API_VERSION, apiKey: SHOPIFY_API_PUBLIC_KEY, apiSecretKey: SHOPIFY_API_KEY, hostName:
|
|
83
|
+
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: (_b = appUrl === null || appUrl === void 0 ? void 0 : appUrl.protocol) === null || _b === void 0 ? void 0 : _b.replace(':', ''), scopes: (_c = SHOPIFY_API_SCOPES === null || SHOPIFY_API_SCOPES === void 0 ? void 0 : SHOPIFY_API_SCOPES.replace(/, /g, ',')) === null || _c === void 0 ? void 0 : _c.split(',') }, (utils_1.stringNotEmpty(billingName) && utils_1.objectNotEmpty(billingConfig)) && {
|
|
81
84
|
billing: {
|
|
82
85
|
[billingName]: billingConfig,
|
|
83
86
|
},
|
package/dist/withShopify.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"withShopify.js","sourceRoot":"","sources":["../src/withShopify.js"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,sDAAyD;AAEzD,0DAAoD;AAEpD,mCAWgB;AAET,MAAM,WAAW,GAAG,KAAK,EAAE,SAAS,EAAE,EAAyB,EAAE,EAAE
|
|
1
|
+
{"version":3,"file":"withShopify.js","sourceRoot":"","sources":["../src/withShopify.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.1-
|
|
3
|
+
"version": "1.7.1-beta.10",
|
|
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",
|
|
@@ -48,7 +48,7 @@
|
|
|
48
48
|
},
|
|
49
49
|
"dependencies": {
|
|
50
50
|
"@agnostack/next-plugins": "latest",
|
|
51
|
-
"@shopify/shopify-api": "7.
|
|
51
|
+
"@shopify/shopify-api": "7.1.0",
|
|
52
52
|
"browser-monads": "1.0.0",
|
|
53
53
|
"cookies": "0.8.0",
|
|
54
54
|
"luxon": "3.2.1",
|