@magda/typescript-common 2.0.0-alpha.0 → 2.0.0-alpha.3

package/dist/test/getStorageUrl.spec.js

@@ -0,0 +1,95 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+require("mocha");
+const chai_1 = require("chai");
+const urijs_1 = __importDefault(require("urijs"));
+const jsverify_1 = __importDefault(require("./jsverify"));
+const getStorageUrl_1 = __importStar(require("../getStorageUrl"));
+function generateStr(len) {
+    if (len <= 0) {
+        return "";
+    }
+    return Array(len)
+        .fill(0)
+        .map((item) => String.fromCharCode(Math.ceil(Math.random() * 255)))
+        .join("");
+}
+function verifyUrl(datasetId, distId, fileName, optionalFurtherCheck) {
+    const storageUrl = getStorageUrl_1.default(datasetId, distId, fileName);
+    const parts = urijs_1.default(storageUrl).segmentCoded();
+    const objectKey = parts.join("/");
+    chai_1.expect(objectKey.length).lte(1024);
+    chai_1.expect(parts.length).equal(3);
+    parts.forEach((part) => chai_1.expect(part.replace(getStorageUrl_1.InvalidCharsRegEx, "") === part));
+    if (optionalFurtherCheck) {
+        optionalFurtherCheck(storageUrl);
+    }
+    return true;
+}
+describe("getStorageUrl", function () {
+    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) => {
+        const fullFileName = fileName + (hasExtName ? "." : "") + extName;
+        return verifyUrl("ds-" + datasetId, "dis-" + distId, fullFileName);
+    });
+    it("should generate object key less than 1024 char with very long file name", () => {
+        return (verifyUrl("ds-" + generateStr(32), "dis-" + generateStr(32), Array(99999).fill("a").join("") + ".exe") &&
+            verifyUrl("ds-" + generateStr(32), "dis-" + generateStr(32), Array(99999).fill("a").join("") +
+                "." +
+                Array(99999).fill("a").join("")) &&
+            verifyUrl("ds-" + generateStr(32), "dis-" + generateStr(32), Array(99999).fill("a").join("")));
+    });
+    it("should generate object key less than 1024 char with very long dataset or distribution id", () => {
+        return (verifyUrl("ds-" + Array(99999).fill("a").join(""), "dis-" + generateStr(32), "test.exe", (storageUrl) => chai_1.expect(storageUrl.indexOf("test.exe")).not.equal(-1)) &&
+            verifyUrl("ds-" + generateStr(32), "dis-" + Array(99999).fill("a").join(""), "test.exe", (storageUrl) => chai_1.expect(storageUrl.indexOf("test.exe")).not.equal(-1)) &&
+            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)));
+    });
+});
+describe("isValidS3ObjectKey", () => {
+    it("should return false for `sds//sds`", () => {
+        chai_1.expect(getStorageUrl_1.isValidS3ObjectKey("sds//sds")).to.be.false;
+    });
+    it("should return false for `/sds/ss/sds`", () => {
+        chai_1.expect(getStorageUrl_1.isValidS3ObjectKey("/sds/ss/sds")).to.be.false;
+    });
+    it("should return true for `sds/ss/sds`", () => {
+        chai_1.expect(getStorageUrl_1.isValidS3ObjectKey("sds/ss/sds")).to.be.true;
+    });
+    it("should return false for `sds/ss/sds/`", () => {
+        chai_1.expect(getStorageUrl_1.isValidS3ObjectKey("sds/ss/sds/")).to.be.false;
+    });
+    it("should return true for `magda-ds-192f7ca4-f3ad-4f87-9331-941329c616dd/magda-dist-8cd82dfb-61cd-4bb4-b168-85a511e1109d/pdf-test.pdf`", () => {
+        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;
+    });
+    it("should return false for `magda-datasets/magda-ds-192f7ca4-f3ad-4f87-9331-941329c616dd/magda-dist-68af523a-9ace-4ef9-b813-599b4c19dfbf/test spatial.csv`", () => {
+        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;
+    });
+    it("should return true for `magda-datasets/magda-ds-192f7ca4-f3ad-4f87-9331-941329c616dd/magda-dist-68af523a-9ace-4ef9-b813-599b4c19dfbf/testspatial.csv`", () => {
+        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;
+    });
+    it("should return false for key longer than 1024", () => {
+        chai_1.expect(getStorageUrl_1.isValidS3ObjectKey(Array(1025).fill("a").join(""))).to.be.false;
+    });
+});
+//# sourceMappingURL=getStorageUrl.spec.js.map

