@magda/typescript-common 2.3.3 → 3.0.0-alpha.0
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/AspectBuilder.d.ts +1 -1
- package/dist/AspectBuilder.js +1 -2
- package/dist/AspectCreationFailure.js +3 -4
- package/dist/AspectCreationFailure.js.map +1 -1
- package/dist/AsyncPage.js +59 -79
- package/dist/AsyncPage.js.map +1 -1
- package/dist/BaseApiClient.d.ts +3 -3
- package/dist/BaseApiClient.js +20 -13
- package/dist/BaseApiClient.js.map +1 -1
- package/dist/ConnectionResult.d.ts +2 -2
- package/dist/ConnectionResult.js +17 -22
- package/dist/ConnectionResult.js.map +1 -1
- package/dist/ConnectorRecordId.d.ts +1 -1
- package/dist/ConnectorRecordId.js +9 -13
- package/dist/ConnectorRecordId.js.map +1 -1
- package/dist/IndexerApiClient.d.ts +1 -1
- package/dist/IndexerApiClient.js +13 -32
- package/dist/IndexerApiClient.js.map +1 -1
- package/dist/JsonConnector.d.ts +9 -9
- package/dist/JsonConnector.js +163 -206
- package/dist/JsonConnector.js.map +1 -1
- package/dist/JsonTransformer.d.ts +3 -3
- package/dist/JsonTransformer.js +71 -75
- package/dist/JsonTransformer.js.map +1 -1
- package/dist/OpaCompileResponseParser.d.ts +4 -4
- package/dist/OpaCompileResponseParser.js +278 -211
- package/dist/OpaCompileResponseParser.js.map +1 -1
- package/dist/RecordCreationFailure.d.ts +1 -1
- package/dist/RecordCreationFailure.js +4 -4
- package/dist/RecordCreationFailure.js.map +1 -1
- package/dist/SQLUtils.d.ts +3 -3
- package/dist/SQLUtils.js +139 -195
- package/dist/SQLUtils.js.map +1 -1
- package/dist/ServerError.js +2 -4
- package/dist/ServerError.js.map +1 -1
- package/dist/Try.js +20 -35
- package/dist/Try.js.map +1 -1
- package/dist/addTrailingSlash.js +1 -4
- package/dist/addTrailingSlash.js.map +1 -1
- package/dist/appendUrlSegments.js +3 -8
- package/dist/appendUrlSegments.js.map +1 -1
- package/dist/authorization-api/AccessControlError.d.ts +1 -1
- package/dist/authorization-api/AccessControlError.js +2 -8
- package/dist/authorization-api/AccessControlError.js.map +1 -1
- package/dist/authorization-api/ApiClient.d.ts +3 -3
- package/dist/authorization-api/ApiClient.js +211 -272
- package/dist/authorization-api/ApiClient.js.map +1 -1
- package/dist/authorization-api/AuthError.d.ts +1 -1
- package/dist/authorization-api/AuthError.js +2 -8
- package/dist/authorization-api/AuthError.js.map +1 -1
- package/dist/authorization-api/GenericError.js +2 -4
- package/dist/authorization-api/GenericError.js.map +1 -1
- package/dist/authorization-api/authMiddleware.d.ts +3 -3
- package/dist/authorization-api/authMiddleware.js +19 -40
- package/dist/authorization-api/authMiddleware.js.map +1 -1
- package/dist/authorization-api/constants.js +9 -12
- package/dist/authorization-api/constants.js.map +1 -1
- package/dist/authorization-api/model.d.ts +8 -8
- package/dist/authorization-api/model.js +1 -2
- package/dist/coerceJson.js +1 -3
- package/dist/coerceJson.js.map +1 -1
- package/dist/createNoCacheFetchOptions.d.ts +1 -1
- package/dist/createNoCacheFetchOptions.js +4 -7
- package/dist/createNoCacheFetchOptions.js.map +1 -1
- package/dist/createServiceError.d.ts +1 -1
- package/dist/createServiceError.js +4 -9
- package/dist/createServiceError.js.map +1 -1
- package/dist/delay.js +1 -3
- package/dist/delay.js.map +1 -1
- package/dist/express/getNoCacheHeaders.js +1 -3
- package/dist/express/getNoCacheHeaders.js.map +1 -1
- package/dist/express/setResponseNoCache.d.ts +1 -1
- package/dist/express/setResponseNoCache.js +3 -8
- package/dist/express/setResponseNoCache.js.map +1 -1
- package/dist/express/status.d.ts +14 -15
- package/dist/express/status.js +135 -126
- package/dist/express/status.js.map +1 -1
- package/dist/fetchRequest.d.ts +6 -6
- package/dist/fetchRequest.js +36 -51
- package/dist/fetchRequest.js.map +1 -1
- package/dist/formatServiceError.js +1 -4
- package/dist/formatServiceError.js.map +1 -1
- package/dist/generated/registry/api.d.ts +4 -4
- package/dist/generated/registry/api.js +197 -102
- package/dist/generated/registry/api.js.map +1 -1
- package/dist/getAbsoluteUrl.js +8 -11
- package/dist/getAbsoluteUrl.js.map +1 -1
- package/dist/getBasePathFromUrl.js +3 -9
- package/dist/getBasePathFromUrl.js.map +1 -1
- package/dist/getBoolValWithDefault.js +1 -3
- package/dist/getBoolValWithDefault.js.map +1 -1
- package/dist/getRequest.js +9 -26
- package/dist/getRequest.js.map +1 -1
- package/dist/getRequestNoCache.js +4 -21
- package/dist/getRequestNoCache.js.map +1 -1
- package/dist/getStorageUrl.js +13 -23
- package/dist/getStorageUrl.js.map +1 -1
- package/dist/handleServerError.js +3 -9
- package/dist/handleServerError.js.map +1 -1
- package/dist/markdownToHtml.js +5 -11
- package/dist/markdownToHtml.js.map +1 -1
- package/dist/opa/AspectQuery.js +55 -79
- package/dist/opa/AspectQuery.js.map +1 -1
- package/dist/opa/AuthDecision.d.ts +2 -2
- package/dist/opa/AuthDecision.js +52 -69
- package/dist/opa/AuthDecision.js.map +1 -1
- package/dist/opa/AuthDecisionQueryClient.d.ts +2 -2
- package/dist/opa/AuthDecisionQueryClient.js +72 -102
- package/dist/opa/AuthDecisionQueryClient.js.map +1 -1
- package/dist/pgTypes.js +4 -9
- package/dist/pgTypes.js.map +1 -1
- package/dist/registry/AuthorizedRegistryClient.d.ts +4 -4
- package/dist/registry/AuthorizedRegistryClient.js +52 -92
- package/dist/registry/AuthorizedRegistryClient.js.map +1 -1
- package/dist/registry/RegistryClient.d.ts +2 -2
- package/dist/registry/RegistryClient.js +60 -76
- package/dist/registry/RegistryClient.js.map +1 -1
- package/dist/registry/TenantConsts.js +3 -6
- package/dist/registry/TenantConsts.js.map +1 -1
- package/dist/registry/model.js +1 -2
- package/dist/registry-manual/api.d.ts +1 -1
- package/dist/registry-manual/api.js +18 -7
- package/dist/registry-manual/api.js.map +1 -1
- package/dist/request.d.ts +2 -2
- package/dist/request.js +4 -9
- package/dist/request.js.map +1 -1
- package/dist/retry.d.ts +1 -1
- package/dist/retry.js +3 -9
- package/dist/retry.js.map +1 -1
- package/dist/retryBackoff.js +3 -9
- package/dist/retryBackoff.js.map +1 -1
- package/dist/runLater.js +1 -4
- package/dist/runLater.js.map +1 -1
- package/dist/session/GetUserId.d.ts +2 -2
- package/dist/session/GetUserId.js +10 -16
- package/dist/session/GetUserId.js.map +1 -1
- package/dist/session/GetUserSession.d.ts +1 -1
- package/dist/session/GetUserSession.js +6 -10
- package/dist/session/GetUserSession.js.map +1 -1
- package/dist/session/addJwtSecretFromEnvVar.js +1 -4
- package/dist/session/addJwtSecretFromEnvVar.js.map +1 -1
- package/dist/session/buildJwt.d.ts +1 -1
- package/dist/session/buildJwt.js +2 -5
- package/dist/session/buildJwt.js.map +1 -1
- package/dist/session/buildJwtFromReq.d.ts +1 -1
- package/dist/session/buildJwtFromReq.js +3 -8
- package/dist/session/buildJwtFromReq.js.map +1 -1
- package/dist/session/cookieUtils.d.ts +2 -13
- package/dist/session/cookieUtils.js +8 -9
- package/dist/session/cookieUtils.js.map +1 -1
- package/dist/session/destroySession.js +18 -33
- package/dist/session/destroySession.js.map +1 -1
- package/dist/session/getSessionId.js +5 -11
- package/dist/session/getSessionId.js.map +1 -1
- package/dist/tenant-api/AuthorizedTenantClient.d.ts +1 -1
- package/dist/tenant-api/AuthorizedTenantClient.js +22 -36
- package/dist/tenant-api/AuthorizedTenantClient.js.map +1 -1
- package/dist/tenant-api/Tenant.js +13 -5
- package/dist/tenant-api/Tenant.js.map +1 -1
- package/dist/test/JsonConnector.spec.js +56 -61
- package/dist/test/JsonConnector.spec.js.map +1 -1
- package/dist/test/JsonTransformer.spec.js +15 -19
- package/dist/test/JsonTransformer.spec.js.map +1 -1
- package/dist/test/arbitraries.d.ts +21 -21
- package/dist/test/arbitraries.js +85 -99
- package/dist/test/arbitraries.js.map +1 -1
- package/dist/test/aspect-templates/organization-details.d.ts +1 -4
- package/dist/test/aspect-templates/organization-details.js +1 -1
- package/dist/test/aspect-templates/organization-details.js.map +1 -1
- package/dist/test/buildApiClient.spec.js +81 -107
- package/dist/test/buildApiClient.spec.js.map +1 -1
- package/dist/test/buildAuthorizedTenantClient.spec.js +25 -40
- package/dist/test/buildAuthorizedTenantClient.spec.js.map +1 -1
- package/dist/test/connectors/MockExpressServer.js +9 -23
- package/dist/test/connectors/MockExpressServer.js.map +1 -1
- package/dist/test/connectors/MockRegistry.d.ts +1 -1
- package/dist/test/connectors/MockRegistry.js +11 -18
- package/dist/test/connectors/MockRegistry.js.map +1 -1
- package/dist/test/connectors/runConnectorTest.js +33 -55
- package/dist/test/connectors/runConnectorTest.js.map +1 -1
- package/dist/test/createMockAuthDecisionQueryClient.d.ts +4 -4
- package/dist/test/createMockAuthDecisionQueryClient.js +4 -9
- package/dist/test/createMockAuthDecisionQueryClient.js.map +1 -1
- package/dist/test/db/getTestDBConfig.js +1 -3
- package/dist/test/db/getTestDBConfig.js.map +1 -1
- package/dist/test/db/runMigrationSql.js +37 -58
- package/dist/test/db/runMigrationSql.js.map +1 -1
- package/dist/test/express/status.spec.js +81 -72
- package/dist/test/express/status.spec.js.map +1 -1
- package/dist/test/fakeArgv.js +6 -5
- package/dist/test/fakeArgv.js.map +1 -1
- package/dist/test/getBasePathFromUrl.spec.js +5 -10
- package/dist/test/getBasePathFromUrl.spec.js.map +1 -1
- package/dist/test/getStorageUrl.spec.js +22 -46
- package/dist/test/getStorageUrl.spec.js.map +1 -1
- package/dist/test/mockAuthApiHost.js +26 -28
- package/dist/test/mockAuthApiHost.js.map +1 -1
- package/dist/test/mockAuthorization.js +4 -10
- package/dist/test/mockAuthorization.js.map +1 -1
- package/dist/test/mockTenantDataStore.d.ts +1 -1
- package/dist/test/mockTenantDataStore.js +3 -5
- package/dist/test/mockTenantDataStore.js.map +1 -1
- package/dist/test/mockUserDataStore.d.ts +1 -1
- package/dist/test/mockUserDataStore.js +4 -6
- package/dist/test/mockUserDataStore.js.map +1 -1
- package/dist/test/registry/buildAuthorizedClient.spec.js +65 -87
- package/dist/test/registry/buildAuthorizedClient.spec.js.map +1 -1
- package/dist/test/session/buildJwt.spec.js +15 -19
- package/dist/test/session/buildJwt.spec.js.map +1 -1
- package/dist/test/session/buildJwtForRegistryEsriOpaGroupsAndOwnerTest.spec.js +6 -11
- package/dist/test/session/buildJwtForRegistryEsriOpaGroupsAndOwnerTest.spec.js.map +1 -1
- package/dist/test/session/buildJwtForRegistryEsriOpaGroupsTest.spec.js +6 -11
- package/dist/test/session/buildJwtForRegistryEsriOpaGroupsTest.spec.js.map +1 -1
- package/dist/test/session/buildJwtForRegistryEsriOpaOwnerTest.spec.js +6 -11
- package/dist/test/session/buildJwtForRegistryEsriOpaOwnerTest.spec.js.map +1 -1
- package/dist/test/testAsyncPage.spec.js +84 -105
- package/dist/test/testAsyncPage.spec.js.map +1 -1
- package/dist/test/testOpaCompileResponseParser.spec.js +192 -196
- package/dist/test/testOpaCompileResponseParser.spec.js.map +1 -1
- package/dist/test/util.js +1 -5
- package/dist/test/util.js.map +1 -1
- package/dist/unknown2Error.d.ts +2 -0
- package/dist/unknown2Error.js +3 -0
- package/dist/unknown2Error.js.map +1 -0
- package/dist/util/arrayToMaybe.d.ts +1 -1
- package/dist/util/arrayToMaybe.js +3 -6
- package/dist/util/arrayToMaybe.js.map +1 -1
- package/dist/util/cleanOrgTitle.js +1 -4
- package/dist/util/cleanOrgTitle.js.map +1 -1
- package/dist/util/escapeRegExp.js +1 -3
- package/dist/util/escapeRegExp.js.map +1 -1
- package/dist/util/getMinikubeIP.js +3 -9
- package/dist/util/getMinikubeIP.js.map +1 -1
- package/dist/util/isArray.js +1 -3
- package/dist/util/isArray.js.map +1 -1
- package/dist/util/isUuid.js +1 -3
- package/dist/util/isUuid.js.map +1 -1
- package/dist/util/unionToThrowable.d.ts +1 -1
- package/dist/util/unionToThrowable.js +3 -9
- package/dist/util/unionToThrowable.js.map +1 -1
- package/dist/utilityTypes.d.ts +1 -1
- package/dist/utilityTypes.js +1 -2
- package/package.json +44 -26
- package/dist/test/jsverify.d.ts +0 -2
- package/dist/test/jsverify.js +0 -8
- package/dist/test/jsverify.js.map +0 -1
|
@@ -1,11 +1,6 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
};
|
|
5
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
require("mocha");
|
|
7
|
-
const chai_1 = require("chai");
|
|
8
|
-
const getBasePathFromUrl_1 = __importDefault(require("../getBasePathFromUrl"));
|
|
1
|
+
import "mocha";
|
|
2
|
+
import { expect } from "chai";
|
|
3
|
+
import getBasePathFromUrl from "../getBasePathFromUrl.js";
|
|
9
4
|
const assertionList = {
|
|
10
5
|
"": "/",
|
|
11
6
|
"http://example.com": "/",
|
|
@@ -17,8 +12,8 @@ const assertionList = {
|
|
|
17
12
|
describe("getBasePathFromUrl", function () {
|
|
18
13
|
Object.keys(assertionList).forEach((key) => {
|
|
19
14
|
it(`Should return "${assertionList[key]}" for url "${key}" `, function () {
|
|
20
|
-
const result =
|
|
21
|
-
|
|
15
|
+
const result = getBasePathFromUrl(key);
|
|
16
|
+
expect(result).to.be.equal(assertionList[key]);
|
|
22
17
|
});
|
|
23
18
|
});
|
|
24
19
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getBasePathFromUrl.spec.js","sourceRoot":"","sources":["../../src/test/getBasePathFromUrl.spec.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"getBasePathFromUrl.spec.js","sourceRoot":"","sources":["../../src/test/getBasePathFromUrl.spec.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,CAAC;AACf,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAC9B,OAAO,kBAAkB,MAAM,0BAA0B,CAAC;AAE1D,MAAM,aAAa,GAA8B;IAC7C,EAAE,EAAE,GAAG;IACP,oBAAoB,EAAE,GAAG;IACzB,qBAAqB,EAAE,GAAG;IAC1B,4BAA4B,EAAE,SAAS;IACvC,2BAA2B,EAAE,SAAS;IACtC,iDAAiD;CACpD,CAAC;AAEF,QAAQ,CAAC,oBAAoB,EAAE;IAC3B,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;QACvC,EAAE,CAAC,kBAAkB,aAAa,CAAC,GAAG,CAAC,cAAc,GAAG,IAAI,EAAE;YAC1D,MAAM,MAAM,GAAG,kBAAkB,CAAC,GAAG,CAAC,CAAC;YACvC,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC;QACnD,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}
|
|
@@ -1,32 +1,8 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
if (k2 === undefined) k2 = k;
|
|
7
|
-
o[k2] = m[k];
|
|
8
|
-
}));
|
|
9
|
-
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
10
|
-
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
11
|
-
}) : function(o, v) {
|
|
12
|
-
o["default"] = v;
|
|
13
|
-
});
|
|
14
|
-
var __importStar = (this && this.__importStar) || function (mod) {
|
|
15
|
-
if (mod && mod.__esModule) return mod;
|
|
16
|
-
var result = {};
|
|
17
|
-
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
18
|
-
__setModuleDefault(result, mod);
|
|
19
|
-
return result;
|
|
20
|
-
};
|
|
21
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
22
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
23
|
-
};
|
|
24
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
25
|
-
require("mocha");
|
|
26
|
-
const chai_1 = require("chai");
|
|
27
|
-
const urijs_1 = __importDefault(require("urijs"));
|
|
28
|
-
const jsverify_1 = __importDefault(require("./jsverify"));
|
|
29
|
-
const getStorageUrl_1 = __importStar(require("../getStorageUrl"));
|
|
1
|
+
import "mocha";
|
|
2
|
+
import { expect } from "chai";
|
|
3
|
+
import urijs from "urijs";
|
|
4
|
+
import jsc from "jsverify";
|
|
5
|
+
import getStorageUrl, { InvalidCharsRegEx, isValidS3ObjectKey } from "../getStorageUrl.js";
|
|
30
6
|
function generateStr(len) {
|
|
31
7
|
if (len <= 0) {
|
|
32
8
|
return "";
|
|
@@ -37,19 +13,19 @@ function generateStr(len) {
|
|
|
37
13
|
.join("");
|
|
38
14
|
}
|
|
39
15
|
function verifyUrl(datasetId, distId, fileName, optionalFurtherCheck) {
|
|
40
|
-
const storageUrl =
|
|
41
|
-
const parts =
|
|
16
|
+
const storageUrl = getStorageUrl(datasetId, distId, fileName);
|
|
17
|
+
const parts = urijs(storageUrl).segmentCoded();
|
|
42
18
|
const objectKey = parts.join("/");
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
parts.forEach((part) =>
|
|
19
|
+
expect(objectKey.length).lte(1024);
|
|
20
|
+
expect(parts.length).equal(3);
|
|
21
|
+
parts.forEach((part) => expect(part.replace(InvalidCharsRegEx, "") === part));
|
|
46
22
|
if (optionalFurtherCheck) {
|
|
47
23
|
optionalFurtherCheck(storageUrl);
|
|
48
24
|
}
|
|
49
25
|
return true;
|
|
50
26
|
}
|
|
51
27
|
describe("getStorageUrl", function () {
|
|
52
|
-
|
|
28
|
+
jsc.property("should generate url contains valid s3 object key", jsc.string, jsc.string, jsc.string, jsc.string, jsc.bool, (datasetId, distId, fileName, extName, hasExtName) => {
|
|
53
29
|
const fullFileName = fileName + (hasExtName ? "." : "") + extName;
|
|
54
30
|
return verifyUrl("ds-" + datasetId, "dis-" + distId, fullFileName);
|
|
55
31
|
});
|
|
@@ -61,35 +37,35 @@ describe("getStorageUrl", function () {
|
|
|
61
37
|
verifyUrl("ds-" + generateStr(32), "dis-" + generateStr(32), Array(99999).fill("a").join("")));
|
|
62
38
|
});
|
|
63
39
|
it("should generate object key less than 1024 char with very long dataset or distribution id", () => {
|
|
64
|
-
return (verifyUrl("ds-" + Array(99999).fill("a").join(""), "dis-" + generateStr(32), "test.exe", (storageUrl) =>
|
|
65
|
-
verifyUrl("ds-" + generateStr(32), "dis-" + Array(99999).fill("a").join(""), "test.exe", (storageUrl) =>
|
|
66
|
-
verifyUrl("ds-" + Array(99999).fill("a").join(""), "dis-" + Array(99999).fill("a").join(""), "test.exe", (storageUrl) =>
|
|
40
|
+
return (verifyUrl("ds-" + Array(99999).fill("a").join(""), "dis-" + generateStr(32), "test.exe", (storageUrl) => expect(storageUrl.indexOf("test.exe")).not.equal(-1)) &&
|
|
41
|
+
verifyUrl("ds-" + generateStr(32), "dis-" + Array(99999).fill("a").join(""), "test.exe", (storageUrl) => expect(storageUrl.indexOf("test.exe")).not.equal(-1)) &&
|
|
42
|
+
verifyUrl("ds-" + Array(99999).fill("a").join(""), "dis-" + Array(99999).fill("a").join(""), "test.exe", (storageUrl) => expect(storageUrl.indexOf("test.exe")).not.equal(-1)));
|
|
67
43
|
});
|
|
68
44
|
});
|
|
69
45
|
describe("isValidS3ObjectKey", () => {
|
|
70
46
|
it("should return false for `sds//sds`", () => {
|
|
71
|
-
|
|
47
|
+
expect(isValidS3ObjectKey("sds//sds")).to.be.false;
|
|
72
48
|
});
|
|
73
49
|
it("should return false for `/sds/ss/sds`", () => {
|
|
74
|
-
|
|
50
|
+
expect(isValidS3ObjectKey("/sds/ss/sds")).to.be.false;
|
|
75
51
|
});
|
|
76
52
|
it("should return true for `sds/ss/sds`", () => {
|
|
77
|
-
|
|
53
|
+
expect(isValidS3ObjectKey("sds/ss/sds")).to.be.true;
|
|
78
54
|
});
|
|
79
55
|
it("should return false for `sds/ss/sds/`", () => {
|
|
80
|
-
|
|
56
|
+
expect(isValidS3ObjectKey("sds/ss/sds/")).to.be.false;
|
|
81
57
|
});
|
|
82
58
|
it("should return true for `magda-ds-192f7ca4-f3ad-4f87-9331-941329c616dd/magda-dist-8cd82dfb-61cd-4bb4-b168-85a511e1109d/pdf-test.pdf`", () => {
|
|
83
|
-
|
|
59
|
+
expect(isValidS3ObjectKey("magda-ds-192f7ca4-f3ad-4f87-9331-941329c616dd/magda-dist-8cd82dfb-61cd-4bb4-b168-85a511e1109d/pdf-test.pdf")).to.be.true;
|
|
84
60
|
});
|
|
85
61
|
it("should return false for `magda-datasets/magda-ds-192f7ca4-f3ad-4f87-9331-941329c616dd/magda-dist-68af523a-9ace-4ef9-b813-599b4c19dfbf/test spatial.csv`", () => {
|
|
86
|
-
|
|
62
|
+
expect(isValidS3ObjectKey("magda-datasets/magda-ds-192f7ca4-f3ad-4f87-9331-941329c616dd/magda-dist-68af523a-9ace-4ef9-b813-599b4c19dfbf/test spatial.csv")).to.be.false;
|
|
87
63
|
});
|
|
88
64
|
it("should return true for `magda-datasets/magda-ds-192f7ca4-f3ad-4f87-9331-941329c616dd/magda-dist-68af523a-9ace-4ef9-b813-599b4c19dfbf/testspatial.csv`", () => {
|
|
89
|
-
|
|
65
|
+
expect(isValidS3ObjectKey("magda-datasets/magda-ds-192f7ca4-f3ad-4f87-9331-941329c616dd/magda-dist-68af523a-9ace-4ef9-b813-599b4c19dfbf/testspatial.csv")).to.be.true;
|
|
90
66
|
});
|
|
91
67
|
it("should return false for key longer than 1024", () => {
|
|
92
|
-
|
|
68
|
+
expect(isValidS3ObjectKey(Array(1025).fill("a").join(""))).to.be.false;
|
|
93
69
|
});
|
|
94
70
|
});
|
|
95
71
|
//# sourceMappingURL=getStorageUrl.spec.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getStorageUrl.spec.js","sourceRoot":"","sources":["../../src/test/getStorageUrl.spec.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"getStorageUrl.spec.js","sourceRoot":"","sources":["../../src/test/getStorageUrl.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,14 +1,13 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
class mockAuthApiHost {
|
|
1
|
+
import nock from "nock";
|
|
2
|
+
import { getUserId } from "../session/GetUserId.js";
|
|
3
|
+
import AuthError from "../authorization-api/AuthError.js";
|
|
4
|
+
import mockUserDataStore from "./mockUserDataStore.js";
|
|
5
|
+
import * as url from "url";
|
|
6
|
+
export default class mockAuthApiHost {
|
|
7
|
+
scope;
|
|
8
|
+
authApiUrl;
|
|
9
|
+
jwtSecret;
|
|
10
|
+
defaultAdminUserId;
|
|
12
11
|
constructor(authApiUrl, jwtSecret, defaultAdminUserId) {
|
|
13
12
|
if (!authApiUrl)
|
|
14
13
|
throw new Error("authApiUrl is required to run mockAuthApiHost");
|
|
@@ -22,12 +21,12 @@ class mockAuthApiHost {
|
|
|
22
21
|
this.createHost();
|
|
23
22
|
}
|
|
24
23
|
start() {
|
|
25
|
-
|
|
24
|
+
nock.disableNetConnect();
|
|
26
25
|
this.createHost();
|
|
27
26
|
}
|
|
28
27
|
stop() {
|
|
29
|
-
|
|
30
|
-
|
|
28
|
+
nock.cleanAll();
|
|
29
|
+
nock.enableNetConnect();
|
|
31
30
|
}
|
|
32
31
|
mockReq(req, paramName = null) {
|
|
33
32
|
const mockReq = {
|
|
@@ -38,7 +37,7 @@ class mockAuthApiHost {
|
|
|
38
37
|
else
|
|
39
38
|
return "";
|
|
40
39
|
},
|
|
41
|
-
query:
|
|
40
|
+
query: url.parse(req.path, true, true).query,
|
|
42
41
|
params: (function () {
|
|
43
42
|
if (!paramName)
|
|
44
43
|
return {};
|
|
@@ -51,14 +50,14 @@ class mockAuthApiHost {
|
|
|
51
50
|
return mockReq;
|
|
52
51
|
}
|
|
53
52
|
mockAuthCheck(req, requiredAdminAccess = false) {
|
|
54
|
-
const userId =
|
|
53
|
+
const userId = getUserId(req, this.jwtSecret).valueOrThrow(new AuthError("Unauthorised", 401));
|
|
55
54
|
if (!requiredAdminAccess)
|
|
56
55
|
return;
|
|
57
56
|
if (userId != this.defaultAdminUserId)
|
|
58
|
-
throw new
|
|
57
|
+
throw new AuthError("Can only be accessed by Admin users", 403);
|
|
59
58
|
}
|
|
60
59
|
createHost() {
|
|
61
|
-
this.scope =
|
|
60
|
+
this.scope = nock(this.authApiUrl).persist();
|
|
62
61
|
const thisObj = this;
|
|
63
62
|
this.scope
|
|
64
63
|
.get("/private/users/lookup")
|
|
@@ -69,7 +68,7 @@ class mockAuthApiHost {
|
|
|
69
68
|
thisObj.mockAuthCheck(req, true);
|
|
70
69
|
}
|
|
71
70
|
catch (e) {
|
|
72
|
-
if (e instanceof
|
|
71
|
+
if (e instanceof AuthError) {
|
|
73
72
|
return [e.statusCode, e.message];
|
|
74
73
|
}
|
|
75
74
|
else {
|
|
@@ -81,13 +80,13 @@ class mockAuthApiHost {
|
|
|
81
80
|
const sourceId = req.query.sourceId;
|
|
82
81
|
if (!source || !sourceId)
|
|
83
82
|
return [500, "Missing query parameter"];
|
|
84
|
-
const records =
|
|
83
|
+
const records = mockUserDataStore.getRecordBySourceAndSourceId(source, sourceId);
|
|
85
84
|
if (!records.length)
|
|
86
85
|
return [404, "cannot locate record"];
|
|
87
86
|
return [200, JSON.stringify(records[0])];
|
|
88
87
|
}
|
|
89
88
|
catch (e) {
|
|
90
|
-
return [500, e
|
|
89
|
+
return [500, e?.message];
|
|
91
90
|
}
|
|
92
91
|
});
|
|
93
92
|
this.scope
|
|
@@ -98,7 +97,7 @@ class mockAuthApiHost {
|
|
|
98
97
|
thisObj.mockAuthCheck(req, true);
|
|
99
98
|
}
|
|
100
99
|
catch (e) {
|
|
101
|
-
if (e instanceof
|
|
100
|
+
if (e instanceof AuthError) {
|
|
102
101
|
return [e.statusCode, e.message];
|
|
103
102
|
}
|
|
104
103
|
else {
|
|
@@ -109,13 +108,13 @@ class mockAuthApiHost {
|
|
|
109
108
|
const userId = req.params.userId;
|
|
110
109
|
if (!userId)
|
|
111
110
|
return [500, "Missing userId parameter"];
|
|
112
|
-
const records =
|
|
111
|
+
const records = mockUserDataStore.getRecordByUserId(userId);
|
|
113
112
|
if (!records.length)
|
|
114
113
|
return [404, "cannot locate record"];
|
|
115
114
|
return [200, JSON.stringify(records[0])];
|
|
116
115
|
}
|
|
117
116
|
catch (e) {
|
|
118
|
-
return [500, e
|
|
117
|
+
return [500, e?.message];
|
|
119
118
|
}
|
|
120
119
|
});
|
|
121
120
|
this.scope
|
|
@@ -126,7 +125,7 @@ class mockAuthApiHost {
|
|
|
126
125
|
thisObj.mockAuthCheck(req, true);
|
|
127
126
|
}
|
|
128
127
|
catch (e) {
|
|
129
|
-
if (e instanceof
|
|
128
|
+
if (e instanceof AuthError) {
|
|
130
129
|
return [e.statusCode, e.message];
|
|
131
130
|
}
|
|
132
131
|
else {
|
|
@@ -137,14 +136,13 @@ class mockAuthApiHost {
|
|
|
137
136
|
if (!requestBody)
|
|
138
137
|
return [500, "Missing request body"];
|
|
139
138
|
const user = requestBody;
|
|
140
|
-
const newUser =
|
|
139
|
+
const newUser = mockUserDataStore.createRecord(user);
|
|
141
140
|
return [200, JSON.stringify(newUser)];
|
|
142
141
|
}
|
|
143
142
|
catch (e) {
|
|
144
|
-
return [500, e
|
|
143
|
+
return [500, e?.message];
|
|
145
144
|
}
|
|
146
145
|
});
|
|
147
146
|
}
|
|
148
147
|
}
|
|
149
|
-
exports.default = mockAuthApiHost;
|
|
150
148
|
//# sourceMappingURL=mockAuthApiHost.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mockAuthApiHost.js","sourceRoot":"","sources":["../../src/test/mockAuthApiHost.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"mockAuthApiHost.js","sourceRoot":"","sources":["../../src/test/mockAuthApiHost.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,13 +1,8 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
};
|
|
5
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
const jwt = require("jsonwebtoken");
|
|
7
|
-
const nock_1 = __importDefault(require("nock"));
|
|
8
|
-
function mockAuthorization(adminApiUrl, isAdmin, jwtSecret, req) {
|
|
1
|
+
import jwt from "jsonwebtoken";
|
|
2
|
+
import nock from "nock";
|
|
3
|
+
export default function mockAuthorization(adminApiUrl, isAdmin, jwtSecret, req) {
|
|
9
4
|
const userId = "b1fddd6f-e230-4068-bd2c-1a21844f1598";
|
|
10
|
-
const scope =
|
|
5
|
+
const scope = nock(adminApiUrl);
|
|
11
6
|
if (!isAdmin)
|
|
12
7
|
scope
|
|
13
8
|
.get(`/public/users/${userId}`)
|
|
@@ -20,5 +15,4 @@ function mockAuthorization(adminApiUrl, isAdmin, jwtSecret, req) {
|
|
|
20
15
|
return res;
|
|
21
16
|
});
|
|
22
17
|
}
|
|
23
|
-
exports.default = mockAuthorization;
|
|
24
18
|
//# sourceMappingURL=mockAuthorization.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mockAuthorization.js","sourceRoot":"","sources":["../../src/test/mockAuthorization.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"mockAuthorization.js","sourceRoot":"","sources":["../../src/test/mockAuthorization.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,cAAc,CAAC;AAC/B,OAAO,IAAI,MAAM,MAAM,CAAC;AAKxB,MAAM,CAAC,OAAO,UAAU,iBAAiB,CACrC,WAAmB,EACnB,OAAgB,EAChB,SAAiB,EACjB,GAAS;IAET,MAAM,MAAM,GAAG,sCAAsC,CAAC;IACtD,MAAM,KAAK,GAAG,IAAI,CAAC,WAAW,CAAC,CAAC;IAEhC,IAAI,CAAC,OAAO;QACR,KAAK;aACA,GAAG,CAAC,iBAAiB,MAAM,EAAE,CAAC;aAC9B,KAAK,CAAC,GAAG,EAAE,oDAAoD,CAAC,CAAC;;QACrE,KAAK,CAAC,GAAG,CAAC,iBAAiB,MAAM,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC;IAElE,MAAM,EAAE,GAAG,GAAG,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,SAAS,CAAC,CAAC;IAEnD,OAAO,GAAG,CAAC,GAAG,CAAC,iBAAiB,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE;QAC/C,KAAK,CAAC,IAAI,EAAE,CAAC;QACb,OAAO,GAAG,CAAC;IACf,CAAC,CAAC,CAAC;AACP,CAAC"}
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
1
|
const mockTenantData = [
|
|
4
2
|
{
|
|
5
3
|
id: 0,
|
|
@@ -21,14 +19,14 @@ let nextTenantId = 3;
|
|
|
21
19
|
let runtimeTenantDataStore;
|
|
22
20
|
const mockTenantDataStore = {
|
|
23
21
|
reset: function () {
|
|
24
|
-
runtimeTenantDataStore = mockTenantData.map((item) => (
|
|
22
|
+
runtimeTenantDataStore = mockTenantData.map((item) => ({ ...item }));
|
|
25
23
|
nextTenantId = 3;
|
|
26
24
|
},
|
|
27
25
|
getTenants: function () {
|
|
28
26
|
return runtimeTenantDataStore;
|
|
29
27
|
},
|
|
30
28
|
createTenant(tenant) {
|
|
31
|
-
const newTenant =
|
|
29
|
+
const newTenant = { ...tenant, id: nextTenantId++ };
|
|
32
30
|
runtimeTenantDataStore.push(newTenant);
|
|
33
31
|
return newTenant;
|
|
34
32
|
},
|
|
@@ -37,5 +35,5 @@ const mockTenantDataStore = {
|
|
|
37
35
|
}
|
|
38
36
|
};
|
|
39
37
|
mockTenantDataStore.reset();
|
|
40
|
-
|
|
38
|
+
export default mockTenantDataStore;
|
|
41
39
|
//# sourceMappingURL=mockTenantDataStore.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mockTenantDataStore.js","sourceRoot":"","sources":["../../src/test/mockTenantDataStore.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"mockTenantDataStore.js","sourceRoot":"","sources":["../../src/test/mockTenantDataStore.ts"],"names":[],"mappings":"AAEA,MAAM,cAAc,GAAG;IACnB;QACI,EAAE,EAAE,CAAC;QACL,UAAU,EAAE,UAAU;QACtB,OAAO,EAAE,IAAI;KAChB;IACD;QACI,EAAE,EAAE,CAAC;QACL,UAAU,EAAE,UAAU;QACtB,OAAO,EAAE,IAAI;KAChB;IACD;QACI,EAAE,EAAE,CAAC;QACL,UAAU,EAAE,UAAU;QACtB,OAAO,EAAE,KAAK;KACjB;CACJ,CAAC;AAEF,IAAI,YAAY,GAAG,CAAC,CAAC;AACrB,IAAI,sBAAgC,CAAC;AAErC,MAAM,mBAAmB,GAAG;IACxB,KAAK,EAAE;QACH,sBAAsB,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,IAAI,EAAE,CAAC,CAAC,CAAC;QACrE,YAAY,GAAG,CAAC,CAAC;IACrB,CAAC;IAED,UAAU,EAAE;QACR,OAAO,sBAAsB,CAAC;IAClC,CAAC;IAED,YAAY,CAAC,MAAc;QACvB,MAAM,SAAS,GAAQ,EAAE,GAAG,MAAM,EAAE,EAAE,EAAE,YAAY,EAAE,EAAE,CAAC;QACzD,sBAAsB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACvC,OAAO,SAAS,CAAC;IACrB,CAAC;IACD,YAAY,EAAE;QACV,OAAO,sBAAsB,CAAC,MAAM,CAAC;IACzC,CAAC;CACJ,CAAC;AAEF,mBAAmB,CAAC,KAAK,EAAE,CAAC;AAE5B,eAAe,mBAAmB,CAAC"}
|
|
@@ -1,6 +1,4 @@
|
|
|
1
|
-
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
const uuid_1 = require("uuid");
|
|
1
|
+
import { v4 as uuidv4 } from "uuid";
|
|
4
2
|
const mockUserData = [
|
|
5
3
|
{
|
|
6
4
|
id: "00000000-0000-4000-8000-000000000000",
|
|
@@ -24,7 +22,7 @@ const mockUserData = [
|
|
|
24
22
|
let runtimeUserDataStore;
|
|
25
23
|
const mockUserDataStore = {
|
|
26
24
|
reset: function () {
|
|
27
|
-
runtimeUserDataStore = mockUserData.map((item) => (
|
|
25
|
+
runtimeUserDataStore = mockUserData.map((item) => ({ ...item }));
|
|
28
26
|
},
|
|
29
27
|
getData: function () {
|
|
30
28
|
return runtimeUserDataStore;
|
|
@@ -43,7 +41,7 @@ const mockUserDataStore = {
|
|
|
43
41
|
return runtimeUserDataStore[idx];
|
|
44
42
|
},
|
|
45
43
|
createRecord(user) {
|
|
46
|
-
const newRecord =
|
|
44
|
+
const newRecord = { ...user, id: uuidv4() };
|
|
47
45
|
runtimeUserDataStore.push(newRecord);
|
|
48
46
|
return newRecord;
|
|
49
47
|
},
|
|
@@ -52,5 +50,5 @@ const mockUserDataStore = {
|
|
|
52
50
|
}
|
|
53
51
|
};
|
|
54
52
|
mockUserDataStore.reset();
|
|
55
|
-
|
|
53
|
+
export default mockUserDataStore;
|
|
56
54
|
//# sourceMappingURL=mockUserDataStore.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mockUserDataStore.js","sourceRoot":"","sources":["../../src/test/mockUserDataStore.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"mockUserDataStore.js","sourceRoot":"","sources":["../../src/test/mockUserDataStore.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,IAAI,MAAM,EAAE,MAAM,MAAM,CAAC;AAGpC,MAAM,YAAY,GAAG;IACjB;QACI,EAAE,EAAE,sCAAsC;QAC1C,WAAW,EAAE,OAAO;QACpB,KAAK,EAAE,iBAAiB;QACxB,QAAQ,EAAE,oBAAoB;QAC9B,MAAM,EAAE,QAAQ;QAChB,QAAQ,EAAE,GAAG;QACb,OAAO,EAAE,IAAI;KAChB;IACD;QACI,EAAE,EAAE,sCAAsC;QAC1C,WAAW,EAAE,eAAe;QAC5B,KAAK,EAAE,eAAe;QACtB,QAAQ,EAAE,oBAAoB;QAC9B,MAAM,EAAE,MAAM;QACd,QAAQ,EAAE,UAAU;QACpB,OAAO,EAAE,KAAK;KACjB;CACJ,CAAC;AAEF,IAAI,oBAA4B,CAAC;AAEjC,MAAM,iBAAiB,GAAG;IACtB,KAAK,EAAE;QACH,oBAAoB,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,IAAI,EAAE,CAAC,CAAC,CAAC;IACrE,CAAC;IAED,OAAO,EAAE;QACL,OAAO,oBAAoB,CAAC;IAChC,CAAC;IACD,4BAA4B,CAAC,MAAc,EAAE,QAAgB;QACzD,OAAO,oBAAoB,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE;YAC1C,OAAO,MAAM,CAAC,MAAM,IAAI,MAAM,IAAI,MAAM,CAAC,QAAQ,IAAI,QAAQ,CAAC;QAClE,CAAC,CAAC,CAAC;IACP,CAAC;IACD,iBAAiB,CAAC,MAAc;QAC5B,OAAO,oBAAoB,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE;YAC1C,OAAO,MAAM,CAAC,EAAE,IAAI,MAAM,CAAC;QAC/B,CAAC,CAAC,CAAC;IACP,CAAC;IACD,gBAAgB,CAAC,GAAW;QACxB,OAAO,oBAAoB,CAAC,GAAG,CAAC,CAAC;IACrC,CAAC;IACD,YAAY,CAAC,IAAU;QACnB,MAAM,SAAS,GAAQ,EAAE,GAAG,IAAI,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,CAAC;QACjD,oBAAoB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACrC,OAAO,SAAS,CAAC;IACrB,CAAC;IACD,WAAW,EAAE;QACT,OAAO,oBAAoB,CAAC,MAAM,CAAC;IACvC,CAAC;CACJ,CAAC;AAEF,iBAAiB,CAAC,KAAK,EAAE,CAAC;AAE1B,eAAe,iBAAiB,CAAC"}
|