@magda/typescript-common 2.0.0-alpha.2 → 2.0.0-alpha.5
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/SQLUtils.d.ts +5 -5
- package/dist/SQLUtils.js.map +1 -1
- package/dist/authorization-api/ApiClient.d.ts +1 -0
- package/dist/authorization-api/ApiClient.js +30 -1
- package/dist/authorization-api/ApiClient.js.map +1 -1
- package/dist/authorization-api/authMiddleware.d.ts +11 -5
- package/dist/authorization-api/authMiddleware.js +55 -13
- package/dist/authorization-api/authMiddleware.js.map +1 -1
- package/dist/authorization-api/model.d.ts +38 -1
- package/dist/generated/registry/api.d.ts +55 -2
- package/dist/generated/registry/api.js +218 -3
- package/dist/generated/registry/api.js.map +1 -1
- package/dist/registry/AuthorizedRegistryClient.d.ts +19 -13
- package/dist/registry/AuthorizedRegistryClient.js +36 -7
- package/dist/registry/AuthorizedRegistryClient.js.map +1 -1
- package/dist/registry/RegistryClient.d.ts +5 -4
- package/dist/registry/RegistryClient.js +13 -2
- package/dist/registry/RegistryClient.js.map +1 -1
- package/dist/registry/model.d.ts +5 -0
- package/dist/test/buildApiClient.spec.js +32 -14
- package/dist/test/buildApiClient.spec.js.map +1 -1
- package/dist/util/unionToThrowable.d.ts +2 -1
- package/dist/util/unionToThrowable.js +8 -1
- package/dist/util/unionToThrowable.js.map +1 -1
- package/package.json +3 -3
package/dist/SQLUtils.d.ts
CHANGED
|
@@ -43,16 +43,16 @@ export declare function getTableColumnName(columnName: String, tableRef?: String
|
|
|
43
43
|
* @param {{ [key: string]: Value }} data
|
|
44
44
|
* @return {*}
|
|
45
45
|
*/
|
|
46
|
-
export declare function createTableRecord(poolOrClient: pg.PoolClient | pg.Pool, table: string, data: {
|
|
46
|
+
export declare function createTableRecord(poolOrClient: pg.PoolClient | pg.Pool | pg.Client, table: string, data: {
|
|
47
47
|
[key: string]: RawValue;
|
|
48
48
|
}, allowFieldList?: string[], autoGenerateUuid?: boolean): Promise<any>;
|
|
49
49
|
export declare function updateTableRecord(poolOrClient: pg.PoolClient | pg.Pool, table: string, id: string, data: {
|
|
50
50
|
[key: string]: Value;
|
|
51
51
|
}, allowFieldList?: string[]): Promise<any>;
|
|
52
|
-
export declare function deleteTableRecord(poolOrClient: pg.Client | pg.Pool, table: string, id: string): Promise<void>;
|
|
52
|
+
export declare function deleteTableRecord(poolOrClient: pg.Client | pg.Pool | pg.PoolClient, table: string, id: string): Promise<void>;
|
|
53
53
|
export declare function parseIntParam(p: number | string | undefined): number;
|
|
54
54
|
export declare const MAX_PAGE_RECORD_NUMBER = 500;
|
|
55
|
-
export declare function searchTableRecord<T = any>(poolOrClient: pg.Client | pg.Pool, table: string, contiditions?: SQLSyntax[], queryConfig?: {
|
|
55
|
+
export declare function searchTableRecord<T = any>(poolOrClient: pg.Client | pg.Pool | pg.PoolClient, table: string, contiditions?: SQLSyntax[], queryConfig?: {
|
|
56
56
|
offset?: number | string;
|
|
57
57
|
limit?: number | string;
|
|
58
58
|
authDecision?: AuthDecision;
|
|
@@ -65,6 +65,6 @@ export declare function searchTableRecord<T = any>(poolOrClient: pg.Client | pg.
|
|
|
65
65
|
}[];
|
|
66
66
|
groupBy?: SQLSyntax | SQLSyntax[];
|
|
67
67
|
}): Promise<T[]>;
|
|
68
|
-
export declare function getTableRecord<T = any>(poolOrClient: pg.Client | pg.Pool, table: string, id: string, authDecision?: AuthDecision, objectKind?: PossibleObjectKind, toSqlConfig?: AspectQueryToSqlConfig): Promise<T | null>;
|
|
69
|
-
export declare function countTableRecord(poolOrClient: pg.Client | pg.Pool, table: string, contiditions?: SQLSyntax[], authDecision?: AuthDecision, objectKind?: PossibleObjectKind, toSqlConfig?: AspectQueryToSqlConfig): Promise<number>;
|
|
68
|
+
export declare function getTableRecord<T = any>(poolOrClient: pg.Client | pg.Pool | pg.PoolClient, table: string, id: string, authDecision?: AuthDecision, objectKind?: PossibleObjectKind, toSqlConfig?: AspectQueryToSqlConfig): Promise<T | null>;
|
|
69
|
+
export declare function countTableRecord(poolOrClient: pg.Client | pg.Pool | pg.PoolClient, table: string, contiditions?: SQLSyntax[], authDecision?: AuthDecision, objectKind?: PossibleObjectKind, toSqlConfig?: AspectQueryToSqlConfig): Promise<number>;
|
|
70
70
|
export {};
|
package/dist/SQLUtils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SQLUtils.js","sourceRoot":"","sources":["../src/SQLUtils.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,yDAA8D;AAE9D,qDAA6E;AAE7E,mCAA+C;AAC/C,gEAAwC;AAIxC;;;;;;;GAOG;AACH,SAAgB,mBAAmB,CAAC,KAAa;IAC7C,OAAO,GAAG,GAAG,KAAK,CAAC,OAAO,CAAC,eAAe,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,GAAG,GAAG,CAAC;AAC/E,CAAC;AAFD,kDAEC;AAED;;;;;;;;GAQG;AACH,SAAgB,gBAAgB,CAAC,EAAU;IACvC,MAAM,cAAc,GAAG,EAAE,CAAC,OAAO,CAAC,eAAe,EAAE,EAAE,CAAC,CAAC;IACvD,MAAM,KAAK,GAAG,cAAc,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACxC,MAAM,YAAY,GACd,KAAK,CAAC,MAAM,GAAG,CAAC;QACZ,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;QAC1D,CAAC,CAAC,mBAAmB,CAAC,cAAc,CAAC,CAAC;IAC9C,OAAO,oBAAS,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC;AAClD,CAAC;AARD,4CAQC;AAED;;;;;;;;GAQG;AACH,SAAgB,kBAAkB,CAC9B,UAAkB,EAClB,WAAmB,EAAE,EACrB,yBAAkC,KAAK;IAEvC,MAAM,EAAE,GAAG;QACP,QAAQ;QACR,sBAAsB,CAAC,CAAC,CAAC,UAAU,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,UAAU;KACjE;SACI,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC;SACtB,IAAI,CAAC,GAAG,CAAC,CAAC;IACf,OAAO,gBAAgB,CAAC,EAAE,CAAC,CAAC;AAChC,CAAC;AAZD,gDAYC;AAED;;;;;;;;;;GAUG;AACH,SAAsB,iBAAiB,CACnC,
|
|
1
|
+
{"version":3,"file":"SQLUtils.js","sourceRoot":"","sources":["../src/SQLUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -131,6 +131,7 @@ export default class ApiClient {
|
|
|
131
131
|
createOrgNode(parentNodeId: string, node: Partial<Omit<OrgUnitRecord, "id" | "createBy" | "createTime" | "editBy" | "editTime" | "left" | "right">>): Promise<OrgUnit>;
|
|
132
132
|
createRole(name: string, desc?: string): Promise<Role>;
|
|
133
133
|
createRolePermission(roleId: string, permissionData: CreateRolePermissionInputData): Promise<PermissionRecord>;
|
|
134
|
+
createPermission(permissionData: CreateRolePermissionInputData): Promise<PermissionRecord>;
|
|
134
135
|
getOperationByUri(opUri: string): Promise<OperationRecord>;
|
|
135
136
|
getResourceByUri(resUri: string): Promise<ResourceRecord>;
|
|
136
137
|
private handleGetResult;
|
|
@@ -88,7 +88,26 @@ class ApiClient {
|
|
|
88
88
|
*/
|
|
89
89
|
lookupUser(source, sourceId) {
|
|
90
90
|
return __awaiter(this, void 0, void 0, function* () {
|
|
91
|
-
|
|
91
|
+
if (!source) {
|
|
92
|
+
throw new ServerError_1.default("source cannot be empty!", 400);
|
|
93
|
+
}
|
|
94
|
+
if (!sourceId) {
|
|
95
|
+
throw new ServerError_1.default("sourceId cannot be empty!", 400);
|
|
96
|
+
}
|
|
97
|
+
const uri = urijs_1.default(`${this.baseUrl}public/users`).search({
|
|
98
|
+
source,
|
|
99
|
+
sourceId,
|
|
100
|
+
limit: 1
|
|
101
|
+
});
|
|
102
|
+
const res = yield isomorphic_fetch_1.default(uri.toString(), this.getMergeRequestInitOption());
|
|
103
|
+
if (!res.ok) {
|
|
104
|
+
throw new ServerError_1.default(yield res.text(), res.status);
|
|
105
|
+
}
|
|
106
|
+
const data = yield res.json();
|
|
107
|
+
if (!(data === null || data === void 0 ? void 0 : data.length)) {
|
|
108
|
+
return tsmonad_1.Maybe.nothing();
|
|
109
|
+
}
|
|
110
|
+
return tsmonad_1.Maybe.just(data[0]);
|
|
92
111
|
});
|
|
93
112
|
}
|
|
94
113
|
/**
|
|
@@ -346,6 +365,16 @@ class ApiClient {
|
|
|
346
365
|
return yield this.processJsonResponse(res);
|
|
347
366
|
});
|
|
348
367
|
}
|
|
368
|
+
createPermission(permissionData) {
|
|
369
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
370
|
+
const uri = urijs_1.default(`${this.baseUrl}public/permissions`);
|
|
371
|
+
const res = yield isomorphic_fetch_1.default(uri.toString(), this.getMergeRequestInitOption({
|
|
372
|
+
method: "post",
|
|
373
|
+
body: JSON.stringify(permissionData)
|
|
374
|
+
}));
|
|
375
|
+
return yield this.processJsonResponse(res);
|
|
376
|
+
});
|
|
377
|
+
}
|
|
349
378
|
getOperationByUri(opUri) {
|
|
350
379
|
return __awaiter(this, void 0, void 0, function* () {
|
|
351
380
|
const uri = urijs_1.default(`${this.baseUrl}public/operations/byUri/${opUri}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ApiClient.js","sourceRoot":"","sources":["../../src/authorization-api/ApiClient.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,wEAAqC;AAcrC,qCAAgC;AAChC,oDAA4B;AAC5B,mEAA2C;AAC3C,2EAAmD;AACnD,kDAA0B;AAE1B,iEAAyC;AACzC,4DAAoC;AAEpC,MAAqB,SAAS;IAK1B;IACI,mCAAmC;IACnC,OAAe,EACf,YAAoB,IAAI,EACxB,SAAiB,IAAI;QARjB,QAAG,GAAW,IAAI,CAAC;QACnB,sBAAiB,GAAgB,IAAI,CAAC;QACtC,YAAO,GAAW,EAAE,CAAC;QAQzB,IAAI,CAAC,OAAO,GAAG,0BAAgB,CAAC,OAAO,CAAC,CAAC;QACzC,IAAI,SAAS,IAAI,MAAM,EAAE;YACrB,IAAI,CAAC,GAAG,GAAG,kBAAQ,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;SAC1C;QACD,IAAI,IAAI,CAAC,GAAG,EAAE;YACV,IAAI,CAAC,iBAAiB,GAAG;gBACrB,OAAO,EAAE;oBACL,iBAAiB,EAAE,IAAI,CAAC,GAAG;iBAC9B;aACJ,CAAC;SACL;IACL,CAAC;IAED,yBAAyB,CAAC,eAA4B,IAAI;QACtD,IAAI,qBAAqB,GAAgB,EAAE,CAAC;QAC5C,IACI,CAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,IAAI;YAClB,CAAC,EAAC,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,OAAO,CAAA;gBACnB,CAAC,OAAO,YAAY,CAAC,OAAO,KAAK,QAAQ;oBACrC,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC;yBAC5B,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC;yBAC/B,OAAO,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAC9C;YACE,qBAAqB,GAAG;gBACpB,OAAO,EAAE;oBACL,cAAc,EAAE,kBAAkB;iBACrC;aACJ,CAAC;SACL;QACD,OAAO,gBAAM,CAAC,KAAK,CACf,EAAE,EACF,IAAI,CAAC,iBAAiB,EACtB,YAAY,EACZ,qBAAqB,CACxB,CAAC;IACN,CAAC;IAEK,mBAAmB,CAAU,GAAa;;YAC5C,IAAI,GAAG,CAAC,MAAM,IAAI,GAAG,IAAI,GAAG,CAAC,MAAM,GAAG,GAAG,EAAE;gBACvC,OAAO,CAAC,MAAM,GAAG,CAAC,IAAI,EAAE,CAAM,CAAC;aAClC;iBAAM;gBACH,MAAM,YAAY,GAAG,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC;gBACtC,MAAM,IAAI,qBAAW,CACjB,UAAU,GAAG,CAAC,UAAU,KAAK,YAAY,CAAC,OAAO,CAC7C,aAAa,EACb,EAAE,CACL,EAAE,EACH,GAAG,CAAC,MAAM,CACb,CAAC;aACL;QACL,CAAC;KAAA;IAED;;;;;;OAMG;IACG,OAAO,CAAC,MAAc;;YACxB,OAAO,MAAM,IAAI,CAAC,eAAe,CAC7B,0BAAK,CACD,GAAG,IAAI,CAAC,OAAO,gBAAgB,MAAM,EAAE,EACvC,IAAI,CAAC,yBAAyB,EAAE,CACnC,CACJ,CAAC;QACN,CAAC;KAAA;IAED;;;;;;;OAOG;IACG,UAAU,CACZ,MAAc,EACd,QAAgB;;YAEhB,
|
|
1
|
+
{"version":3,"file":"ApiClient.js","sourceRoot":"","sources":["../../src/authorization-api/ApiClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Request, Response } from "express";
|
|
1
|
+
import { Request, Response, NextFunction } from "express";
|
|
2
2
|
import AuthDecisionQueryClient, { AuthDecisionReqConfig } from "../opa/AuthDecisionQueryClient";
|
|
3
3
|
/**
|
|
4
4
|
* Find the user making the request. Assign it to req passport style.
|
|
@@ -6,6 +6,7 @@ import AuthDecisionQueryClient, { AuthDecisionReqConfig } from "../opa/AuthDecis
|
|
|
6
6
|
*/
|
|
7
7
|
export declare const getUser: (baseAuthUrl: string, jwtSecret: string, actionUserId?: string) => (req: Request, res: Response, next: () => void) => void;
|
|
8
8
|
export declare const mustBeAdmin: (baseAuthUrl: string, jwtSecret: string) => (req: Request, res: Response, next: () => void) => void;
|
|
9
|
+
export declare type AuthDecisionReqConfigOrConfigFuncParam = AuthDecisionReqConfig | ((req: Request, res: Response, next: NextFunction) => AuthDecisionReqConfig | null | Promise<AuthDecisionReqConfig | null>);
|
|
9
10
|
/**
|
|
10
11
|
* Make auth decision based on auth decision request config.
|
|
11
12
|
* Depends on the config provided, either partial eval (conditional decision on a set of records/objects)
|
|
@@ -13,10 +14,15 @@ export declare const mustBeAdmin: (baseAuthUrl: string, jwtSecret: string) => (r
|
|
|
13
14
|
*
|
|
14
15
|
* @export
|
|
15
16
|
* @param {AuthDecisionQueryClient} authDecisionClient
|
|
16
|
-
* @param {
|
|
17
|
+
* @param {AuthDecisionReqConfigOrConfigFuncParam} configOrConfigFunc An auth decision config object or a function returns an auth decision config object.
|
|
18
|
+
* When a function is supplied, the function can opt to:
|
|
19
|
+
* - return an auth decision object based on incoming request.
|
|
20
|
+
* - throw an Error
|
|
21
|
+
* - send the response and return a `null` value to skip the rest of request processing.
|
|
22
|
+
* - call `next` function and return a `null` value to skip the rest of processing of current middleware
|
|
17
23
|
* @return {*}
|
|
18
24
|
*/
|
|
19
|
-
export declare function withAuthDecision(authDecisionClient: AuthDecisionQueryClient,
|
|
25
|
+
export declare function withAuthDecision(authDecisionClient: AuthDecisionQueryClient, configOrConfigFunc: AuthDecisionReqConfigOrConfigFuncParam): (req: Request, res: Response, next: () => void) => Promise<void>;
|
|
20
26
|
/**
|
|
21
27
|
* Require unconditional auth decision based on auth decision request config.
|
|
22
28
|
* When making decision on a group of records/objects, this method makes sure
|
|
@@ -24,11 +30,11 @@ export declare function withAuthDecision(authDecisionClient: AuthDecisionQueryCl
|
|
|
24
30
|
*
|
|
25
31
|
* @export
|
|
26
32
|
* @param {AuthDecisionQueryClient} authDecisionClient
|
|
27
|
-
* @param {
|
|
33
|
+
* @param {AuthDecisionReqConfigOrConfigFuncParam} configOrConfigFunc
|
|
28
34
|
* @param {boolean} [requiredDecision=true]
|
|
29
35
|
* @return {*}
|
|
30
36
|
*/
|
|
31
|
-
export declare function requireUnconditionalAuthDecision(authDecisionClient: AuthDecisionQueryClient,
|
|
37
|
+
export declare function requireUnconditionalAuthDecision(authDecisionClient: AuthDecisionQueryClient, configOrConfigFunc: AuthDecisionReqConfigOrConfigFuncParam, requiredDecision?: boolean): (req: Request, res: Response, next: () => void) => void;
|
|
32
38
|
declare type InputDataOrFuncType = ((req: Request, res: Response) => Record<string, any>) | Record<string, any>;
|
|
33
39
|
/**
|
|
34
40
|
* require permission based on input data provided.
|
|
@@ -46,15 +46,44 @@ exports.getUser = (baseAuthUrl, jwtSecret, actionUserId) => (req, res, next) =>
|
|
|
46
46
|
exports.mustBeAdmin = (baseAuthUrl, jwtSecret) => {
|
|
47
47
|
const getUserInstance = exports.getUser(baseAuthUrl, jwtSecret);
|
|
48
48
|
return (req, res, next) => {
|
|
49
|
-
getUserInstance(req, res, () => {
|
|
50
|
-
|
|
51
|
-
|
|
49
|
+
getUserInstance(req, res, () => __awaiter(void 0, void 0, void 0, function* () {
|
|
50
|
+
var _a, _b;
|
|
51
|
+
try {
|
|
52
|
+
// check the legacy `isAdmin` role
|
|
53
|
+
if ((_a = req === null || req === void 0 ? void 0 : req.user) === null || _a === void 0 ? void 0 : _a.isAdmin) {
|
|
54
|
+
next();
|
|
55
|
+
return;
|
|
56
|
+
}
|
|
57
|
+
else if ((_b = req === null || req === void 0 ? void 0 : req.user) === null || _b === void 0 ? void 0 : _b.id) {
|
|
58
|
+
const msg403 = "Only admin users are authorised to access this API: " +
|
|
59
|
+
req.url;
|
|
60
|
+
const apiClient = new ApiClient_1.default(baseAuthUrl, jwtSecret, constants_1.DEFAULT_ADMIN_USER_ID);
|
|
61
|
+
const roles = yield apiClient.getUserRoles(req.user.id);
|
|
62
|
+
if (!(roles === null || roles === void 0 ? void 0 : roles.length)) {
|
|
63
|
+
throw new ServerError_1.default(msg403, 403);
|
|
64
|
+
}
|
|
65
|
+
if (roles.findIndex((role) => role.id === constants_1.ADMIN_USERS_ROLE_ID) !== -1) {
|
|
66
|
+
next();
|
|
67
|
+
return;
|
|
68
|
+
}
|
|
69
|
+
else {
|
|
70
|
+
throw new ServerError_1.default(msg403, 403);
|
|
71
|
+
}
|
|
72
|
+
}
|
|
73
|
+
else {
|
|
74
|
+
throw new ServerError_1.default("Not authorized", 401);
|
|
75
|
+
}
|
|
52
76
|
}
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
77
|
+
catch (e) {
|
|
78
|
+
if (e instanceof ServerError_1.default) {
|
|
79
|
+
console.warn(`Rejecting by mustBeAdmin: ${e}`);
|
|
80
|
+
res.status(e.statusCode).send(e.message);
|
|
81
|
+
}
|
|
82
|
+
else {
|
|
83
|
+
res.status(500).send(`${e}`);
|
|
84
|
+
}
|
|
56
85
|
}
|
|
57
|
-
});
|
|
86
|
+
}));
|
|
58
87
|
};
|
|
59
88
|
};
|
|
60
89
|
/**
|
|
@@ -64,15 +93,27 @@ exports.mustBeAdmin = (baseAuthUrl, jwtSecret) => {
|
|
|
64
93
|
*
|
|
65
94
|
* @export
|
|
66
95
|
* @param {AuthDecisionQueryClient} authDecisionClient
|
|
67
|
-
* @param {
|
|
96
|
+
* @param {AuthDecisionReqConfigOrConfigFuncParam} configOrConfigFunc An auth decision config object or a function returns an auth decision config object.
|
|
97
|
+
* When a function is supplied, the function can opt to:
|
|
98
|
+
* - return an auth decision object based on incoming request.
|
|
99
|
+
* - throw an Error
|
|
100
|
+
* - send the response and return a `null` value to skip the rest of request processing.
|
|
101
|
+
* - call `next` function and return a `null` value to skip the rest of processing of current middleware
|
|
68
102
|
* @return {*}
|
|
69
103
|
*/
|
|
70
|
-
function withAuthDecision(authDecisionClient,
|
|
104
|
+
function withAuthDecision(authDecisionClient, configOrConfigFunc) {
|
|
71
105
|
return (req, res, next) => __awaiter(this, void 0, void 0, function* () {
|
|
72
106
|
try {
|
|
107
|
+
const config = typeof configOrConfigFunc === "function"
|
|
108
|
+
? yield configOrConfigFunc(req, res, next)
|
|
109
|
+
: configOrConfigFunc;
|
|
110
|
+
if (!config) {
|
|
111
|
+
return;
|
|
112
|
+
}
|
|
73
113
|
const jwtToken = req.get("X-Magda-Session");
|
|
74
114
|
const authDecision = yield authDecisionClient.getAuthDecision(config, jwtToken);
|
|
75
115
|
res.locals.authDecision = authDecision;
|
|
116
|
+
res.locals.authDecisionConfig = config;
|
|
76
117
|
next();
|
|
77
118
|
}
|
|
78
119
|
catch (e) {
|
|
@@ -94,20 +135,21 @@ exports.withAuthDecision = withAuthDecision;
|
|
|
94
135
|
*
|
|
95
136
|
* @export
|
|
96
137
|
* @param {AuthDecisionQueryClient} authDecisionClient
|
|
97
|
-
* @param {
|
|
138
|
+
* @param {AuthDecisionReqConfigOrConfigFuncParam} configOrConfigFunc
|
|
98
139
|
* @param {boolean} [requiredDecision=true]
|
|
99
140
|
* @return {*}
|
|
100
141
|
*/
|
|
101
|
-
function requireUnconditionalAuthDecision(authDecisionClient,
|
|
142
|
+
function requireUnconditionalAuthDecision(authDecisionClient, configOrConfigFunc, requiredDecision = true) {
|
|
102
143
|
return (req, res, next) => {
|
|
103
|
-
withAuthDecision(authDecisionClient,
|
|
144
|
+
withAuthDecision(authDecisionClient, configOrConfigFunc)(req, res, () => {
|
|
145
|
+
var _a, _b;
|
|
104
146
|
const authDecision = res.locals.authDecision;
|
|
105
147
|
if ((authDecision === null || authDecision === void 0 ? void 0 : authDecision.hasResidualRules) === false &&
|
|
106
148
|
AuthDecision_1.isTrueEquivalent(authDecision === null || authDecision === void 0 ? void 0 : authDecision.result) == requiredDecision) {
|
|
107
149
|
return next();
|
|
108
150
|
}
|
|
109
151
|
else {
|
|
110
|
-
res.status(403).send(`you are not permitted to perform \`${
|
|
152
|
+
res.status(403).send(`you are not permitted to perform \`${(_b = (_a = res === null || res === void 0 ? void 0 : res.locals) === null || _a === void 0 ? void 0 : _a.authDecisionConfig) === null || _b === void 0 ? void 0 : _b.operationUri}\` on required resources.`);
|
|
111
153
|
}
|
|
112
154
|
});
|
|
113
155
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"authMiddleware.js","sourceRoot":"","sources":["../../src/authorization-api/authMiddleware.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,oDAAqE;AACrE,4DAAoC;AAIpC,sDAAqE;AACrE,
|
|
1
|
+
{"version":3,"file":"authMiddleware.js","sourceRoot":"","sources":["../../src/authorization-api/authMiddleware.ts"],"names":[],"mappings":"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"}
|
|
@@ -47,8 +47,12 @@ export declare type OrgUnit = Partial<OrgUnitRecord> & {
|
|
|
47
47
|
export interface APIKeyRecord {
|
|
48
48
|
id: string;
|
|
49
49
|
user_id: string;
|
|
50
|
-
created_timestamp:
|
|
50
|
+
created_timestamp: Date;
|
|
51
51
|
hash: string;
|
|
52
|
+
enabled: boolean;
|
|
53
|
+
expiry_time?: Date;
|
|
54
|
+
last_successful_attempt_time?: Date;
|
|
55
|
+
last_failed_attempt_time?: Date;
|
|
52
56
|
}
|
|
53
57
|
export interface Role {
|
|
54
58
|
id: string;
|
|
@@ -126,3 +130,36 @@ export interface AccessControlMetaData {
|
|
|
126
130
|
preAuthorisedPermissionIds?: string[];
|
|
127
131
|
};
|
|
128
132
|
}
|
|
133
|
+
export interface CreateAccessGroupRequestBodyType {
|
|
134
|
+
name: string;
|
|
135
|
+
resourceUri: string;
|
|
136
|
+
description?: string;
|
|
137
|
+
keywords?: string[];
|
|
138
|
+
operationUris: string[];
|
|
139
|
+
ownerId?: string;
|
|
140
|
+
orgUnitId?: string;
|
|
141
|
+
}
|
|
142
|
+
export interface UpdateAccessGroupRequestBodyType {
|
|
143
|
+
name?: string;
|
|
144
|
+
description?: string;
|
|
145
|
+
keywords?: string[];
|
|
146
|
+
operationUris?: string[];
|
|
147
|
+
ownerId?: string;
|
|
148
|
+
orgUnitId?: string;
|
|
149
|
+
}
|
|
150
|
+
export interface AccessGroup {
|
|
151
|
+
id: string;
|
|
152
|
+
name: string;
|
|
153
|
+
resourceUri: string;
|
|
154
|
+
operationUris: string[];
|
|
155
|
+
description?: string;
|
|
156
|
+
keywords?: string[];
|
|
157
|
+
permissionId: string;
|
|
158
|
+
roleId: string;
|
|
159
|
+
ownerId?: string;
|
|
160
|
+
orgUnit?: string;
|
|
161
|
+
createTime?: Date;
|
|
162
|
+
createBy?: string;
|
|
163
|
+
editTime?: Date;
|
|
164
|
+
editBy?: string;
|
|
165
|
+
}
|
|
@@ -35,6 +35,11 @@ export declare class AspectDefinition {
|
|
|
35
35
|
export declare class CountResponse {
|
|
36
36
|
'count': number;
|
|
37
37
|
}
|
|
38
|
+
export declare class DeleteRecordsAspectArrayItemsRequest {
|
|
39
|
+
'recordIds': Array<string>;
|
|
40
|
+
'jsonPath': string;
|
|
41
|
+
'items': Array<JsValue>;
|
|
42
|
+
}
|
|
38
43
|
export declare class DeleteResult {
|
|
39
44
|
'deleted': boolean;
|
|
40
45
|
}
|
|
@@ -66,11 +71,22 @@ export declare class JsObject {
|
|
|
66
71
|
}
|
|
67
72
|
export declare class JsValue {
|
|
68
73
|
}
|
|
74
|
+
export declare class JsonPatch {
|
|
75
|
+
'ops': Array<Operation>;
|
|
76
|
+
}
|
|
69
77
|
export declare class MultipleDeleteResult {
|
|
70
78
|
'count': number;
|
|
71
79
|
}
|
|
72
80
|
export declare class Operation {
|
|
73
81
|
}
|
|
82
|
+
export declare class PatchRecordsRequest {
|
|
83
|
+
'recordIds': Array<string>;
|
|
84
|
+
'jsonPath': JsonPatch;
|
|
85
|
+
}
|
|
86
|
+
export declare class PutRecordsAspectRequest {
|
|
87
|
+
'recordIds': Array<string>;
|
|
88
|
+
'data': JsObject;
|
|
89
|
+
}
|
|
74
90
|
/**
|
|
75
91
|
* A record in the registry, usually including data for one or more aspects, unique for a tenant.
|
|
76
92
|
*/
|
|
@@ -355,8 +371,9 @@ export declare class RecordAspectsApi {
|
|
|
355
371
|
* @param aspect The record aspect to save.
|
|
356
372
|
* @param xMagdaSession Magda internal session id
|
|
357
373
|
* @param xMagdaTenantId 0
|
|
374
|
+
* @param merge Whether merge the supplied aspect data to existing aspect data or replace it
|
|
358
375
|
*/
|
|
359
|
-
putById(recordId: string, aspectId: string, aspect: any, xMagdaSession: string, xMagdaTenantId: number): Promise<{
|
|
376
|
+
putById(recordId: string, aspectId: string, aspect: any, xMagdaSession: string, xMagdaTenantId: number, merge?: boolean): Promise<{
|
|
360
377
|
response: http.IncomingMessage;
|
|
361
378
|
body: any;
|
|
362
379
|
}>;
|
|
@@ -431,6 +448,18 @@ export declare class RecordsApi {
|
|
|
431
448
|
response: http.IncomingMessage;
|
|
432
449
|
body: DeleteResult;
|
|
433
450
|
}>;
|
|
451
|
+
/**
|
|
452
|
+
* Remove items from records' aspect data
|
|
453
|
+
* Remove items from records' aspect data
|
|
454
|
+
* @param xMagdaTenantId 0
|
|
455
|
+
* @param aspectId ID of the aspect to update.
|
|
456
|
+
* @param requestData An json object has key 'recordIds', 'jsonPath', 'items'
|
|
457
|
+
* @param xMagdaSession Magda internal session id
|
|
458
|
+
*/
|
|
459
|
+
deleteRecordsAspectArrayItems(xMagdaTenantId: number, aspectId: string, requestData: DeleteRecordsAspectArrayItemsRequest, xMagdaSession: string): Promise<{
|
|
460
|
+
response: http.IncomingMessage;
|
|
461
|
+
body: Array<any>;
|
|
462
|
+
}>;
|
|
434
463
|
/**
|
|
435
464
|
* Get a list of all records
|
|
436
465
|
*
|
|
@@ -530,7 +559,7 @@ export declare class RecordsApi {
|
|
|
530
559
|
* Modify a record by applying a JSON Patch
|
|
531
560
|
* The patch should follow IETF RFC 6902 (https://tools.ietf.org/html/rfc6902).
|
|
532
561
|
* @param xMagdaTenantId 0
|
|
533
|
-
* @param id ID of the
|
|
562
|
+
* @param id ID of the record to be pacthed.
|
|
534
563
|
* @param recordPatch The RFC 6902 patch to apply to the aspect.
|
|
535
564
|
* @param xMagdaSession Magda internal session id
|
|
536
565
|
*/
|
|
@@ -538,6 +567,17 @@ export declare class RecordsApi {
|
|
|
538
567
|
response: http.IncomingMessage;
|
|
539
568
|
body: Record;
|
|
540
569
|
}>;
|
|
570
|
+
/**
|
|
571
|
+
* Modify a list of records by applying the same JSON Patch
|
|
572
|
+
* The patch should follow IETF RFC 6902 (https://tools.ietf.org/html/rfc6902).
|
|
573
|
+
* @param xMagdaTenantId 0
|
|
574
|
+
* @param requestData An json object has key 'recordIds' & 'jsonPath'
|
|
575
|
+
* @param xMagdaSession Magda internal session id
|
|
576
|
+
*/
|
|
577
|
+
patchRecords(xMagdaTenantId: number, requestData: PatchRecordsRequest, xMagdaSession: string): Promise<{
|
|
578
|
+
response: http.IncomingMessage;
|
|
579
|
+
body: Array<any>;
|
|
580
|
+
}>;
|
|
541
581
|
/**
|
|
542
582
|
* Modify a record by ID
|
|
543
583
|
* Modifies a record. Aspects included in the request are created or updated, but missing aspects are not removed.
|
|
@@ -550,6 +590,19 @@ export declare class RecordsApi {
|
|
|
550
590
|
response: http.IncomingMessage;
|
|
551
591
|
body: Record;
|
|
552
592
|
}>;
|
|
593
|
+
/**
|
|
594
|
+
* Modify a list of records's aspect with same new data
|
|
595
|
+
* Modify a list of records's aspect with same new data
|
|
596
|
+
* @param xMagdaTenantId 0
|
|
597
|
+
* @param aspectId ID of the aspect to update.
|
|
598
|
+
* @param requestData An json object has key 'recordIds' & 'data'
|
|
599
|
+
* @param xMagdaSession Magda internal session id
|
|
600
|
+
* @param merge Whether merge the supplied aspect data to existing aspect data or replace it
|
|
601
|
+
*/
|
|
602
|
+
putRecordsAspect(xMagdaTenantId: number, aspectId: string, requestData: PutRecordsAspectRequest, xMagdaSession: string, merge?: boolean): Promise<{
|
|
603
|
+
response: http.IncomingMessage;
|
|
604
|
+
body: Array<any>;
|
|
605
|
+
}>;
|
|
553
606
|
/**
|
|
554
607
|
* Trim by source tag
|
|
555
608
|
* Trims records with the provided source that DON'T have the supplied source tag
|