@magda/typescript-common 2.0.0-alpha.0 → 2.0.0-alpha.1
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/OpaCompileResponseParser.d.ts +115 -4
- package/dist/OpaCompileResponseParser.js +233 -19
- package/dist/OpaCompileResponseParser.js.map +1 -1
- package/dist/SQLUtils.js +1 -1
- package/dist/SQLUtils.js.map +1 -1
- package/dist/authorization-api/authMiddleware.d.ts +7 -6
- package/dist/authorization-api/authMiddleware.js +54 -45
- package/dist/authorization-api/authMiddleware.js.map +1 -1
- package/dist/authorization-api/model.d.ts +1 -1
- package/dist/generated/registry/api.d.ts +11 -0
- package/dist/generated/registry/api.js +57 -0
- package/dist/generated/registry/api.js.map +1 -1
- package/dist/getStorageUrl.d.ts +34 -0
- package/dist/getStorageUrl.js +138 -0
- package/dist/getStorageUrl.js.map +1 -0
- package/dist/handleServerError.d.ts +2 -0
- package/dist/handleServerError.js +17 -0
- package/dist/handleServerError.js.map +1 -0
- package/dist/opa/AspectQuery.js +3 -0
- package/dist/opa/AspectQuery.js.map +1 -1
- package/dist/opa/AuthDecision.js +1 -1
- package/dist/opa/AuthDecision.js.map +1 -1
- package/dist/opa/AuthDecisionQueryClient.js +8 -5
- package/dist/opa/AuthDecisionQueryClient.js.map +1 -1
- package/dist/registry/RegistryClient.d.ts +1 -0
- package/dist/registry/RegistryClient.js +14 -0
- package/dist/registry/RegistryClient.js.map +1 -1
- package/dist/test/getStorageUrl.spec.d.ts +1 -0
- package/dist/test/getStorageUrl.spec.js +95 -0
- package/dist/test/getStorageUrl.spec.js.map +1 -0
- package/dist/test/sampleAuthDecisions/datasetPermissionWithOrgUnitConstraint.json +2 -2
- package/dist/test/sampleAuthDecisions/extraLargeResponse.json +2519 -0
- package/dist/test/sampleOpaResponses/datasetPermissionWithOrgUnitConstraint.json +2 -2
- package/dist/test/sampleOpaResponses/extraLargeResponse.json +104869 -0
- package/dist/test/testOpaCompileResponseParser.spec.js +19 -2
- package/dist/test/testOpaCompileResponseParser.spec.js.map +1 -1
- package/package.json +6 -4
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AuthDecisionQueryClient.js","sourceRoot":"","sources":["../../src/opa/AuthDecisionQueryClient.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wEAAqC;AACrC,kDAA0B;AAC1B,+DAAyE;AAgBzE,MAAM,uBAAuB;IAOzB,YAAY,cAAsB,EAAE,YAAqB,KAAK;QAN7C,mBAAc,GAAW,EAAE,CAAC;QAItC,iBAAY,GAAgB,EAAE,CAAC;QAGlC,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;QACrC,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"AuthDecisionQueryClient.js","sourceRoot":"","sources":["../../src/opa/AuthDecisionQueryClient.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wEAAqC;AACrC,kDAA0B;AAC1B,+DAAyE;AAgBzE,MAAM,uBAAuB;IAOzB,YAAY,cAAsB,EAAE,YAAqB,KAAK;QAN7C,mBAAc,GAAW,EAAE,CAAC;QAItC,iBAAY,GAAgB,EAAE,CAAC;QAGlC,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;QACrC,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,IAAI,CAAC,SAAS,EAAE;YAChB,OAAO,CAAC,IAAI,CACR,8JAA8J,CACjK,CAAC;SACL;IACL,CAAC;IAEK,eAAe,CACjB,MAA6B,EAC7B,QAAiB;;;YAEjB,IAAI,IAAI,CAAC,SAAS,EAAE;gBAChB,OAAO,CAAC,IAAI,CACR,8FAA8F,CACjG,CAAC;gBACF,OAAO,wCAAyB,CAAC;aACpC;YAED,MAAM,WAAW,GAA2B,EAAE,CAAC;YAE/C,IAAI,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,MAAM,EAAE;gBAChB,WAAW,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;aACtC;YACD,IAAI,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,OAAO,EAAE;gBACjB,WAAW,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC;aACxC;YACD,IAAI,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,OAAO,EAAE;gBACjB,WAAW,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC;aACxC;YACD,IAAI,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,MAAM,EAAE;gBAChB,WAAW,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;aACtC;YACD,IAAI,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,aAAa,EAAE;gBACvB,WAAW,CAAC,aAAa,GAAG,MAAM,CAAC,aAAa,CAAC;aACpD;YACD,IAAI,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,QAAQ,KAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE;gBAC7C,WAAW,CAAC,QAAQ,GAAG,EAAE,CAAC;aAC7B;YAED,MAAM,OAAO,GACT,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,KAAK,YAAI,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,QAAQ,0CAAE,MAAM,CAAA,KAAI,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,WAAW,CAAA,CAAC;YAErE,MAAM,OAAO,GAAG,eAAK,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;YAC3C,MAAM,WAAW,GAAG,OAAO;iBACtB,YAAY,EAAE;iBACd,MAAM,CAAC,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;iBAC3B,MAAM,CAAC,eAAK,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,YAAY,EAAE,CAAC,CAAC;YAEvD,MAAM,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;YAErE,MAAM,WAAW,+CACb,OAAO,EAAE,EAA4B,IAClC,uBAAuB,CAAC,YAAY,GACpC,IAAI,CAAC,YAAY,KACpB,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,GACnC,CAAC;YAEF,IAAI,QAAQ,EAAE;gBACT,WAAW,CAAC,OAAkC,CAC3C,iBAAiB,CACpB,GAAG,QAAQ,CAAC;aAChB;YAED,MAAM,WAAW,GAA2B,EAAE,CAAC;YAE/C,IAAI,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,KAAK,EAAE;gBACf,WAAW,CAAC,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC;aACpC;YAED,UAAI,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,QAAQ,0CAAE,MAAM,EAAE;gBAC1B,WAAW,CAAC,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC;aAC1C;YAED,IAAI,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,WAAW,EAAE;gBACrB,WAAW,CAAC,WAAW,GAAG,MAAM,CAAC,WAAW,CAAC;aAChD;YAED,IAAI,OAAO,EAAE;gBACT,WAAW,CAAC,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;gBAC9C,WAAW,CAAC,OAAkC,CAAC,cAAc,CAAC;oBAC3D,kBAAkB,CAAC;aAC1B;YAED,MAAM,GAAG,GAAG,MAAM,0BAAK,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,WAAW,CAAC,CAAC;YACxD,IAAI,GAAG,CAAC,MAAM,IAAI,GAAG,EAAE;gBACnB,MAAM,QAAQ,GAAG,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC;gBAClC,MAAM,QAAQ,GAAG,oDAAoD,MAAM,CAAC,YAAY,0BAA0B,QAAQ,EAAE,CAAC;gBAC7H,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;gBACxB,MAAM,IAAI,KAAK,CAAC,QAAQ,CAAC,CAAC;aAC7B;YAED,MAAM,IAAI,GAAG,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC;YAE9B,OAAO,sBAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;;KACtC;;AApGa,oCAAY,GAAgB,EAAE,CAAC;AAuGjD,kBAAe,uBAAuB,CAAC"}
|
|
@@ -41,6 +41,7 @@ export default class RegistryClient {
|
|
|
41
41
|
getAspectDefinitions(): Promise<AspectDefinition[] | Error>;
|
|
42
42
|
getAspectDefinition(aspectId: string, jwtToken?: string): Promise<AspectDefinition>;
|
|
43
43
|
getRecord(id: string, aspect?: Array<string>, optionalAspect?: Array<string>, dereference?: boolean): Promise<Record | Error>;
|
|
44
|
+
getRecordInFull(id: string): Promise<Record>;
|
|
44
45
|
getRecords<I extends Record>(aspect?: Array<string>, optionalAspect?: Array<string>, pageToken?: string, dereference?: boolean, limit?: number, aspectQueries?: string[], aspectOrQuery?: string[], orderBy?: string, orderByDir?: string, orderNullFirst?: boolean): Promise<RecordsPage<I> | Error>;
|
|
45
46
|
getRecordsPageTokens(aspect?: Array<string>, limit?: number): Promise<string[] | Error>;
|
|
46
47
|
}
|
|
@@ -74,6 +74,20 @@ class RegistryClient {
|
|
|
74
74
|
.then((result) => result.body)
|
|
75
75
|
.catch(createServiceError_1.default);
|
|
76
76
|
}
|
|
77
|
+
getRecordInFull(id) {
|
|
78
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
79
|
+
try {
|
|
80
|
+
const res = yield this.recordsApi.getByIdInFull(encodeURIComponent(id), this.tenantId, this.jwt);
|
|
81
|
+
if (typeof res.body === "string") {
|
|
82
|
+
throw new Error("Invalid non-json response: " + res.body);
|
|
83
|
+
}
|
|
84
|
+
return res.body;
|
|
85
|
+
}
|
|
86
|
+
catch (e) {
|
|
87
|
+
throw this.toServerError(e);
|
|
88
|
+
}
|
|
89
|
+
});
|
|
90
|
+
}
|
|
77
91
|
getRecords(aspect, optionalAspect, pageToken, dereference, limit, aspectQueries, aspectOrQuery, orderBy, orderByDir, orderNullFirst) {
|
|
78
92
|
const operation = (pageToken) => () => this.recordsApi.getAll(this.tenantId, aspect, optionalAspect, pageToken, undefined, limit, dereference, aspectQueries, aspectOrQuery, orderBy, orderByDir, orderNullFirst, this.jwt);
|
|
79
93
|
return retry_1.default(operation(pageToken), this.secondsBetweenRetries, this.maxRetries, (e, retriesLeft) => console.log(formatServiceError_1.default("Failed to GET records.", e, retriesLeft)))
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RegistryClient.js","sourceRoot":"","sources":["../../src/registry/RegistryClient.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"RegistryClient.js","sourceRoot":"","sources":["../../src/registry/RegistryClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
import "mocha";
|
|
@@ -0,0 +1,95 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
|
|
5
|
+
}) : (function(o, m, k, k2) {
|
|
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.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"));
|
|
30
|
+
function generateStr(len) {
|
|
31
|
+
if (len <= 0) {
|
|
32
|
+
return "";
|
|
33
|
+
}
|
|
34
|
+
return Array(len)
|
|
35
|
+
.fill(0)
|
|
36
|
+
.map((item) => String.fromCharCode(Math.ceil(Math.random() * 255)))
|
|
37
|
+
.join("");
|
|
38
|
+
}
|
|
39
|
+
function verifyUrl(datasetId, distId, fileName, optionalFurtherCheck) {
|
|
40
|
+
const storageUrl = getStorageUrl_1.default(datasetId, distId, fileName);
|
|
41
|
+
const parts = urijs_1.default(storageUrl).segmentCoded();
|
|
42
|
+
const objectKey = parts.join("/");
|
|
43
|
+
chai_1.expect(objectKey.length).lte(1024);
|
|
44
|
+
chai_1.expect(parts.length).equal(3);
|
|
45
|
+
parts.forEach((part) => chai_1.expect(part.replace(getStorageUrl_1.InvalidCharsRegEx, "") === part));
|
|
46
|
+
if (optionalFurtherCheck) {
|
|
47
|
+
optionalFurtherCheck(storageUrl);
|
|
48
|
+
}
|
|
49
|
+
return true;
|
|
50
|
+
}
|
|
51
|
+
describe("getStorageUrl", function () {
|
|
52
|
+
jsverify_1.default.property("should generate url contains valid s3 object key", jsverify_1.default.string, jsverify_1.default.string, jsverify_1.default.string, jsverify_1.default.string, jsverify_1.default.bool, (datasetId, distId, fileName, extName, hasExtName) => {
|
|
53
|
+
const fullFileName = fileName + (hasExtName ? "." : "") + extName;
|
|
54
|
+
return verifyUrl("ds-" + datasetId, "dis-" + distId, fullFileName);
|
|
55
|
+
});
|
|
56
|
+
it("should generate object key less than 1024 char with very long file name", () => {
|
|
57
|
+
return (verifyUrl("ds-" + generateStr(32), "dis-" + generateStr(32), Array(99999).fill("a").join("") + ".exe") &&
|
|
58
|
+
verifyUrl("ds-" + generateStr(32), "dis-" + generateStr(32), Array(99999).fill("a").join("") +
|
|
59
|
+
"." +
|
|
60
|
+
Array(99999).fill("a").join("")) &&
|
|
61
|
+
verifyUrl("ds-" + generateStr(32), "dis-" + generateStr(32), Array(99999).fill("a").join("")));
|
|
62
|
+
});
|
|
63
|
+
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) => chai_1.expect(storageUrl.indexOf("test.exe")).not.equal(-1)) &&
|
|
65
|
+
verifyUrl("ds-" + generateStr(32), "dis-" + Array(99999).fill("a").join(""), "test.exe", (storageUrl) => chai_1.expect(storageUrl.indexOf("test.exe")).not.equal(-1)) &&
|
|
66
|
+
verifyUrl("ds-" + Array(99999).fill("a").join(""), "dis-" + Array(99999).fill("a").join(""), "test.exe", (storageUrl) => chai_1.expect(storageUrl.indexOf("test.exe")).not.equal(-1)));
|
|
67
|
+
});
|
|
68
|
+
});
|
|
69
|
+
describe("isValidS3ObjectKey", () => {
|
|
70
|
+
it("should return false for `sds//sds`", () => {
|
|
71
|
+
chai_1.expect(getStorageUrl_1.isValidS3ObjectKey("sds//sds")).to.be.false;
|
|
72
|
+
});
|
|
73
|
+
it("should return false for `/sds/ss/sds`", () => {
|
|
74
|
+
chai_1.expect(getStorageUrl_1.isValidS3ObjectKey("/sds/ss/sds")).to.be.false;
|
|
75
|
+
});
|
|
76
|
+
it("should return true for `sds/ss/sds`", () => {
|
|
77
|
+
chai_1.expect(getStorageUrl_1.isValidS3ObjectKey("sds/ss/sds")).to.be.true;
|
|
78
|
+
});
|
|
79
|
+
it("should return false for `sds/ss/sds/`", () => {
|
|
80
|
+
chai_1.expect(getStorageUrl_1.isValidS3ObjectKey("sds/ss/sds/")).to.be.false;
|
|
81
|
+
});
|
|
82
|
+
it("should return true for `magda-ds-192f7ca4-f3ad-4f87-9331-941329c616dd/magda-dist-8cd82dfb-61cd-4bb4-b168-85a511e1109d/pdf-test.pdf`", () => {
|
|
83
|
+
chai_1.expect(getStorageUrl_1.isValidS3ObjectKey("magda-ds-192f7ca4-f3ad-4f87-9331-941329c616dd/magda-dist-8cd82dfb-61cd-4bb4-b168-85a511e1109d/pdf-test.pdf")).to.be.true;
|
|
84
|
+
});
|
|
85
|
+
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
|
+
chai_1.expect(getStorageUrl_1.isValidS3ObjectKey("magda-datasets/magda-ds-192f7ca4-f3ad-4f87-9331-941329c616dd/magda-dist-68af523a-9ace-4ef9-b813-599b4c19dfbf/test spatial.csv")).to.be.false;
|
|
87
|
+
});
|
|
88
|
+
it("should return true for `magda-datasets/magda-ds-192f7ca4-f3ad-4f87-9331-941329c616dd/magda-dist-68af523a-9ace-4ef9-b813-599b4c19dfbf/testspatial.csv`", () => {
|
|
89
|
+
chai_1.expect(getStorageUrl_1.isValidS3ObjectKey("magda-datasets/magda-ds-192f7ca4-f3ad-4f87-9331-941329c616dd/magda-dist-68af523a-9ace-4ef9-b813-599b4c19dfbf/testspatial.csv")).to.be.true;
|
|
90
|
+
});
|
|
91
|
+
it("should return false for key longer than 1024", () => {
|
|
92
|
+
chai_1.expect(getStorageUrl_1.isValidS3ObjectKey(Array(1025).fill("a").join(""))).to.be.false;
|
|
93
|
+
});
|
|
94
|
+
});
|
|
95
|
+
//# sourceMappingURL=getStorageUrl.spec.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"getStorageUrl.spec.js","sourceRoot":"","sources":["../../src/test/getStorageUrl.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -31,7 +31,7 @@
|
|
|
31
31
|
},
|
|
32
32
|
{
|
|
33
33
|
"isRef": true,
|
|
34
|
-
"value": "input.object.dataset.accessControl.
|
|
34
|
+
"value": "input.object.dataset.accessControl.orgUnitId"
|
|
35
35
|
}
|
|
36
36
|
]
|
|
37
37
|
}
|
|
@@ -67,7 +67,7 @@
|
|
|
67
67
|
},
|
|
68
68
|
{
|
|
69
69
|
"isRef": true,
|
|
70
|
-
"value": "input.object.dataset.accessControl.
|
|
70
|
+
"value": "input.object.dataset.accessControl.orgUnitId"
|
|
71
71
|
}
|
|
72
72
|
]
|
|
73
73
|
}
|