@agnostack/next-shopify 1.9.0-beta.5 → 1.9.0-beta.7
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/lib/handlers/api/appInstallation.js +4 -4
- package/dist/lib/handlers/api/appInstallation.js.map +1 -1
- package/dist/lib/handlers/api/auth.js +6 -6
- package/dist/lib/handlers/api/auth.js.map +1 -1
- package/dist/lib/handlers/api/billing.js +4 -4
- package/dist/lib/handlers/api/billing.js.map +1 -1
- package/dist/lib/handlers/api/callback.js +11 -11
- package/dist/lib/handlers/api/callback.js.map +1 -1
- package/dist/lib/handlers/api/graph.js +11 -11
- package/dist/lib/handlers/api/graph.js.map +1 -1
- package/dist/lib/handlers/api/index.js +5 -1
- package/dist/lib/handlers/api/index.js.map +1 -1
- package/dist/lib/handlers/api/proxy.js +14 -14
- package/dist/lib/handlers/api/proxy.js.map +1 -1
- package/dist/lib/handlers/api/rest.js +7 -7
- package/dist/lib/handlers/api/rest.js.map +1 -1
- package/dist/lib/handlers/api/uninstall.js +4 -4
- package/dist/lib/handlers/api/uninstall.js.map +1 -1
- package/dist/lib/handlers/api/webhook.js +4 -4
- package/dist/lib/handlers/api/webhook.js.map +1 -1
- package/dist/lib/handlers/index.js +5 -1
- package/dist/lib/handlers/index.js.map +1 -1
- package/dist/lib/handlers/ssr/index.js +5 -1
- package/dist/lib/handlers/ssr/index.js.map +1 -1
- package/dist/lib/handlers/ssr/protect.js +7 -7
- package/dist/lib/handlers/ssr/protect.js.map +1 -1
- package/dist/lib/handlers/ssr/wrap.js +3 -3
- package/dist/lib/handlers/ssr/wrap.js.map +1 -1
- package/dist/lib/index.js +5 -1
- package/dist/lib/index.js.map +1 -1
- package/dist/lib/utils/billing.js +10 -10
- package/dist/lib/utils/billing.js.map +1 -1
- package/dist/lib/utils/crypto.js +2 -2
- package/dist/lib/utils/crypto.js.map +1 -1
- package/dist/lib/utils/firebase.js +4 -4
- package/dist/lib/utils/firebase.js.map +1 -1
- package/dist/lib/utils/index.js +5 -1
- package/dist/lib/utils/index.js.map +1 -1
- package/dist/lib/utils/session.js +17 -17
- package/dist/lib/utils/session.js.map +1 -1
- package/dist/lib/utils/shopify-api-js/oauth.js +5 -5
- package/dist/lib/utils/shopify-api-js/oauth.js.map +1 -1
- package/dist/lib/utils/shopify.js +12 -12
- package/dist/lib/utils/shopify.js.map +1 -1
- package/dist/lib/withShopify.js +12 -12
- package/dist/lib/withShopify.js.map +1 -1
- package/dist/runtime/index.js +5 -1
- package/dist/runtime/index.js.map +1 -1
- package/dist/shared/display.js +33 -33
- package/dist/shared/display.js.map +1 -1
- package/dist/shared/index.js +5 -1
- package/dist/shared/index.js.map +1 -1
- package/package.json +5 -5
|
@@ -57,16 +57,16 @@ const APP_INSTALLATION_QUERY = `
|
|
|
57
57
|
// NOTE: typically handling: "/api/admin/installation/[appId]"
|
|
58
58
|
const handleLoadAppInstallation = (serverRuntimeConfig) => (req, res, params) => __awaiter(void 0, void 0, void 0, function* () {
|
|
59
59
|
const { appId } = params !== null && params !== void 0 ? params : {};
|
|
60
|
-
if (shared_1.stringEmpty(appId)) {
|
|
60
|
+
if ((0, shared_1.stringEmpty)(appId)) {
|
|
61
61
|
return res.status(412).json({ message: 'Missing required param' });
|
|
62
62
|
}
|
|
63
|
-
const _handleGraph = graph_1.handleGraph(serverRuntimeConfig);
|
|
63
|
+
const _handleGraph = (0, graph_1.handleGraph)(serverRuntimeConfig);
|
|
64
64
|
return _handleGraph(req, res, {
|
|
65
65
|
query: APP_INSTALLATION_QUERY,
|
|
66
66
|
variables: { namespace: `${appId}-metafields` },
|
|
67
67
|
transform: (data) => {
|
|
68
68
|
const { id: appInstallationId, launchUrl, uninstallUrl, activeSubscriptions, oneTimePurchases: { nodes: oneTimePurchases, } = {}, metafields: { nodes: metafields, } = {}, } = data !== null && data !== void 0 ? data : {};
|
|
69
|
-
const activePurchases = shared_1.ensureArray(oneTimePurchases).reduce((_activePurchases, _a) => {
|
|
69
|
+
const activePurchases = (0, shared_1.ensureArray)(oneTimePurchases).reduce((_activePurchases, _a) => {
|
|
70
70
|
var { status } = _a, oneTimePurchase = __rest(_a, ["status"]);
|
|
71
71
|
return ([
|
|
72
72
|
..._activePurchases,
|
|
@@ -76,7 +76,7 @@ const handleLoadAppInstallation = (serverRuntimeConfig) => (req, res, params) =>
|
|
|
76
76
|
]);
|
|
77
77
|
}, []);
|
|
78
78
|
// NOTE: removing namespace for security
|
|
79
|
-
const appMetafields = shared_1.ensureArray(metafields).reduce((_appMetafields,
|
|
79
|
+
const appMetafields = (0, shared_1.ensureArray)(metafields).reduce((_appMetafields,
|
|
80
80
|
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
|
81
81
|
_a) => {
|
|
82
82
|
var
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"appInstallation.js","sourceRoot":"","sources":["../../../../src/lib/handlers/api/appInstallation.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;AAAA,4CAA0D;AAC1D,mCAAqC;AAErC,MAAM,sBAAsB,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA8B9B,CAAA;AAED,8DAA8D;AACvD,MAAM,yBAAyB,GAAG,CAAC,mBAAmB,EAAE,EAAE,CAAC,CAAO,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,EAAE;IAC3F,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,EAAE,CAAA;IAE9B,IAAI,oBAAW,
|
|
1
|
+
{"version":3,"file":"appInstallation.js","sourceRoot":"","sources":["../../../../src/lib/handlers/api/appInstallation.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;AAAA,4CAA0D;AAC1D,mCAAqC;AAErC,MAAM,sBAAsB,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA8B9B,CAAA;AAED,8DAA8D;AACvD,MAAM,yBAAyB,GAAG,CAAC,mBAAmB,EAAE,EAAE,CAAC,CAAO,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,EAAE;IAC3F,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,EAAE,CAAA;IAE9B,IAAI,IAAA,oBAAW,EAAC,KAAK,CAAC,EAAE;QACtB,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,wBAAwB,EAAE,CAAC,CAAA;KACnE;IAED,MAAM,YAAY,GAAG,IAAA,mBAAW,EAAC,mBAAmB,CAAC,CAAA;IAErD,OAAO,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE;QAC5B,KAAK,EAAE,sBAAsB;QAC7B,SAAS,EAAE,EAAE,SAAS,EAAE,GAAG,KAAK,aAAa,EAAE;QAC/C,SAAS,EAAE,CAAC,IAAI,EAAE,EAAE;YAClB,MAAM,EACJ,EAAE,EAAE,iBAAiB,EACrB,SAAS,EACT,YAAY,EACZ,mBAAmB,EACnB,gBAAgB,EAAE,EAChB,KAAK,EAAE,gBAAgB,GACxB,GAAG,EAAE,EACN,UAAU,EAAE,EACV,KAAK,EAAE,UAAU,GAClB,GAAG,EAAE,GACP,GAAG,IAAI,aAAJ,IAAI,cAAJ,IAAI,GAAI,EAAE,CAAA;YAEd,MAAM,eAAe,GAAG,IAAA,oBAAW,EAAC,gBAAgB,CAAC,CAAC,MAAM,CAAC,CAC3D,gBAAgB,EAChB,EAA8B,EAC9B,EAAE;oBADF,EAAE,MAAM,OAAsB,EAAjB,eAAe,cAA5B,UAA8B,CAAF;gBACzB,OAAA,CAAC;oBACJ,GAAG,gBAAgB;oBACnB,GAAG,CAAC,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC;wBACzB,eAAe;qBAChB,CAAC,CAAC,CAAC,EAAE;iBACP,CAAC,CAAA;aAAA,EAAE,EAAE,CAAC,CAAA;YAEP,wCAAwC;YACxC,MAAM,aAAa,GAAG,IAAA,oBAAW,EAAC,UAAU,CAAC,CAAC,MAAM,CAAC,CACnD,cAAc;YACd,6DAA6D;YAC7D,EAA4C,EAC5C,EAAE;;gBAFF,6DAA6D;gBAC7D,EAAE,SAAS,EAAE,UAAU,EAAE,GAAG,OAAgB,EAAX,SAAS;gBAD1C,6DAA6D;gBAC7D,oBAA4C,CAAF;gBACvC,OAAA,iCACA,cAAc,KACjB,CAAC,GAAG,CAAC,EAAE,SAAS,IAChB,CAAA;aAAA,EAAE,EAAE,CAAC,CAAA;YAEP,OAAO;gBACL,aAAa;gBACb,eAAe,gCACb,EAAE,EAAE,iBAAiB,EACrB,mBAAmB;oBACnB,eAAe,IACZ,SAAS,IAAI;oBACd,SAAS,EAAE,SAAS;iBACrB,GACE,YAAY,IAAI;oBACjB,YAAY,EAAE,YAAY;iBAC3B,CACF;aACF,CAAA;QACH,CAAC;KACF,CAAC,CAAA;AACJ,CAAC,CAAA,CAAA;AA9DY,QAAA,yBAAyB,6BA8DrC"}
|
|
@@ -30,21 +30,21 @@ const handleAuth = (serverRuntimeConfig) => (req, res, params) => __awaiter(void
|
|
|
30
30
|
const { isOnline } = params !== null && params !== void 0 ? params : {};
|
|
31
31
|
const _b = (_a = req.query) !== null && _a !== void 0 ? _a : {}, { reAuth: _reAuth } = _b, query = __rest(_b, ["reAuth"]);
|
|
32
32
|
const { embedded, state, host, shop: _shop } = query;
|
|
33
|
-
const reAuth = shared_1.isTrue(_reAuth, 'undefined');
|
|
34
|
-
const shopify = utils_1.getInitializedShopify(serverRuntimeConfig);
|
|
33
|
+
const reAuth = (0, shared_1.isTrue)(_reAuth, 'undefined');
|
|
34
|
+
const shopify = (0, utils_1.getInitializedShopify)(serverRuntimeConfig);
|
|
35
35
|
const shop = shopify.utils.sanitizeShop(_shop);
|
|
36
|
-
if (shared_1.stringEmpty(shop)) {
|
|
36
|
+
if ((0, shared_1.stringEmpty)(shop)) {
|
|
37
37
|
return res.redirect(`${PAGE_PATHS[shared_1.PAGE_ROUTE_NAMES.ERROR]}?code=no_shop_provided&type=handleAuth`);
|
|
38
38
|
}
|
|
39
39
|
if (embedded === '1') {
|
|
40
|
-
const callbackURL = utils_1.getCallback(API_URLS, { reAuth, isOnline });
|
|
40
|
+
const callbackURL = (0, utils_1.getCallback)(API_URLS, { reAuth, isOnline });
|
|
41
41
|
// TODO: explore objectToQuerystring
|
|
42
42
|
const redirectUriParams = new URLSearchParams({ shop, host, state }).toString();
|
|
43
43
|
const queryParams = new URLSearchParams(Object.assign(Object.assign({}, query), { shop, redirectUri: `${callbackURL}?${redirectUriParams}` })).toString();
|
|
44
44
|
return res.redirect(`${PAGE_PATHS[shared_1.PAGE_ROUTE_NAMES.EXIT]}?${queryParams}`);
|
|
45
45
|
}
|
|
46
|
-
const callbackPath = utils_1.getCallback(API_PATHS, { reAuth, isOnline });
|
|
47
|
-
return utils_1.beginAuth({
|
|
46
|
+
const callbackPath = (0, utils_1.getCallback)(API_PATHS, { reAuth, isOnline });
|
|
47
|
+
return (0, utils_1.beginAuth)({
|
|
48
48
|
shop,
|
|
49
49
|
state,
|
|
50
50
|
isOnline,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../../../src/lib/handlers/api/auth.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;AAAA,uCAIoB;AACpB,4CAIwB;AAExB,wEAAwE;AACjE,MAAM,UAAU,GAAG,CAAC,mBAAmB,EAAE,EAAE,CAAC,CAAO,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,EAAE;;IAC5E,MAAM,EACJ,UAAU,EACV,SAAS,EACT,QAAQ,EACR,UAAU,GACX,GAAG,mBAAmB,CAAA;IACvB,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,EAAE,CAAA;IACjC,MAAM,KAAgC,MAAA,GAAG,CAAC,KAAK,mCAAI,EAAE,EAA/C,EAAE,MAAM,EAAE,OAAO,OAA8B,EAAzB,KAAK,cAA3B,UAA6B,CAAkB,CAAA;IACrD,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,KAAK,CAAA;IACpD,MAAM,MAAM,GAAG,eAAM,
|
|
1
|
+
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../../../src/lib/handlers/api/auth.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;AAAA,uCAIoB;AACpB,4CAIwB;AAExB,wEAAwE;AACjE,MAAM,UAAU,GAAG,CAAC,mBAAmB,EAAE,EAAE,CAAC,CAAO,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,EAAE;;IAC5E,MAAM,EACJ,UAAU,EACV,SAAS,EACT,QAAQ,EACR,UAAU,GACX,GAAG,mBAAmB,CAAA;IACvB,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,EAAE,CAAA;IACjC,MAAM,KAAgC,MAAA,GAAG,CAAC,KAAK,mCAAI,EAAE,EAA/C,EAAE,MAAM,EAAE,OAAO,OAA8B,EAAzB,KAAK,cAA3B,UAA6B,CAAkB,CAAA;IACrD,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,KAAK,CAAA;IACpD,MAAM,MAAM,GAAG,IAAA,eAAM,EAAC,OAAO,EAAE,WAAW,CAAC,CAAA;IAE3C,MAAM,OAAO,GAAG,IAAA,6BAAqB,EAAC,mBAAmB,CAAC,CAAA;IAC1D,MAAM,IAAI,GAAG,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,KAAK,CAAC,CAAA;IAE9C,IAAI,IAAA,oBAAW,EAAC,IAAI,CAAC,EAAE;QACrB,OAAO,GAAG,CAAC,QAAQ,CAAC,GAAG,UAAU,CAAC,yBAAgB,CAAC,KAAK,CAAC,wCAAwC,CAAC,CAAA;KACnG;IAED,IAAI,QAAQ,KAAK,GAAG,EAAE;QACpB,MAAM,WAAW,GAAG,IAAA,mBAAW,EAAC,QAAQ,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAA;QAC/D,oCAAoC;QACpC,MAAM,iBAAiB,GAAG,IAAI,eAAe,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAA;QAC/E,MAAM,WAAW,GAAG,IAAI,eAAe,iCAClC,KAAK,KACR,IAAI,EACJ,WAAW,EAAE,GAAG,WAAW,IAAI,iBAAiB,EAAE,IAClD,CAAC,QAAQ,EAAE,CAAA;QAEb,OAAO,GAAG,CAAC,QAAQ,CAAC,GAAG,UAAU,CAAC,yBAAgB,CAAC,IAAI,CAAC,IAAI,WAAW,EAAE,CAAC,CAAA;KAC3E;IAED,MAAM,YAAY,GAAG,IAAA,mBAAW,EAAC,SAAS,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAA;IAEjE,OAAO,IAAA,iBAAS,EAAC;QACf,IAAI;QACJ,KAAK;QACL,QAAQ;QACR,YAAY;QACZ,UAAU,EAAE,GAAG;QACf,WAAW,EAAE,GAAG;QAChB,MAAM,EAAE,UAAU;KACnB,CAAC,CAAA;AACJ,CAAC,CAAA,CAAA;AA3CY,QAAA,UAAU,cA2CtB"}
|
|
@@ -37,12 +37,12 @@ const handleAppBilling = (serverRuntimeConfig) => (req, res) => __awaiter(void 0
|
|
|
37
37
|
var _a;
|
|
38
38
|
try {
|
|
39
39
|
const { 'x-shopify-shop-domain': shop } = (_a = req.headers) !== null && _a !== void 0 ? _a : {};
|
|
40
|
-
if (shared_1.stringEmpty(shop)) {
|
|
40
|
+
if ((0, shared_1.stringEmpty)(shop)) {
|
|
41
41
|
return res.status(200).json({ handler: 'billing', error: 'Missing shop' });
|
|
42
42
|
}
|
|
43
|
-
const { shopify, loadSession, updateSession } = yield utils_1.getShopifyHelpers(serverRuntimeConfig, { shop });
|
|
43
|
+
const { shopify, loadSession, updateSession } = yield (0, utils_1.getShopifyHelpers)(serverRuntimeConfig, { shop });
|
|
44
44
|
// NOTE raw request body is required for Shopify webhook validation
|
|
45
|
-
const _rawBody = yield raw_body_1.default(req);
|
|
45
|
+
const _rawBody = yield (0, raw_body_1.default)(req);
|
|
46
46
|
const rawBody = _rawBody.toString();
|
|
47
47
|
const _b = yield shopify.webhooks.validate({
|
|
48
48
|
rawBody,
|
|
@@ -54,7 +54,7 @@ const handleAppBilling = (serverRuntimeConfig) => (req, res) => __awaiter(void 0
|
|
|
54
54
|
let message = 'ignored';
|
|
55
55
|
const [eventType, { status } = {}] = Object.entries(JSON.parse(rawBody))[0];
|
|
56
56
|
if ((eventType === shared_1.BILLING_EVENT_TYPES.SUBSCRIPTION) && TERMINAL_STATUSES.includes(status)) {
|
|
57
|
-
const { Rest } = yield utils_1.getVerifiedClients(serverRuntimeConfig, { shop });
|
|
57
|
+
const { Rest } = yield (0, utils_1.getVerifiedClients)(serverRuntimeConfig, { shop });
|
|
58
58
|
// NOTE: this deletes the app in the case of subscription apps in a "terminal" state to cover the info in ShopifyApi docs for billing:
|
|
59
59
|
// "Note: the merchant may refuse payment when prompted or cancel subscriptions later on, but the app will already be installed at that point. We recommend using billing webhooks to revoke access for merchants when they cancel / decline payment."
|
|
60
60
|
yield Rest.delete({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"billing.js","sourceRoot":"","sources":["../../../../src/lib/handlers/api/billing.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wDAAiC;AAEjC,uCAGoB;AACpB,4CAGwB;AAExB,MAAM,iBAAiB,GAAG;IACxB,SAAS;IACT,UAAU;IACV,WAAW;CACZ,CAAA;AAED,wDAAwD;AACjD,MAAM,gBAAgB,GAAG,CAAC,mBAAmB,EAAE,EAAE,CAAC,CAAO,GAAG,EAAE,GAAG,EAAE,EAAE;;IAC1E,IAAI;QACF,MAAM,EAAE,uBAAuB,EAAE,IAAI,EAAE,GAAG,MAAA,GAAG,CAAC,OAAO,mCAAI,EAAE,CAAA;QAE3D,IAAI,oBAAW,
|
|
1
|
+
{"version":3,"file":"billing.js","sourceRoot":"","sources":["../../../../src/lib/handlers/api/billing.js"],"names":[],"mappings":"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"}
|
|
@@ -41,14 +41,14 @@ const handleCallback = (serverRuntimeConfig) => (req, res, params) => __awaiter(
|
|
|
41
41
|
const { isOnline, reAuth } = params !== null && params !== void 0 ? params : {};
|
|
42
42
|
const { shop, host, state } = (_a = req.query) !== null && _a !== void 0 ? _a : {};
|
|
43
43
|
const authPayload = { rawRequest: req, rawResponse: res };
|
|
44
|
-
if (shared_1.stringEmpty(shop) || shared_1.stringEmpty(host)) {
|
|
44
|
+
if ((0, shared_1.stringEmpty)(shop) || (0, shared_1.stringEmpty)(host)) {
|
|
45
45
|
// HMMM: why is this a 303 (rather than a 302 or or anything)??
|
|
46
46
|
return res.redirect(303, `${errorPath}?code=${shared_1.ERROR_CODES.INVALID_CALLBACK}`);
|
|
47
47
|
}
|
|
48
48
|
let redirectUrl = `${errorPath}?code=invalid_callback_response`;
|
|
49
49
|
let shopify;
|
|
50
50
|
try {
|
|
51
|
-
const { shopify: _shopify, storeSession, loadSession, ensureBilling } = yield utils_1.getShopifyHelpers(serverRuntimeConfig, { shop });
|
|
51
|
+
const { shopify: _shopify, storeSession, loadSession, ensureBilling } = yield (0, utils_1.getShopifyHelpers)(serverRuntimeConfig, { shop });
|
|
52
52
|
shopify = _shopify;
|
|
53
53
|
const { session: _session } = yield shopify.auth.callback(authPayload);
|
|
54
54
|
const session = _session.toObject();
|
|
@@ -56,8 +56,8 @@ const handleCallback = (serverRuntimeConfig) => (req, res, params) => __awaiter(
|
|
|
56
56
|
(PAYMENT_CONFIG === null || PAYMENT_CONFIG === void 0 ? void 0 : PAYMENT_CONFIG.required) &&
|
|
57
57
|
API_PATHS[shared_1.API_ROUTE_NAMES.AUTH_OFFLINE]);
|
|
58
58
|
const shouldStoreSession = isOnline || !isReviewMode;
|
|
59
|
-
const shouldProcessOfflineAuth = isOnline && shared_1.objectNotEmpty(webhooks) && API_PATHS[shared_1.API_ROUTE_NAMES.AUTH_OFFLINE];
|
|
60
|
-
const shouldRegisterWebhooks = !shared_1.isTrue(session === null || session === void 0 ? void 0 : session.isOnline) || !API_PATHS[shared_1.API_ROUTE_NAMES.AUTH_OFFLINE];
|
|
59
|
+
const shouldProcessOfflineAuth = isOnline && (0, shared_1.objectNotEmpty)(webhooks) && API_PATHS[shared_1.API_ROUTE_NAMES.AUTH_OFFLINE];
|
|
60
|
+
const shouldRegisterWebhooks = !(0, shared_1.isTrue)(session === null || session === void 0 ? void 0 : session.isOnline) || !API_PATHS[shared_1.API_ROUTE_NAMES.AUTH_OFFLINE];
|
|
61
61
|
const shouldCheckBilling = PAYMENT_CONFIG === null || PAYMENT_CONFIG === void 0 ? void 0 : PAYMENT_CONFIG.required;
|
|
62
62
|
// NOTE: billingStatus is a custom field we add when we're in review mode to handle reauth billing correctly
|
|
63
63
|
let billingStatus = 'PENDING';
|
|
@@ -82,7 +82,7 @@ const handleCallback = (serverRuntimeConfig) => (req, res, params) => __awaiter(
|
|
|
82
82
|
return res.redirect(302, `${API_PATHS[shared_1.API_ROUTE_NAMES.AUTH_OFFLINE]}?${queryParams}`);
|
|
83
83
|
}
|
|
84
84
|
if (shouldRegisterWebhooks) {
|
|
85
|
-
const webhookHandlers = utils_1.getWebhookHandlers(serverRuntimeConfig);
|
|
85
|
+
const webhookHandlers = (0, utils_1.getWebhookHandlers)(serverRuntimeConfig);
|
|
86
86
|
shopify.webhooks.addHandlers(webhookHandlers);
|
|
87
87
|
// NOTE: webhooks cannot use an online session to make API calls to Shopify (but not all webooks may be doing that for all apps)
|
|
88
88
|
yield shopify.webhooks.register({ session });
|
|
@@ -91,15 +91,15 @@ const handleCallback = (serverRuntimeConfig) => (req, res, params) => __awaiter(
|
|
|
91
91
|
redirectUrl = yield shopify.auth.getEmbeddedAppUrl(authPayload);
|
|
92
92
|
if (shouldCheckBilling) {
|
|
93
93
|
// NOTE this ensures while in "review" mode that we rebill each time
|
|
94
|
-
const skipBillingCheck = isReviewMode && (!shared_1.isTrue(reAuth) || (billingStatus != 'ACTIVE'));
|
|
94
|
+
const skipBillingCheck = isReviewMode && (!(0, shared_1.isTrue)(reAuth) || (billingStatus != 'ACTIVE'));
|
|
95
95
|
const confirmationUrl = yield ensureBilling(session, skipBillingCheck);
|
|
96
|
-
if (shared_1.stringNotEmpty(confirmationUrl)) {
|
|
96
|
+
if ((0, shared_1.stringNotEmpty)(confirmationUrl)) {
|
|
97
97
|
redirectUrl = confirmationUrl;
|
|
98
98
|
}
|
|
99
99
|
}
|
|
100
100
|
// NOTE confirm that state can be appended to the confirmationUrl,
|
|
101
101
|
// otherwise we can append to the redirectUrl above the billing check
|
|
102
|
-
redirectUrl = shared_1.appendQuery(redirectUrl, new URLSearchParams({ state }).toString());
|
|
102
|
+
redirectUrl = (0, shared_1.appendQuery)(redirectUrl, new URLSearchParams({ state }).toString());
|
|
103
103
|
}
|
|
104
104
|
catch (error) {
|
|
105
105
|
console.error('Error handling callback route', error);
|
|
@@ -108,8 +108,8 @@ const handleCallback = (serverRuntimeConfig) => (req, res, params) => __awaiter(
|
|
|
108
108
|
if (shopify) {
|
|
109
109
|
try {
|
|
110
110
|
const embeddedAppUrl = yield shopify.auth.getEmbeddedAppUrl(authPayload);
|
|
111
|
-
if (shared_1.stringNotEmpty(embeddedAppUrl)) {
|
|
112
|
-
baseErrorUrl = `${embeddedAppUrl}${shared_1.ensureLeadingSlash(errorPath)}`;
|
|
111
|
+
if ((0, shared_1.stringNotEmpty)(embeddedAppUrl)) {
|
|
112
|
+
baseErrorUrl = `${embeddedAppUrl}${(0, shared_1.ensureLeadingSlash)(errorPath)}`;
|
|
113
113
|
}
|
|
114
114
|
// eslint-disable-next-line no-empty
|
|
115
115
|
}
|
|
@@ -147,7 +147,7 @@ const handleCallback = (serverRuntimeConfig) => (req, res, params) => __awaiter(
|
|
|
147
147
|
break;
|
|
148
148
|
}
|
|
149
149
|
case error instanceof shopify_api_1.GraphqlQueryError: {
|
|
150
|
-
const errorMessages = shared_1.ensureArray((_b = error.response) === null || _b === void 0 ? void 0 : _b.errors).map(({ message }) => shared_1.ensureString(message));
|
|
150
|
+
const errorMessages = (0, shared_1.ensureArray)((_b = error.response) === null || _b === void 0 ? void 0 : _b.errors).map(({ message }) => (0, shared_1.ensureString)(message));
|
|
151
151
|
console.error(`${errorMessage}. GraphqlQuery Error ${errorMessages.join('. ')}`);
|
|
152
152
|
redirectUrl = `${baseErrorUrl}?code=${shared_1.ERROR_CODES.QUERY}`;
|
|
153
153
|
break;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"callback.js","sourceRoot":"","sources":["../../../../src/lib/handlers/api/callback.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;AAAA,sDAM6B;AAE7B,uCAGoB;AACpB,4CAcwB;AAExB;;;;;EAKE;AACK,MAAM,cAAc,GAAG,CAAC,mBAAmB,EAAE,EAAE,CAAC,CAAO,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,EAAE;;IAChF,MAUI,KAAA,mBAAmB,EAVjB,EACJ,SAAS,EACT,UAAU,EACV,cAAc,EACd,gBAAgB,OAMK,EALrB,oBAIM,EAJN,qBAII,EAAE,KAAA;IAHJ,6DAA6D;IAC7D,KAAC,2BAAkB,CAAC,eAAgB;IADpC,6DAA6D;IACvB,mBAAmB,SAAA,EACtD,QAAQ,cAHC,uCAIb,CACoB,CAAA;IACvB,MAAM,SAAS,GAAG,UAAU,CAAC,yBAAgB,CAAC,KAAK,CAAC,CAAA;IACpD,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,EAAE,CAAA;IACzC,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,MAAA,GAAG,CAAC,KAAK,mCAAI,EAAE,CAAA;IAC7C,MAAM,WAAW,GAAG,EAAE,UAAU,EAAE,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,CAAA;IAEzD,IAAI,oBAAW,
|
|
1
|
+
{"version":3,"file":"callback.js","sourceRoot":"","sources":["../../../../src/lib/handlers/api/callback.js"],"names":[],"mappings":"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"}
|
|
@@ -29,10 +29,10 @@ const handleGraph = (serverRuntimeConfig) => (req, res, params) => __awaiter(voi
|
|
|
29
29
|
const { body = '{}' } = req, _c = req.query, _d = _c === void 0 ? {} : _c, { shop, apiVersion } = _d, _query = __rest(_d, ["shop", "apiVersion"]);
|
|
30
30
|
const _e = params !== null && params !== void 0 ? params : JSON.parse(body), { query: graphQuery, variables: graphVariables, transform = (_data) => _data } = _e, graphParams = __rest(_e, ["query", "variables", "transform"]);
|
|
31
31
|
let query = _query;
|
|
32
|
-
if (shared_1.isType(query, 'string')) {
|
|
33
|
-
query = shared_1.querystringToObject(query);
|
|
32
|
+
if ((0, shared_1.isType)(query, 'string')) {
|
|
33
|
+
query = (0, shared_1.querystringToObject)(query);
|
|
34
34
|
}
|
|
35
|
-
if (shared_1.stringEmpty(shop) || shared_1.stringEmpty(graphQuery)) {
|
|
35
|
+
if ((0, shared_1.stringEmpty)(shop) || (0, shared_1.stringEmpty)(graphQuery)) {
|
|
36
36
|
return res.status(400).json({ message: 'Invalid arguments' });
|
|
37
37
|
}
|
|
38
38
|
let statusCode;
|
|
@@ -40,11 +40,11 @@ const handleGraph = (serverRuntimeConfig) => (req, res, params) => __awaiter(voi
|
|
|
40
40
|
let headers = {};
|
|
41
41
|
let message = 'Error handling query call';
|
|
42
42
|
try {
|
|
43
|
-
const { Graphql } = yield utils_1.getVerifiedClients(serverRuntimeConfig, { req, res, shop, apiVersion });
|
|
43
|
+
const { Graphql } = yield (0, utils_1.getVerifiedClients)(serverRuntimeConfig, { req, res, shop, apiVersion });
|
|
44
44
|
response = yield Graphql.query(Object.assign(Object.assign({ data: graphVariables ? {
|
|
45
45
|
query: graphQuery,
|
|
46
46
|
variables: graphVariables,
|
|
47
|
-
} : graphQuery }, shared_1.objectNotEmpty(query) && { query }), graphParams));
|
|
47
|
+
} : graphQuery }, (0, shared_1.objectNotEmpty)(query) && { query }), graphParams));
|
|
48
48
|
statusCode = 200;
|
|
49
49
|
}
|
|
50
50
|
catch (error) {
|
|
@@ -53,7 +53,7 @@ const handleGraph = (serverRuntimeConfig) => (req, res, params) => __awaiter(voi
|
|
|
53
53
|
switch (true) {
|
|
54
54
|
case error instanceof shared_1.ShopifyAuthenticationError: {
|
|
55
55
|
console.error(`${message}. Authentication Error.`, error);
|
|
56
|
-
const errorResponse = utils_1.getAuthErrorResponse(serverRuntimeConfig, { error, shop });
|
|
56
|
+
const errorResponse = (0, utils_1.getAuthErrorResponse)(serverRuntimeConfig, { error, shop });
|
|
57
57
|
statusCode = errorResponse.statusCode;
|
|
58
58
|
message = errorResponse.message;
|
|
59
59
|
// HMMMM, should this be:
|
|
@@ -72,7 +72,7 @@ const handleGraph = (serverRuntimeConfig) => (req, res, params) => __awaiter(voi
|
|
|
72
72
|
break;
|
|
73
73
|
}
|
|
74
74
|
case error instanceof shopify_api_1.GraphqlQueryError: {
|
|
75
|
-
const errorMessages = shared_1.ensureArray((_a = error.response) === null || _a === void 0 ? void 0 : _a.errors).map(({ message }) => shared_1.ensureString(message));
|
|
75
|
+
const errorMessages = (0, shared_1.ensureArray)((_a = error.response) === null || _a === void 0 ? void 0 : _a.errors).map(({ message }) => (0, shared_1.ensureString)(message));
|
|
76
76
|
console.error(`${message}. ${errorMessages.join('. ')}.`);
|
|
77
77
|
// HMMMM, should this be:
|
|
78
78
|
// message = `${message}. ${errorMessages.join('. ')}.`
|
|
@@ -92,10 +92,10 @@ const handleGraph = (serverRuntimeConfig) => (req, res, params) => __awaiter(voi
|
|
|
92
92
|
}
|
|
93
93
|
try {
|
|
94
94
|
const responseBody = (_b = response.body.data) !== null && _b !== void 0 ? _b : response.body;
|
|
95
|
-
const [_responseData] = Object.values(shared_1.ensureObject(responseBody));
|
|
96
|
-
const _f = shared_1.ensureObject(_responseData), { userErrors } = _f, responseData = __rest(_f, ["userErrors"]);
|
|
97
|
-
if (shared_1.arrayNotEmpty(userErrors)) {
|
|
98
|
-
const errorMessages = shared_1.ensureArray(userErrors).map(({ message }) => shared_1.ensureString(message));
|
|
95
|
+
const [_responseData] = Object.values((0, shared_1.ensureObject)(responseBody));
|
|
96
|
+
const _f = (0, shared_1.ensureObject)(_responseData), { userErrors } = _f, responseData = __rest(_f, ["userErrors"]);
|
|
97
|
+
if ((0, shared_1.arrayNotEmpty)(userErrors)) {
|
|
98
|
+
const errorMessages = (0, shared_1.ensureArray)(userErrors).map(({ message }) => (0, shared_1.ensureString)(message));
|
|
99
99
|
return res.status(500).json({ message: `${message}. ${errorMessages.join('. ')}.` });
|
|
100
100
|
}
|
|
101
101
|
// NOTE: sending in both to transform in case someone needs the userErrors
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"graph.js","sourceRoot":"","sources":["../../../../src/lib/handlers/api/graph.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;AAAA,sDAAsE;AAEtE,uCAGoB;AACpB,4CAUwB;AAEjB,MAAM,WAAW,GAAG,CAAC,mBAAmB,EAAE,EAAE,CAAC,CAAO,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,EAAE;;IAC7E,MAAM,EAAE,IAAI,GAAG,IAAI,KAAkD,GAAG,EAAnD,KAAgD,GAAG,MAAR,EAA3C,qBAAyC,EAAE,KAAA,EAA3C,EAAS,IAAI,EAAE,UAAU,OAAkB,EAAb,MAAM,cAA7B,sBAA+B,CAAa,CAAA;IACxE,MAAM,KAKF,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EALxB,EACJ,KAAK,EAAE,UAAU,EACjB,SAAS,EAAE,cAAc,EACzB,SAAS,GAAG,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,OAEA,EADzB,WAAW,cAJV,mCAKL,CAA6B,CAAA;IAE9B,IAAI,KAAK,GAAG,MAAM,CAAA;IAClB,IAAI,eAAM,
|
|
1
|
+
{"version":3,"file":"graph.js","sourceRoot":"","sources":["../../../../src/lib/handlers/api/graph.js"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
3
|
if (k2 === undefined) k2 = k;
|
|
4
|
-
Object.
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
5
9
|
}) : (function(o, m, k, k2) {
|
|
6
10
|
if (k2 === undefined) k2 = k;
|
|
7
11
|
o[k2] = m[k];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/lib/handlers/api/index.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/lib/handlers/api/index.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,oDAAiC;AACjC,yCAAsB;AACtB,4CAAyB;AACzB,6CAA0B;AAC1B,0CAAuB;AACvB,0CAAuB;AACvB,yCAAsB;AACtB,8CAA2B;AAC3B,4CAAyB;AAEzB,mEAAmE;AAC5D,MAAM,YAAY,GAAG,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;IACvC,GAAG,kBACD,UAAU,EAAE,KAAK,IACd,MAAM,CACV;CACF,CAAC,CAAA;AALW,QAAA,YAAY,gBAKvB"}
|
|
@@ -32,19 +32,19 @@ const utils_1 = require("../../utils");
|
|
|
32
32
|
const shared_1 = require("../../../shared");
|
|
33
33
|
const PROXY_TIMEOUT = 6000; // NOTE: 6 seconds
|
|
34
34
|
const verifyAppProxySignature = (signature, verifiable, sharedSecret) => {
|
|
35
|
-
const hmac = utils_1.generateHMAC(shared_1.objectToSortedString(verifiable), sharedSecret);
|
|
36
|
-
return utils_1.compareHashes(signature, hmac);
|
|
35
|
+
const hmac = (0, utils_1.generateHMAC)((0, shared_1.objectToSortedString)(verifiable), sharedSecret);
|
|
36
|
+
return (0, utils_1.compareHashes)(signature, hmac);
|
|
37
37
|
};
|
|
38
38
|
const handleProxy = (serverRuntimeConfig) => (req, res, _params) => __awaiter(void 0, void 0, void 0, function* () {
|
|
39
39
|
var _a;
|
|
40
40
|
const { APP_CONFIG, SETTING_REPLACEMENTS, TARGET_SAFELIST, ORIGIN_SAFELIST } = serverRuntimeConfig;
|
|
41
|
-
const targetSafelist = shared_1.ensureObject(TARGET_SAFELIST);
|
|
41
|
+
const targetSafelist = (0, shared_1.ensureObject)(TARGET_SAFELIST);
|
|
42
42
|
const targetOriginsSafelist = Object.keys(targetSafelist);
|
|
43
43
|
const originsSafelist = [
|
|
44
|
-
...shared_1.ensureArray(ORIGIN_SAFELIST),
|
|
44
|
+
...(0, shared_1.ensureArray)(ORIGIN_SAFELIST),
|
|
45
45
|
'https://cdn.shopify.com'
|
|
46
46
|
];
|
|
47
|
-
yield nextjs_cors_1.default(req, res, {
|
|
47
|
+
yield (0, nextjs_cors_1.default)(req, res, {
|
|
48
48
|
methods: ['PUT', 'PATCH', 'POST', 'DELETE'],
|
|
49
49
|
origin: (origin, callback) => {
|
|
50
50
|
var _a;
|
|
@@ -53,12 +53,12 @@ const handleProxy = (serverRuntimeConfig) => (req, res, _params) => __awaiter(vo
|
|
|
53
53
|
}
|
|
54
54
|
let _shop;
|
|
55
55
|
try {
|
|
56
|
-
_shop = shared_1.ensureString(origin).startsWith('http') ? new URL(origin).hostname : origin;
|
|
56
|
+
_shop = (0, shared_1.ensureString)(origin).startsWith('http') ? new URL(origin).hostname : origin;
|
|
57
57
|
}
|
|
58
58
|
catch (ignore) {
|
|
59
59
|
console.log('Ignoring error decoding origin', ignore);
|
|
60
60
|
}
|
|
61
|
-
if (_shop && shared_1.stringNotEmpty((_a = utils_1.getSanitizedShopData(_shop)) === null || _a === void 0 ? void 0 : _a.shop)) {
|
|
61
|
+
if (_shop && (0, shared_1.stringNotEmpty)((_a = (0, utils_1.getSanitizedShopData)(_shop)) === null || _a === void 0 ? void 0 : _a.shop)) {
|
|
62
62
|
return callback(null, true);
|
|
63
63
|
}
|
|
64
64
|
return callback(new Error('Invalid CORS origin'));
|
|
@@ -69,16 +69,16 @@ const handleProxy = (serverRuntimeConfig) => (req, res, _params) => __awaiter(vo
|
|
|
69
69
|
const { target: _target } = _params !== null && _params !== void 0 ? _params : {};
|
|
70
70
|
const { origin: target, hostname, pathname, search } = _target ? new URL(_target) : {};
|
|
71
71
|
const targetUrl = [pathname, search].filter(shared_1.stringNotEmpty).join('');
|
|
72
|
-
if (!targetUrl || shared_1.arrayEmpty(targetOriginsSafelist) || !targetOriginsSafelist.includes(hostname)) {
|
|
72
|
+
if (!targetUrl || (0, shared_1.arrayEmpty)(targetOriginsSafelist) || !targetOriginsSafelist.includes(hostname)) {
|
|
73
73
|
return res.status(407).json({ message: 'Unproxyable target.' });
|
|
74
74
|
}
|
|
75
75
|
const { query: _query, headers: _headers } = req;
|
|
76
|
-
const query = shared_1.ensureObject(_query);
|
|
76
|
+
const query = (0, shared_1.ensureObject)(_query);
|
|
77
77
|
// TODO!!!!!!: update this to not send as querystring/get via app itself somehow on backend?
|
|
78
78
|
const { signature, proxyEncoded } = query, verifiable = __rest(query, ["signature", "proxyEncoded"]);
|
|
79
79
|
const { shop: _shop, host: _host, timestamp, path_prefix } = verifiable;
|
|
80
|
-
const isShopifyOriginOrRelative = shared_1.stringNotEmpty(shared_1.ensureString(path_prefix).startsWith('http')
|
|
81
|
-
? (_a = utils_1.getSanitizedShopData(new URL(path_prefix).hostname)) === null || _a === void 0 ? void 0 : _a.shop
|
|
80
|
+
const isShopifyOriginOrRelative = (0, shared_1.stringNotEmpty)((0, shared_1.ensureString)(path_prefix).startsWith('http')
|
|
81
|
+
? (_a = (0, utils_1.getSanitizedShopData)(new URL(path_prefix).hostname)) === null || _a === void 0 ? void 0 : _a.shop
|
|
82
82
|
: path_prefix);
|
|
83
83
|
// TODO: explore moving this to sessionToken middleware??
|
|
84
84
|
const _b = _headers !== null && _headers !== void 0 ? _headers : {}, { 'x-extension-session': sessionToken, 'x-extension-point': extensionPoint } = _b, __headers = __rest(_b, ['x-extension-session', 'x-extension-point']);
|
|
@@ -90,14 +90,14 @@ const handleProxy = (serverRuntimeConfig) => (req, res, _params) => __awaiter(vo
|
|
|
90
90
|
}
|
|
91
91
|
if (sessionToken) {
|
|
92
92
|
// NOTE: this does not contain sid for some reason (presuming permission approval)
|
|
93
|
-
const { shop, host } = utils_1.decodeShopData(sessionToken);
|
|
93
|
+
const { shop, host } = (0, utils_1.decodeShopData)(sessionToken);
|
|
94
94
|
if ((shop !== _shop) || (host !== _host)) {
|
|
95
95
|
return res.status(403).json({ message: 'Unauthorized shop or host.' });
|
|
96
96
|
}
|
|
97
97
|
}
|
|
98
98
|
// TODO: explore adding hmac check/middleware?
|
|
99
|
-
const setting = shared_1.ensureObject(SETTING_REPLACEMENTS);
|
|
100
|
-
const headers = Object.entries(shared_1.ensureObject(targetSafelist[hostname])).reduce((_replacedHeaders, [header, headerValue]) => (Object.assign(Object.assign({}, _replacedHeaders), { [header]: shared_1.templateReplace(headerValue, { setting }) })), __headers);
|
|
99
|
+
const setting = (0, shared_1.ensureObject)(SETTING_REPLACEMENTS);
|
|
100
|
+
const headers = Object.entries((0, shared_1.ensureObject)(targetSafelist[hostname])).reduce((_replacedHeaders, [header, headerValue]) => (Object.assign(Object.assign({}, _replacedHeaders), { [header]: (0, shared_1.templateReplace)(headerValue, { setting }) })), __headers);
|
|
101
101
|
return new Promise((_resolve, reject) => {
|
|
102
102
|
req.url = targetUrl;
|
|
103
103
|
req.headers = headers;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"proxy.js","sourceRoot":"","sources":["../../../../src/lib/handlers/api/proxy.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,sDAAsD;AACtD,gDAAgD;AAChD,4DAAkC;AAClC,8DAAkC;AAElC,uCAKoB;AACpB,4CAQwB;AAExB,MAAM,aAAa,GAAG,IAAI,CAAA,CAAC,kBAAkB;AAE7C,MAAM,uBAAuB,GAAG,CAAC,SAAS,EAAE,UAAU,EAAE,YAAY,EAAE,EAAE;IACtE,MAAM,IAAI,GAAG,oBAAY,
|
|
1
|
+
{"version":3,"file":"proxy.js","sourceRoot":"","sources":["../../../../src/lib/handlers/api/proxy.js"],"names":[],"mappings":"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"}
|
|
@@ -29,7 +29,7 @@ const handleRest = (serverRuntimeConfig) => (req, res, _params) => __awaiter(voi
|
|
|
29
29
|
const { query: _query, method: _method, body: _body } = req;
|
|
30
30
|
const { shop } = _query !== null && _query !== void 0 ? _query : {};
|
|
31
31
|
const _a = _params !== null && _params !== void 0 ? _params : {}, { method: methodParam, query: queryParam, body: bodyParam, path, transform = (_data) => _data } = _a, params = __rest(_a, ["method", "query", "body", "path", "transform"]);
|
|
32
|
-
if (shared_1.stringEmpty(shop) || shared_1.stringEmpty(path)) {
|
|
32
|
+
if ((0, shared_1.stringEmpty)(shop) || (0, shared_1.stringEmpty)(path)) {
|
|
33
33
|
return {
|
|
34
34
|
statusCode: 400,
|
|
35
35
|
message: 'Invalid arguments',
|
|
@@ -41,13 +41,13 @@ const handleRest = (serverRuntimeConfig) => (req, res, _params) => __awaiter(voi
|
|
|
41
41
|
let headers = {};
|
|
42
42
|
try {
|
|
43
43
|
let queryData = queryParam !== null && queryParam !== void 0 ? queryParam : _query;
|
|
44
|
-
if (shared_1.isType(queryData, 'string')) {
|
|
45
|
-
queryData = shared_1.querystringToObject(queryData);
|
|
44
|
+
if ((0, shared_1.isType)(queryData, 'string')) {
|
|
45
|
+
queryData = (0, shared_1.querystringToObject)(queryData);
|
|
46
46
|
}
|
|
47
|
-
const _b = shared_1.ensureObject(queryData), { apiVersion } = _b, query = __rest(_b, ["apiVersion"]);
|
|
47
|
+
const _b = (0, shared_1.ensureObject)(queryData), { apiVersion } = _b, query = __rest(_b, ["apiVersion"]);
|
|
48
48
|
const body = bodyParam !== null && bodyParam !== void 0 ? bodyParam : _body;
|
|
49
|
-
const method = shared_1.ensureString(methodParam !== null && methodParam !== void 0 ? methodParam : _method).toLowerCase();
|
|
50
|
-
const { Rest } = yield utils_1.getVerifiedClients(serverRuntimeConfig, { req, res, shop, apiVersion });
|
|
49
|
+
const method = (0, shared_1.ensureString)(methodParam !== null && methodParam !== void 0 ? methodParam : _method).toLowerCase();
|
|
50
|
+
const { Rest } = yield (0, utils_1.getVerifiedClients)(serverRuntimeConfig, { req, res, shop, apiVersion });
|
|
51
51
|
response = yield Rest[method](Object.assign({ path,
|
|
52
52
|
query,
|
|
53
53
|
body, type: shopify_api_1.DataType.JSON }, params));
|
|
@@ -60,7 +60,7 @@ const handleRest = (serverRuntimeConfig) => (req, res, _params) => __awaiter(voi
|
|
|
60
60
|
switch (true) {
|
|
61
61
|
case error instanceof shared_1.ShopifyAuthenticationError: {
|
|
62
62
|
console.error(`${message}. Authentication Error.`, error);
|
|
63
|
-
const errorResponse = utils_1.getAuthErrorResponse(serverRuntimeConfig, { error, shop });
|
|
63
|
+
const errorResponse = (0, utils_1.getAuthErrorResponse)(serverRuntimeConfig, { error, shop });
|
|
64
64
|
statusCode = errorResponse.statusCode;
|
|
65
65
|
message = errorResponse.message;
|
|
66
66
|
headers = errorResponse.headers;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rest.js","sourceRoot":"","sources":["../../../../src/lib/handlers/api/rest.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAAgD;AAChD,sDAA6D;AAE7D,uCAGoB;AACpB,4CAOwB;AAEjB,MAAM,UAAU,GAAG,CAAC,mBAAmB,EAAE,EAAE,CAAC,CAAO,GAAG,EAAE,GAAG,EAAE,OAAO,EAAE,EAAE;IAC7E,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,GAAG,CAAA;IAC3D,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,EAAE,CAAA;IAC7B,MAAM,KAOF,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI,EAAE,EAPX,EACJ,MAAM,EAAE,WAAW,EACnB,KAAK,EAAE,UAAU,EACjB,IAAI,EAAE,SAAS,EACf,IAAI,EACJ,SAAS,GAAG,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,OAEb,EADZ,MAAM,cANL,gDAOL,CAAgB,CAAA;IAEjB,IAAI,oBAAW,
|
|
1
|
+
{"version":3,"file":"rest.js","sourceRoot":"","sources":["../../../../src/lib/handlers/api/rest.js"],"names":[],"mappings":"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"}
|
|
@@ -32,12 +32,12 @@ const handleAppUninstalled = (serverRuntimeConfig) => (req, res) => __awaiter(vo
|
|
|
32
32
|
var _a;
|
|
33
33
|
try {
|
|
34
34
|
const { 'x-shopify-shop-domain': shop } = (_a = req.headers) !== null && _a !== void 0 ? _a : {};
|
|
35
|
-
if (shared_1.stringEmpty(shop)) {
|
|
35
|
+
if ((0, shared_1.stringEmpty)(shop)) {
|
|
36
36
|
return res.status(200).json({ handler: 'uninstall', error: 'Missing shop' });
|
|
37
37
|
}
|
|
38
|
-
const { shopify, findSessionIds, deleteSessions } = yield utils_1.getShopifyHelpers(serverRuntimeConfig, { shop });
|
|
38
|
+
const { shopify, findSessionIds, deleteSessions } = yield (0, utils_1.getShopifyHelpers)(serverRuntimeConfig, { shop });
|
|
39
39
|
// NOTE raw request body is required for Shopify webhook validation
|
|
40
|
-
const rawBody = yield raw_body_1.default(req);
|
|
40
|
+
const rawBody = yield (0, raw_body_1.default)(req);
|
|
41
41
|
const _b = yield shopify.webhooks.validate({
|
|
42
42
|
rawBody: rawBody.toString(),
|
|
43
43
|
rawRequest: req,
|
|
@@ -46,7 +46,7 @@ const handleAppUninstalled = (serverRuntimeConfig) => (req, res) => __awaiter(vo
|
|
|
46
46
|
if (valid) {
|
|
47
47
|
try {
|
|
48
48
|
const sessionsIds = yield findSessionIds(shop);
|
|
49
|
-
if (shared_1.arrayNotEmpty(sessionsIds)) {
|
|
49
|
+
if ((0, shared_1.arrayNotEmpty)(sessionsIds)) {
|
|
50
50
|
yield deleteSessions(sessionsIds);
|
|
51
51
|
}
|
|
52
52
|
return res.status(200).json({ handler: 'uninstall', message: 'success' });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"uninstall.js","sourceRoot":"","sources":["../../../../src/lib/handlers/api/uninstall.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wDAAiC;AAEjC,uCAA+C;AAC/C,4CAGwB;AAExB,4DAA4D;AACrD,MAAM,oBAAoB,GAAG,CAAC,mBAAmB,EAAE,EAAE,CAAC,CAAO,GAAG,EAAE,GAAG,EAAE,EAAE;;IAC9E,IAAI;QACF,MAAM,EAAE,uBAAuB,EAAE,IAAI,EAAE,GAAG,MAAA,GAAG,CAAC,OAAO,mCAAI,EAAE,CAAA;QAE3D,IAAI,oBAAW,
|
|
1
|
+
{"version":3,"file":"uninstall.js","sourceRoot":"","sources":["../../../../src/lib/handlers/api/uninstall.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wDAAiC;AAEjC,uCAA+C;AAC/C,4CAGwB;AAExB,4DAA4D;AACrD,MAAM,oBAAoB,GAAG,CAAC,mBAAmB,EAAE,EAAE,CAAC,CAAO,GAAG,EAAE,GAAG,EAAE,EAAE;;IAC9E,IAAI;QACF,MAAM,EAAE,uBAAuB,EAAE,IAAI,EAAE,GAAG,MAAA,GAAG,CAAC,OAAO,mCAAI,EAAE,CAAA;QAE3D,IAAI,IAAA,oBAAW,EAAC,IAAI,CAAC,EAAE;YACrB,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,cAAc,EAAE,CAAC,CAAA;SAC7E;QAED,MAAM,EAAE,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,GAAG,MAAM,IAAA,yBAAiB,EAAC,mBAAmB,EAAE,EAAE,IAAI,EAAE,CAAC,CAAA;QAE1G,mEAAmE;QACnE,MAAM,OAAO,GAAG,MAAM,IAAA,kBAAU,EAAC,GAAG,CAAC,CAAA;QACrC,MAAM,KAA6B,MAAM,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC;YACjE,OAAO,EAAE,OAAO,CAAC,QAAQ,EAAE;YAC3B,UAAU,EAAE,GAAG;YACf,WAAW,EAAE,GAAG;SACjB,CAAC,EAJI,EAAE,KAAK,OAIX,EAJgB,YAAY,cAAxB,SAA0B,CAI9B,CAAA;QAEF,IAAI,KAAK,EAAE;YACT,IAAI;gBACF,MAAM,WAAW,GAAG,MAAM,cAAc,CAAC,IAAI,CAAC,CAAA;gBAC9C,IAAI,IAAA,sBAAa,EAAC,WAAW,CAAC,EAAE;oBAC9B,MAAM,cAAc,CAAC,WAAW,CAAC,CAAA;iBAClC;gBACD,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,SAAS,EAAE,CAAC,CAAA;aAC1E;YAAC,OAAO,KAAK,EAAE;gBACd,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,OAAO,EAAE,CAAC,CAAA;aAC7E;SACF;QAED,OAAO,CAAC,IAAI,CAAC,sCAAsC,EAAE,YAAY,CAAC,CAAA;QAClE,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,sCAAsC,EAAE,CAAC,CAAA;KACrG;IAAC,OAAO,KAAK,EAAE;QACd,OAAO,CAAC,KAAK,CAAC,0BAA0B,EAAE,KAAK,CAAC,CAAA;QAChD,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,0BAA0B,EAAE,CAAC,CAAA;KACzF;AACH,CAAC,CAAA,CAAA;AApCY,QAAA,oBAAoB,wBAoChC"}
|
|
@@ -32,12 +32,12 @@ const handlWebhookEvent = (serverRuntimeConfig, topicHandlers) => (req, res) =>
|
|
|
32
32
|
var _a;
|
|
33
33
|
try {
|
|
34
34
|
const _b = (_a = req.headers) !== null && _a !== void 0 ? _a : {}, { 'x-shopify-shop-domain': shop } = _b, _headers = __rest(_b, ['x-shopify-shop-domain']);
|
|
35
|
-
if (shared_1.stringEmpty(shop)) {
|
|
35
|
+
if ((0, shared_1.stringEmpty)(shop)) {
|
|
36
36
|
return res.status(200).json({ handler: 'webhook', error: 'Missing shop' });
|
|
37
37
|
}
|
|
38
|
-
const { shopify } = yield utils_1.getShopifyHelpers(serverRuntimeConfig, { shop });
|
|
38
|
+
const { shopify } = yield (0, utils_1.getShopifyHelpers)(serverRuntimeConfig, { shop });
|
|
39
39
|
// NOTE raw request body is required for Shopify webhook validation
|
|
40
|
-
const _rawBody = yield raw_body_1.default(req);
|
|
40
|
+
const _rawBody = yield (0, raw_body_1.default)(req);
|
|
41
41
|
const rawBody = _rawBody.toString();
|
|
42
42
|
// TODO: note sure why we are failing validation?!?!
|
|
43
43
|
const _c = (serverRuntimeConfig.SHOPIFY_RUN_MODE === 'cli') ? {
|
|
@@ -56,7 +56,7 @@ const handlWebhookEvent = (serverRuntimeConfig, topicHandlers) => (req, res) =>
|
|
|
56
56
|
try {
|
|
57
57
|
const { topic, domain, webhookId, apiVersion, rawBody: eventRawBody } = message;
|
|
58
58
|
const eventBody = JSON.parse(eventRawBody);
|
|
59
|
-
const topicHandlePromises = shared_1.ensureArray(topicHandlers === null || topicHandlers === void 0 ? void 0 : topicHandlers[shared_1.convertEventTopic(topic)]).map((handler) => handler({
|
|
59
|
+
const topicHandlePromises = (0, shared_1.ensureArray)(topicHandlers === null || topicHandlers === void 0 ? void 0 : topicHandlers[(0, shared_1.convertEventTopic)(topic)]).map((handler) => handler({
|
|
60
60
|
apiVersion,
|
|
61
61
|
webhookId,
|
|
62
62
|
topic,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webhook.js","sourceRoot":"","sources":["../../../../src/lib/handlers/api/webhook.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wDAAiC;AAEjC,uCAA+C;AAC/C,4CAIwB;AAExB,sDAAsD;AAC/C,MAAM,iBAAiB,GAAG,CAAC,mBAAmB,EAAE,aAAa,EAAE,EAAE,CAAC,CAAO,GAAG,EAAE,GAAG,EAAE,EAAE;;IAC1F,IAAI;QACF,MAAM,KAGF,MAAA,GAAG,CAAC,OAAO,mCAAI,EAAE,EAHf,EACJ,uBAAuB,EAAE,IAAI,OAEV,EADhB,QAAQ,cAFP,yBAGL,CAAoB,CAAA;QAErB,IAAI,oBAAW,
|
|
1
|
+
{"version":3,"file":"webhook.js","sourceRoot":"","sources":["../../../../src/lib/handlers/api/webhook.js"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
3
|
if (k2 === undefined) k2 = k;
|
|
4
|
-
Object.
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
5
9
|
}) : (function(o, m, k, k2) {
|
|
6
10
|
if (k2 === undefined) k2 = k;
|
|
7
11
|
o[k2] = m[k];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/handlers/index.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/handlers/index.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,wCAAqB;AACrB,wCAAqB"}
|