@magda/typescript-common 2.0.0-alpha.1 → 2.0.0-alpha.2
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/BaseApiClient.d.ts +41 -0
- package/dist/BaseApiClient.js +63 -0
- package/dist/BaseApiClient.js.map +1 -0
- package/dist/IndexerApiClient.d.ts +16 -0
- package/dist/IndexerApiClient.js +39 -0
- package/dist/IndexerApiClient.js.map +1 -0
- package/dist/JsonTransformer.js +1 -2
- package/dist/JsonTransformer.js.map +1 -1
- package/dist/SQLUtils.d.ts +2 -2
- package/dist/SQLUtils.js.map +1 -1
- package/dist/Try.d.ts +17 -0
- package/dist/Try.js +68 -0
- package/dist/Try.js.map +1 -0
- package/dist/authorization-api/ApiClient.d.ts +9 -13
- package/dist/authorization-api/ApiClient.js +88 -31
- package/dist/authorization-api/ApiClient.js.map +1 -1
- package/dist/authorization-api/authMiddleware.d.ts +0 -1
- package/dist/authorization-api/authMiddleware.js +1 -8
- package/dist/authorization-api/authMiddleware.js.map +1 -1
- package/dist/authorization-api/constants.d.ts +1 -0
- package/dist/authorization-api/constants.js +2 -1
- package/dist/authorization-api/constants.js.map +1 -1
- package/dist/authorization-api/model.d.ts +55 -21
- package/dist/createNoCacheFetchOptions.d.ts +15 -0
- package/dist/createNoCacheFetchOptions.js +20 -0
- package/dist/createNoCacheFetchOptions.js.map +1 -0
- package/dist/fetchRequest.d.ts +11 -0
- package/dist/fetchRequest.js +62 -0
- package/dist/fetchRequest.js.map +1 -0
- package/dist/generated/registry/api.d.ts +1 -5
- package/dist/generated/registry/api.js.map +1 -1
- package/dist/getAbsoluteUrl.d.ts +7 -7
- package/dist/getAbsoluteUrl.js +22 -19
- package/dist/getAbsoluteUrl.js.map +1 -1
- package/dist/getRequest.d.ts +1 -0
- package/dist/getRequest.js +28 -0
- package/dist/getRequest.js.map +1 -0
- package/dist/getRequestNoCache.d.ts +1 -0
- package/dist/getRequestNoCache.js +23 -0
- package/dist/getRequestNoCache.js.map +1 -0
- package/dist/registry/AuthorizedRegistryClient.d.ts +7 -11
- package/dist/registry/AuthorizedRegistryClient.js +56 -21
- package/dist/registry/AuthorizedRegistryClient.js.map +1 -1
- package/dist/registry/RegistryClient.d.ts +4 -7
- package/dist/registry/RegistryClient.js +21 -16
- package/dist/registry/RegistryClient.js.map +1 -1
- package/dist/registry/model.d.ts +5 -0
- package/dist/registry/model.js +3 -0
- package/dist/registry/model.js.map +1 -0
- package/dist/test/arbitraries.js +2 -4
- package/dist/test/arbitraries.js.map +1 -1
- package/dist/test/buildApiClient.spec.js +2 -41
- package/dist/test/buildApiClient.spec.js.map +1 -1
- package/dist/test/db/getTestDBConfig.js +1 -1
- package/dist/test/db/getTestDBConfig.js.map +1 -1
- package/dist/test/mockAuthApiHost.js +2 -26
- package/dist/test/mockAuthApiHost.js.map +1 -1
- package/dist/test/mockAuthorization.js +2 -2
- package/dist/test/mockAuthorization.js.map +1 -1
- package/dist/test/registry/buildAuthorizedClient.spec.js +9 -7
- package/dist/test/registry/buildAuthorizedClient.spec.js.map +1 -1
- package/package.json +7 -10
|
@@ -91,45 +91,6 @@ describe("Test ApiClient.ts", function () {
|
|
|
91
91
|
expect(data).to.deep.equal(mockUserData[1]);
|
|
92
92
|
});
|
|
93
93
|
});
|
|
94
|
-
it("`getUserPublic` should return the correct test user record if called without sepecifying user ID", function () {
|
|
95
|
-
return __awaiter(this, void 0, void 0, function* () {
|
|
96
|
-
const api = new ApiClient_1.default(argv.authorizationApi);
|
|
97
|
-
const data = (yield api.getUserPublic(mockUserData[1].id)).valueOr(null);
|
|
98
|
-
const expectedUserData = {
|
|
99
|
-
id: mockUserData[1].id,
|
|
100
|
-
photoURL: mockUserData[1].photoURL,
|
|
101
|
-
displayName: mockUserData[1].displayName,
|
|
102
|
-
isAdmin: mockUserData[1].isAdmin
|
|
103
|
-
};
|
|
104
|
-
expect(data).to.deep.equal(expectedUserData);
|
|
105
|
-
});
|
|
106
|
-
});
|
|
107
|
-
it("`getUserPublic` should return the correct test user record if called as a standard user", function () {
|
|
108
|
-
return __awaiter(this, void 0, void 0, function* () {
|
|
109
|
-
const api = new ApiClient_1.default(argv.authorizationApi, argv.jwtSecret, mockUserData[1].id);
|
|
110
|
-
const data = (yield api.getUserPublic(mockUserData[1].id)).valueOr(null);
|
|
111
|
-
const expectedUserData = {
|
|
112
|
-
id: mockUserData[1].id,
|
|
113
|
-
photoURL: mockUserData[1].photoURL,
|
|
114
|
-
displayName: mockUserData[1].displayName,
|
|
115
|
-
isAdmin: mockUserData[1].isAdmin
|
|
116
|
-
};
|
|
117
|
-
expect(data).to.deep.equal(expectedUserData);
|
|
118
|
-
});
|
|
119
|
-
});
|
|
120
|
-
it("`getUserPublic` should return the correct test user record if called as admin user", function () {
|
|
121
|
-
return __awaiter(this, void 0, void 0, function* () {
|
|
122
|
-
const api = new ApiClient_1.default(argv.authorizationApi, argv.jwtSecret, argv.userId);
|
|
123
|
-
const data = (yield api.getUserPublic(mockUserData[1].id)).valueOr(null);
|
|
124
|
-
const expectedUserData = {
|
|
125
|
-
id: mockUserData[1].id,
|
|
126
|
-
photoURL: mockUserData[1].photoURL,
|
|
127
|
-
displayName: mockUserData[1].displayName,
|
|
128
|
-
isAdmin: mockUserData[1].isAdmin
|
|
129
|
-
};
|
|
130
|
-
expect(data).to.deep.equal(expectedUserData);
|
|
131
|
-
});
|
|
132
|
-
});
|
|
133
94
|
const newUserDataToBeInserted = {
|
|
134
95
|
displayName: "Test User2",
|
|
135
96
|
email: "test@test.com",
|
|
@@ -141,13 +102,13 @@ describe("Test ApiClient.ts", function () {
|
|
|
141
102
|
it(`\`createUser\` should return 'Encountered error 401 when POSTing new user to ${argv.authorizationApi}' error if called without sepecifying user ID`, function () {
|
|
142
103
|
return __awaiter(this, void 0, void 0, function* () {
|
|
143
104
|
const api = new ApiClient_1.default(argv.authorizationApi);
|
|
144
|
-
return expect(api.createUser(newUserDataToBeInserted)).to.eventually.rejectedWith(
|
|
105
|
+
return expect(api.createUser(newUserDataToBeInserted)).to.eventually.rejectedWith("Encountered error 401: Unauthorised when creating new user to http://localhost:6104/v0/public/users");
|
|
145
106
|
});
|
|
146
107
|
});
|
|
147
108
|
it(`\`createUser\` should return 'Encountered error 403 when POSTing new user to ${argv.authorizationApi}' error if called as a standard user`, function () {
|
|
148
109
|
return __awaiter(this, void 0, void 0, function* () {
|
|
149
110
|
const api = new ApiClient_1.default(argv.authorizationApi, argv.jwtSecret, mockUserData[1].id);
|
|
150
|
-
return expect(api.createUser(newUserDataToBeInserted)).to.eventually.rejectedWith(
|
|
111
|
+
return expect(api.createUser(newUserDataToBeInserted)).to.eventually.rejectedWith("Encountered error 403: Can only be accessed by Admin users when creating new user to http://localhost:6104/v0/public/users");
|
|
151
112
|
});
|
|
152
113
|
});
|
|
153
114
|
let newlyCreatedUserId = null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildApiClient.spec.js","sourceRoot":"","sources":["../../src/test/buildApiClient.spec.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AACA,kDAA0B;AAC1B,gDAAwB;AACxB,wEAA8C;AAC9C,kDAA0B;AAC1B,+FAAuE;AACvE,wEAAgD;AAChD,+EAAuD;AACvD,4EAAoD;AAEpD,cAAI,CAAC,GAAG,CAAC,0BAAc,CAAC,CAAC;AACzB,MAAM,MAAM,GAAG,cAAI,CAAC,MAAM,CAAC;AAE3B,MAAM,YAAY,GAAG,2BAAiB,CAAC,OAAO,EAAE,CAAC;AAEjD,QAAQ,CAAC,mBAAmB,EAAE;IAC1B,MAAM,IAAI,GAAG,gCAAsB,CAC/B,eAAK;SACA,MAAM,EAAE;SACR,IAAI,EAAE;SACN,MAAM,CAAC,kBAAkB,EAAE;QACxB,QAAQ,EAAE,wCAAwC;QAClD,IAAI,EAAE,QAAQ;QACd,OAAO,EAAE,0BAA0B;KACtC,CAAC;SACD,MAAM,CAAC,WAAW,EAAE;QACjB,QAAQ,EACJ,kJAAkJ;QACtJ,IAAI,EAAE,QAAQ;KACjB,CAAC;SACD,MAAM,CAAC,QAAQ,EAAE;QACd,QAAQ,EACJ,uEAAuE;QAC3E,IAAI,EAAE,QAAQ;QACd,MAAM,EAAE,IAAI;QACZ,OAAO,EACH,OAAO,CAAC,GAAG,CAAC,OAAO,IAAI,OAAO,CAAC,GAAG,CAAC,yBAAyB;KACnE,CAAC,CAAC,IAAI,CACd,CAAC;IAEF,MAAM,QAAQ,GAAG,IAAI,yBAAe,CAChC,IAAI,CAAC,gBAAgB,EACrB,IAAI,CAAC,SAAS,EACd,IAAI,CAAC,MAAM,CACd,CAAC;IAEF,MAAM,CAAC;QACH,eAAK,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,SAAS,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;QACjD,eAAK,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,SAAS,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;QAChD,QAAQ,CAAC,KAAK,EAAE,CAAC;IACrB,CAAC,CAAC,CAAC;IAEH,KAAK,CAAC;QACD,OAAO,CAAC,KAAa,CAAC,OAAO,EAAE,CAAC;QAChC,OAAO,CAAC,IAAY,CAAC,OAAO,EAAE,CAAC;QAChC,QAAQ,CAAC,IAAI,EAAE,CAAC;IACpB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,uFAAuF,EAAE;;YACxF,MAAM,GAAG,GAAG,IAAI,mBAAS,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;YACjD,OAAO,MAAM,CACT,GAAG,CAAC,UAAU,CAAC,MAAM,EAAE,UAAU,CAAC,CACrC,CAAC,EAAE,CAAC,UAAU,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC;QACjD,CAAC;KAAA,CAAC,CAAC;IAEH,EAAE,CAAC,qGAAqG,EAAE;;YACtG,MAAM,GAAG,GAAG,IAAI,mBAAS,CACrB,IAAI,CAAC,gBAAgB,EACrB,IAAI,CAAC,SAAS,EACd,YAAY,CAAC,CAAC,CAAC,CAAC,EAAE,CACrB,CAAC;YACF,OAAO,MAAM,CACT,GAAG,CAAC,UAAU,CAAC,MAAM,EAAE,UAAU,CAAC,CACrC,CAAC,EAAE,CAAC,UAAU,CAAC,YAAY,CAAC,qCAAqC,CAAC,CAAC;QACxE,CAAC;KAAA,CAAC,CAAC;IAEH,EAAE,CAAC,iFAAiF,EAAE;;YAClF,MAAM,GAAG,GAAG,IAAI,mBAAS,CACrB,IAAI,CAAC,gBAAgB,EACrB,IAAI,CAAC,SAAS,EACd,IAAI,CAAC,MAAM,CACd,CAAC;YACF,MAAM,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,UAAU,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YACtE,MAAM,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC;QAChD,CAAC;KAAA,CAAC,CAAC;IAEH,EAAE,CAAC,oFAAoF,EAAE;;YACrF,MAAM,GAAG,GAAG,IAAI,mBAAS,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;YACjD,OAAO,MAAM,CACT,GAAG,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAClC,CAAC,EAAE,CAAC,UAAU,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC;QACjD,CAAC;KAAA,CAAC,CAAC;IAEH,EAAE,CAAC,kGAAkG,EAAE;;YACnG,MAAM,GAAG,GAAG,IAAI,mBAAS,CACrB,IAAI,CAAC,gBAAgB,EACrB,IAAI,CAAC,SAAS,EACd,YAAY,CAAC,CAAC,CAAC,CAAC,EAAE,CACrB,CAAC;YACF,OAAO,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,YAAY,CAClE,qCAAqC,CACxC,CAAC;QACN,CAAC;KAAA,CAAC,CAAC;IAEH,EAAE,CAAC,8EAA8E,EAAE;;YAC/E,MAAM,GAAG,GAAG,IAAI,mBAAS,CACrB,IAAI,CAAC,gBAAgB,EACrB,IAAI,CAAC,SAAS,EACd,IAAI,CAAC,MAAM,CACd,CAAC;YACF,MAAM,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YACnE,MAAM,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC;QAChD,CAAC;KAAA,CAAC,CAAC;IAEH,
|
|
1
|
+
{"version":3,"file":"buildApiClient.spec.js","sourceRoot":"","sources":["../../src/test/buildApiClient.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,7 @@ function getTestDBConfig() {
|
|
|
6
6
|
host: host ? host : "localhost",
|
|
7
7
|
database: database ? database : "postgres",
|
|
8
8
|
user: user ? user : "postgres",
|
|
9
|
-
password: password ? password : ""
|
|
9
|
+
password: password ? password : "password"
|
|
10
10
|
};
|
|
11
11
|
}
|
|
12
12
|
exports.default = getTestDBConfig;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getTestDBConfig.js","sourceRoot":"","sources":["../../../src/test/db/getTestDBConfig.ts"],"names":[],"mappings":";;AAAA,SAAS,eAAe;IACpB,MAAM,EACF,aAAa,EAAE,IAAI,EACnB,WAAW,EAAE,QAAQ,EACrB,aAAa,EAAE,IAAI,EACnB,iBAAiB,EAAE,QAAQ,EAC9B,GAAG,OAAO,CAAC,GAAG,CAAC;IAEhB,OAAO;QACH,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,WAAW;QAC/B,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,UAAU;QAC1C,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,UAAU;QAC9B,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"getTestDBConfig.js","sourceRoot":"","sources":["../../../src/test/db/getTestDBConfig.ts"],"names":[],"mappings":";;AAAA,SAAS,eAAe;IACpB,MAAM,EACF,aAAa,EAAE,IAAI,EACnB,WAAW,EAAE,QAAQ,EACrB,aAAa,EAAE,IAAI,EACnB,iBAAiB,EAAE,QAAQ,EAC9B,GAAG,OAAO,CAAC,GAAG,CAAC;IAEhB,OAAO;QACH,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,WAAW;QAC/B,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,UAAU;QAC1C,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,UAAU;QAC9B,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,UAAU;KAC7C,CAAC;AACN,CAAC;AAED,kBAAe,eAAe,CAAC"}
|
|
@@ -91,7 +91,7 @@ class mockAuthApiHost {
|
|
|
91
91
|
}
|
|
92
92
|
});
|
|
93
93
|
this.scope
|
|
94
|
-
.get(/\/
|
|
94
|
+
.get(/\/public\/users\/[^\/]+/)
|
|
95
95
|
.reply(function (uri, requestBody) {
|
|
96
96
|
const req = thisObj.mockReq(this.req, "userId");
|
|
97
97
|
try {
|
|
@@ -119,31 +119,7 @@ class mockAuthApiHost {
|
|
|
119
119
|
}
|
|
120
120
|
});
|
|
121
121
|
this.scope
|
|
122
|
-
.
|
|
123
|
-
.reply(function (uri, requestBody) {
|
|
124
|
-
const req = thisObj.mockReq(this.req, "userId");
|
|
125
|
-
try {
|
|
126
|
-
const userId = req.params.userId;
|
|
127
|
-
if (!userId)
|
|
128
|
-
return [500, "Missing userId parameter"];
|
|
129
|
-
const records = mockUserDataStore_1.default
|
|
130
|
-
.getRecordByUserId(userId)
|
|
131
|
-
.map((record) => ({
|
|
132
|
-
id: record.id,
|
|
133
|
-
photoURL: record.photoURL,
|
|
134
|
-
displayName: record.displayName,
|
|
135
|
-
isAdmin: record.isAdmin
|
|
136
|
-
}));
|
|
137
|
-
if (!records.length)
|
|
138
|
-
return [404, "cannot locate record"];
|
|
139
|
-
return [200, JSON.stringify(records[0])];
|
|
140
|
-
}
|
|
141
|
-
catch (e) {
|
|
142
|
-
return [500, e.message];
|
|
143
|
-
}
|
|
144
|
-
});
|
|
145
|
-
this.scope
|
|
146
|
-
.post("/private/users")
|
|
122
|
+
.post("/public/users")
|
|
147
123
|
.reply(function (uri, requestBody) {
|
|
148
124
|
const req = thisObj.mockReq(this.req);
|
|
149
125
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mockAuthApiHost.js","sourceRoot":"","sources":["../../src/test/mockAuthApiHost.ts"],"names":[],"mappings":";;;;;AAAA,gDAAwB;AAExB,oDAAiD;AACjD,+EAAuD;AAEvD,4EAAoD;AAEpD,8CAAsB;AAEtB,MAAqB,eAAe;IAMhC,YACI,UAAkB,EAClB,SAAiB,EACjB,kBAA0B;QAE1B,IAAI,CAAC,UAAU;YACX,MAAM,IAAI,KAAK,CAAC,+CAA+C,CAAC,CAAC;QACrE,IAAI,CAAC,SAAS;YACV,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAC;QACpE,IAAI,CAAC,kBAAkB;YACnB,MAAM,IAAI,KAAK,CACX,uDAAuD,CAC1D,CAAC;QAEN,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,kBAAkB,GAAG,kBAAkB,CAAC;QAE7C,IAAI,CAAC,UAAU,EAAE,CAAC;IACtB,CAAC;IAEM,KAAK;QACR,cAAI,CAAC,iBAAiB,EAAE,CAAC;QACzB,IAAI,CAAC,UAAU,EAAE,CAAC;IACtB,CAAC;IAEM,IAAI;QACP,cAAI,CAAC,QAAQ,EAAE,CAAC;QAChB,cAAI,CAAC,gBAAgB,EAAE,CAAC;IAC5B,CAAC;IAEM,OAAO,CAAC,GAAQ,EAAE,YAAoB,IAAI;QAC7C,MAAM,OAAO,GAAG;YACZ,MAAM,EAAE,UAAU,UAAkB;gBAChC,MAAM,MAAM,GAAG,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,WAAW,EAAE,CAAC,CAAC;gBACrD,IAAI,MAAM,IAAI,MAAM,CAAC,MAAM;oBAAE,OAAO,MAAM,CAAC,CAAC,CAAC,CAAC;;oBACzC,OAAO,EAAE,CAAC;YACnB,CAAC;YACD,KAAK,EAAE,aAAG,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,KAAK;YAC5C,MAAM,EAAE,CAAC;gBACL,IAAI,CAAC,SAAS;oBAAE,OAAO,EAAE,CAAC;gBAC1B,MAAM,CAAC,GAAG,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;gBACxC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM;oBAAE,OAAO,IAAI,CAAC;gBACjC,OAAO,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YACjC,CAAC,CAAC,EAAE;SACI,CAAC;QAEb,OAAO,OAAO,CAAC;IACnB,CAAC;IAEM,aAAa,CAAC,GAAY,EAAE,sBAA+B,KAAK;QACnE,MAAM,MAAM,GAAG,qBAAS,CAAC,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC,YAAY,CACtD,IAAI,mBAAS,CAAC,cAAc,EAAE,GAAG,CAAC,CACrC,CAAC;QACF,IAAI,CAAC,mBAAmB;YAAE,OAAO;QACjC,IAAI,MAAM,IAAI,IAAI,CAAC,kBAAkB;YACjC,MAAM,IAAI,mBAAS,CAAC,qCAAqC,EAAE,GAAG,CAAC,CAAC;IACxE,CAAC;IAEO,UAAU;QACd,IAAI,CAAC,KAAK,GAAG,cAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,OAAO,EAAE,CAAC;QAC7C,MAAM,OAAO,GAAG,IAAI,CAAC;QACrB,IAAI,CAAC,KAAK;aACL,GAAG,CAAC,uBAAuB,CAAC;aAC5B,KAAK,CAAC,IAAI,CAAC;aACX,KAAK,CAAC,UAAqB,GAAG,EAAE,WAAW;YACxC,MAAM,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACtC,IAAI;gBACA,OAAO,CAAC,aAAa,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;aACpC;YAAC,OAAO,CAAC,EAAE;gBACR,IAAI,CAAC,YAAY,mBAAS,EAAE;oBACxB,OAAO,CAAC,CAAC,CAAC,UAAU,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC;iBACpC;qBAAM;oBACH,OAAO,CAAC,GAAG,EAAE,cAAc,CAAC,CAAC;iBAChC;aACJ;YACD,IAAI;gBACA,MAAM,MAAM,GAAG,GAAG,CAAC,KAAK,CAAC,MAAgB,CAAC;gBAC1C,MAAM,QAAQ,GAAG,GAAG,CAAC,KAAK,CAAC,QAAkB,CAAC;gBAC9C,IAAI,CAAC,MAAM,IAAI,CAAC,QAAQ;oBACpB,OAAO,CAAC,GAAG,EAAE,yBAAyB,CAAC,CAAC;gBAC5C,MAAM,OAAO,GAAG,2BAAiB,CAAC,4BAA4B,CAC1D,MAAM,EACN,QAAQ,CACX,CAAC;gBACF,IAAI,CAAC,OAAO,CAAC,MAAM;oBAAE,OAAO,CAAC,GAAG,EAAE,sBAAsB,CAAC,CAAC;gBAC1D,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;aAC5C;YAAC,OAAO,CAAC,EAAE;gBACR,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC;aAC3B;QACL,CAAC,CAAC,CAAC;QAEP,IAAI,CAAC,KAAK;aACL,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"mockAuthApiHost.js","sourceRoot":"","sources":["../../src/test/mockAuthApiHost.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,10 +10,10 @@ function mockAuthorization(adminApiUrl, isAdmin, jwtSecret, req) {
|
|
|
10
10
|
const scope = nock_1.default(adminApiUrl);
|
|
11
11
|
if (!isAdmin)
|
|
12
12
|
scope
|
|
13
|
-
.get(`/
|
|
13
|
+
.get(`/public/users/${userId}`)
|
|
14
14
|
.reply(401, "Only admin users are authorised to access this API");
|
|
15
15
|
else
|
|
16
|
-
scope.get(`/
|
|
16
|
+
scope.get(`/public/users/${userId}`).reply(200, { isAdmin });
|
|
17
17
|
const id = jwt.sign({ userId: userId }, jwtSecret);
|
|
18
18
|
return req.set("X-Magda-Session", id).then((res) => {
|
|
19
19
|
scope.done();
|
|
@@ -1 +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,
|
|
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,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"}
|
|
@@ -42,7 +42,7 @@ describe("Test AuthorizedRegistryClient.ts", function () {
|
|
|
42
42
|
jwtSecret: "top secret",
|
|
43
43
|
tenantId: 0
|
|
44
44
|
});
|
|
45
|
-
}).to.throw(Error, "
|
|
45
|
+
}).to.throw(Error, "userId must be supplied when jwtSecret is supplied.");
|
|
46
46
|
expect(function () {
|
|
47
47
|
new AuthorizedRegistryClient_1.default({
|
|
48
48
|
baseUrl: "some.where",
|
|
@@ -50,7 +50,8 @@ describe("Test AuthorizedRegistryClient.ts", function () {
|
|
|
50
50
|
jwtSecret: null,
|
|
51
51
|
tenantId: 0
|
|
52
52
|
});
|
|
53
|
-
}).to.throw(Error, "
|
|
53
|
+
}).to.throw(Error, "jwtSecret must be supplied when userId is supplied.");
|
|
54
|
+
// when all userId, jwtSecret & jwt are not provided, the client will act as an anonymous user
|
|
54
55
|
expect(function () {
|
|
55
56
|
new AuthorizedRegistryClient_1.default({
|
|
56
57
|
baseUrl: "some.where",
|
|
@@ -58,7 +59,7 @@ describe("Test AuthorizedRegistryClient.ts", function () {
|
|
|
58
59
|
jwtSecret: null,
|
|
59
60
|
tenantId: 0
|
|
60
61
|
});
|
|
61
|
-
}).to.throw(
|
|
62
|
+
}).to.not.throw();
|
|
62
63
|
expect(function () {
|
|
63
64
|
new AuthorizedRegistryClient_1.default({
|
|
64
65
|
baseUrl: "some.where",
|
|
@@ -66,7 +67,7 @@ describe("Test AuthorizedRegistryClient.ts", function () {
|
|
|
66
67
|
jwtSecret: "",
|
|
67
68
|
tenantId: 0
|
|
68
69
|
});
|
|
69
|
-
}).to.throw(Error, "
|
|
70
|
+
}).to.throw(Error, "jwtSecret must be supplied when userId is supplied.");
|
|
70
71
|
});
|
|
71
72
|
});
|
|
72
73
|
it("accepts jwt", function () {
|
|
@@ -79,22 +80,23 @@ describe("Test AuthorizedRegistryClient.ts", function () {
|
|
|
79
80
|
expect(registry !== undefined);
|
|
80
81
|
});
|
|
81
82
|
});
|
|
82
|
-
it("
|
|
83
|
+
it("should not reject null or empty jwt and act as an anonymous user instead", function () {
|
|
83
84
|
return __awaiter(this, void 0, void 0, function* () {
|
|
85
|
+
// when all userId, jwtSecret & jwt are not provided, the client will act as an anonymous user
|
|
84
86
|
expect(function () {
|
|
85
87
|
new AuthorizedRegistryClient_1.default({
|
|
86
88
|
baseUrl: "some.where",
|
|
87
89
|
jwt: null,
|
|
88
90
|
tenantId: 0
|
|
89
91
|
});
|
|
90
|
-
}).to.throw(
|
|
92
|
+
}).not.to.throw();
|
|
91
93
|
expect(function () {
|
|
92
94
|
new AuthorizedRegistryClient_1.default({
|
|
93
95
|
baseUrl: "some.where",
|
|
94
96
|
jwt: "",
|
|
95
97
|
tenantId: 0
|
|
96
98
|
});
|
|
97
|
-
}).to.throw(
|
|
99
|
+
}).not.to.throw();
|
|
98
100
|
});
|
|
99
101
|
});
|
|
100
102
|
});
|
|
@@ -1 +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,
|
|
1
|
+
{"version":3,"file":"buildAuthorizedClient.spec.js","sourceRoot":"","sources":["../../../src/test/registry/buildAuthorizedClient.spec.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@magda/typescript-common",
|
|
3
3
|
"description": "Common TypeScript code shared between components.",
|
|
4
|
-
"version": "2.0.0-alpha.
|
|
4
|
+
"version": "2.0.0-alpha.2",
|
|
5
5
|
"license": "Apache-2.0",
|
|
6
6
|
"scripts": {
|
|
7
7
|
"prebuild": "rimraf dist tsconfig.tsbuildinfo",
|
|
@@ -10,15 +10,12 @@
|
|
|
10
10
|
"watch": "tsc -b --watch",
|
|
11
11
|
"generate": "generate-registry-typescript ./src/generated/registry",
|
|
12
12
|
"test": "nyc mocha --compilers ts:ts-node/register,tsx:ts-node/register --require tsconfig-paths/register \"src/test/**/*.spec.ts\"",
|
|
13
|
-
"create_esri_groups_jwt": "nyc mocha --compilers ts:ts-node/register,tsx:ts-node/register --require tsconfig-paths/register \"src/test/**/buildJwtForRegistryEsriOpaGroupsTest.ts\"",
|
|
14
|
-
"create_esri_owner_jwt": "nyc mocha --compilers ts:ts-node/register,tsx:ts-node/register --require tsconfig-paths/register \"src/test/**/buildJwtForRegistryEsriOpaOwnerTest.ts\"",
|
|
15
|
-
"create_esri_groups_owner_jwt": "nyc mocha --compilers ts:ts-node/register,tsx:ts-node/register --require tsconfig-paths/register \"src/test/**/buildJwtForRegistryEsriOpaGroupsAndOwnerTest.ts\"",
|
|
16
13
|
"dev": "yarn run watch",
|
|
17
14
|
"release": "npm publish || echo \"Skip releasing npm package @magda/typescript-common.\""
|
|
18
15
|
},
|
|
19
16
|
"devDependencies": {
|
|
20
|
-
"@magda/registry-aspects": "^2.0.0-alpha.
|
|
21
|
-
"@magda/scripts": "^2.0.0-alpha.
|
|
17
|
+
"@magda/registry-aspects": "^2.0.0-alpha.2",
|
|
18
|
+
"@magda/scripts": "^2.0.0-alpha.2",
|
|
22
19
|
"@types/chai": "^4.0.0",
|
|
23
20
|
"@types/chai-as-promised": "^7.1.0",
|
|
24
21
|
"@types/cross-spawn": "^6.0.1",
|
|
@@ -28,12 +25,12 @@
|
|
|
28
25
|
"@types/lodash": "^4.14.73",
|
|
29
26
|
"@types/mocha": "^2.2.41",
|
|
30
27
|
"@types/nock": "^8.2.1",
|
|
31
|
-
"@types/pg": "^
|
|
28
|
+
"@types/pg": "^7.14.4",
|
|
32
29
|
"@types/read-pkg-up": "^3.0.1",
|
|
33
30
|
"@types/sinon": "^4.1.3",
|
|
34
31
|
"@types/superagent": "^3.5.5",
|
|
35
32
|
"@types/supertest": "^2.0.3",
|
|
36
|
-
"@types/urijs": "1.19.
|
|
33
|
+
"@types/urijs": "^1.19.19",
|
|
37
34
|
"@types/uuid": "^8.0.0",
|
|
38
35
|
"@types/yargs": "^12.0.8",
|
|
39
36
|
"chai": "^4.1.2",
|
|
@@ -63,13 +60,13 @@
|
|
|
63
60
|
"lodash": "^4.17.11",
|
|
64
61
|
"markdown-it": "^10.0.0",
|
|
65
62
|
"moment": "^2.17.1",
|
|
66
|
-
"pg": "^
|
|
63
|
+
"pg": "^7.18.2",
|
|
67
64
|
"read-pkg-up": "^3.0.0",
|
|
68
65
|
"request": "^2.88.0",
|
|
69
66
|
"resolve": "^1.15.0",
|
|
70
67
|
"sql-syntax": "^1.1.3",
|
|
71
68
|
"tsmonad": "^0.7.2",
|
|
72
|
-
"urijs": "^1.19.
|
|
69
|
+
"urijs": "^1.19.11",
|
|
73
70
|
"uuid": "^8.2.0",
|
|
74
71
|
"yargs": "^12.0.5"
|
|
75
72
|
},
|