package/dist/test/getStorageUrl.spec.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"getStorageUrl.spec.js","sourceRoot":"","sources":["../../src/test/getStorageUrl.spec.ts"],"names":[],"mappings":"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"}

package/dist/test/mockAuthApiHost.js

@@ -91,7 +91,7 @@ class mockAuthApiHost {
             }
         });
         this.scope
-            .get(/\/private\/users\/[^\/]+/)
+            .get(/\/public\/users\/[^\/]+/)
             .reply(function (uri, requestBody) {
             const req = thisObj.mockReq(this.req, "userId");
             try {
@@ -119,31 +119,7 @@ class mockAuthApiHost {
             }
         });
         this.scope
-            .get(/\/public\/users\/[^\/]+/)
-            .reply(function (uri, requestBody) {
-            const req = thisObj.mockReq(this.req, "userId");
-            try {
-                const userId = req.params.userId;
-                if (!userId)
-                    return [500, "Missing userId parameter"];
-                const records = mockUserDataStore_1.default
-                    .getRecordByUserId(userId)
-                    .map((record) => ({
-                    id: record.id,
-                    photoURL: record.photoURL,
-                    displayName: record.displayName,
-                    isAdmin: record.isAdmin
-                }));
-                if (!records.length)
-                    return [404, "cannot locate record"];
-                return [200, JSON.stringify(records[0])];
-            }
-            catch (e) {
-                return [500, e.message];
-            }
-        });
-        this.scope
-            .post("/private/users")
+            .post("/public/users")
             .reply(function (uri, requestBody) {
             const req = thisObj.mockReq(this.req);
             try {

package/dist/test/mockAuthApiHost.js.map

@@ -1 +1 @@
-{"version":3,"file":"mockAuthApiHost.js","sourceRoot":"","sources":["../../src/test/mockAuthApiHost.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"mockAuthApiHost.js","sourceRoot":"","sources":["../../src/test/mockAuthApiHost.ts"],"names":[],"mappings":"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"}

package/dist/test/mockAuthorization.js

@@ -10,10 +10,10 @@ function mockAuthorization(adminApiUrl, isAdmin, jwtSecret, req) {
     const scope = nock_1.default(adminApiUrl);
     if (!isAdmin)
         scope
-            .get(`/private/users/${userId}`)
+            .get(`/public/users/${userId}`)
             .reply(401, "Only admin users are authorised to access this API");
     else
-        scope.get(`/private/users/${userId}`).reply(200, { isAdmin });
+        scope.get(`/public/users/${userId}`).reply(200, { isAdmin });
     const id = jwt.sign({ userId: userId }, jwtSecret);
     return req.set("X-Magda-Session", id).then((res) => {
         scope.done();

package/dist/test/mockAuthorization.js.map

@@ -1 +1 @@
-{"version":3,"file":"mockAuthorization.js","sourceRoot":"","sources":["../../src/test/mockAuthorization.ts"],"names":[],"mappings":";;;;;AAAA,MAAM,GAAG,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;AACpC,gDAAwB;AAKxB,SAAwB,iBAAiB,CACrC,WAAmB,EACnB,OAAgB,EAChB,SAAiB,EACjB,GAAS;IAET,MAAM,MAAM,GAAG,sCAAsC,CAAC;IACtD,MAAM,KAAK,GAAG,cAAI,CAAC,WAAW,CAAC,CAAC;IAEhC,IAAI,CAAC,OAAO;QACR,KAAK;aACA,GAAG,CAAC,kBAAkB,MAAM,EAAE,CAAC;aAC/B,KAAK,CAAC,GAAG,EAAE,oDAAoD,CAAC,CAAC;;QACrE,KAAK,CAAC,GAAG,CAAC,kBAAkB,MAAM,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC;IAEnE,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;AArBD,oCAqBC"}
+{"version":3,"file":"mockAuthorization.js","sourceRoot":"","sources":["../../src/test/mockAuthorization.ts"],"names":[],"mappings":";;;;;AAAA,MAAM,GAAG,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;AACpC,gDAAwB;AAKxB,SAAwB,iBAAiB,CACrC,WAAmB,EACnB,OAAgB,EAChB,SAAiB,EACjB,GAAS;IAET,MAAM,MAAM,GAAG,sCAAsC,CAAC;IACtD,MAAM,KAAK,GAAG,cAAI,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;AArBD,oCAqBC"}

package/dist/test/registry/buildAuthorizedClient.spec.js

@@ -42,7 +42,7 @@ describe("Test AuthorizedRegistryClient.ts", function () {
                     jwtSecret: "top secret",
                     tenantId: 0
                 });
-            }).to.throw(Error, "Either jwt or userId and jwtSecret must have values.");
+            }).to.throw(Error, "userId must be supplied when jwtSecret is supplied.");
             expect(function () {
                 new AuthorizedRegistryClient_1.default({
                     baseUrl: "some.where",
@@ -50,7 +50,8 @@ describe("Test AuthorizedRegistryClient.ts", function () {
                     jwtSecret: null,
                     tenantId: 0
                 });
-            }).to.throw(Error, "Either jwt or userId and jwtSecret must have values.");
+            }).to.throw(Error, "jwtSecret must be supplied when userId is supplied.");
+            // when all userId, jwtSecret & jwt are not provided, the client will act as an anonymous user
             expect(function () {
                 new AuthorizedRegistryClient_1.default({
                     baseUrl: "some.where",
@@ -58,7 +59,7 @@ describe("Test AuthorizedRegistryClient.ts", function () {
                     jwtSecret: null,
                     tenantId: 0
                 });
-            }).to.throw(Error, "Either jwt or userId and jwtSecret must have values.");
+            }).to.not.throw();
             expect(function () {
                 new AuthorizedRegistryClient_1.default({
                     baseUrl: "some.where",
@@ -66,7 +67,7 @@ describe("Test AuthorizedRegistryClient.ts", function () {
                     jwtSecret: "",
                     tenantId: 0
                 });
-            }).to.throw(Error, "Either jwt or userId and jwtSecret must have values.");
+            }).to.throw(Error, "jwtSecret must be supplied when userId is supplied.");
         });
     });
     it("accepts jwt", function () {
@@ -79,22 +80,23 @@ describe("Test AuthorizedRegistryClient.ts", function () {
             expect(registry !== undefined);
         });
     });
-    it("rejects null or empty jwt", function () {
+    it("should not reject null or empty jwt and act as an anonymous user instead", function () {
         return __awaiter(this, void 0, void 0, function* () {
+            // when all userId, jwtSecret & jwt are not provided, the client will act as an anonymous user
             expect(function () {
                 new AuthorizedRegistryClient_1.default({
                     baseUrl: "some.where",
                     jwt: null,
                     tenantId: 0
                 });
-            }).to.throw(Error, "Either jwt or userId and jwtSecret must have values.");
+            }).not.to.throw();
             expect(function () {
                 new AuthorizedRegistryClient_1.default({
                     baseUrl: "some.where",
                     jwt: "",
                     tenantId: 0
                 });
-            }).to.throw(Error, "Either jwt or userId and jwtSecret must have values.");
+            }).not.to.throw();
         });
     });
 });

