@magda/typescript-common 2.0.0-alpha.1 → 2.0.0-alpha.4
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 +10 -13
- package/dist/authorization-api/ApiClient.js +118 -32
- package/dist/authorization-api/ApiClient.js.map +1 -1
- package/dist/authorization-api/authMiddleware.d.ts +0 -1
- package/dist/authorization-api/authMiddleware.js +37 -15
- 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 +60 -22
- 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 +34 -55
- 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
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ApiClient.js","sourceRoot":"","sources":["../../src/authorization-api/ApiClient.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,wEAAqC;
|
|
1
|
+
{"version":3,"file":"ApiClient.js","sourceRoot":"","sources":["../../src/authorization-api/ApiClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { Request, Response } from "express";
|
|
2
2
|
import AuthDecisionQueryClient, { AuthDecisionReqConfig } from "../opa/AuthDecisionQueryClient";
|
|
3
|
-
export declare const mustBeLoggedIn: (jwtSecret: string) => (this: any, req: Request, res: Response, next: () => void) => void;
|
|
4
3
|
/**
|
|
5
4
|
* Find the user making the request. Assign it to req passport style.
|
|
6
5
|
* !deprecated! should use middleware `getUserId` or `requireUserId` instead.
|
|
@@ -12,19 +12,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
12
12
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
13
|
};
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
|
-
exports.requireUserId = exports.getUserId = exports.requirePermission = exports.requireUnconditionalAuthDecision = exports.withAuthDecision = exports.mustBeAdmin = exports.getUser =
|
|
15
|
+
exports.requireUserId = exports.getUserId = exports.requirePermission = exports.requireUnconditionalAuthDecision = exports.withAuthDecision = exports.mustBeAdmin = exports.getUser = void 0;
|
|
16
16
|
const GetUserId_1 = require("../session/GetUserId");
|
|
17
17
|
const ApiClient_1 = __importDefault(require("./ApiClient"));
|
|
18
18
|
const AuthDecision_1 = require("../opa/AuthDecision");
|
|
19
19
|
const constants_1 = require("./constants");
|
|
20
20
|
const ServerError_1 = __importDefault(require("../ServerError"));
|
|
21
|
-
// deprecated middleware. To be removed after all code is secured with new model
|
|
22
|
-
exports.mustBeLoggedIn = (jwtSecret) => function (req, res, next) {
|
|
23
|
-
GetUserId_1.getUserIdHandling(req, res, jwtSecret, (userId) => {
|
|
24
|
-
this.userId = userId;
|
|
25
|
-
next();
|
|
26
|
-
});
|
|
27
|
-
};
|
|
28
21
|
/**
|
|
29
22
|
* Find the user making the request. Assign it to req passport style.
|
|
30
23
|
* !deprecated! should use middleware `getUserId` or `requireUserId` instead.
|
|
@@ -53,15 +46,44 @@ exports.getUser = (baseAuthUrl, jwtSecret, actionUserId) => (req, res, next) =>
|
|
|
53
46
|
exports.mustBeAdmin = (baseAuthUrl, jwtSecret) => {
|
|
54
47
|
const getUserInstance = exports.getUser(baseAuthUrl, jwtSecret);
|
|
55
48
|
return (req, res, next) => {
|
|
56
|
-
getUserInstance(req, res, () => {
|
|
57
|
-
|
|
58
|
-
|
|
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
|
+
}
|
|
59
76
|
}
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
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
|
+
}
|
|
63
85
|
}
|
|
64
|
-
});
|
|
86
|
+
}));
|
|
65
87
|
};
|
|
66
88
|
};
|
|
67
89
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"authMiddleware.js","sourceRoot":"","sources":["../../src/authorization-api/authMiddleware.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,
|
|
1
|
+
{"version":3,"file":"authMiddleware.js","sourceRoot":"","sources":["../../src/authorization-api/authMiddleware.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,oDAAqE;AACrE,4DAAoC;AAIpC,sDAAqE;AACrE,2CAAyE;AACzE,iEAAyC;AAEzC;;;GAGG;AACU,QAAA,OAAO,GAAG,CACnB,WAAmB,EACnB,SAAiB,EACjB,YAAqB,EACvB,EAAE,CAAC,CAAC,GAAY,EAAE,GAAa,EAAE,IAAgB,EAAE,EAAE;IACnD,qBAAgB,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC,MAAM,CAAC;QACpC,IAAI,EAAE,CAAC,MAAM,EAAE,EAAE;YACb,MAAM,SAAS,GAAG,IAAI,mBAAS,CAC3B,WAAW,EACX,SAAS,EACT,YAAY,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,iCAAqB,CACtD,CAAC;YACF,SAAS;iBACJ,OAAO,CAAC,MAAM,CAAC;iBACf,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE;gBAChB,SAAS,CAAC,MAAM,CAAC;oBACb,IAAI,EAAE,CAAC,IAAI,EAAE,EAAE;wBACX,GAAG,CAAC,IAAI,mCAID,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,GAC1B,IAAI,CACV,CAAC;wBACF,IAAI,EAAE,CAAC;oBACX,CAAC;oBACD,OAAO,EAAE,IAAI;iBAChB,CAAC,CAAC;YACP,CAAC,CAAC;iBACD,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC;QAC7B,CAAC;QACD,OAAO,EAAE,IAAI;KAChB,CAAC,CAAC;AACP,CAAC,CAAC;AAEF,gFAAgF;AACnE,QAAA,WAAW,GAAG,CAAC,WAAmB,EAAE,SAAiB,EAAE,EAAE;IAClE,MAAM,eAAe,GAAG,eAAO,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;IACxD,OAAO,CAAC,GAAY,EAAE,GAAa,EAAE,IAAgB,EAAE,EAAE;QACrD,eAAe,CAAC,GAAG,EAAE,GAAG,EAAE,GAAS,EAAE;;YACjC,IAAI;gBACA,kCAAkC;gBAClC,UAAI,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,IAAI,0CAAE,OAAO,EAAE;oBACpB,IAAI,EAAE,CAAC;oBACP,OAAO;iBACV;qBAAM,UAAI,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,IAAI,0CAAE,EAAE,EAAE;oBACtB,MAAM,MAAM,GACR,sDAAsD;wBACtD,GAAG,CAAC,GAAG,CAAC;oBACZ,MAAM,SAAS,GAAG,IAAI,mBAAS,CAC3B,WAAW,EACX,SAAS,EACT,iCAAqB,CACxB,CAAC;oBACF,MAAM,KAAK,GAAG,MAAM,SAAS,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;oBACxD,IAAI,EAAC,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,MAAM,CAAA,EAAE;wBAChB,MAAM,IAAI,qBAAW,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;qBACtC;oBACD,IACI,KAAK,CAAC,SAAS,CACX,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,KAAK,+BAAmB,CAC5C,KAAK,CAAC,CAAC,EACV;wBACE,IAAI,EAAE,CAAC;wBACP,OAAO;qBACV;yBAAM;wBACH,MAAM,IAAI,qBAAW,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;qBACtC;iBACJ;qBAAM;oBACH,MAAM,IAAI,qBAAW,CAAC,gBAAgB,EAAE,GAAG,CAAC,CAAC;iBAChD;aACJ;YAAC,OAAO,CAAC,EAAE;gBACR,IAAI,CAAC,YAAY,qBAAW,EAAE;oBAC1B,OAAO,CAAC,IAAI,CAAC,6BAA6B,CAAC,EAAE,CAAC,CAAC;oBAC/C,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;iBAC5C;qBAAM;oBACH,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;iBAChC;aACJ;QACL,CAAC,CAAA,CAAC,CAAC;IACP,CAAC,CAAC;AACN,CAAC,CAAC;AAEF;;;;;;;;;GASG;AACH,SAAgB,gBAAgB,CAC5B,kBAA2C,EAC3C,MAA6B;IAE7B,OAAO,CAAO,GAAY,EAAE,GAAa,EAAE,IAAgB,EAAE,EAAE;QAC3D,IAAI;YACA,MAAM,QAAQ,GAAG,GAAG,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;YAC5C,MAAM,YAAY,GAAG,MAAM,kBAAkB,CAAC,eAAe,CACzD,MAAM,EACN,QAAQ,CACX,CAAC;YACF,GAAG,CAAC,MAAM,CAAC,YAAY,GAAG,YAAY,CAAC;YACvC,IAAI,EAAE,CAAC;SACV;QAAC,OAAO,CAAC,EAAE;YACR,OAAO,CAAC,KAAK,CAAC,sCAAsC,CAAC,EAAE,CAAC,CAAC;YACzD,IAAI,CAAC,YAAY,qBAAW,EAAE;gBAC1B,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;aAC5C;iBAAM;gBACH,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAChB,qEAAqE,CAAC,EAAE,CAC3E,CAAC;aACL;SACJ;IACL,CAAC,CAAA,CAAC;AACN,CAAC;AAxBD,4CAwBC;AAED;;;;;;;;;;GAUG;AACH,SAAgB,gCAAgC,CAC5C,kBAA2C,EAC3C,MAA6B,EAC7B,mBAA4B,IAAI;IAEhC,OAAO,CAAC,GAAY,EAAE,GAAa,EAAE,IAAgB,EAAE,EAAE;QACrD,gBAAgB,CAAC,kBAAkB,EAAE,MAAM,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE;YACxD,MAAM,YAAY,GAAG,GAAG,CAAC,MAAM,CAAC,YAA4B,CAAC;YAC7D,IACI,CAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,gBAAgB,MAAK,KAAK;gBACxC,+BAAgB,CAAC,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,MAAM,CAAC,IAAI,gBAAgB,EAC5D;gBACE,OAAO,IAAI,EAAE,CAAC;aACjB;iBAAM;gBACH,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAChB,sCAAsC,MAAM,CAAC,YAAY,2BAA2B,CACvF,CAAC;aACL;QACL,CAAC,CAAC,CAAC;IACP,CAAC,CAAC;AACN,CAAC;AApBD,4EAoBC;AAMD;;;;;;;;;;GAUG;AACH,SAAgB,iBAAiB,CAC7B,kBAA2C,EAC3C,YAAoB,EACpB,eAAqC;IAErC,OAAO,CAAC,GAAY,EAAE,GAAa,EAAE,IAAgB,EAAE,EAAE;QACrD,IAAI;YACA,MAAM,MAAM,GAAG;gBACX,YAAY;gBACZ,QAAQ,EAAE,EAAE;aACU,CAAC;YAC3B,IAAI,eAAe,EAAE;gBACjB,IAAI,OAAO,eAAe,KAAK,UAAU,EAAE;oBACvC,MAAM,CAAC,KAAK,GAAG,eAAe,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;iBAC5C;qBAAM;oBACH,MAAM,CAAC,KAAK,GAAG,eAAe,CAAC;iBAClC;aACJ;YACD,gCAAgC,CAAC,kBAAkB,EAAE,MAAM,EAAE,IAAI,CAAC,CAC9D,GAAG,EACH,GAAG,EACH,IAAI,CACP,CAAC;SACL;QAAC,OAAO,CAAC,EAAE;YACR,OAAO,CAAC,KAAK,CAAC,uCAAuC,CAAC,EAAE,CAAC,CAAC;YAC1D,IAAI,CAAC,YAAY,qBAAW,EAAE;gBAC1B,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;aAC5C;iBAAM;gBACH,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAChB,uCAAuC,CAAC,EAAE,CAC7C,CAAC;aACL;SACJ;IACL,CAAC,CAAC;AACN,CAAC;AAlCD,8CAkCC;AAED;;;;;;;;GAQG;AACH,SAAgB,SAAS,CAAC,SAAiB;IACvC,OAAO,CAAC,GAAY,EAAE,GAAa,EAAE,IAAgB,EAAE,EAAE;QACrD,qBAAgB,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC,MAAM,CAAC;YACpC,IAAI,EAAE,CAAC,MAAM,EAAE,EAAE;gBACb,GAAG,CAAC,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC;gBAC3B,IAAI,EAAE,CAAC;YACX,CAAC;YACD,OAAO,EAAE,GAAG,EAAE;gBACV,GAAG,CAAC,MAAM,CAAC,MAAM,GAAG,SAAS,CAAC;gBAC9B,IAAI,EAAE,CAAC;YACX,CAAC;SACJ,CAAC,CAAC;IACP,CAAC,CAAC;AACN,CAAC;AAbD,8BAaC;AAED;;;;;;;;GAQG;AACU,QAAA,aAAa,GAAG,CAAC,SAAiB,EAAE,EAAE,CAAC,CAChD,GAAY,EACZ,GAAa,EACb,IAAgB,EAClB,EAAE,CACA,SAAS,CAAC,SAAS,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE;IAChC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,EAAE;QACpB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAChB,+DAA+D,CAClE,CAAC;KACL;SAAM;QACH,OAAO,IAAI,EAAE,CAAC;KACjB;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -2,4 +2,5 @@ export declare const ANONYMOUS_USERS_ROLE_ID = "00000000-0000-0001-0000-00000000
|
|
|
2
2
|
export declare const AUTHENTICATED_USERS_ROLE_ID = "00000000-0000-0002-0000-000000000000";
|
|
3
3
|
export declare const ADMIN_USERS_ROLE_ID = "00000000-0000-0003-0000-000000000000";
|
|
4
4
|
export declare const DEFAULT_ADMIN_USER_ID = "00000000-0000-4000-8000-000000000000";
|
|
5
|
+
export declare const DATA_STEWARDS_ROLE_ID = "4154bf84-d36e-4551-9734-4666f5b1e1c0";
|
|
5
6
|
export declare const SYSTEM_ROLES: string[];
|
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.SYSTEM_ROLES = exports.DEFAULT_ADMIN_USER_ID = exports.ADMIN_USERS_ROLE_ID = exports.AUTHENTICATED_USERS_ROLE_ID = exports.ANONYMOUS_USERS_ROLE_ID = void 0;
|
|
3
|
+
exports.SYSTEM_ROLES = exports.DATA_STEWARDS_ROLE_ID = exports.DEFAULT_ADMIN_USER_ID = exports.ADMIN_USERS_ROLE_ID = exports.AUTHENTICATED_USERS_ROLE_ID = exports.ANONYMOUS_USERS_ROLE_ID = void 0;
|
|
4
4
|
exports.ANONYMOUS_USERS_ROLE_ID = "00000000-0000-0001-0000-000000000000";
|
|
5
5
|
exports.AUTHENTICATED_USERS_ROLE_ID = "00000000-0000-0002-0000-000000000000";
|
|
6
6
|
exports.ADMIN_USERS_ROLE_ID = "00000000-0000-0003-0000-000000000000";
|
|
7
7
|
exports.DEFAULT_ADMIN_USER_ID = "00000000-0000-4000-8000-000000000000";
|
|
8
|
+
exports.DATA_STEWARDS_ROLE_ID = "4154bf84-d36e-4551-9734-4666f5b1e1c0";
|
|
8
9
|
exports.SYSTEM_ROLES = [
|
|
9
10
|
exports.ANONYMOUS_USERS_ROLE_ID,
|
|
10
11
|
exports.AUTHENTICATED_USERS_ROLE_ID,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/authorization-api/constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,uBAAuB,GAAG,sCAAsC,CAAC;AACjE,QAAA,2BAA2B,GACpC,sCAAsC,CAAC;AAC9B,QAAA,mBAAmB,GAAG,sCAAsC,CAAC;AAC7D,QAAA,qBAAqB,GAAG,sCAAsC,CAAC;AAE/D,QAAA,YAAY,GAAG;IACxB,+BAAuB;IACvB,mCAA2B;IAC3B,2BAAmB;CACtB,CAAC"}
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/authorization-api/constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,uBAAuB,GAAG,sCAAsC,CAAC;AACjE,QAAA,2BAA2B,GACpC,sCAAsC,CAAC;AAC9B,QAAA,mBAAmB,GAAG,sCAAsC,CAAC;AAC7D,QAAA,qBAAqB,GAAG,sCAAsC,CAAC;AAC/D,QAAA,qBAAqB,GAAG,sCAAsC,CAAC;AAE/D,QAAA,YAAY,GAAG;IACxB,+BAAuB;IACvB,mCAA2B;IAC3B,2BAAmB;CACtB,CAAC"}
|
|
@@ -11,40 +11,48 @@ declare global {
|
|
|
11
11
|
}
|
|
12
12
|
}
|
|
13
13
|
}
|
|
14
|
-
export interface
|
|
15
|
-
id
|
|
14
|
+
export interface UserRecord {
|
|
15
|
+
id: string;
|
|
16
16
|
displayName: string;
|
|
17
|
-
photoURL
|
|
17
|
+
photoURL: string;
|
|
18
18
|
isAdmin: boolean;
|
|
19
|
+
orgUnitId: string;
|
|
20
|
+
email: string;
|
|
21
|
+
source: string;
|
|
22
|
+
sourceId: string;
|
|
23
|
+
}
|
|
24
|
+
export declare type PublicUser = Partial<Pick<UserRecord, "id" | "photoURL" | "orgUnitId">> & Omit<UserRecord, "id" | "photoURL" | "orgUnitId" | "email" | "source" | "sourceId"> & {
|
|
19
25
|
roles?: Role[];
|
|
20
26
|
permissions?: Permission[];
|
|
21
27
|
managingOrgUnitIds?: string[];
|
|
22
|
-
orgUnitId?: string;
|
|
23
28
|
orgUnit?: OrgUnit;
|
|
24
|
-
}
|
|
29
|
+
};
|
|
30
|
+
export declare type User = PublicUser & Pick<UserRecord, "email" | "source" | "sourceId">;
|
|
31
|
+
export declare type CreateUserData = Partial<Omit<UserRecord, "email" | "displayName" | "id">> & Pick<UserRecord, "displayName" | "email">;
|
|
25
32
|
export declare type OrgUnitRelationshipType = "ancestor" | "descendant" | "equal" | "unrelated";
|
|
26
|
-
export interface
|
|
27
|
-
id
|
|
28
|
-
name
|
|
29
|
-
description
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
editTime?: Date;
|
|
37
|
-
}
|
|
38
|
-
export interface User extends PublicUser {
|
|
39
|
-
email: string;
|
|
40
|
-
source: string;
|
|
41
|
-
sourceId: string;
|
|
33
|
+
export interface OrgUnitRecord {
|
|
34
|
+
id: string;
|
|
35
|
+
name: string;
|
|
36
|
+
description: string;
|
|
37
|
+
left: number;
|
|
38
|
+
right: number;
|
|
39
|
+
createBy: string;
|
|
40
|
+
createTime: Date;
|
|
41
|
+
editBy: string;
|
|
42
|
+
editTime: Date;
|
|
42
43
|
}
|
|
44
|
+
export declare type OrgUnit = Partial<OrgUnitRecord> & {
|
|
45
|
+
relationship?: OrgUnitRelationshipType;
|
|
46
|
+
};
|
|
43
47
|
export interface APIKeyRecord {
|
|
44
48
|
id: string;
|
|
45
49
|
user_id: string;
|
|
46
|
-
created_timestamp:
|
|
50
|
+
created_timestamp: Date;
|
|
47
51
|
hash: string;
|
|
52
|
+
enabled: boolean;
|
|
53
|
+
expiry_time?: Date;
|
|
54
|
+
last_successful_attempt_time?: Date;
|
|
55
|
+
last_failed_attempt_time?: Date;
|
|
48
56
|
}
|
|
49
57
|
export interface Role {
|
|
50
58
|
id: string;
|
|
@@ -77,6 +85,36 @@ export interface Permission {
|
|
|
77
85
|
editBy?: string;
|
|
78
86
|
editTime?: Date;
|
|
79
87
|
}
|
|
88
|
+
export interface PermissionRecord {
|
|
89
|
+
id: string;
|
|
90
|
+
name: string;
|
|
91
|
+
description: string;
|
|
92
|
+
resource_id: string;
|
|
93
|
+
user_ownership_constraint: boolean;
|
|
94
|
+
org_unit_ownership_constraint: boolean;
|
|
95
|
+
pre_authorised_constraint: boolean;
|
|
96
|
+
owner_id: string;
|
|
97
|
+
create_time: string;
|
|
98
|
+
create_by: string;
|
|
99
|
+
edit_time: string;
|
|
100
|
+
edit_by: string;
|
|
101
|
+
}
|
|
102
|
+
export interface CreateRolePermissionInputData extends Omit<PermissionRecord, "id" | "owner_id" | "create_by" | "create_time" | "edit_by" | "edit_time"> {
|
|
103
|
+
operationIds: string[];
|
|
104
|
+
}
|
|
105
|
+
export declare type OperationRecord = {
|
|
106
|
+
id: string;
|
|
107
|
+
uri: string;
|
|
108
|
+
name: string;
|
|
109
|
+
description: string;
|
|
110
|
+
resource_id: string;
|
|
111
|
+
};
|
|
112
|
+
export declare type ResourceRecord = {
|
|
113
|
+
id: string;
|
|
114
|
+
uri: string;
|
|
115
|
+
name: string;
|
|
116
|
+
description: string;
|
|
117
|
+
};
|
|
80
118
|
export interface UserToken {
|
|
81
119
|
id: string;
|
|
82
120
|
}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
export default function createNoCacheFetchOptions(fetchOptions?: RequestInit): {
|
|
2
|
+
body?: BodyInit;
|
|
3
|
+
cache?: RequestCache;
|
|
4
|
+
credentials?: RequestCredentials;
|
|
5
|
+
headers?: HeadersInit;
|
|
6
|
+
integrity?: string;
|
|
7
|
+
keepalive?: boolean;
|
|
8
|
+
method?: string;
|
|
9
|
+
mode?: RequestMode;
|
|
10
|
+
redirect?: RequestRedirect;
|
|
11
|
+
referrer?: string;
|
|
12
|
+
referrerPolicy?: ReferrerPolicy;
|
|
13
|
+
signal?: AbortSignal;
|
|
14
|
+
window?: any;
|
|
15
|
+
};
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
function createNoCacheFetchOptions(fetchOptions = {}) {
|
|
4
|
+
const noCacheHeaders = {
|
|
5
|
+
"Cache-Control": "no-cache, no-store, must-revalidate",
|
|
6
|
+
Pragma: "no-cache",
|
|
7
|
+
Expires: "0"
|
|
8
|
+
};
|
|
9
|
+
const options = Object.assign({}, fetchOptions);
|
|
10
|
+
if (!options.headers) {
|
|
11
|
+
options.headers = Object.assign({}, noCacheHeaders);
|
|
12
|
+
}
|
|
13
|
+
else {
|
|
14
|
+
options.headers = Object.assign(Object.assign({}, options.headers), noCacheHeaders);
|
|
15
|
+
}
|
|
16
|
+
options.cache = "reload";
|
|
17
|
+
return options;
|
|
18
|
+
}
|
|
19
|
+
exports.default = createNoCacheFetchOptions;
|
|
20
|
+
//# sourceMappingURL=createNoCacheFetchOptions.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"createNoCacheFetchOptions.js","sourceRoot":"","sources":["../src/createNoCacheFetchOptions.ts"],"names":[],"mappings":";;AAAA,SAAwB,yBAAyB,CAC7C,eAA4B,EAAE;IAE9B,MAAM,cAAc,GAAG;QACnB,eAAe,EAAE,qCAAqC;QACtD,MAAM,EAAE,UAAU;QAClB,OAAO,EAAE,GAAG;KACf,CAAC;IACF,MAAM,OAAO,qBAAQ,YAAY,CAAE,CAAC;IACpC,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE;QAClB,OAAO,CAAC,OAAO,qBAAQ,cAAc,CAAE,CAAC;KAC3C;SAAM;QACH,OAAO,CAAC,OAAO,mCAAQ,OAAO,CAAC,OAAO,GAAK,cAAc,CAAE,CAAC;KAC/D;IACD,OAAO,CAAC,KAAK,GAAG,QAAQ,CAAC;IACzB,OAAO,OAAO,CAAC;AACnB,CAAC;AAhBD,4CAgBC"}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
declare type RequestContentTypeJson = "application/json";
|
|
2
|
+
declare type RequestContentTypePlainText = "text/plain";
|
|
3
|
+
declare type RequestContentTypeForm = "application/x-www-form-urlencoded";
|
|
4
|
+
declare type RequestContentTypeBinary = "application/octet-stream";
|
|
5
|
+
declare type RequestContentTypeMultipartForm = "multipart/form-data";
|
|
6
|
+
declare type RequestContentType = RequestContentTypeJson | RequestContentTypePlainText | RequestContentTypeForm | RequestContentTypeBinary | RequestContentTypeMultipartForm;
|
|
7
|
+
export declare function setDefaultRequestInitOptions(options: RequestInit): void;
|
|
8
|
+
export declare function getDefaultRequestInitOptions(): RequestInit;
|
|
9
|
+
export default function fetchRequest<T = any, CT = string>(method: string, url: string, body?: any, contentType?: CT | RequestContentType | undefined | null, returnHeaders?: false, extraRequestOptions?: RequestInit): Promise<T>;
|
|
10
|
+
export default function fetchRequest<T = any, CT = string>(method: string, url: string, body?: any, contentType?: CT | RequestContentType | undefined | null, returnHeaders?: true, extraRequestOptions?: RequestInit): Promise<[T, Headers]>;
|
|
11
|
+
export {};
|
|
@@ -0,0 +1,62 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
+
});
|
|
10
|
+
};
|
|
11
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
|
+
};
|
|
14
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
|
+
exports.getDefaultRequestInitOptions = exports.setDefaultRequestInitOptions = void 0;
|
|
16
|
+
const isomorphic_fetch_1 = __importDefault(require("isomorphic-fetch"));
|
|
17
|
+
const merge_1 = __importDefault(require("lodash/merge"));
|
|
18
|
+
const ServerError_1 = __importDefault(require("./ServerError"));
|
|
19
|
+
let defaultRequestInitOptions = {};
|
|
20
|
+
function setDefaultRequestInitOptions(options) {
|
|
21
|
+
defaultRequestInitOptions = options;
|
|
22
|
+
}
|
|
23
|
+
exports.setDefaultRequestInitOptions = setDefaultRequestInitOptions;
|
|
24
|
+
function getDefaultRequestInitOptions() {
|
|
25
|
+
return defaultRequestInitOptions;
|
|
26
|
+
}
|
|
27
|
+
exports.getDefaultRequestInitOptions = getDefaultRequestInitOptions;
|
|
28
|
+
function fetchRequest(method, url, body = undefined, contentType = "application/json", returnHeaders = false, extraRequestOptions = {}) {
|
|
29
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
30
|
+
const defaultOptions = Object.assign({}, (defaultRequestInitOptions ? defaultRequestInitOptions : {}));
|
|
31
|
+
const fetchOptions = merge_1.default(defaultOptions, Object.assign({ method }, extraRequestOptions));
|
|
32
|
+
if (body !== undefined) {
|
|
33
|
+
if (contentType === "application/json") {
|
|
34
|
+
fetchOptions.body = JSON.stringify(body);
|
|
35
|
+
fetchOptions.headers = {
|
|
36
|
+
"Content-type": "application/json"
|
|
37
|
+
};
|
|
38
|
+
}
|
|
39
|
+
else {
|
|
40
|
+
fetchOptions.body = body;
|
|
41
|
+
if (typeof contentType === "string") {
|
|
42
|
+
fetchOptions.headers = {
|
|
43
|
+
"Content-type": contentType
|
|
44
|
+
};
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
}
|
|
48
|
+
const response = yield isomorphic_fetch_1.default(url, fetchOptions);
|
|
49
|
+
if (response.status >= 200 && response.status < 300) {
|
|
50
|
+
// wrapping this in try/catch as the request succeeded
|
|
51
|
+
// this is just haggling over response content
|
|
52
|
+
return returnHeaders
|
|
53
|
+
? [(yield response.json()), response.headers]
|
|
54
|
+
: (yield response.json());
|
|
55
|
+
}
|
|
56
|
+
// --- get responseText and remove any HTML tags
|
|
57
|
+
const responseText = (yield response.text()).replace(/<(.|\n)*?>/g, "");
|
|
58
|
+
throw new ServerError_1.default(responseText, response.status);
|
|
59
|
+
});
|
|
60
|
+
}
|
|
61
|
+
exports.default = fetchRequest;
|
|
62
|
+
//# sourceMappingURL=fetchRequest.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"fetchRequest.js","sourceRoot":"","sources":["../src/fetchRequest.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,wEAAqC;AACrC,yDAAiC;AACjC,gEAAwC;AAexC,IAAI,yBAAyB,GAAgB,EAAE,CAAC;AAEhD,SAAgB,4BAA4B,CAAC,OAAoB;IAC7D,yBAAyB,GAAG,OAAO,CAAC;AACxC,CAAC;AAFD,oEAEC;AAED,SAAgB,4BAA4B;IACxC,OAAO,yBAAyB,CAAC;AACrC,CAAC;AAFD,oEAEC;AAoBD,SAA8B,YAAY,CACtC,MAAc,EACd,GAAW,EACX,OAAY,SAAS,EACrB,cAIa,kBAAkB,EAC/B,gBAAyB,KAAK,EAC9B,sBAAmC,EAAE;;QAErC,MAAM,cAAc,qBACb,CAAC,yBAAyB,CAAC,CAAC,CAAC,yBAAyB,CAAC,CAAC,CAAC,EAAE,CAAC,CAClE,CAAC;QACF,MAAM,YAAY,GAAG,eAAK,CAAC,cAAc,kBACrC,MAAM,IACH,mBAAmB,EACxB,CAAC;QACH,IAAI,IAAI,KAAK,SAAS,EAAE;YACpB,IAAI,WAAW,KAAK,kBAAkB,EAAE;gBACpC,YAAY,CAAC,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;gBACzC,YAAY,CAAC,OAAO,GAAG;oBACnB,cAAc,EAAE,kBAAkB;iBACrC,CAAC;aACL;iBAAM;gBACH,YAAY,CAAC,IAAI,GAAG,IAAI,CAAC;gBACzB,IAAI,OAAO,WAAW,KAAK,QAAQ,EAAE;oBACjC,YAAY,CAAC,OAAO,GAAG;wBACnB,cAAc,EAAE,WAAW;qBAC9B,CAAC;iBACL;aACJ;SACJ;QAED,MAAM,QAAQ,GAAG,MAAM,0BAAK,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC;QAEhD,IAAI,QAAQ,CAAC,MAAM,IAAI,GAAG,IAAI,QAAQ,CAAC,MAAM,GAAG,GAAG,EAAE;YACjD,sDAAsD;YACtD,8CAA8C;YAC9C,OAAO,aAAa;gBAChB,CAAC,CAAE,CAAC,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAM,EAAE,QAAQ,CAAC,OAAO,CAAkB;gBACpE,CAAC,CAAE,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAO,CAAC;SACxC;QACD,gDAAgD;QAChD,MAAM,YAAY,GAAG,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,aAAa,EAAE,EAAE,CAAC,CAAC;QACxE,MAAM,IAAI,qBAAW,CAAC,YAAY,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;IACzD,CAAC;CAAA;AA/CD,+BA+CC"}
|
|
@@ -88,10 +88,6 @@ export declare class Record {
|
|
|
88
88
|
*/
|
|
89
89
|
'aspects': any;
|
|
90
90
|
/**
|
|
91
|
-
* The read authorization policy id of a record
|
|
92
|
-
*/
|
|
93
|
-
'authnReadPolicyId': string;
|
|
94
|
-
/**
|
|
95
91
|
* A tag representing the action by the source of this record (e.g. an id for a individual crawl of a data portal).
|
|
96
92
|
*/
|
|
97
93
|
'sourceTag': string;
|
|
@@ -540,7 +536,7 @@ export declare class RecordsApi {
|
|
|
540
536
|
*/
|
|
541
537
|
patchById(xMagdaTenantId: number, id: string, recordPatch: Array<Operation>, xMagdaSession: string): Promise<{
|
|
542
538
|
response: http.IncomingMessage;
|
|
543
|
-
body:
|
|
539
|
+
body: Record;
|
|
544
540
|
}>;
|
|
545
541
|
/**
|
|
546
542
|
* Modify a record by ID
|