@agnostack/next-shopify 1.15.0-beta.2 → 1.15.0-beta.21
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 +136 -0
- package/dist/lib/handlers/api/auth.js +15 -11
- package/dist/lib/handlers/api/auth.js.map +1 -1
- package/dist/lib/handlers/api/billing.js +13 -9
- package/dist/lib/handlers/api/billing.js.map +1 -1
- package/dist/lib/handlers/api/callback.js +37 -33
- package/dist/lib/handlers/api/callback.js.map +1 -1
- package/dist/lib/handlers/api/index.js +25 -7
- package/dist/lib/handlers/api/index.js.map +1 -1
- package/dist/lib/handlers/api/uninstall.js +12 -8
- package/dist/lib/handlers/api/uninstall.js.map +1 -1
- package/dist/lib/handlers/api/verifiable/appInstallation.js +11 -7
- package/dist/lib/handlers/api/verifiable/appInstallation.js.map +1 -1
- package/dist/lib/handlers/api/verifiable/graph.js +26 -22
- package/dist/lib/handlers/api/verifiable/graph.js.map +1 -1
- package/dist/lib/handlers/api/verifiable/index.js +21 -5
- package/dist/lib/handlers/api/verifiable/index.js.map +1 -1
- package/dist/lib/handlers/api/verifiable/proxy.js +39 -32
- package/dist/lib/handlers/api/verifiable/proxy.js.map +1 -1
- package/dist/lib/handlers/api/verifiable/rest.js +23 -19
- package/dist/lib/handlers/api/verifiable/rest.js.map +1 -1
- package/dist/lib/handlers/api/verifiable/token.js +27 -23
- package/dist/lib/handlers/api/verifiable/token.js.map +1 -1
- package/dist/lib/handlers/api/webhook.js +13 -9
- package/dist/lib/handlers/api/webhook.js.map +1 -1
- package/dist/lib/handlers/index.js +18 -2
- package/dist/lib/handlers/index.js.map +1 -1
- package/dist/lib/handlers/ssr/index.js +18 -2
- package/dist/lib/handlers/ssr/index.js.map +1 -1
- package/dist/lib/handlers/ssr/protect.js +24 -17
- package/dist/lib/handlers/ssr/protect.js.map +1 -1
- package/dist/lib/handlers/ssr/wrap.js +10 -6
- package/dist/lib/handlers/ssr/wrap.js.map +1 -1
- package/dist/lib/index.d.ts +1 -1
- package/dist/lib/index.d.ts.map +1 -1
- package/dist/lib/index.js +24 -5
- package/dist/lib/index.js.map +1 -1
- package/dist/lib/utils/billing.js +23 -18
- package/dist/lib/utils/billing.js.map +1 -1
- package/dist/lib/utils/crypto.d.ts +1 -1
- package/dist/lib/utils/crypto.d.ts.map +1 -1
- package/dist/lib/utils/crypto.js +25 -15
- package/dist/lib/utils/crypto.js.map +1 -1
- package/dist/lib/utils/firebase.js +29 -17
- package/dist/lib/utils/firebase.js.map +1 -1
- package/dist/lib/utils/headers.js +13 -6
- package/dist/lib/utils/headers.js.map +1 -1
- package/dist/lib/utils/index.js +24 -8
- package/dist/lib/utils/index.js.map +1 -1
- package/dist/lib/utils/session.js +64 -59
- package/dist/lib/utils/session.js.map +1 -1
- package/dist/lib/utils/shopify-api-js/oauth.js +23 -16
- package/dist/lib/utils/shopify-api-js/oauth.js.map +1 -1
- package/dist/lib/utils/shopify.js +37 -25
- package/dist/lib/utils/shopify.js.map +1 -1
- package/dist/lib/utils/token.js +15 -11
- package/dist/lib/utils/token.js.map +1 -1
- package/dist/plugins/index.d.ts +3 -0
- package/dist/plugins/index.d.ts.map +1 -0
- package/dist/plugins/index.js +19 -0
- package/dist/plugins/index.js.map +1 -0
- package/dist/plugins/types.d.ts +1 -0
- package/dist/plugins/types.d.ts.map +1 -0
- package/dist/plugins/types.js +1 -0
- package/dist/plugins/types.js.map +1 -0
- package/dist/plugins/withShopify.d.ts.map +1 -0
- package/dist/{lib → plugins}/withShopify.js +83 -77
- package/dist/plugins/withShopify.js.map +1 -0
- package/dist/react/hooks/index.js +17 -1
- package/dist/react/hooks/index.js.map +1 -1
- package/dist/react/hooks/useVerification.d.ts +1 -1
- package/dist/react/hooks/useVerification.js +23 -7
- package/dist/react/hooks/useVerification.js.map +1 -1
- package/dist/react/index.d.ts +1 -0
- package/dist/react/index.d.ts.map +1 -1
- package/dist/react/index.js +18 -1
- package/dist/react/index.js.map +1 -1
- package/dist/runtime/index.js +17 -1
- package/dist/runtime/index.js.map +1 -1
- package/dist/shared/WebCrypto.d.ts +55 -0
- package/dist/shared/WebCrypto.d.ts.map +1 -0
- package/dist/shared/WebCrypto.js +345 -0
- package/dist/shared/WebCrypto.js.map +1 -0
- package/dist/shared/constants.js +15 -11
- package/dist/shared/constants.js.map +1 -1
- package/dist/shared/datetime.js +110 -83
- package/dist/shared/datetime.js.map +1 -1
- package/dist/shared/display.d.ts +0 -2
- package/dist/shared/display.d.ts.map +1 -1
- package/dist/shared/display.js +231 -155
- package/dist/shared/display.js.map +1 -1
- package/dist/shared/errors.js +12 -5
- package/dist/shared/errors.js.map +1 -1
- package/dist/shared/graph.js +14 -11
- package/dist/shared/graph.js.map +1 -1
- package/dist/shared/index.d.ts +2 -1
- package/dist/shared/index.d.ts.map +1 -1
- package/dist/shared/index.js +32 -10
- package/dist/shared/index.js.map +1 -1
- package/dist/shared/match.js +25 -17
- package/dist/shared/match.js.map +1 -1
- package/dist/shared/request.d.ts.map +1 -1
- package/dist/shared/request.js +19 -13
- package/dist/shared/request.js.map +1 -1
- package/dist/shared/shopify.js +31 -21
- package/dist/shared/shopify.js.map +1 -1
- package/dist/shared/uuid.d.ts +3 -0
- package/dist/shared/uuid.d.ts.map +1 -0
- package/dist/shared/uuid.js +10 -0
- package/dist/shared/uuid.js.map +1 -0
- package/dist/shared/verification.d.ts +12 -5
- package/dist/shared/verification.d.ts.map +1 -1
- package/dist/shared/verification.js +34 -23
- package/dist/shared/verification.js.map +1 -1
- package/dist/umd/lib/index.d.ts +1 -1
- package/dist/umd/lib/index.d.ts.map +1 -1
- package/dist/umd/lib/utils/crypto.d.ts +1 -1
- package/dist/umd/lib/utils/crypto.d.ts.map +1 -1
- package/dist/umd/plugins/index.d.ts +3 -0
- package/dist/umd/plugins/index.d.ts.map +1 -0
- package/dist/umd/plugins/types.d.ts +1 -0
- package/dist/umd/plugins/types.d.ts.map +1 -0
- package/dist/umd/plugins/withShopify.d.ts.map +1 -0
- package/dist/umd/react/hooks/useVerification.d.ts +1 -1
- package/dist/umd/react/index.d.ts +1 -0
- package/dist/umd/react/index.d.ts.map +1 -1
- package/dist/umd/shared/WebCrypto.d.ts +55 -0
- package/dist/umd/shared/WebCrypto.d.ts.map +1 -0
- package/dist/umd/shared/display.d.ts +0 -2
- package/dist/umd/shared/display.d.ts.map +1 -1
- package/dist/umd/shared/index.d.ts +2 -1
- package/dist/umd/shared/index.d.ts.map +1 -1
- package/dist/umd/shared/request.d.ts.map +1 -1
- package/dist/umd/shared/uuid.d.ts +3 -0
- package/dist/umd/shared/uuid.d.ts.map +1 -0
- package/dist/umd/shared/verification.d.ts +12 -5
- package/dist/umd/shared/verification.d.ts.map +1 -1
- package/dist/umd/verification/index.d.ts +2 -0
- package/dist/umd/verification/index.d.ts.map +1 -1
- package/dist/umd/verification/utils/errors.d.ts.map +1 -0
- package/dist/umd/verification/utils/index.d.ts +3 -0
- package/dist/umd/verification/utils/index.d.ts.map +1 -0
- package/dist/umd/verification/utils/rawbody.d.ts.map +1 -0
- package/dist/umd/verification/verification.d.ts +3 -1
- package/dist/umd/verification/verification.d.ts.map +1 -1
- package/dist/umd/verification.js +901 -0
- package/dist/umd/verification.js.map +1 -0
- package/dist/verification/index.d.ts +2 -0
- package/dist/verification/index.d.ts.map +1 -1
- package/dist/verification/index.js +19 -1
- package/dist/verification/index.js.map +1 -1
- package/dist/verification/utils/errors.d.ts.map +1 -0
- package/dist/verification/{errors.js → utils/errors.js} +5 -1
- package/dist/verification/utils/errors.js.map +1 -0
- package/dist/verification/utils/index.d.ts +3 -0
- package/dist/verification/utils/index.d.ts.map +1 -0
- package/dist/verification/utils/index.js +19 -0
- package/dist/verification/utils/index.js.map +1 -0
- package/dist/verification/utils/rawbody.d.ts.map +1 -0
- package/dist/verification/utils/rawbody.js +57 -0
- package/dist/verification/utils/rawbody.js.map +1 -0
- package/dist/verification/verification.d.ts +3 -1
- package/dist/verification/verification.d.ts.map +1 -1
- package/dist/verification/verification.js +71 -62
- package/dist/verification/verification.js.map +1 -1
- package/package.json +12 -12
- package/dist/lib/withShopify.d.ts.map +0 -1
- package/dist/lib/withShopify.js.map +0 -1
- package/dist/shared/subtlecrypto.d.ts +0 -41
- package/dist/shared/subtlecrypto.d.ts.map +0 -1
- package/dist/shared/subtlecrypto.js +0 -256
- package/dist/shared/subtlecrypto.js.map +0 -1
- package/dist/umd/lib/withShopify.d.ts.map +0 -1
- package/dist/umd/shared/subtlecrypto.d.ts +0 -41
- package/dist/umd/shared/subtlecrypto.d.ts.map +0 -1
- package/dist/umd/umd-verification.js +0 -968
- package/dist/umd/umd-verification.js.map +0 -1
- package/dist/umd/verification/errors.d.ts.map +0 -1
- package/dist/umd/verification/rawbody.d.ts.map +0 -1
- package/dist/verification/errors.d.ts.map +0 -1
- package/dist/verification/errors.js.map +0 -1
- package/dist/verification/rawbody.d.ts.map +0 -1
- package/dist/verification/rawbody.js +0 -31
- package/dist/verification/rawbody.js.map +0 -1
- package/node_modules/bytes/History.md +0 -97
- package/node_modules/bytes/LICENSE +0 -23
- package/node_modules/bytes/Readme.md +0 -152
- package/node_modules/bytes/index.js +0 -170
- package/node_modules/bytes/package.json +0 -42
- package/node_modules/depd/History.md +0 -103
- package/node_modules/depd/LICENSE +0 -22
- package/node_modules/depd/Readme.md +0 -280
- package/node_modules/depd/index.js +0 -538
- package/node_modules/depd/lib/browser/index.js +0 -77
- package/node_modules/depd/package.json +0 -45
- package/node_modules/http-errors/HISTORY.md +0 -180
- package/node_modules/http-errors/LICENSE +0 -23
- package/node_modules/http-errors/README.md +0 -169
- package/node_modules/http-errors/index.js +0 -289
- package/node_modules/http-errors/package.json +0 -50
- package/node_modules/iconv-lite/Changelog.md +0 -162
- package/node_modules/iconv-lite/LICENSE +0 -21
- package/node_modules/iconv-lite/README.md +0 -156
- package/node_modules/iconv-lite/encodings/dbcs-codec.js +0 -555
- package/node_modules/iconv-lite/encodings/dbcs-data.js +0 -176
- package/node_modules/iconv-lite/encodings/index.js +0 -22
- package/node_modules/iconv-lite/encodings/internal.js +0 -188
- package/node_modules/iconv-lite/encodings/sbcs-codec.js +0 -72
- package/node_modules/iconv-lite/encodings/sbcs-data-generated.js +0 -451
- package/node_modules/iconv-lite/encodings/sbcs-data.js +0 -174
- package/node_modules/iconv-lite/encodings/tables/big5-added.json +0 -122
- package/node_modules/iconv-lite/encodings/tables/cp936.json +0 -264
- package/node_modules/iconv-lite/encodings/tables/cp949.json +0 -273
- package/node_modules/iconv-lite/encodings/tables/cp950.json +0 -177
- package/node_modules/iconv-lite/encodings/tables/eucjp.json +0 -182
- package/node_modules/iconv-lite/encodings/tables/gb18030-ranges.json +0 -1
- package/node_modules/iconv-lite/encodings/tables/gbk-added.json +0 -55
- package/node_modules/iconv-lite/encodings/tables/shiftjis.json +0 -125
- package/node_modules/iconv-lite/encodings/utf16.js +0 -177
- package/node_modules/iconv-lite/encodings/utf7.js +0 -290
- package/node_modules/iconv-lite/lib/bom-handling.js +0 -52
- package/node_modules/iconv-lite/lib/extend-node.js +0 -217
- package/node_modules/iconv-lite/lib/index.d.ts +0 -24
- package/node_modules/iconv-lite/lib/index.js +0 -153
- package/node_modules/iconv-lite/lib/streams.js +0 -121
- package/node_modules/iconv-lite/package.json +0 -46
- package/node_modules/inherits/LICENSE +0 -16
- package/node_modules/inherits/README.md +0 -42
- package/node_modules/inherits/inherits.js +0 -9
- package/node_modules/inherits/inherits_browser.js +0 -27
- package/node_modules/inherits/package.json +0 -29
- package/node_modules/raw-body/HISTORY.md +0 -308
- package/node_modules/raw-body/LICENSE +0 -22
- package/node_modules/raw-body/README.md +0 -223
- package/node_modules/raw-body/SECURITY.md +0 -24
- package/node_modules/raw-body/index.d.ts +0 -87
- package/node_modules/raw-body/index.js +0 -336
- package/node_modules/raw-body/package.json +0 -49
- package/node_modules/safer-buffer/LICENSE +0 -21
- package/node_modules/safer-buffer/Porting-Buffer.md +0 -268
- package/node_modules/safer-buffer/Readme.md +0 -156
- package/node_modules/safer-buffer/dangerous.js +0 -58
- package/node_modules/safer-buffer/package.json +0 -34
- package/node_modules/safer-buffer/safer.js +0 -77
- package/node_modules/safer-buffer/tests.js +0 -406
- package/node_modules/setprototypeof/LICENSE +0 -13
- package/node_modules/setprototypeof/README.md +0 -31
- package/node_modules/setprototypeof/index.d.ts +0 -2
- package/node_modules/setprototypeof/index.js +0 -17
- package/node_modules/setprototypeof/package.json +0 -38
- package/node_modules/setprototypeof/test/index.js +0 -24
- package/node_modules/statuses/HISTORY.md +0 -82
- package/node_modules/statuses/LICENSE +0 -23
- package/node_modules/statuses/README.md +0 -136
- package/node_modules/statuses/codes.json +0 -65
- package/node_modules/statuses/index.js +0 -146
- package/node_modules/statuses/package.json +0 -49
- package/node_modules/toidentifier/HISTORY.md +0 -9
- package/node_modules/toidentifier/LICENSE +0 -21
- package/node_modules/toidentifier/README.md +0 -61
- package/node_modules/toidentifier/index.js +0 -32
- package/node_modules/toidentifier/package.json +0 -38
- package/node_modules/unpipe/HISTORY.md +0 -4
- package/node_modules/unpipe/LICENSE +0 -22
- package/node_modules/unpipe/README.md +0 -43
- package/node_modules/unpipe/index.js +0 -69
- package/node_modules/unpipe/package.json +0 -27
- /package/dist/{lib → plugins}/withShopify.d.ts +0 -0
- /package/dist/umd/{lib → plugins}/withShopify.d.ts +0 -0
- /package/dist/umd/verification/{errors.d.ts → utils/errors.d.ts} +0 -0
- /package/dist/umd/verification/{rawbody.d.ts → utils/rawbody.d.ts} +0 -0
- /package/dist/verification/{errors.d.ts → utils/errors.d.ts} +0 -0
- /package/dist/verification/{rawbody.d.ts → utils/rawbody.d.ts} +0 -0
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
"use strict";
|
|
1
2
|
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
2
3
|
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
3
4
|
return new (P || (P = Promise))(function (resolve, reject) {
|
|
@@ -7,19 +8,22 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
7
8
|
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
8
9
|
});
|
|
9
10
|
};
|
|
10
|
-
|
|
11
|
-
|
|
11
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
+
exports.handleLoadAppInstallation = void 0;
|
|
13
|
+
const shared_1 = require("../../../../shared");
|
|
14
|
+
const graph_1 = require("./graph");
|
|
12
15
|
// NOTE: typically handling: "/api/admin/installation/[appId]" (called by getUseAppInstallation)
|
|
13
|
-
|
|
16
|
+
const handleLoadAppInstallation = (serverRuntimeConfig) => (req, res, params) => __awaiter(void 0, void 0, void 0, function* () {
|
|
14
17
|
const { appId } = params !== null && params !== void 0 ? params : {};
|
|
15
|
-
if (stringEmpty(appId)) {
|
|
18
|
+
if ((0, shared_1.stringEmpty)(appId)) {
|
|
16
19
|
return res.status(412).json({ message: 'Missing required param' });
|
|
17
20
|
}
|
|
18
|
-
const _handleGraph = handleGraph(serverRuntimeConfig);
|
|
21
|
+
const _handleGraph = (0, graph_1.handleGraph)(serverRuntimeConfig);
|
|
19
22
|
return _handleGraph(req, res, {
|
|
20
|
-
query: APP_QUERY.INSTALLATION,
|
|
23
|
+
query: shared_1.APP_QUERY.INSTALLATION,
|
|
21
24
|
variables: { namespace: `${appId}-metafields` },
|
|
22
|
-
transform: TRANSFORM.APP_QUERY,
|
|
25
|
+
transform: shared_1.TRANSFORM.APP_QUERY,
|
|
23
26
|
});
|
|
24
27
|
});
|
|
28
|
+
exports.handleLoadAppInstallation = handleLoadAppInstallation;
|
|
25
29
|
//# sourceMappingURL=appInstallation.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"appInstallation.js","sourceRoot":"","sources":["../../../../../src/lib/handlers/api/verifiable/appInstallation.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"appInstallation.js","sourceRoot":"","sources":["../../../../../src/lib/handlers/api/verifiable/appInstallation.js"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+CAAsE;AACtE,mCAAqC;AAErC,gGAAgG;AACzF,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,kBAAS,CAAC,YAAY;QAC7B,SAAS,EAAE,EAAE,SAAS,EAAE,GAAG,KAAK,aAAa,EAAE;QAC/C,SAAS,EAAE,kBAAS,CAAC,SAAS;KAC/B,CAAC,CAAA;AACJ,CAAC,CAAA,CAAA;AAdY,QAAA,yBAAyB,6BAcrC"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
"use strict";
|
|
1
2
|
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
2
3
|
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
3
4
|
return new (P || (P = Promise))(function (resolve, reject) {
|
|
@@ -18,12 +19,14 @@ var __rest = (this && this.__rest) || function (s, e) {
|
|
|
18
19
|
}
|
|
19
20
|
return t;
|
|
20
21
|
};
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
22
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
23
|
+
exports.handleGraph = void 0;
|
|
24
|
+
const shopify_api_1 = require("@shopify/shopify-api");
|
|
25
|
+
const utils_1 = require("../../../utils");
|
|
26
|
+
const shared_1 = require("../../../../shared");
|
|
27
|
+
const verification_1 = require("../../../../verification");
|
|
28
|
+
const handleGraph = (serverRuntimeConfig) => {
|
|
29
|
+
const _getVerificationHelpers = (0, verification_1.getVerificationHelpers)(serverRuntimeConfig);
|
|
27
30
|
return (req, res, params) => __awaiter(void 0, void 0, void 0, function* () {
|
|
28
31
|
var _a, _b, _c;
|
|
29
32
|
let requestBody;
|
|
@@ -32,18 +35,18 @@ export const handleGraph = (serverRuntimeConfig) => {
|
|
|
32
35
|
({ requestBody, processResponse } = yield _getVerificationHelpers(req));
|
|
33
36
|
}
|
|
34
37
|
catch (error) {
|
|
35
|
-
if (error instanceof VerificationError) {
|
|
38
|
+
if (error instanceof verification_1.VerificationError) {
|
|
36
39
|
return res.status(error.code).json(Object.assign({ message: error.message }, error.data));
|
|
37
40
|
}
|
|
38
41
|
return res.status(403).json({ message: 'Verification error' });
|
|
39
42
|
}
|
|
40
43
|
const _d = (_a = req.query) !== null && _a !== void 0 ? _a : {}, { shop, apiVersion } = _d, _query = __rest(_d, ["shop", "apiVersion"]);
|
|
41
|
-
const _e = params !== null && params !== void 0 ? params : safeParse(requestBody || '{}'), { isOnline, query: graphQuery, variables: graphVariables, transform = (_data) => _data } = _e, graphParams = __rest(_e, ["isOnline", "query", "variables", "transform"]);
|
|
44
|
+
const _e = params !== null && params !== void 0 ? params : (0, shared_1.safeParse)(requestBody || '{}'), { isOnline, query: graphQuery, variables: graphVariables, transform = (_data) => _data } = _e, graphParams = __rest(_e, ["isOnline", "query", "variables", "transform"]);
|
|
42
45
|
let query = _query;
|
|
43
|
-
if (isType(query, 'string')) {
|
|
44
|
-
query = querystringToObject(query);
|
|
46
|
+
if ((0, shared_1.isType)(query, 'string')) {
|
|
47
|
+
query = (0, shared_1.querystringToObject)(query);
|
|
45
48
|
}
|
|
46
|
-
if (stringEmpty(shop) || stringEmpty(graphQuery)) {
|
|
49
|
+
if ((0, shared_1.stringEmpty)(shop) || (0, shared_1.stringEmpty)(graphQuery)) {
|
|
47
50
|
return res.status(400).json({ message: 'Invalid arguments' });
|
|
48
51
|
}
|
|
49
52
|
let statusCode;
|
|
@@ -51,21 +54,21 @@ export const handleGraph = (serverRuntimeConfig) => {
|
|
|
51
54
|
let headers = {};
|
|
52
55
|
let message = 'Error handling query call';
|
|
53
56
|
try {
|
|
54
|
-
const { getVerifiedClients } = yield getShopifyHelpers(serverRuntimeConfig, { shop });
|
|
57
|
+
const { getVerifiedClients } = yield (0, utils_1.getShopifyHelpers)(serverRuntimeConfig, { shop });
|
|
55
58
|
const { Graphql } = yield getVerifiedClients({ req, res, shop, apiVersion, isOnline });
|
|
56
59
|
response = yield Graphql.query(Object.assign(Object.assign({ data: graphVariables ? {
|
|
57
60
|
query: graphQuery,
|
|
58
61
|
variables: graphVariables,
|
|
59
|
-
} : graphQuery }, objectNotEmpty(query) && { query }), graphParams));
|
|
62
|
+
} : graphQuery }, (0, shared_1.objectNotEmpty)(query) && { query }), graphParams));
|
|
60
63
|
statusCode = 200;
|
|
61
64
|
}
|
|
62
65
|
catch (error) {
|
|
63
66
|
statusCode = 500;
|
|
64
67
|
// TODO: clean up to share between rest and graph (pr at least keep in sync)
|
|
65
68
|
switch (true) {
|
|
66
|
-
case error instanceof ShopifyAuthenticationError: {
|
|
69
|
+
case error instanceof shared_1.ShopifyAuthenticationError: {
|
|
67
70
|
console.error(`${message}. Authentication Error.`, error);
|
|
68
|
-
const errorResponse = getAuthErrorResponse(serverRuntimeConfig, { error, shop });
|
|
71
|
+
const errorResponse = (0, utils_1.getAuthErrorResponse)(serverRuntimeConfig, { error, shop });
|
|
69
72
|
statusCode = errorResponse.statusCode;
|
|
70
73
|
message = errorResponse.message;
|
|
71
74
|
// HMMMM, should this be:
|
|
@@ -73,7 +76,7 @@ export const handleGraph = (serverRuntimeConfig) => {
|
|
|
73
76
|
headers = errorResponse.headers;
|
|
74
77
|
break;
|
|
75
78
|
}
|
|
76
|
-
case error instanceof BillingError: {
|
|
79
|
+
case error instanceof shopify_api_1.BillingError: {
|
|
77
80
|
// HMMMM, should this be:
|
|
78
81
|
// message = `${message}. Billing Error - ${error.message}.`
|
|
79
82
|
console.error(`${message}. Billing Error - ${error.message}.`, error.errorData);
|
|
@@ -83,8 +86,8 @@ export const handleGraph = (serverRuntimeConfig) => {
|
|
|
83
86
|
}
|
|
84
87
|
break;
|
|
85
88
|
}
|
|
86
|
-
case error instanceof GraphqlQueryError: {
|
|
87
|
-
const errorMessages = ensureArray((_b = error.response) === null || _b === void 0 ? void 0 : _b.errors).map(({ message }) => ensureString(message));
|
|
89
|
+
case error instanceof shopify_api_1.GraphqlQueryError: {
|
|
90
|
+
const errorMessages = (0, shared_1.ensureArray)((_b = error.response) === null || _b === void 0 ? void 0 : _b.errors).map(({ message }) => (0, shared_1.ensureString)(message));
|
|
88
91
|
console.error(`${message}. ${errorMessages.join('. ')}.`);
|
|
89
92
|
// HMMMM, should this be:
|
|
90
93
|
// message = `${message}. ${errorMessages.join('. ')}.`
|
|
@@ -104,11 +107,11 @@ export const handleGraph = (serverRuntimeConfig) => {
|
|
|
104
107
|
if (!(response === null || response === void 0 ? void 0 : response.body)) {
|
|
105
108
|
return res.status(statusCode).json({ message });
|
|
106
109
|
}
|
|
107
|
-
const responseBody = ensureObject((_c = response.body.data) !== null && _c !== void 0 ? _c : response.body);
|
|
110
|
+
const responseBody = (0, shared_1.ensureObject)((_c = response.body.data) !== null && _c !== void 0 ? _c : response.body);
|
|
108
111
|
const [_responseData] = Object.values(responseBody);
|
|
109
|
-
const _f = ensureObject(_responseData), { userErrors } = _f, responseData = __rest(_f, ["userErrors"]);
|
|
110
|
-
if (arrayNotEmpty(userErrors)) {
|
|
111
|
-
const errorMessages = ensureArray(userErrors).map(({ message }) => ensureString(message));
|
|
112
|
+
const _f = (0, shared_1.ensureObject)(_responseData), { userErrors } = _f, responseData = __rest(_f, ["userErrors"]);
|
|
113
|
+
if ((0, shared_1.arrayNotEmpty)(userErrors)) {
|
|
114
|
+
const errorMessages = (0, shared_1.ensureArray)(userErrors).map(({ message }) => (0, shared_1.ensureString)(message));
|
|
112
115
|
return res.status(500).json({ message: `${message}. ${errorMessages.join('. ')}.` });
|
|
113
116
|
}
|
|
114
117
|
// NOTE: sending in both to transform in case someone needs the userErrors
|
|
@@ -120,4 +123,5 @@ export const handleGraph = (serverRuntimeConfig) => {
|
|
|
120
123
|
}
|
|
121
124
|
});
|
|
122
125
|
};
|
|
126
|
+
exports.handleGraph = handleGraph;
|
|
123
127
|
//# sourceMappingURL=graph.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"graph.js","sourceRoot":"","sources":["../../../../../src/lib/handlers/api/verifiable/graph.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"graph.js","sourceRoot":"","sources":["../../../../../src/lib/handlers/api/verifiable/graph.js"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,22 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
1
|
+
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
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);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
14
|
+
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
15
|
+
};
|
|
16
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
|
+
__exportStar(require("./appInstallation"), exports);
|
|
18
|
+
__exportStar(require("./graph"), exports);
|
|
19
|
+
__exportStar(require("./proxy"), exports);
|
|
20
|
+
__exportStar(require("./rest"), exports);
|
|
21
|
+
__exportStar(require("./token"), exports);
|
|
6
22
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/lib/handlers/api/verifiable/index.js"],"names":[],"mappings":"AAAA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/lib/handlers/api/verifiable/index.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,oDAAiC;AACjC,0CAAuB;AACvB,0CAAuB;AACvB,yCAAsB;AACtB,0CAAuB"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
"use strict";
|
|
1
2
|
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
2
3
|
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
3
4
|
return new (P || (P = Promise))(function (resolve, reject) {
|
|
@@ -18,24 +19,29 @@ var __rest = (this && this.__rest) || function (s, e) {
|
|
|
18
19
|
}
|
|
19
20
|
return t;
|
|
20
21
|
};
|
|
22
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
23
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
24
|
+
};
|
|
25
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
|
+
exports.handleProxy = void 0;
|
|
21
27
|
/* eslint-disable @typescript-eslint/no-unused-vars */
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
+
const nextjs_cors_1 = __importDefault(require("nextjs-cors"));
|
|
29
|
+
const http_proxy_1 = __importDefault(require("http-proxy"));
|
|
30
|
+
const node_http_proxy_json_1 = __importDefault(require("node-http-proxy-json"));
|
|
31
|
+
const utils_1 = require("../../../utils");
|
|
32
|
+
const shared_1 = require("../../../../shared");
|
|
33
|
+
const verification_1 = require("../../../../verification");
|
|
28
34
|
const PROXY_TIMEOUT = 6000; // NOTE: 6 seconds
|
|
29
35
|
const verifyAppProxySignature = (signature, verifiable, hmacSecret) => {
|
|
30
|
-
const hmac = generateHMAC(objectToSortedString(verifiable), hmacSecret);
|
|
31
|
-
return compareHashes(signature, hmac);
|
|
36
|
+
const hmac = (0, utils_1.generateHMAC)((0, shared_1.objectToSortedString)(verifiable), hmacSecret);
|
|
37
|
+
return (0, utils_1.compareHashes)(signature, hmac);
|
|
32
38
|
};
|
|
33
|
-
|
|
39
|
+
const handleProxy = (serverRuntimeConfig, config) => {
|
|
34
40
|
const { generateReplacements } = config !== null && config !== void 0 ? config : {};
|
|
35
41
|
const { API_BASE_PATH, API_URLS, API_PATHS, APP_CONFIG, APP_BASE_URL, TARGET_SAFELIST, ORIGIN_SAFELIST, } = serverRuntimeConfig;
|
|
36
|
-
const _prepareHeaders = prepareHeaders(serverRuntimeConfig);
|
|
37
|
-
const _getVerificationHelpers = getVerificationHelpers(serverRuntimeConfig);
|
|
38
|
-
const _getVerifiedSessionData = getVerifiedSessionData(serverRuntimeConfig);
|
|
42
|
+
const _prepareHeaders = (0, utils_1.prepareHeaders)(serverRuntimeConfig);
|
|
43
|
+
const _getVerificationHelpers = (0, verification_1.getVerificationHelpers)(serverRuntimeConfig);
|
|
44
|
+
const _getVerifiedSessionData = (0, utils_1.getVerifiedSessionData)(serverRuntimeConfig);
|
|
39
45
|
return (req, res, params) => __awaiter(void 0, void 0, void 0, function* () {
|
|
40
46
|
var _a, _b, _c, _d;
|
|
41
47
|
const _e = (_a = req.headers) !== null && _a !== void 0 ? _a : {}, { origin, 'x-forwarded-for': _forwardFor, 'x-forwarded-proto': _forwardProto, 'x-forwarded-host': forwardHost, 'x-proxy-origin': proxyOrigin } = _e, _headers = __rest(_e, ["origin", 'x-forwarded-for', 'x-forwarded-proto', 'x-forwarded-host', 'x-proxy-origin']);
|
|
@@ -47,16 +53,16 @@ export const handleProxy = (serverRuntimeConfig, config) => {
|
|
|
47
53
|
let targetPath;
|
|
48
54
|
try {
|
|
49
55
|
// NOTE: GET requests are not always sending along origin
|
|
50
|
-
if (stringEmpty(origin)) {
|
|
56
|
+
if ((0, shared_1.stringEmpty)(origin)) {
|
|
51
57
|
req.headers = Object.assign(Object.assign({}, req.headers), { origin: proxyOrigin || forwardHost });
|
|
52
58
|
}
|
|
53
59
|
const _f = (_b = req.query) !== null && _b !== void 0 ? _b : {}, { signature, proxyEncoded } = _f, verifiable = __rest(_f, ["signature", "proxyEncoded"]);
|
|
54
60
|
const { shop: _shop, host, timestamp, path_prefix } = verifiable;
|
|
55
61
|
const shop = _shop || shopHeader;
|
|
56
|
-
yield
|
|
62
|
+
yield (0, nextjs_cors_1.default)(req, res, {
|
|
57
63
|
methods: ['PUT', 'PATCH', 'POST', 'DELETE'],
|
|
58
64
|
origin: (origin, callback) => {
|
|
59
|
-
const isSafelisted = matchHostname(origin, [
|
|
65
|
+
const isSafelisted = (0, shared_1.matchHostname)(origin, [
|
|
60
66
|
...ORIGIN_SAFELIST,
|
|
61
67
|
'cdn.shopify.com' // NOTE: this is the domain for checkout UI extensions
|
|
62
68
|
]);
|
|
@@ -69,10 +75,10 @@ export const handleProxy = (serverRuntimeConfig, config) => {
|
|
|
69
75
|
});
|
|
70
76
|
const { target: targetParam } = params !== null && params !== void 0 ? params : {};
|
|
71
77
|
// eslint-disable-next-line max-len
|
|
72
|
-
const _targetUrl = (stringEmpty(targetParam) || targetParam.startsWith('http')) ? targetParam : `${APP_BASE_URL}/${removeLeadingSlash(targetParam)}`;
|
|
73
|
-
const { origin: target, hostname, pathname, search } = stringNotEmpty(_targetUrl) ? new URL(_targetUrl) : {};
|
|
74
|
-
targetPath = [pathname, search].filter(stringNotEmpty).join('');
|
|
75
|
-
const safelistedTarget = matchHostname(hostname, Object.assign({ [new URL(APP_BASE_URL).hostname]: {
|
|
78
|
+
const _targetUrl = ((0, shared_1.stringEmpty)(targetParam) || targetParam.startsWith('http')) ? targetParam : `${APP_BASE_URL}/${(0, shared_1.removeLeadingSlash)(targetParam)}`;
|
|
79
|
+
const { origin: target, hostname, pathname, search } = (0, shared_1.stringNotEmpty)(_targetUrl) ? new URL(_targetUrl) : {};
|
|
80
|
+
targetPath = [pathname, search].filter(shared_1.stringNotEmpty).join('');
|
|
81
|
+
const safelistedTarget = (0, shared_1.matchHostname)(hostname, Object.assign({ [new URL(APP_BASE_URL).hostname]: {
|
|
76
82
|
// HMMM: can we generate our own session token (or use the current one) so as to not have to tell handleGraph/Rest to behave as offline?
|
|
77
83
|
// headers: {
|
|
78
84
|
// Authorization: 'Bearer {{setting.zendesk.token}}',
|
|
@@ -82,30 +88,30 @@ export const handleProxy = (serverRuntimeConfig, config) => {
|
|
|
82
88
|
host,
|
|
83
89
|
},
|
|
84
90
|
} }, TARGET_SAFELIST));
|
|
85
|
-
if (stringEmpty(targetPath) || (safelistedTarget == undefined)) {
|
|
91
|
+
if ((0, shared_1.stringEmpty)(targetPath) || (safelistedTarget == undefined)) {
|
|
86
92
|
return res.status(407).json({ message: 'Unproxyable target' });
|
|
87
93
|
}
|
|
88
94
|
if (!shop || !host || !extensionPoint || !signature || !proxyEncoded) {
|
|
89
95
|
return res.status(400).json({ message: 'Invalid or missing headers', extensionPoint });
|
|
90
96
|
}
|
|
91
|
-
const isShopifyOriginOrRelative = stringNotEmpty(ensureString(path_prefix).startsWith('http')
|
|
92
|
-
? sanitizeShop(new URL(path_prefix).hostname)
|
|
97
|
+
const isShopifyOriginOrRelative = (0, shared_1.stringNotEmpty)((0, shared_1.ensureString)(path_prefix).startsWith('http')
|
|
98
|
+
? (0, shared_1.sanitizeShop)(new URL(path_prefix).hostname)
|
|
93
99
|
: path_prefix);
|
|
94
100
|
// TODO: once Shopify fixes CORS issue when origin is cdn.shopify.com, update this!
|
|
95
101
|
if (!verifyAppProxySignature(signature, verifiable, isShopifyOriginOrRelative ? APP_CONFIG.apiSecretKey : timestamp)) {
|
|
96
102
|
return res.status(403).json({ message: 'Invalid signature' });
|
|
97
103
|
}
|
|
98
|
-
const isTokenRequest = ((targetParam === null || targetParam === void 0 ? void 0 : targetParam.startsWith(API_PATHS[API_ROUTE_NAMES.SESSION_TOKEN])) ||
|
|
99
|
-
(targetParam === null || targetParam === void 0 ? void 0 : targetParam.startsWith(API_URLS[API_ROUTE_NAMES.SESSION_TOKEN])));
|
|
104
|
+
const isTokenRequest = ((targetParam === null || targetParam === void 0 ? void 0 : targetParam.startsWith(API_PATHS[shared_1.API_ROUTE_NAMES.SESSION_TOKEN])) ||
|
|
105
|
+
(targetParam === null || targetParam === void 0 ? void 0 : targetParam.startsWith(API_URLS[shared_1.API_ROUTE_NAMES.SESSION_TOKEN])));
|
|
100
106
|
if (!isTokenRequest) {
|
|
101
107
|
const isVerifiedSession = yield _getVerifiedSessionData(sessionToken, { shop, host });
|
|
102
108
|
if (!isVerifiedSession) {
|
|
103
109
|
return res.status(403).json({ message: 'Unverified signature' });
|
|
104
110
|
}
|
|
105
111
|
}
|
|
106
|
-
const { headers: targetHeaders, params: targetParams } = ensureObject(safelistedTarget);
|
|
107
|
-
if (objectNotEmpty(targetParams)) {
|
|
108
|
-
targetPath = appendQuery(targetPath, new URLSearchParams(targetParams).toString());
|
|
112
|
+
const { headers: targetHeaders, params: targetParams } = (0, shared_1.ensureObject)(safelistedTarget);
|
|
113
|
+
if ((0, shared_1.objectNotEmpty)(targetParams)) {
|
|
114
|
+
targetPath = (0, shared_1.appendQuery)(targetPath, new URLSearchParams(targetParams).toString());
|
|
109
115
|
}
|
|
110
116
|
let requestBody;
|
|
111
117
|
let processResponse;
|
|
@@ -116,7 +122,7 @@ export const handleProxy = (serverRuntimeConfig, config) => {
|
|
|
116
122
|
}));
|
|
117
123
|
}
|
|
118
124
|
catch (error) {
|
|
119
|
-
if (error instanceof VerificationError) {
|
|
125
|
+
if (error instanceof verification_1.VerificationError) {
|
|
120
126
|
return res.status(error.code).json({ message: error.message });
|
|
121
127
|
}
|
|
122
128
|
return res.status(403).json({ message: 'Verification error' });
|
|
@@ -127,7 +133,7 @@ export const handleProxy = (serverRuntimeConfig, config) => {
|
|
|
127
133
|
appId,
|
|
128
134
|
headers: Object.assign(Object.assign({}, _headers), targetHeaders),
|
|
129
135
|
});
|
|
130
|
-
const proxy =
|
|
136
|
+
const proxy = http_proxy_1.default.createProxy();
|
|
131
137
|
return new Promise((resolve, reject) => {
|
|
132
138
|
req.url = targetPath;
|
|
133
139
|
if (headers) {
|
|
@@ -141,7 +147,7 @@ export const handleProxy = (serverRuntimeConfig, config) => {
|
|
|
141
147
|
}
|
|
142
148
|
});
|
|
143
149
|
proxy.on('proxyRes', function (proxyRes, proxyResRequest, proxyResResponse) {
|
|
144
|
-
|
|
150
|
+
(0, node_http_proxy_json_1.default)(proxyResResponse, proxyRes, function (proxyResBody) {
|
|
145
151
|
return __awaiter(this, void 0, void 0, function* () {
|
|
146
152
|
return processResponse(proxyResBody);
|
|
147
153
|
});
|
|
@@ -163,12 +169,13 @@ export const handleProxy = (serverRuntimeConfig, config) => {
|
|
|
163
169
|
}
|
|
164
170
|
catch (error) {
|
|
165
171
|
// eslint-disable-next-line max-len
|
|
166
|
-
console.error(`Error handling proxy request: ${targetPath}`, cleanObject(Object.assign({ type: error === null || error === void 0 ? void 0 : error.type, code: error === null || error === void 0 ? void 0 : error.code, name: error === null || error === void 0 ? void 0 : error.name, message: error === null || error === void 0 ? void 0 : error.message }, error === null || error === void 0 ? void 0 : error.data)));
|
|
167
|
-
if (error instanceof ShopifySessionInvalidError) {
|
|
172
|
+
console.error(`Error handling proxy request: ${targetPath}`, (0, shared_1.cleanObject)(Object.assign({ type: error === null || error === void 0 ? void 0 : error.type, code: error === null || error === void 0 ? void 0 : error.code, name: error === null || error === void 0 ? void 0 : error.name, message: error === null || error === void 0 ? void 0 : error.message }, error === null || error === void 0 ? void 0 : error.data)));
|
|
173
|
+
if (error instanceof shared_1.ShopifySessionInvalidError) {
|
|
168
174
|
return res.status((_c = error === null || error === void 0 ? void 0 : error.code) !== null && _c !== void 0 ? _c : 407).json({ message: error.message, type: (_d = error === null || error === void 0 ? void 0 : error.type) !== null && _d !== void 0 ? _d : 'ShopifySessionInvalidError' });
|
|
169
175
|
}
|
|
170
176
|
return res.status(400).json({ message: (error === null || error === void 0 ? void 0 : error.message) || 'Error handling proxy request', targetPath });
|
|
171
177
|
}
|
|
172
178
|
});
|
|
173
179
|
};
|
|
180
|
+
exports.handleProxy = handleProxy;
|
|
174
181
|
//# sourceMappingURL=proxy.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"proxy.js","sourceRoot":"","sources":["../../../../../src/lib/handlers/api/verifiable/proxy.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"proxy.js","sourceRoot":"","sources":["../../../../../src/lib/handlers/api/verifiable/proxy.js"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
"use strict";
|
|
1
2
|
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
2
3
|
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
3
4
|
return new (P || (P = Promise))(function (resolve, reject) {
|
|
@@ -18,12 +19,14 @@ var __rest = (this && this.__rest) || function (s, e) {
|
|
|
18
19
|
}
|
|
19
20
|
return t;
|
|
20
21
|
};
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
22
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
23
|
+
exports.handleRest = void 0;
|
|
24
|
+
const shopify_api_1 = require("@shopify/shopify-api");
|
|
25
|
+
const utils_1 = require("../../../utils");
|
|
26
|
+
const shared_1 = require("../../../../shared");
|
|
27
|
+
const verification_1 = require("../../../../verification");
|
|
28
|
+
const handleRest = (serverRuntimeConfig) => {
|
|
29
|
+
const _getVerificationHelpers = (0, verification_1.getVerificationHelpers)(serverRuntimeConfig);
|
|
27
30
|
return (req, res, _params) => __awaiter(void 0, void 0, void 0, function* () {
|
|
28
31
|
let requestBody;
|
|
29
32
|
let processResponse;
|
|
@@ -31,7 +34,7 @@ export const handleRest = (serverRuntimeConfig) => {
|
|
|
31
34
|
({ requestBody, processResponse } = yield _getVerificationHelpers(req));
|
|
32
35
|
}
|
|
33
36
|
catch (error) {
|
|
34
|
-
if (error instanceof VerificationError) {
|
|
37
|
+
if (error instanceof verification_1.VerificationError) {
|
|
35
38
|
return res.status(error.code).json(Object.assign({ message: error.message }, error.data));
|
|
36
39
|
}
|
|
37
40
|
return res.status(403).json({ message: 'Verification error' });
|
|
@@ -39,7 +42,7 @@ export const handleRest = (serverRuntimeConfig) => {
|
|
|
39
42
|
const { query: _query, method: _method } = req;
|
|
40
43
|
const { shop } = _query !== null && _query !== void 0 ? _query : {};
|
|
41
44
|
const _a = _params !== null && _params !== void 0 ? _params : {}, { path, isOnline, method: methodParam, query: queryParam, body: bodyParam, transform = (_data) => _data } = _a, params = __rest(_a, ["path", "isOnline", "method", "query", "body", "transform"]);
|
|
42
|
-
if (stringEmpty(shop) || stringEmpty(path)) {
|
|
45
|
+
if ((0, shared_1.stringEmpty)(shop) || (0, shared_1.stringEmpty)(path)) {
|
|
43
46
|
return {
|
|
44
47
|
statusCode: 400,
|
|
45
48
|
message: 'Invalid arguments',
|
|
@@ -51,17 +54,17 @@ export const handleRest = (serverRuntimeConfig) => {
|
|
|
51
54
|
let headers = {};
|
|
52
55
|
try {
|
|
53
56
|
let queryData = queryParam !== null && queryParam !== void 0 ? queryParam : _query;
|
|
54
|
-
if (isType(queryData, 'string')) {
|
|
55
|
-
queryData = querystringToObject(queryData);
|
|
57
|
+
if ((0, shared_1.isType)(queryData, 'string')) {
|
|
58
|
+
queryData = (0, shared_1.querystringToObject)(queryData);
|
|
56
59
|
}
|
|
57
|
-
const _b = ensureObject(queryData), { apiVersion } = _b, query = __rest(_b, ["apiVersion"]);
|
|
58
|
-
const body = safeParse(bodyParam !== null && bodyParam !== void 0 ? bodyParam : requestBody);
|
|
59
|
-
const method = ensureString(methodParam !== null && methodParam !== void 0 ? methodParam : _method).toLowerCase();
|
|
60
|
-
const { getVerifiedClients } = yield getShopifyHelpers(serverRuntimeConfig, { shop });
|
|
60
|
+
const _b = (0, shared_1.ensureObject)(queryData), { apiVersion } = _b, query = __rest(_b, ["apiVersion"]);
|
|
61
|
+
const body = (0, shared_1.safeParse)(bodyParam !== null && bodyParam !== void 0 ? bodyParam : requestBody);
|
|
62
|
+
const method = (0, shared_1.ensureString)(methodParam !== null && methodParam !== void 0 ? methodParam : _method).toLowerCase();
|
|
63
|
+
const { getVerifiedClients } = yield (0, utils_1.getShopifyHelpers)(serverRuntimeConfig, { shop });
|
|
61
64
|
const { Rest } = yield getVerifiedClients({ req, res, shop, apiVersion, isOnline });
|
|
62
65
|
response = yield Rest[method](Object.assign({ path,
|
|
63
66
|
query,
|
|
64
|
-
body, type: DataType.JSON }, params));
|
|
67
|
+
body, type: shopify_api_1.DataType.JSON }, params));
|
|
65
68
|
statusCode = 200;
|
|
66
69
|
}
|
|
67
70
|
catch (error) {
|
|
@@ -69,15 +72,15 @@ export const handleRest = (serverRuntimeConfig) => {
|
|
|
69
72
|
statusCode = 500;
|
|
70
73
|
// TODO: clean up to share between rest and graph (pr at least keep in sync)
|
|
71
74
|
switch (true) {
|
|
72
|
-
case error instanceof ShopifyAuthenticationError: {
|
|
75
|
+
case error instanceof shared_1.ShopifyAuthenticationError: {
|
|
73
76
|
console.error(`${message}. Authentication Error.`, error);
|
|
74
|
-
const errorResponse = getAuthErrorResponse(serverRuntimeConfig, { error, shop });
|
|
77
|
+
const errorResponse = (0, utils_1.getAuthErrorResponse)(serverRuntimeConfig, { error, shop });
|
|
75
78
|
statusCode = errorResponse.statusCode;
|
|
76
79
|
message = errorResponse.message;
|
|
77
80
|
headers = errorResponse.headers;
|
|
78
81
|
break;
|
|
79
82
|
}
|
|
80
|
-
case error instanceof BillingError: {
|
|
83
|
+
case error instanceof shopify_api_1.BillingError: {
|
|
81
84
|
console.error(`${message}. Billing Error - ${error.message}.`, error.errorData);
|
|
82
85
|
statusCode = 402;
|
|
83
86
|
if (error === null || error === void 0 ? void 0 : error.message) {
|
|
@@ -99,7 +102,7 @@ export const handleRest = (serverRuntimeConfig) => {
|
|
|
99
102
|
return res.status(statusCode).json(transformedResponse);
|
|
100
103
|
}
|
|
101
104
|
// HMMMMM???
|
|
102
|
-
if ((params === null || params === void 0 ? void 0 : params.type) && ![DataType.GraphQL, DataType.JSON].includes(params.type)) {
|
|
105
|
+
if ((params === null || params === void 0 ? void 0 : params.type) && ![shopify_api_1.DataType.GraphQL, shopify_api_1.DataType.JSON].includes(params.type)) {
|
|
103
106
|
const transformedResponse = yield processResponse(response);
|
|
104
107
|
return res.status(statusCode).send(transformedResponse);
|
|
105
108
|
}
|
|
@@ -111,4 +114,5 @@ export const handleRest = (serverRuntimeConfig) => {
|
|
|
111
114
|
return res.status(statusCode).json(transformedResponse);
|
|
112
115
|
});
|
|
113
116
|
};
|
|
117
|
+
exports.handleRest = handleRest;
|
|
114
118
|
//# sourceMappingURL=rest.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rest.js","sourceRoot":"","sources":["../../../../../src/lib/handlers/api/verifiable/rest.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"rest.js","sourceRoot":"","sources":["../../../../../src/lib/handlers/api/verifiable/rest.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;AAAA,sDAA6D;AAE7D,0CAAwE;AACxE,+CAQ2B;AAC3B,2DAAoF;AAE7E,MAAM,UAAU,GAAG,CAAC,mBAAmB,EAAE,EAAE;IAChD,MAAM,uBAAuB,GAAG,IAAA,qCAAsB,EAAC,mBAAmB,CAAC,CAAA;IAE3E,OAAO,CAAO,GAAG,EAAE,GAAG,EAAE,OAAO,EAAE,EAAE;QACjC,IAAI,WAAW,CAAA;QACf,IAAI,eAAe,CAAA;QACnB,IAAI;YACF,CAAC,EAAE,WAAW,EAAE,eAAe,EAAE,GAAG,MAAM,uBAAuB,CAAC,GAAG,CAAC,CAAC,CAAA;SACxE;QAAC,OAAO,KAAK,EAAE;YACd,IAAI,KAAK,YAAY,gCAAiB,EAAE;gBACtC,OAAO,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,iBAAG,OAAO,EAAE,KAAK,CAAC,OAAO,IAAK,KAAK,CAAC,IAAI,EAAG,CAAA;aAC9E;YAED,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,oBAAoB,EAAE,CAAC,CAAA;SAC/D;QAED,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,GAAG,CAAA;QAC9C,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,EAAE,CAAA;QAC7B,MAAM,KAQF,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI,EAAE,EARX,EACJ,IAAI,EACJ,QAAQ,EACR,MAAM,EAAE,WAAW,EACnB,KAAK,EAAE,UAAU,EACjB,IAAI,EAAE,SAAS,EACf,SAAS,GAAG,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,OAEb,EADZ,MAAM,cAPL,4DAQL,CAAgB,CAAA;QAEjB,IAAI,IAAA,oBAAW,EAAC,IAAI,CAAC,IAAI,IAAA,oBAAW,EAAC,IAAI,CAAC,EAAE;YAC1C,OAAO;gBACL,UAAU,EAAE,GAAG;gBACf,OAAO,EAAE,mBAAmB;aAC7B,CAAA;SACF;QAED,IAAI,UAAU,CAAA;QACd,IAAI,QAAQ,CAAA;QACZ,IAAI,OAAO,CAAA;QACX,IAAI,OAAO,GAAG,EAAE,CAAA;QAEhB,IAAI;YACF,IAAI,SAAS,GAAG,UAAU,aAAV,UAAU,cAAV,UAAU,GAAI,MAAM,CAAA;YACpC,IAAI,IAAA,eAAM,EAAC,SAAS,EAAE,QAAQ,CAAC,EAAE;gBAC/B,SAAS,GAAG,IAAA,4BAAmB,EAAC,SAAS,CAAC,CAAA;aAC3C;YAED,MAAM,KAA2B,IAAA,qBAAY,EAAC,SAAS,CAAC,EAAlD,EAAE,UAAU,OAAsC,EAAjC,KAAK,cAAtB,cAAwB,CAA0B,CAAA;YACxD,MAAM,IAAI,GAAG,IAAA,kBAAS,EAAC,SAAS,aAAT,SAAS,cAAT,SAAS,GAAI,WAAW,CAAC,CAAA;YAChD,MAAM,MAAM,GAAG,IAAA,qBAAY,EAAC,WAAW,aAAX,WAAW,cAAX,WAAW,GAAI,OAAO,CAAC,CAAC,WAAW,EAAE,CAAA;YAEjE,MAAM,EAAE,kBAAkB,EAAE,GAAG,MAAM,IAAA,yBAAiB,EAAC,mBAAmB,EAAE,EAAE,IAAI,EAAE,CAAC,CAAA;YACrF,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,kBAAkB,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,CAAC,CAAA;YAEnF,QAAQ,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,iBAC3B,IAAI;gBACJ,KAAK;gBACL,IAAI,EACJ,IAAI,EAAE,sBAAQ,CAAC,IAAI,IAChB,MAAM,EACT,CAAA;YAEF,UAAU,GAAG,GAAG,CAAA;SACjB;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,GAAG,0BAA0B,CAAA;YACpC,UAAU,GAAG,GAAG,CAAA;YAEhB,4EAA4E;YAC5E,QAAQ,IAAI,EAAE;gBACZ,KAAK,KAAK,YAAY,mCAA0B,CAAC,CAAC;oBAChD,OAAO,CAAC,KAAK,CAAC,GAAG,OAAO,yBAAyB,EAAE,KAAK,CAAC,CAAA;oBACzD,MAAM,aAAa,GAAG,IAAA,4BAAoB,EAAC,mBAAmB,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAA;oBAChF,UAAU,GAAG,aAAa,CAAC,UAAU,CAAA;oBACrC,OAAO,GAAG,aAAa,CAAC,OAAO,CAAA;oBAC/B,OAAO,GAAG,aAAa,CAAC,OAAO,CAAA;oBAC/B,MAAK;iBACN;gBAED,KAAK,KAAK,YAAY,0BAAY,CAAC,CAAC;oBAClC,OAAO,CAAC,KAAK,CAAC,GAAG,OAAO,qBAAqB,KAAK,CAAC,OAAO,GAAG,EAAE,KAAK,CAAC,SAAS,CAAC,CAAA;oBAC/E,UAAU,GAAG,GAAG,CAAA;oBAChB,IAAI,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,OAAO,EAAE;wBAClB,OAAO,GAAG,KAAK,CAAC,OAAO,CAAA;qBACxB;oBACD,MAAK;iBACN;gBAED,OAAO,CAAC,CAAC;oBACP,OAAO,CAAC,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,CAAA;oBAC7B,MAAK;iBACN;aACF;SACF;QAED,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;YAC/C,GAAG,CAAC,SAAS,CAAC,GAAG,EAAE,KAAK,CAAC,CAAA;QAC3B,CAAC,CAAC,CAAA;QAEF,IAAI,CAAC,QAAQ,EAAE;YACb,MAAM,mBAAmB,GAAG,MAAM,eAAe,CAAC,EAAE,OAAO,EAAE,CAAC,CAAA;YAC9D,OAAO,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAA;SACxD;QAED,YAAY;QACZ,IAAI,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,KAAI,CAAC,CAAC,sBAAQ,CAAC,OAAO,EAAE,sBAAQ,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE;YAC5E,MAAM,mBAAmB,GAAG,MAAM,eAAe,CAAC,QAAQ,CAAC,CAAA;YAC3D,OAAO,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAA;SACxD;QAED,IAAI,CAAC,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,IAAI,CAAA,EAAE;YACnB,MAAM,mBAAmB,GAAG,MAAM,eAAe,CAAC,EAAE,OAAO,EAAE,CAAC,CAAA;YAC9D,OAAO,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAA;SACxD;QAED,MAAM,mBAAmB,GAAG,MAAM,eAAe,CAC/C,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,CACzB,CAAA;QACD,OAAO,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAA;IACzD,CAAC,CAAA,CAAA;AACH,CAAC,CAAA;AAtHY,QAAA,UAAU,cAsHtB"}
|