package/dist/test/registry/buildAuthorizedClient.spec.js.map

@@ -1 +1 @@
-{"version":3,"file":"buildAuthorizedClient.spec.js","sourceRoot":"","sources":["../../../src/test/registry/buildAuthorizedClient.spec.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AACA,gDAAwB;AACxB,wEAA8C;AAC9C,gDAAwB;AACxB,6HAAqG;AAErG,cAAI,CAAC,GAAG,CAAC,0BAAc,CAAC,CAAC;AACzB,MAAM,MAAM,GAAG,cAAI,CAAC,MAAM,CAAC;AAE3B,QAAQ,CAAC,kCAAkC,EAAE;IACzC,SAAS,CAAC,GAAG,EAAE;QACX,cAAI,CAAC,QAAQ,EAAE,CAAC;IACpB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,8BAA8B,EAAE;;YAC/B,MAAM,QAAQ,GAAG,IAAI,kCAAwB,CAAC;gBAC1C,OAAO,EAAE,YAAY;gBACrB,MAAM,EAAE,WAAW;gBACnB,SAAS,EAAE,YAAY;gBACvB,QAAQ,EAAE,CAAC;aACd,CAAC,CAAC;YACH,MAAM,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC;QACnC,CAAC;KAAA,CAAC,CAAC;IAEH,EAAE,CAAC,+CAA+C,EAAE;;YAChD,MAAM,CAAC;gBACH,IAAI,kCAAwB,CAAC;oBACzB,OAAO,EAAE,YAAY;oBACrB,MAAM,EAAE,IAAI;oBACZ,SAAS,EAAE,YAAY;oBACvB,QAAQ,EAAE,CAAC;iBACd,CAAC,CAAC;YACP,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CACP,KAAK,EACL,sDAAsD,CACzD,CAAC;YAEF,MAAM,CAAC;gBACH,IAAI,kCAAwB,CAAC;oBACzB,OAAO,EAAE,YAAY;oBACrB,MAAM,EAAE,WAAW;oBACnB,SAAS,EAAE,IAAI;oBACf,QAAQ,EAAE,CAAC;iBACd,CAAC,CAAC;YACP,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CACP,KAAK,EACL,sDAAsD,CACzD,CAAC;YAEF,MAAM,CAAC;gBACH,IAAI,kCAAwB,CAAC;oBACzB,OAAO,EAAE,YAAY;oBACrB,MAAM,EAAE,IAAI;oBACZ,SAAS,EAAE,IAAI;oBACf,QAAQ,EAAE,CAAC;iBACd,CAAC,CAAC;YACP,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CACP,KAAK,EACL,sDAAsD,CACzD,CAAC;YAEF,MAAM,CAAC;gBACH,IAAI,kCAAwB,CAAC;oBACzB,OAAO,EAAE,YAAY;oBACrB,MAAM,EAAE,WAAW;oBACnB,SAAS,EAAE,EAAE;oBACb,QAAQ,EAAE,CAAC;iBACd,CAAC,CAAC;YACP,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CACP,KAAK,EACL,sDAAsD,CACzD,CAAC;QACN,CAAC;KAAA,CAAC,CAAC;IAEH,EAAE,CAAC,aAAa,EAAE;;YACd,MAAM,QAAQ,GAAG,IAAI,kCAAwB,CAAC;gBAC1C,OAAO,EAAE,YAAY;gBACrB,GAAG,EAAE,gBAAgB;gBACrB,QAAQ,EAAE,CAAC;aACd,CAAC,CAAC;YACH,MAAM,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC;QACnC,CAAC;KAAA,CAAC,CAAC;IAEH,EAAE,CAAC,2BAA2B,EAAE;;YAC5B,MAAM,CAAC;gBACH,IAAI,kCAAwB,CAAC;oBACzB,OAAO,EAAE,YAAY;oBACrB,GAAG,EAAE,IAAI;oBACT,QAAQ,EAAE,CAAC;iBACd,CAAC,CAAC;YACP,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CACP,KAAK,EACL,sDAAsD,CACzD,CAAC;YAEF,MAAM,CAAC;gBACH,IAAI,kCAAwB,CAAC;oBACzB,OAAO,EAAE,YAAY;oBACrB,GAAG,EAAE,EAAE;oBACP,QAAQ,EAAE,CAAC;iBACd,CAAC,CAAC;YACP,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CACP,KAAK,EACL,sDAAsD,CACzD,CAAC;QACN,CAAC;KAAA,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}
+{"version":3,"file":"buildAuthorizedClient.spec.js","sourceRoot":"","sources":["../../../src/test/registry/buildAuthorizedClient.spec.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AACA,gDAAwB;AACxB,wEAA8C;AAC9C,gDAAwB;AACxB,6HAAqG;AAErG,cAAI,CAAC,GAAG,CAAC,0BAAc,CAAC,CAAC;AACzB,MAAM,MAAM,GAAG,cAAI,CAAC,MAAM,CAAC;AAE3B,QAAQ,CAAC,kCAAkC,EAAE;IACzC,SAAS,CAAC,GAAG,EAAE;QACX,cAAI,CAAC,QAAQ,EAAE,CAAC;IACpB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,8BAA8B,EAAE;;YAC/B,MAAM,QAAQ,GAAG,IAAI,kCAAwB,CAAC;gBAC1C,OAAO,EAAE,YAAY;gBACrB,MAAM,EAAE,WAAW;gBACnB,SAAS,EAAE,YAAY;gBACvB,QAAQ,EAAE,CAAC;aACd,CAAC,CAAC;YACH,MAAM,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC;QACnC,CAAC;KAAA,CAAC,CAAC;IAEH,EAAE,CAAC,+CAA+C,EAAE;;YAChD,MAAM,CAAC;gBACH,IAAI,kCAAwB,CAAC;oBACzB,OAAO,EAAE,YAAY;oBACrB,MAAM,EAAE,IAAI;oBACZ,SAAS,EAAE,YAAY;oBACvB,QAAQ,EAAE,CAAC;iBACd,CAAC,CAAC;YACP,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CACP,KAAK,EACL,qDAAqD,CACxD,CAAC;YAEF,MAAM,CAAC;gBACH,IAAI,kCAAwB,CAAC;oBACzB,OAAO,EAAE,YAAY;oBACrB,MAAM,EAAE,WAAW;oBACnB,SAAS,EAAE,IAAI;oBACf,QAAQ,EAAE,CAAC;iBACd,CAAC,CAAC;YACP,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CACP,KAAK,EACL,qDAAqD,CACxD,CAAC;YAEF,8FAA8F;YAC9F,MAAM,CAAC;gBACH,IAAI,kCAAwB,CAAC;oBACzB,OAAO,EAAE,YAAY;oBACrB,MAAM,EAAE,IAAI;oBACZ,SAAS,EAAE,IAAI;oBACf,QAAQ,EAAE,CAAC;iBACd,CAAC,CAAC;YACP,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC;YAElB,MAAM,CAAC;gBACH,IAAI,kCAAwB,CAAC;oBACzB,OAAO,EAAE,YAAY;oBACrB,MAAM,EAAE,WAAW;oBACnB,SAAS,EAAE,EAAE;oBACb,QAAQ,EAAE,CAAC;iBACd,CAAC,CAAC;YACP,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CACP,KAAK,EACL,qDAAqD,CACxD,CAAC;QACN,CAAC;KAAA,CAAC,CAAC;IAEH,EAAE,CAAC,aAAa,EAAE;;YACd,MAAM,QAAQ,GAAG,IAAI,kCAAwB,CAAC;gBAC1C,OAAO,EAAE,YAAY;gBACrB,GAAG,EAAE,gBAAgB;gBACrB,QAAQ,EAAE,CAAC;aACd,CAAC,CAAC;YACH,MAAM,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC;QACnC,CAAC;KAAA,CAAC,CAAC;IAEH,EAAE,CAAC,0EAA0E,EAAE;;YAC3E,8FAA8F;YAC9F,MAAM,CAAC;gBACH,IAAI,kCAAwB,CAAC;oBACzB,OAAO,EAAE,YAAY;oBACrB,GAAG,EAAE,IAAI;oBACT,QAAQ,EAAE,CAAC;iBACd,CAAC,CAAC;YACP,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC;YAElB,MAAM,CAAC;gBACH,IAAI,kCAAwB,CAAC;oBACzB,OAAO,EAAE,YAAY;oBACrB,GAAG,EAAE,EAAE;oBACP,QAAQ,EAAE,CAAC;iBACd,CAAC,CAAC;YACP,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC;QACtB,CAAC;KAAA,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}

package/dist/test/sampleAuthDecisions/datasetPermissionWithOrgUnitConstraint.json

@@ -31,7 +31,7 @@
                         },
                         {
                             "isRef": true,
-                            "value": "input.object.dataset.accessControl.orgUnitOwnerId"
+                            "value": "input.object.dataset.accessControl.orgUnitId"
                         }
                     ]
                 }
@@ -67,7 +67,7 @@
                         },
                         {
                             "isRef": true,
-                            "value": "input.object.dataset.accessControl.orgUnitOwnerId"
+                            "value": "input.object.dataset.accessControl.orgUnitId"
                         }
                     ]
                 }