@authup/server-core 1.0.0-beta.4 → 1.0.0-beta.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/commands/setup.js +2 -2
- package/dist/commands/setup.js.map +1 -1
- package/dist/commands/start.d.ts.map +1 -1
- package/dist/commands/start.js +4 -5
- package/dist/commands/start.js.map +1 -1
- package/dist/config/build.d.ts +1 -1
- package/dist/config/build.d.ts.map +1 -1
- package/dist/config/build.js +12 -5
- package/dist/config/build.js.map +1 -1
- package/dist/config/constants.d.ts +13 -6
- package/dist/config/constants.d.ts.map +1 -1
- package/dist/config/constants.js +13 -6
- package/dist/config/constants.js.map +1 -1
- package/dist/config/index.d.ts +1 -1
- package/dist/config/index.d.ts.map +1 -1
- package/dist/config/index.js +1 -1
- package/dist/config/index.js.map +1 -1
- package/dist/config/module.d.ts +1 -1
- package/dist/config/module.d.ts.map +1 -1
- package/dist/config/parse.d.ts +1 -1
- package/dist/config/parse.d.ts.map +1 -1
- package/dist/config/setup.d.ts +1 -1
- package/dist/config/setup.d.ts.map +1 -1
- package/dist/config/{type.d.ts → types.d.ts} +31 -11
- package/dist/config/types.d.ts.map +1 -0
- package/dist/config/{type.js → types.js} +1 -1
- package/dist/config/types.js.map +1 -0
- package/dist/config/utils/env.d.ts +1 -1
- package/dist/config/utils/env.d.ts.map +1 -1
- package/dist/config/utils/env.js +52 -21
- package/dist/config/utils/env.js.map +1 -1
- package/dist/database/seeds/module.d.ts.map +1 -1
- package/dist/database/seeds/module.js +17 -14
- package/dist/database/seeds/module.js.map +1 -1
- package/dist/domains/client/repository.d.ts +4 -3
- package/dist/domains/client/repository.d.ts.map +1 -1
- package/dist/domains/client/repository.js +28 -16
- package/dist/domains/client/repository.js.map +1 -1
- package/dist/domains/robot/repository.d.ts +8 -6
- package/dist/domains/robot/repository.d.ts.map +1 -1
- package/dist/domains/robot/repository.js +30 -16
- package/dist/domains/robot/repository.js.map +1 -1
- package/dist/domains/robot/vault.js +3 -3
- package/dist/domains/robot/vault.js.map +1 -1
- package/dist/domains/role/repository.d.ts +3 -3
- package/dist/domains/role/repository.d.ts.map +1 -1
- package/dist/domains/role/repository.js +1 -1
- package/dist/domains/role/repository.js.map +1 -1
- package/dist/domains/user/repository.d.ts +7 -6
- package/dist/domains/user/repository.d.ts.map +1 -1
- package/dist/domains/user/repository.js +17 -9
- package/dist/domains/user/repository.js.map +1 -1
- package/dist/http/controllers/identity-provider/handlers/custom.js +2 -2
- package/dist/http/controllers/identity-provider/handlers/custom.js.map +1 -1
- package/dist/http/controllers/permission/utils/validation.d.ts.map +1 -1
- package/dist/http/controllers/permission/utils/validation.js +0 -1
- package/dist/http/controllers/permission/utils/validation.js.map +1 -1
- package/dist/http/controllers/robot/handlers/delete.d.ts.map +1 -1
- package/dist/http/controllers/robot/handlers/delete.js +3 -1
- package/dist/http/controllers/robot/handlers/delete.js.map +1 -1
- package/dist/http/controllers/robot/handlers/integrity.d.ts.map +1 -1
- package/dist/http/controllers/robot/handlers/integrity.js +24 -15
- package/dist/http/controllers/robot/handlers/integrity.js.map +1 -1
- package/dist/http/controllers/robot/handlers/update.d.ts.map +1 -1
- package/dist/http/controllers/robot/handlers/update.js +4 -2
- package/dist/http/controllers/robot/handlers/update.js.map +1 -1
- package/dist/http/controllers/robot-permission/handlers/delete.js +1 -1
- package/dist/http/controllers/robot-permission/handlers/delete.js.map +1 -1
- package/dist/http/controllers/robot-permission/utils/validation.js +4 -4
- package/dist/http/controllers/robot-permission/utils/validation.js.map +1 -1
- package/dist/http/controllers/role/handlers/delete.js +1 -1
- package/dist/http/controllers/role/handlers/delete.js.map +1 -1
- package/dist/http/controllers/role/handlers/update.js +1 -1
- package/dist/http/controllers/role/handlers/update.js.map +1 -1
- package/dist/http/controllers/role/utils/validaiton.js +4 -4
- package/dist/http/controllers/role/utils/validaiton.js.map +1 -1
- package/dist/http/controllers/role-permission/handlers/delete.js +1 -1
- package/dist/http/controllers/role-permission/handlers/delete.js.map +1 -1
- package/dist/http/controllers/role-permission/utils/validation.js +3 -3
- package/dist/http/controllers/role-permission/utils/validation.js.map +1 -1
- package/dist/http/controllers/root/authorize/handlers/run.js +1 -1
- package/dist/http/controllers/root/authorize/handlers/run.js.map +1 -1
- package/dist/http/controllers/root/status/module.js +2 -2
- package/dist/http/controllers/root/status/module.js.map +1 -1
- package/dist/http/controllers/root/token/handlers/create.js +2 -2
- package/dist/http/controllers/root/token/handlers/create.js.map +1 -1
- package/dist/http/controllers/user/handlers/update.js +1 -1
- package/dist/http/controllers/user-permission/handlers/delete.js +1 -1
- package/dist/http/controllers/user-permission/handlers/delete.js.map +1 -1
- package/dist/http/controllers/user-permission/utils/validation.js +2 -2
- package/dist/http/controllers/user-permission/utils/validation.js.map +1 -1
- package/dist/http/middleware/built-in/auth/module.d.ts.map +1 -1
- package/dist/http/middleware/built-in/auth/module.js +8 -3
- package/dist/http/middleware/built-in/auth/module.js.map +1 -1
- package/dist/http/middleware/built-in/auth/verify.d.ts.map +1 -1
- package/dist/http/middleware/built-in/auth/verify.js +30 -30
- package/dist/http/middleware/built-in/auth/verify.js.map +1 -1
- package/dist/http/middleware/built-in/rate-limit.d.ts.map +1 -1
- package/dist/http/middleware/built-in/rate-limit.js +3 -1
- package/dist/http/middleware/built-in/rate-limit.js.map +1 -1
- package/dist/http/oauth2/grant-types/abstract.js +1 -1
- package/dist/http/oauth2/grant-types/abstract.js.map +1 -1
- package/dist/http/oauth2/grant-types/authorize.js +2 -2
- package/dist/http/oauth2/grant-types/authorize.js.map +1 -1
- package/dist/http/oauth2/grant-types/client-credentials.js +2 -2
- package/dist/http/oauth2/grant-types/client-credentials.js.map +1 -1
- package/dist/http/oauth2/grant-types/internal.js +2 -2
- package/dist/http/oauth2/grant-types/internal.js.map +1 -1
- package/dist/http/oauth2/grant-types/password.js +2 -2
- package/dist/http/oauth2/grant-types/password.js.map +1 -1
- package/dist/http/oauth2/grant-types/refresh-token.js +2 -2
- package/dist/http/oauth2/grant-types/refresh-token.js.map +1 -1
- package/dist/http/oauth2/grant-types/robot-credentials.js +2 -2
- package/dist/http/oauth2/grant-types/robot-credentials.js.map +1 -1
- package/dist/http/oauth2/token/permissions.d.ts +2 -2
- package/dist/http/oauth2/token/permissions.d.ts.map +1 -1
- package/dist/http/utils/owner.d.ts.map +1 -1
- package/dist/http/utils/owner.js +2 -3
- package/dist/http/utils/owner.js.map +1 -1
- package/package.json +7 -7
- package/dist/config/type.d.ts.map +0 -1
- package/dist/config/type.js.map +0 -1
|
@@ -37,23 +37,32 @@ async function handleRobotIntegrityRouteHandler(req, res) {
|
|
|
37
37
|
if (entity.realm) {
|
|
38
38
|
realm = entity.realm;
|
|
39
39
|
}
|
|
40
|
-
if ((0, vault_1.hasClient)()
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
...entity,
|
|
52
|
-
secret,
|
|
53
|
-
});
|
|
40
|
+
if (!(0, vault_1.hasClient)() || !realm || realm.name !== core_1.REALM_MASTER_NAME) {
|
|
41
|
+
return (0, routup_1.sendAccepted)(res);
|
|
42
|
+
}
|
|
43
|
+
let refreshCredentials = false;
|
|
44
|
+
const credentials = await (0, domains_1.findRobotCredentialsInVault)({
|
|
45
|
+
name: entity.name,
|
|
46
|
+
});
|
|
47
|
+
if (credentials) {
|
|
48
|
+
const secretHashedEqual = await repository.verifySecret(credentials.secret, entity.secret);
|
|
49
|
+
if (!secretHashedEqual) {
|
|
50
|
+
refreshCredentials = true;
|
|
54
51
|
}
|
|
55
52
|
}
|
|
56
|
-
|
|
53
|
+
else {
|
|
54
|
+
refreshCredentials = true;
|
|
55
|
+
}
|
|
56
|
+
if (refreshCredentials) {
|
|
57
|
+
const secret = (0, core_1.createNanoID)(64);
|
|
58
|
+
entity.secret = await repository.hashSecret(secret);
|
|
59
|
+
await repository.save(entity);
|
|
60
|
+
await (0, domains_1.saveRobotCredentialsToVault)({
|
|
61
|
+
...entity,
|
|
62
|
+
secret,
|
|
63
|
+
});
|
|
64
|
+
}
|
|
65
|
+
return (0, routup_1.sendAccepted)(res);
|
|
57
66
|
}
|
|
58
67
|
exports.handleRobotIntegrityRouteHandler = handleRobotIntegrityRouteHandler;
|
|
59
68
|
//# sourceMappingURL=integrity.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"integrity.js","sourceRoot":"","sources":["../../../../../src/http/controllers/robot/handlers/integrity.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAGH,uCAIsB;AACtB,qCAA2C;AAC3C,wCAAyC;AAEzC,mCAAuD;AACvD,yDAAkD;AAClD,iDAK6B;AAEtB,KAAK,UAAU,gCAAgC,CAAC,GAAY,EAAE,GAAa;IAC9E,MAAM,EAAE,GAAG,IAAA,wBAAe,EAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IAEtC,MAAM,UAAU,GAAG,MAAM,IAAA,iCAAa,GAAE,CAAC;IACzC,MAAM,UAAU,GAAG,IAAI,yBAAe,CAAC,UAAU,CAAC,CAAC;IACnD,MAAM,KAAK,GAAG,UAAU,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC;IAErD,IAAI,KAAyB,CAAC;IAE9B,IAAI,IAAA,aAAM,EAAC,EAAE,CAAC,EAAE,CAAC;QACb,KAAK,CAAC,KAAK,CAAC,gBAAgB,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;IAC1C,CAAC;SAAM,CAAC;QACJ,KAAK,CAAC,KAAK,CAAC,uBAAuB,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC;QAEnD,KAAK,GAAG,MAAM,IAAA,sBAAY,EAAC,IAAA,wBAAe,EAAC,GAAG,EAAE,SAAS,CAAC,EAAE,IAAI,CAAC,CAAC;QAClE,KAAK,CAAC,QAAQ,CAAC,2BAA2B,EAAE,EAAE,OAAO,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC;IACvE,CAAC;IAED,IAAI,CAAC,KAAK,EAAE,CAAC;QACT,KAAK,CAAC,iBAAiB,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;IACpD,CAAC;IAED,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,MAAM,EAAE,CAAC;IAEpC,IAAI,CAAC,MAAM,EAAE,CAAC;QACV,MAAM,IAAI,oBAAa,EAAE,CAAC;IAC9B,CAAC;IAED,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;QACf,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC;IACzB,CAAC;IAED,
|
|
1
|
+
{"version":3,"file":"integrity.js","sourceRoot":"","sources":["../../../../../src/http/controllers/robot/handlers/integrity.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAGH,uCAIsB;AACtB,qCAA2C;AAC3C,wCAAyC;AAEzC,mCAAuD;AACvD,yDAAkD;AAClD,iDAK6B;AAEtB,KAAK,UAAU,gCAAgC,CAAC,GAAY,EAAE,GAAa;IAC9E,MAAM,EAAE,GAAG,IAAA,wBAAe,EAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IAEtC,MAAM,UAAU,GAAG,MAAM,IAAA,iCAAa,GAAE,CAAC;IACzC,MAAM,UAAU,GAAG,IAAI,yBAAe,CAAC,UAAU,CAAC,CAAC;IACnD,MAAM,KAAK,GAAG,UAAU,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC;IAErD,IAAI,KAAyB,CAAC;IAE9B,IAAI,IAAA,aAAM,EAAC,EAAE,CAAC,EAAE,CAAC;QACb,KAAK,CAAC,KAAK,CAAC,gBAAgB,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;IAC1C,CAAC;SAAM,CAAC;QACJ,KAAK,CAAC,KAAK,CAAC,uBAAuB,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC;QAEnD,KAAK,GAAG,MAAM,IAAA,sBAAY,EAAC,IAAA,wBAAe,EAAC,GAAG,EAAE,SAAS,CAAC,EAAE,IAAI,CAAC,CAAC;QAClE,KAAK,CAAC,QAAQ,CAAC,2BAA2B,EAAE,EAAE,OAAO,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC;IACvE,CAAC;IAED,IAAI,CAAC,KAAK,EAAE,CAAC;QACT,KAAK,CAAC,iBAAiB,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;IACpD,CAAC;IAED,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,MAAM,EAAE,CAAC;IAEpC,IAAI,CAAC,MAAM,EAAE,CAAC;QACV,MAAM,IAAI,oBAAa,EAAE,CAAC;IAC9B,CAAC;IAED,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;QACf,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC;IACzB,CAAC;IAED,IAAI,CAAC,IAAA,iBAAS,GAAE,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC,IAAI,KAAK,wBAAiB,EAAE,CAAC;QAC7D,OAAO,IAAA,qBAAY,EAAC,GAAG,CAAC,CAAC;IAC7B,CAAC;IAED,IAAI,kBAAkB,GAAa,KAAK,CAAC;IACzC,MAAM,WAAW,GAAG,MAAM,IAAA,qCAA2B,EAAC;QAClD,IAAI,EAAE,MAAM,CAAC,IAAI;KACpB,CAAC,CAAC;IAEH,IAAI,WAAW,EAAE,CAAC;QACd,MAAM,iBAAiB,GAAG,MAAM,UAAU,CAAC,YAAY,CAAC,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;QAC3F,IAAI,CAAC,iBAAiB,EAAE,CAAC;YACrB,kBAAkB,GAAG,IAAI,CAAC;QAC9B,CAAC;IACL,CAAC;SAAM,CAAC;QACJ,kBAAkB,GAAG,IAAI,CAAC;IAC9B,CAAC;IAED,IAAI,kBAAkB,EAAE,CAAC;QACrB,MAAM,MAAM,GAAG,IAAA,mBAAY,EAAC,EAAE,CAAC,CAAC;QAEhC,MAAM,CAAC,MAAM,GAAG,MAAM,UAAU,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;QACpD,MAAM,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAE9B,MAAM,IAAA,qCAA2B,EAAC;YAC9B,GAAG,MAAM;YACT,MAAM;SACT,CAAC,CAAC;IACP,CAAC;IAED,OAAO,IAAA,qBAAY,EAAC,GAAG,CAAC,CAAC;AAC7B,CAAC;AA/DD,4EA+DC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update.d.ts","sourceRoot":"","sources":["../../../../../src/http/controllers/robot/handlers/update.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"update.d.ts","sourceRoot":"","sources":["../../../../../src/http/controllers/robot/handlers/update.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAShD,wBAAsB,uBAAuB,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,GAAI,OAAO,CAAC,GAAG,CAAC,CAkExF"}
|
|
@@ -11,6 +11,7 @@ const http_1 = require("@ebec/http");
|
|
|
11
11
|
const core_1 = require("@authup/core");
|
|
12
12
|
const routup_1 = require("routup");
|
|
13
13
|
const typeorm_extension_1 = require("typeorm-extension");
|
|
14
|
+
const config_1 = require("../../../../config");
|
|
14
15
|
const domains_1 = require("../../../../domains");
|
|
15
16
|
const utils_1 = require("../../../utils");
|
|
16
17
|
const utils_2 = require("../utils");
|
|
@@ -37,9 +38,10 @@ async function updateRobotRouteHandler(req, res) {
|
|
|
37
38
|
throw new http_1.ForbiddenError();
|
|
38
39
|
}
|
|
39
40
|
}
|
|
41
|
+
const config = (0, config_1.useConfig)();
|
|
40
42
|
if ((0, core_1.isPropertySet)(result.data, 'name') &&
|
|
41
|
-
entity.name !== result.data.name &&
|
|
42
|
-
entity.name ===
|
|
43
|
+
entity.name.toLowerCase() !== result.data.name.toLowerCase() &&
|
|
44
|
+
entity.name.toLowerCase() === config.robotAdminName.toLowerCase()) {
|
|
43
45
|
const realm = await (0, domains_1.resolveRealm)(entity.realm_id);
|
|
44
46
|
if (realm.name === core_1.REALM_MASTER_NAME) {
|
|
45
47
|
throw new http_1.BadRequestError('The system robot name can not be changed.');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../../../src/http/controllers/robot/handlers/update.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,qCAA4E;AAC5E,uCAEsB;AAEtB,mCAAuD;AACvD,yDAAkD;AAClD,iDAAiG;AACjG,0CAA+C;AAC/C,oCAA8C;AAC9C,8CAA2D;AAEpD,KAAK,UAAU,uBAAuB,CAAC,GAAY,EAAE,GAAa;IACrE,MAAM,EAAE,GAAG,IAAA,wBAAe,EAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IAEtC,MAAM,MAAM,GAAG,MAAM,IAAA,0BAAkB,EAAC,GAAG,EAAE,iCAAuB,CAAC,MAAM,CAAC,CAAC;IAC7E,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;QACf,OAAO,IAAA,qBAAY,EAAC,GAAG,CAAC,CAAC;IAC7B,CAAC;IAED,MAAM,UAAU,GAAG,MAAM,IAAA,iCAAa,GAAE,CAAC;IACzC,MAAM,UAAU,GAAG,IAAI,yBAAe,CAAC,UAAU,CAAC,CAAC;IACnD,IAAI,MAAM,GAAG,MAAM,UAAU,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;IAEhD,IAAI,CAAC,MAAM,EAAE,CAAC;QACV,MAAM,IAAI,oBAAa,EAAE,CAAC;IAC9B,CAAC;IAED,MAAM,OAAO,GAAG,IAAA,qBAAa,EAAC,GAAG,EAAE,SAAS,CAAC,CAAC;IAC9C,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,qBAAc,CAAC,UAAU,CAAC,EAAE,CAAC;QAC1C,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;YAClB,MAAM,IAAI,qBAAc,EAAE,CAAC;QAC/B,CAAC;QAED,IACI,MAAM,CAAC,OAAO;YACd,MAAM,CAAC,OAAO,KAAK,IAAA,qBAAa,EAAC,GAAG,EAAE,QAAQ,CAAC,EACjD,CAAC;YACC,MAAM,IAAI,qBAAc,EAAE,CAAC;QAC/B,CAAC;IACL,CAAC;IAED,IACI,IAAA,oBAAa,EAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC;QAClC,MAAM,CAAC,IAAI,KAAK,MAAM,CAAC,IAAI,CAAC,IAAI;
|
|
1
|
+
{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../../../src/http/controllers/robot/handlers/update.ts"],"names":[],"mappings":"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"}
|
|
@@ -36,7 +36,7 @@ async function deleteRobotPermissionRouteHandler(req, res) {
|
|
|
36
36
|
throw new http_1.ForbiddenError();
|
|
37
37
|
}
|
|
38
38
|
// ----------------------------------------------
|
|
39
|
-
if (!ability.
|
|
39
|
+
if (!ability.satisfy(core_1.PermissionName.ROBOT_PERMISSION_DROP, { target: entity.target })) {
|
|
40
40
|
throw new http_1.ForbiddenError('You are not permitted for the robot-permission target.');
|
|
41
41
|
}
|
|
42
42
|
// ----------------------------------------------
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"delete.js","sourceRoot":"","sources":["../../../../../src/http/controllers/robot-permission/handlers/delete.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,qCAA2D;AAC3D,uCAAuE;AAEvE,mCAAuD;AACvD,yDAAkD;AAClD,iDAA4D;AAC5D,0CAA+C;AAE/C;;;;;GAKG;AACI,KAAK,UAAU,iCAAiC,CAAC,GAAY,EAAE,GAAa;IAC/E,MAAM,EAAE,GAAG,IAAA,wBAAe,EAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IAEtC,MAAM,OAAO,GAAG,IAAA,qBAAa,EAAC,GAAG,EAAE,SAAS,CAAC,CAAC;IAC9C,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,qBAAc,CAAC,qBAAqB,CAAC,EAAE,CAAC;QACrD,MAAM,IAAI,qBAAc,EAAE,CAAC;IAC/B,CAAC;IAED,MAAM,UAAU,GAAG,MAAM,IAAA,iCAAa,GAAE,CAAC;IACzC,MAAM,UAAU,GAAG,UAAU,CAAC,aAAa,CAAC,+BAAqB,CAAC,CAAC;IACnE,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;IAElD,IAAI,CAAC,MAAM,EAAE,CAAC;QACV,MAAM,IAAI,oBAAa,EAAE,CAAC;IAC9B,CAAC;IAED,iDAAiD;IAEjD,IAAI,CAAC,IAAA,8BAAuB,EAAC,IAAA,qBAAa,EAAC,GAAG,EAAE,OAAO,CAAC,EAAE,MAAM,CAAC,cAAc,CAAC,EAAE,CAAC;QAC/E,MAAM,IAAI,qBAAc,EAAE,CAAC;IAC/B,CAAC;IAED,iDAAiD;IAEjD,IAAI,CAAC,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"delete.js","sourceRoot":"","sources":["../../../../../src/http/controllers/robot-permission/handlers/delete.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,qCAA2D;AAC3D,uCAAuE;AAEvE,mCAAuD;AACvD,yDAAkD;AAClD,iDAA4D;AAC5D,0CAA+C;AAE/C;;;;;GAKG;AACI,KAAK,UAAU,iCAAiC,CAAC,GAAY,EAAE,GAAa;IAC/E,MAAM,EAAE,GAAG,IAAA,wBAAe,EAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IAEtC,MAAM,OAAO,GAAG,IAAA,qBAAa,EAAC,GAAG,EAAE,SAAS,CAAC,CAAC;IAC9C,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,qBAAc,CAAC,qBAAqB,CAAC,EAAE,CAAC;QACrD,MAAM,IAAI,qBAAc,EAAE,CAAC;IAC/B,CAAC;IAED,MAAM,UAAU,GAAG,MAAM,IAAA,iCAAa,GAAE,CAAC;IACzC,MAAM,UAAU,GAAG,UAAU,CAAC,aAAa,CAAC,+BAAqB,CAAC,CAAC;IACnE,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;IAElD,IAAI,CAAC,MAAM,EAAE,CAAC;QACV,MAAM,IAAI,oBAAa,EAAE,CAAC;IAC9B,CAAC;IAED,iDAAiD;IAEjD,IAAI,CAAC,IAAA,8BAAuB,EAAC,IAAA,qBAAa,EAAC,GAAG,EAAE,OAAO,CAAC,EAAE,MAAM,CAAC,cAAc,CAAC,EAAE,CAAC;QAC/E,MAAM,IAAI,qBAAc,EAAE,CAAC;IAC/B,CAAC;IAED,iDAAiD;IAEjD,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,qBAAc,CAAC,qBAAqB,EAAE,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC;QACpF,MAAM,IAAI,qBAAc,CAAC,wDAAwD,CAAC,CAAC;IACvF,CAAC;IAED,iDAAiD;IAEjD,MAAM,EAAE,EAAE,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC;IAEhC,MAAM,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAEhC,MAAM,CAAC,EAAE,GAAG,QAAQ,CAAC;IAErB,iDAAiD;IAEjD,OAAO,IAAA,qBAAY,EAAC,GAAG,EAAE,MAAM,CAAC,CAAC;AACrC,CAAC;AAvCD,8EAuCC"}
|
|
@@ -58,10 +58,10 @@ async function runRobotPermissionValidation(req, operation) {
|
|
|
58
58
|
throw new http_1.ForbiddenError('It is only allowed to assign robot permissions, which are also owned.');
|
|
59
59
|
}
|
|
60
60
|
}
|
|
61
|
-
const
|
|
62
|
-
.
|
|
63
|
-
if (
|
|
64
|
-
result.data.target =
|
|
61
|
+
const permission = ability
|
|
62
|
+
.findOne(core_1.PermissionName.ROBOT_PERMISSION_ADD);
|
|
63
|
+
if (permission) {
|
|
64
|
+
result.data.target = permission.target;
|
|
65
65
|
}
|
|
66
66
|
// ----------------------------------------------
|
|
67
67
|
await (0, validation_1.extendExpressValidationResultWithRelation)(result, domains_1.RobotEntity, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validation.js","sourceRoot":"","sources":["../../../../../src/http/controllers/robot-permission/utils/validation.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,yDAA4D;AAC5D,qCAA6D;AAC7D,uCAAuE;AAGvE,iDAAoE;AACpE,0CAAkE;AAElE,oDAM6B;AAC7B,0DAAqE;AAE9D,KAAK,UAAU,4BAA4B,CAC9C,GAAY,EACZ,SAAoF;IAEpF,MAAM,MAAM,GAAoD,IAAA,wCAA2B,GAAE,CAAC;IAE9F,IAAI,SAAS,KAAK,mCAAuB,CAAC,MAAM,EAAE,CAAC;QAC/C,MAAM,IAAA,yBAAK,EAAC,UAAU,CAAC;aAClB,MAAM,EAAE;aACR,MAAM,EAAE;aACR,GAAG,CAAC,GAAG,CAAC,CAAC;QAEd,MAAM,IAAA,yBAAK,EAAC,eAAe,CAAC;aACvB,MAAM,EAAE;aACR,MAAM,EAAE;aACR,GAAG,CAAC,GAAG,CAAC,CAAC;QAEd,MAAM,IAAA,yBAAK,EAAC,QAAQ,CAAC;aAChB,MAAM,EAAE;aACR,QAAQ,EAAE;aACV,QAAQ,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC;aAC7B,QAAQ,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;aAC5B,GAAG,CAAC,GAAG,CAAC,CAAC;IAClB,CAAC;IAED,MAAM,IAAA,yBAAK,EAAC,WAAW,CAAC;SACnB,MAAM,EAAE;SACR,QAAQ,EAAE;SACV,QAAQ,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;SAC5B,GAAG,CAAC,GAAG,CAAC,CAAC;IAEd,iDAAiD;IAEjD,MAAM,UAAU,GAAG,IAAA,oCAAgB,EAAC,GAAG,CAAC,CAAC;IACzC,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC;QACxB,MAAM,IAAI,mCAAsB,CAAC,UAAU,CAAC,CAAC;IACjD,CAAC;IAED,MAAM,CAAC,IAAI,GAAG,IAAA,kCAAqB,EAAC,GAAG,EAAE,EAAE,gBAAgB,EAAE,IAAI,EAAE,CAAC,CAAC;IAErE,iDAAiD;IAEjD,MAAM,OAAO,GAAG,IAAA,qBAAa,EAAC,GAAG,EAAE,SAAS,CAAC,CAAC;IAE9C,MAAM,IAAA,sDAAyC,EAAC,MAAM,EAAE,0BAAgB,EAAE;QACtE,EAAE,EAAE,eAAe;QACnB,MAAM,EAAE,YAAY;KACvB,CAAC,CAAC;IAEH,IAAI,MAAM,CAAC,QAAQ,CAAC,UAAU,EAAE,CAAC;QAC7B,IAAI,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC;YACpC,MAAM,CAAC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,MAAM,CAAC;QAC3D,CAAC;QAED,IACI,CAAC,IAAA,yBAAiB,EAAC,GAAG,CAAC;YACvB,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,EAC/C,CAAC;YACC,MAAM,IAAI,qBAAc,CAAC,uEAAuE,CAAC,CAAC;QACtG,CAAC;IACL,CAAC;IAED,MAAM,
|
|
1
|
+
{"version":3,"file":"validation.js","sourceRoot":"","sources":["../../../../../src/http/controllers/robot-permission/utils/validation.ts"],"names":[],"mappings":"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"}
|
|
@@ -30,7 +30,7 @@ async function deleteRoleRouteHandler(req, res) {
|
|
|
30
30
|
throw new http_1.ForbiddenError();
|
|
31
31
|
}
|
|
32
32
|
// ----------------------------------------------
|
|
33
|
-
if (!ability.
|
|
33
|
+
if (!ability.satisfy(core_1.PermissionName.ROLE_DROP, { target: entity.target })) {
|
|
34
34
|
throw new http_1.ForbiddenError('You are not permitted for the role target.');
|
|
35
35
|
}
|
|
36
36
|
// ----------------------------------------------
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"delete.js","sourceRoot":"","sources":["../../../../../src/http/controllers/role/handlers/delete.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,qCAA2D;AAC3D,uCAAuE;AAEvE,mCAAuD;AACvD,yDAAkD;AAClD,iDAAiD;AACjD,0CAA+C;AAExC,KAAK,UAAU,sBAAsB,CAAC,GAAY,EAAE,GAAa;IACpE,MAAM,EAAE,GAAG,IAAA,wBAAe,EAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IAEtC,MAAM,OAAO,GAAG,IAAA,qBAAa,EAAC,GAAG,EAAE,SAAS,CAAC,CAAC;IAC9C,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,qBAAc,CAAC,SAAS,CAAC,EAAE,CAAC;QACzC,MAAM,IAAI,qBAAc,EAAE,CAAC;IAC/B,CAAC;IAED,MAAM,UAAU,GAAG,MAAM,IAAA,iCAAa,GAAE,CAAC;IACzC,MAAM,UAAU,GAAG,UAAU,CAAC,aAAa,CAAC,oBAAU,CAAC,CAAC;IACxD,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;IAElD,IAAI,CAAC,MAAM,EAAE,CAAC;QACV,MAAM,IAAI,oBAAa,EAAE,CAAC;IAC9B,CAAC;IAED,iDAAiD;IAEjD,IAAI,CAAC,IAAA,8BAAuB,EAAC,IAAA,qBAAa,EAAC,GAAG,EAAE,OAAO,CAAC,EAAE,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC;QACzE,MAAM,IAAI,qBAAc,EAAE,CAAC;IAC/B,CAAC;IAED,iDAAiD;IAEjD,IAAI,CAAC,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"delete.js","sourceRoot":"","sources":["../../../../../src/http/controllers/role/handlers/delete.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,qCAA2D;AAC3D,uCAAuE;AAEvE,mCAAuD;AACvD,yDAAkD;AAClD,iDAAiD;AACjD,0CAA+C;AAExC,KAAK,UAAU,sBAAsB,CAAC,GAAY,EAAE,GAAa;IACpE,MAAM,EAAE,GAAG,IAAA,wBAAe,EAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IAEtC,MAAM,OAAO,GAAG,IAAA,qBAAa,EAAC,GAAG,EAAE,SAAS,CAAC,CAAC;IAC9C,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,qBAAc,CAAC,SAAS,CAAC,EAAE,CAAC;QACzC,MAAM,IAAI,qBAAc,EAAE,CAAC;IAC/B,CAAC;IAED,MAAM,UAAU,GAAG,MAAM,IAAA,iCAAa,GAAE,CAAC;IACzC,MAAM,UAAU,GAAG,UAAU,CAAC,aAAa,CAAC,oBAAU,CAAC,CAAC;IACxD,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;IAElD,IAAI,CAAC,MAAM,EAAE,CAAC;QACV,MAAM,IAAI,oBAAa,EAAE,CAAC;IAC9B,CAAC;IAED,iDAAiD;IAEjD,IAAI,CAAC,IAAA,8BAAuB,EAAC,IAAA,qBAAa,EAAC,GAAG,EAAE,OAAO,CAAC,EAAE,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC;QACzE,MAAM,IAAI,qBAAc,EAAE,CAAC;IAC/B,CAAC;IAED,iDAAiD;IAEjD,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,qBAAc,CAAC,SAAS,EAAE,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC;QACxE,MAAM,IAAI,qBAAc,CAAC,4CAA4C,CAAC,CAAC;IAC3E,CAAC;IAED,iDAAiD;IAEjD,MAAM,EAAE,EAAE,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC;IAEhC,MAAM,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAEhC,MAAM,CAAC,EAAE,GAAG,QAAQ,CAAC;IAErB,iDAAiD;IAEjD,OAAO,IAAA,qBAAY,EAAC,GAAG,EAAE,MAAM,CAAC,CAAC;AACrC,CAAC;AAvCD,wDAuCC"}
|
|
@@ -37,7 +37,7 @@ async function updateRoleRouteHandler(req, res) {
|
|
|
37
37
|
throw new http_1.ForbiddenError();
|
|
38
38
|
}
|
|
39
39
|
// ----------------------------------------------
|
|
40
|
-
if (!ability.
|
|
40
|
+
if (!ability.satisfy(core_1.PermissionName.ROLE_EDIT, { target: entity.target })) {
|
|
41
41
|
throw new http_1.ForbiddenError('You are not permitted for the role target.');
|
|
42
42
|
}
|
|
43
43
|
// ----------------------------------------------
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../../../src/http/controllers/role/handlers/update.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,qCAA2D;AAC3D,uCAAuE;AAEvE,mCAAuD;AACvD,yDAAkD;AAClD,iDAAiD;AACjD,0CAA+C;AAC/C,oCAA6C;AAC7C,0DAAqE;AAE9D,KAAK,UAAU,sBAAsB,CAAC,GAAY,EAAE,GAAa;IACpE,MAAM,EAAE,GAAG,IAAA,wBAAe,EAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IAEtC,MAAM,OAAO,GAAG,IAAA,qBAAa,EAAC,GAAG,EAAE,SAAS,CAAC,CAAC;IAC9C,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,qBAAc,CAAC,SAAS,CAAC,EAAE,CAAC;QACzC,MAAM,IAAI,oBAAa,EAAE,CAAC;IAC9B,CAAC;IAED,MAAM,MAAM,GAAG,MAAM,IAAA,yBAAiB,EAAC,GAAG,EAAE,mCAAuB,CAAC,MAAM,CAAC,CAAC;IAC5E,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;QACf,OAAO,IAAA,qBAAY,EAAC,GAAG,CAAC,CAAC;IAC7B,CAAC;IAED,iDAAiD;IAEjD,MAAM,UAAU,GAAG,MAAM,IAAA,iCAAa,GAAE,CAAC;IACzC,MAAM,UAAU,GAAG,UAAU,CAAC,aAAa,CAAC,oBAAU,CAAC,CAAC;IACxD,IAAI,MAAM,GAAG,MAAM,UAAU,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;IAEhD,IAAI,CAAC,MAAM,EAAE,CAAC;QACV,MAAM,IAAI,oBAAa,EAAE,CAAC;IAC9B,CAAC;IAED,iDAAiD;IAEjD,IAAI,CAAC,IAAA,8BAAuB,EAAC,IAAA,qBAAa,EAAC,GAAG,EAAE,OAAO,CAAC,EAAE,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC;QACzE,MAAM,IAAI,qBAAc,EAAE,CAAC;IAC/B,CAAC;IAED,iDAAiD;IAEjD,IAAI,CAAC,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../../../src/http/controllers/role/handlers/update.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,qCAA2D;AAC3D,uCAAuE;AAEvE,mCAAuD;AACvD,yDAAkD;AAClD,iDAAiD;AACjD,0CAA+C;AAC/C,oCAA6C;AAC7C,0DAAqE;AAE9D,KAAK,UAAU,sBAAsB,CAAC,GAAY,EAAE,GAAa;IACpE,MAAM,EAAE,GAAG,IAAA,wBAAe,EAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IAEtC,MAAM,OAAO,GAAG,IAAA,qBAAa,EAAC,GAAG,EAAE,SAAS,CAAC,CAAC;IAC9C,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,qBAAc,CAAC,SAAS,CAAC,EAAE,CAAC;QACzC,MAAM,IAAI,oBAAa,EAAE,CAAC;IAC9B,CAAC;IAED,MAAM,MAAM,GAAG,MAAM,IAAA,yBAAiB,EAAC,GAAG,EAAE,mCAAuB,CAAC,MAAM,CAAC,CAAC;IAC5E,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;QACf,OAAO,IAAA,qBAAY,EAAC,GAAG,CAAC,CAAC;IAC7B,CAAC;IAED,iDAAiD;IAEjD,MAAM,UAAU,GAAG,MAAM,IAAA,iCAAa,GAAE,CAAC;IACzC,MAAM,UAAU,GAAG,UAAU,CAAC,aAAa,CAAC,oBAAU,CAAC,CAAC;IACxD,IAAI,MAAM,GAAG,MAAM,UAAU,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;IAEhD,IAAI,CAAC,MAAM,EAAE,CAAC;QACV,MAAM,IAAI,oBAAa,EAAE,CAAC;IAC9B,CAAC;IAED,iDAAiD;IAEjD,IAAI,CAAC,IAAA,8BAAuB,EAAC,IAAA,qBAAa,EAAC,GAAG,EAAE,OAAO,CAAC,EAAE,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC;QACzE,MAAM,IAAI,qBAAc,EAAE,CAAC;IAC/B,CAAC;IAED,iDAAiD;IAEjD,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,qBAAc,CAAC,SAAS,EAAE,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC;QACxE,MAAM,IAAI,qBAAc,CAAC,4CAA4C,CAAC,CAAC;IAC3E,CAAC;IAED,iDAAiD;IAEjD,MAAM,GAAG,UAAU,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;IAE/C,MAAM,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAE9B,OAAO,IAAA,qBAAY,EAAC,GAAG,EAAE,MAAM,CAAC,CAAC;AACrC,CAAC;AA1CD,wDA0CC"}
|
|
@@ -70,15 +70,15 @@ async function runRoleValidation(req, operation) {
|
|
|
70
70
|
// ----------------------------------------------
|
|
71
71
|
const ability = (0, utils_1.useRequestEnv)(req, 'ability');
|
|
72
72
|
if (operation === constants_1.RequestHandlerOperation.CREATE) {
|
|
73
|
-
const permissionTarget = ability.
|
|
73
|
+
const permissionTarget = ability.findOne(core_1.PermissionName.ROLE_ADD);
|
|
74
74
|
if (permissionTarget) {
|
|
75
|
-
result.data.target = permissionTarget;
|
|
75
|
+
result.data.target = permissionTarget.target;
|
|
76
76
|
}
|
|
77
77
|
}
|
|
78
78
|
else {
|
|
79
|
-
const permissionTarget = ability.
|
|
79
|
+
const permissionTarget = ability.findOne(core_1.PermissionName.ROLE_EDIT);
|
|
80
80
|
if (permissionTarget) {
|
|
81
|
-
result.data.target = permissionTarget;
|
|
81
|
+
result.data.target = permissionTarget.target;
|
|
82
82
|
}
|
|
83
83
|
}
|
|
84
84
|
// ----------------------------------------------
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validaiton.js","sourceRoot":"","sources":["../../../../../src/http/controllers/role/utils/validaiton.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"validaiton.js","sourceRoot":"","sources":["../../../../../src/http/controllers/role/utils/validaiton.ts"],"names":[],"mappings":"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"}
|
|
@@ -36,7 +36,7 @@ async function deleteRolePermissionRouteHandler(req, res) {
|
|
|
36
36
|
throw new http_1.ForbiddenError();
|
|
37
37
|
}
|
|
38
38
|
// ----------------------------------------------
|
|
39
|
-
if (!ability.
|
|
39
|
+
if (!ability.satisfy(core_1.PermissionName.ROLE_PERMISSION_DROP, { target: entity.target })) {
|
|
40
40
|
throw new http_1.ForbiddenError('You are not permitted for the role-permission target.');
|
|
41
41
|
}
|
|
42
42
|
// ----------------------------------------------
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"delete.js","sourceRoot":"","sources":["../../../../../src/http/controllers/role-permission/handlers/delete.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,qCAA2D;AAC3D,uCAAuE;AAEvE,mCAAuD;AACvD,yDAAkD;AAClD,iDAA2D;AAC3D,4CAAmD;AAEnD;;;;;GAKG;AACI,KAAK,UAAU,gCAAgC,CAAC,GAAY,EAAE,GAAa;IAC9E,MAAM,EAAE,GAAG,IAAA,wBAAe,EAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IAEtC,MAAM,OAAO,GAAG,IAAA,mBAAa,EAAC,GAAG,EAAE,SAAS,CAAC,CAAC;IAC9C,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,qBAAc,CAAC,oBAAoB,CAAC,EAAE,CAAC;QACpD,MAAM,IAAI,qBAAc,EAAE,CAAC;IAC/B,CAAC;IAED,MAAM,UAAU,GAAG,MAAM,IAAA,iCAAa,GAAE,CAAC;IACzC,MAAM,UAAU,GAAG,UAAU,CAAC,aAAa,CAAC,8BAAoB,CAAC,CAAC;IAClE,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;IAElD,IAAI,CAAC,MAAM,EAAE,CAAC;QACV,MAAM,IAAI,oBAAa,EAAE,CAAC;IAC9B,CAAC;IAED,iDAAiD;IAEjD,IAAI,CAAC,IAAA,8BAAuB,EAAC,IAAA,mBAAa,EAAC,GAAG,EAAE,OAAO,CAAC,EAAE,MAAM,CAAC,aAAa,CAAC,EAAE,CAAC;QAC9E,MAAM,IAAI,qBAAc,EAAE,CAAC;IAC/B,CAAC;IAED,iDAAiD;IAEjD,IAAI,CAAC,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"delete.js","sourceRoot":"","sources":["../../../../../src/http/controllers/role-permission/handlers/delete.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,qCAA2D;AAC3D,uCAAuE;AAEvE,mCAAuD;AACvD,yDAAkD;AAClD,iDAA2D;AAC3D,4CAAmD;AAEnD;;;;;GAKG;AACI,KAAK,UAAU,gCAAgC,CAAC,GAAY,EAAE,GAAa;IAC9E,MAAM,EAAE,GAAG,IAAA,wBAAe,EAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IAEtC,MAAM,OAAO,GAAG,IAAA,mBAAa,EAAC,GAAG,EAAE,SAAS,CAAC,CAAC;IAC9C,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,qBAAc,CAAC,oBAAoB,CAAC,EAAE,CAAC;QACpD,MAAM,IAAI,qBAAc,EAAE,CAAC;IAC/B,CAAC;IAED,MAAM,UAAU,GAAG,MAAM,IAAA,iCAAa,GAAE,CAAC;IACzC,MAAM,UAAU,GAAG,UAAU,CAAC,aAAa,CAAC,8BAAoB,CAAC,CAAC;IAClE,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;IAElD,IAAI,CAAC,MAAM,EAAE,CAAC;QACV,MAAM,IAAI,oBAAa,EAAE,CAAC;IAC9B,CAAC;IAED,iDAAiD;IAEjD,IAAI,CAAC,IAAA,8BAAuB,EAAC,IAAA,mBAAa,EAAC,GAAG,EAAE,OAAO,CAAC,EAAE,MAAM,CAAC,aAAa,CAAC,EAAE,CAAC;QAC9E,MAAM,IAAI,qBAAc,EAAE,CAAC;IAC/B,CAAC;IAED,iDAAiD;IAEjD,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,qBAAc,CAAC,oBAAoB,EAAE,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC;QACnF,MAAM,IAAI,qBAAc,CAAC,uDAAuD,CAAC,CAAC;IACtF,CAAC;IAED,iDAAiD;IAEjD,MAAM,EAAE,EAAE,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC;IAEhC,MAAM,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAEhC,MAAM,CAAC,EAAE,GAAG,QAAQ,CAAC;IAErB,iDAAiD;IAEjD,OAAO,IAAA,qBAAY,EAAC,GAAG,EAAE,MAAM,CAAC,CAAC;AACrC,CAAC;AAvCD,4EAuCC"}
|
|
@@ -58,9 +58,9 @@ async function runRolePermissionValidation(req, operation) {
|
|
|
58
58
|
throw new http_1.ForbiddenError('It is only allowed to assign role permissions, which are also owned.');
|
|
59
59
|
}
|
|
60
60
|
}
|
|
61
|
-
const
|
|
62
|
-
if (
|
|
63
|
-
result.data.target =
|
|
61
|
+
const permission = ability.findOne(core_1.PermissionName.ROLE_PERMISSION_ADD);
|
|
62
|
+
if (permission) {
|
|
63
|
+
result.data.target = permission.target;
|
|
64
64
|
}
|
|
65
65
|
// ----------------------------------------------
|
|
66
66
|
await (0, validation_1.extendExpressValidationResultWithRelation)(result, domains_1.RoleEntity, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validation.js","sourceRoot":"","sources":["../../../../../src/http/controllers/role-permission/utils/validation.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,yDAA4D;AAC5D,qCAA6D;AAC7D,uCAAuE;AAGvE,iDAAmE;AACnE,0CAAkE;AAElE,oDAM6B;AAC7B,0DAAqE;AAE9D,KAAK,UAAU,2BAA2B,CAC7C,GAAY,EACZ,SAAoF;IAEpF,MAAM,MAAM,GAAmD,IAAA,wCAA2B,GAAE,CAAC;IAE7F,IAAI,SAAS,KAAK,mCAAuB,CAAC,MAAM,EAAE,CAAC;QAC/C,MAAM,IAAA,yBAAK,EAAC,SAAS,CAAC;aACjB,MAAM,EAAE;aACR,MAAM,EAAE;aACR,GAAG,CAAC,GAAG,CAAC,CAAC;QAEd,MAAM,IAAA,yBAAK,EAAC,eAAe,CAAC;aACvB,MAAM,EAAE;aACR,MAAM,EAAE;aACR,GAAG,CAAC,GAAG,CAAC,CAAC;QAEd,MAAM,IAAA,yBAAK,EAAC,QAAQ,CAAC;aAChB,MAAM,EAAE;aACR,QAAQ,EAAE;aACV,QAAQ,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC;aAC7B,QAAQ,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;aAC5B,GAAG,CAAC,GAAG,CAAC,CAAC;IAClB,CAAC;IAED,MAAM,IAAA,yBAAK,EAAC,WAAW,CAAC;SACnB,MAAM,EAAE;SACR,QAAQ,EAAE;SACV,QAAQ,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;SAC5B,GAAG,CAAC,GAAG,CAAC,CAAC;IAEd,iDAAiD;IAEjD,MAAM,UAAU,GAAG,IAAA,oCAAgB,EAAC,GAAG,CAAC,CAAC;IACzC,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC;QACxB,MAAM,IAAI,mCAAsB,CAAC,UAAU,CAAC,CAAC;IACjD,CAAC;IAED,MAAM,CAAC,IAAI,GAAG,IAAA,kCAAqB,EAAC,GAAG,EAAE,EAAE,gBAAgB,EAAE,IAAI,EAAE,CAAC,CAAC;IAErE,iDAAiD;IAEjD,MAAM,OAAO,GAAG,IAAA,qBAAa,EAAC,GAAG,EAAE,SAAS,CAAC,CAAC;IAE9C,MAAM,IAAA,sDAAyC,EAAC,MAAM,EAAE,0BAAgB,EAAE;QACtE,EAAE,EAAE,eAAe;QACnB,MAAM,EAAE,YAAY;KACvB,CAAC,CAAC;IAEH,IAAI,MAAM,CAAC,QAAQ,CAAC,UAAU,EAAE,CAAC;QAC7B,IAAI,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC;YACpC,MAAM,CAAC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,MAAM,CAAC;QAC3D,CAAC;QAED,IACI,CAAC,IAAA,yBAAiB,EAAC,GAAG,CAAC;YACvB,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,EAC/C,CAAC;YACC,MAAM,IAAI,qBAAc,CAAC,sEAAsE,CAAC,CAAC;QACrG,CAAC;IACL,CAAC;IAED,MAAM,
|
|
1
|
+
{"version":3,"file":"validation.js","sourceRoot":"","sources":["../../../../../src/http/controllers/role-permission/utils/validation.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,7 +15,7 @@ async function runAuthorizationRouteHandler(req, res) {
|
|
|
15
15
|
const config = (0, config_1.useConfig)();
|
|
16
16
|
const result = await (0, oauth2_1.runOAuth2Authorization)(req, {
|
|
17
17
|
issuer: config.publicUrl,
|
|
18
|
-
accessTokenMaxAge: config.
|
|
18
|
+
accessTokenMaxAge: config.tokenRefreshMaxAge,
|
|
19
19
|
});
|
|
20
20
|
// ---------------------------------------------------------
|
|
21
21
|
const url = new node_url_1.URL(result.redirectUri);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run.js","sourceRoot":"","sources":["../../../../../../src/http/controllers/root/authorize/handlers/run.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,uCAA+B;AAE/B,mCAA8B;AAC9B,kDAAkD;AAClD,+CAA4D;AAErD,KAAK,UAAU,4BAA4B,CAC9C,GAAY,EACZ,GAAa;IAEb,MAAM,MAAM,GAAG,IAAA,kBAAS,GAAE,CAAC;IAC3B,MAAM,MAAM,GAAG,MAAM,IAAA,+BAAsB,EAAC,GAAG,EAAE;QAC7C,MAAM,EAAE,MAAM,CAAC,SAAS;QACxB,iBAAiB,EAAE,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"run.js","sourceRoot":"","sources":["../../../../../../src/http/controllers/root/authorize/handlers/run.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,uCAA+B;AAE/B,mCAA8B;AAC9B,kDAAkD;AAClD,+CAA4D;AAErD,KAAK,UAAU,4BAA4B,CAC9C,GAAY,EACZ,GAAa;IAEb,MAAM,MAAM,GAAG,IAAA,kBAAS,GAAE,CAAC;IAC3B,MAAM,MAAM,GAAG,MAAM,IAAA,+BAAsB,EAAC,GAAG,EAAE;QAC7C,MAAM,EAAE,MAAM,CAAC,SAAS;QACxB,iBAAiB,EAAE,MAAM,CAAC,kBAAkB;KAC/C,CAAC,CAAC;IAEH,4DAA4D;IAE5D,MAAM,GAAG,GAAG,IAAI,cAAG,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;IACxC,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;QACf,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;IAChD,CAAC;IAED,IAAI,MAAM,CAAC,iBAAiB,EAAE,CAAC;QAC3B,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,iBAAiB,CAAC,CAAC;IAC3D,CAAC;IAED,IAAI,MAAM,CAAC,WAAW,EAAE,CAAC;QACrB,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,cAAc,EAAE,MAAM,CAAC,WAAW,CAAC,CAAC;IAC7D,CAAC;IAED,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;QACjB,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,UAAU,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;IACrD,CAAC;IAED,IAAA,aAAI,EAAC,GAAG,EAAE,EAAE,GAAG,EAAE,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC;AACjC,CAAC;AA9BD,oEA8BC"}
|
|
@@ -25,8 +25,8 @@ async function useInfo() {
|
|
|
25
25
|
info = {
|
|
26
26
|
version: pkgJson.version,
|
|
27
27
|
timestamp: Date.now(),
|
|
28
|
-
tokenMaxAgeAccessToken: config.
|
|
29
|
-
tokenMaxAgeRefreshToken: config.
|
|
28
|
+
tokenMaxAgeAccessToken: config.tokenRefreshMaxAge,
|
|
29
|
+
tokenMaxAgeRefreshToken: config.tokenAccessMaxAge,
|
|
30
30
|
redis: !!config.redis,
|
|
31
31
|
vault: !!config.vault,
|
|
32
32
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"module.js","sourceRoot":"","sources":["../../../../../src/http/controllers/root/status/module.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;;;AAEH,0DAA6B;AAC7B,mCAA8B;AAC9B,mCAA8B;AAE9B,+CAA+C;AAC/C,wCAAmD;AAWnD,IAAI,IAA+B,CAAC;AAE7B,KAAK,UAAU,OAAO;IACzB,IAAI,OAAO,IAAI,KAAK,WAAW,EAAE,CAAC;QAC9B,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,MAAM,OAAO,GAAG,MAAM,IAAA,aAAI,EAAC,mBAAI,CAAC,IAAI,CAAC,IAAA,yBAAkB,GAAE,EAAE,cAAc,CAAC,CAAC,CAAC;IAC5E,MAAM,MAAM,GAAG,IAAA,kBAAS,GAAE,CAAC;IAE3B,IAAI,GAAG;QACH,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;QACrB,sBAAsB,EAAE,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"module.js","sourceRoot":"","sources":["../../../../../src/http/controllers/root/status/module.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;;;AAEH,0DAA6B;AAC7B,mCAA8B;AAC9B,mCAA8B;AAE9B,+CAA+C;AAC/C,wCAAmD;AAWnD,IAAI,IAA+B,CAAC;AAE7B,KAAK,UAAU,OAAO;IACzB,IAAI,OAAO,IAAI,KAAK,WAAW,EAAE,CAAC;QAC9B,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,MAAM,OAAO,GAAG,MAAM,IAAA,aAAI,EAAC,mBAAI,CAAC,IAAI,CAAC,IAAA,yBAAkB,GAAE,EAAE,cAAc,CAAC,CAAC,CAAC;IAC5E,MAAM,MAAM,GAAG,IAAA,kBAAS,GAAE,CAAC;IAE3B,IAAI,GAAG;QACH,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;QACrB,sBAAsB,EAAE,MAAM,CAAC,kBAAkB;QACjD,uBAAuB,EAAE,MAAM,CAAC,iBAAiB;QACjD,KAAK,EAAE,CAAC,CAAC,MAAM,CAAC,KAAK;QACrB,KAAK,EAAE,CAAC,CAAC,MAAM,CAAC,KAAK;KACxB,CAAC;IAEF,OAAO,IAAI,CAAC;AAChB,CAAC;AAlBD,0BAkBC;AACM,KAAK,UAAU,qBAAqB,CAAC,GAAY,EAAE,GAAa;IACnE,MAAM,MAAM,GAAG,MAAM,OAAO,EAAE,CAAC;IAC/B,MAAM,CAAC,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IAE9B,OAAO,IAAA,aAAI,EAAC,GAAG,EAAE,MAAM,CAAC,CAAC;AAC7B,CAAC;AALD,sDAKC"}
|
|
@@ -57,11 +57,11 @@ async function createTokenRouteHandler(req, res) {
|
|
|
57
57
|
}
|
|
58
58
|
(0, cookie_1.setResponseCookie)(res, core_1.CookieName.ACCESS_TOKEN, tokenResponse.access_token, {
|
|
59
59
|
...cookieOptions,
|
|
60
|
-
maxAge: config.
|
|
60
|
+
maxAge: config.tokenRefreshMaxAge * 1000,
|
|
61
61
|
});
|
|
62
62
|
(0, cookie_1.setResponseCookie)(res, core_1.CookieName.REFRESH_TOKEN, tokenResponse.refresh_token, {
|
|
63
63
|
...cookieOptions,
|
|
64
|
-
maxAge: config.
|
|
64
|
+
maxAge: config.tokenAccessMaxAge * 1000,
|
|
65
65
|
});
|
|
66
66
|
return (0, routup_1.send)(res, tokenResponse);
|
|
67
67
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../../../../src/http/controllers/root/token/handlers/create.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAIH,uCAGsB;AAEtB,iDAAyD;AACzD,uCAA+B;AAE/B,mCAA8B;AAC9B,yDAAoD;AACpD,kDAAkD;AAElD,+CAO4B;AAE5B;;;;;;GAMG;AACI,KAAK,UAAU,uBAAuB,CACzC,GAAY,EACZ,GAAa;IAEb,MAAM,SAAS,GAAG,IAAA,sCAA6B,EAAC,GAAG,CAAC,CAAC;IACrD,IAAI,CAAC,SAAS,EAAE,CAAC;QACb,MAAM,iBAAU,CAAC,YAAY,EAAE,CAAC;IACpC,CAAC;IAED,IAAI,KAAyB,CAAC;IAE9B,QAAQ,SAAS,EAAE,CAAC;QAChB,KAAK,uBAAgB,CAAC,kBAAkB,CAAC,CAAC,CAAC;YACvC,KAAK,GAAG,IAAI,2BAAkB,EAAE,CAAC;YACjC,MAAM;QACV,CAAC;QACD,KAAK,uBAAgB,CAAC,kBAAkB,CAAC,CAAC,CAAC;YACvC,KAAK,GAAG,IAAI,+BAAsB,EAAE,CAAC;YACrC,MAAM;QACV,CAAC;QACD,KAAK,uBAAgB,CAAC,iBAAiB,CAAC,CAAC,CAAC;YACtC,KAAK,GAAG,IAAI,kCAAyB,EAAE,CAAC;YACxC,MAAM;QACV,CAAC;QACD,KAAK,uBAAgB,CAAC,QAAQ,CAAC,CAAC,CAAC;YAC7B,KAAK,GAAG,IAAI,0BAAiB,EAAE,CAAC;YAChC,MAAM;QACV,CAAC;QACD,KAAK,uBAAgB,CAAC,aAAa,CAAC,CAAC,CAAC;YAClC,KAAK,GAAG,IAAI,8BAAqB,EAAE,CAAC;YACpC,MAAM;QACV,CAAC;IACL,CAAC;IAED,MAAM,MAAM,GAAG,IAAA,kBAAS,GAAE,CAAC;IAE3B,MAAM,aAAa,GAA8B,MAAM,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAEtE,MAAM,aAAa,GAAsB,EAAE,CAAC;IAC5C,IAAI,MAAM,CAAC,GAAG,KAAK,mCAAe,CAAC,UAAU,EAAE,CAAC;QAC5C,aAAa,CAAC,MAAM,GAAG,IAAI,cAAG,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC;IAC9D,CAAC;IAED,IAAA,0BAAiB,EAAC,GAAG,EAAE,iBAAU,CAAC,YAAY,EAAE,aAAa,CAAC,YAAY,EAAE;QACxE,GAAG,aAAa;QAChB,MAAM,EAAE,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../../../../src/http/controllers/root/token/handlers/create.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAIH,uCAGsB;AAEtB,iDAAyD;AACzD,uCAA+B;AAE/B,mCAA8B;AAC9B,yDAAoD;AACpD,kDAAkD;AAElD,+CAO4B;AAE5B;;;;;;GAMG;AACI,KAAK,UAAU,uBAAuB,CACzC,GAAY,EACZ,GAAa;IAEb,MAAM,SAAS,GAAG,IAAA,sCAA6B,EAAC,GAAG,CAAC,CAAC;IACrD,IAAI,CAAC,SAAS,EAAE,CAAC;QACb,MAAM,iBAAU,CAAC,YAAY,EAAE,CAAC;IACpC,CAAC;IAED,IAAI,KAAyB,CAAC;IAE9B,QAAQ,SAAS,EAAE,CAAC;QAChB,KAAK,uBAAgB,CAAC,kBAAkB,CAAC,CAAC,CAAC;YACvC,KAAK,GAAG,IAAI,2BAAkB,EAAE,CAAC;YACjC,MAAM;QACV,CAAC;QACD,KAAK,uBAAgB,CAAC,kBAAkB,CAAC,CAAC,CAAC;YACvC,KAAK,GAAG,IAAI,+BAAsB,EAAE,CAAC;YACrC,MAAM;QACV,CAAC;QACD,KAAK,uBAAgB,CAAC,iBAAiB,CAAC,CAAC,CAAC;YACtC,KAAK,GAAG,IAAI,kCAAyB,EAAE,CAAC;YACxC,MAAM;QACV,CAAC;QACD,KAAK,uBAAgB,CAAC,QAAQ,CAAC,CAAC,CAAC;YAC7B,KAAK,GAAG,IAAI,0BAAiB,EAAE,CAAC;YAChC,MAAM;QACV,CAAC;QACD,KAAK,uBAAgB,CAAC,aAAa,CAAC,CAAC,CAAC;YAClC,KAAK,GAAG,IAAI,8BAAqB,EAAE,CAAC;YACpC,MAAM;QACV,CAAC;IACL,CAAC;IAED,MAAM,MAAM,GAAG,IAAA,kBAAS,GAAE,CAAC;IAE3B,MAAM,aAAa,GAA8B,MAAM,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAEtE,MAAM,aAAa,GAAsB,EAAE,CAAC;IAC5C,IAAI,MAAM,CAAC,GAAG,KAAK,mCAAe,CAAC,UAAU,EAAE,CAAC;QAC5C,aAAa,CAAC,MAAM,GAAG,IAAI,cAAG,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC;IAC9D,CAAC;IAED,IAAA,0BAAiB,EAAC,GAAG,EAAE,iBAAU,CAAC,YAAY,EAAE,aAAa,CAAC,YAAY,EAAE;QACxE,GAAG,aAAa;QAChB,MAAM,EAAE,MAAM,CAAC,kBAAkB,GAAG,IAAI;KAC3C,CAAC,CAAC;IAEH,IAAA,0BAAiB,EAAC,GAAG,EAAE,iBAAU,CAAC,aAAa,EAAE,aAAa,CAAC,aAAa,EAAE;QAC1E,GAAG,aAAa;QAChB,MAAM,EAAE,MAAM,CAAC,iBAAiB,GAAG,IAAI;KAC1C,CAAC,CAAC;IAEH,OAAO,IAAA,aAAI,EAAC,GAAG,EAAE,aAAa,CAAC,CAAC;AACpC,CAAC;AAtDD,0DAsDC"}
|
|
@@ -51,7 +51,7 @@ async function updateUserRouteHandler(req, res) {
|
|
|
51
51
|
delete result.data.name;
|
|
52
52
|
}
|
|
53
53
|
const config = (0, config_1.useConfig)();
|
|
54
|
-
if (entity.name === config.
|
|
54
|
+
if (entity.name === config.userAdminName) {
|
|
55
55
|
throw new http_1.BadRequestError('The default user name can not be changed.');
|
|
56
56
|
}
|
|
57
57
|
}
|
|
@@ -36,7 +36,7 @@ async function deleteUserPermissionRouteHandler(req, res) {
|
|
|
36
36
|
throw new http_1.ForbiddenError();
|
|
37
37
|
}
|
|
38
38
|
// ----------------------------------------------
|
|
39
|
-
if (!ability.
|
|
39
|
+
if (!ability.satisfy(core_1.PermissionName.USER_PERMISSION_DROP, { target: entity.target })) {
|
|
40
40
|
throw new http_1.ForbiddenError('You are not permitted for the role-permission target.');
|
|
41
41
|
}
|
|
42
42
|
// ----------------------------------------------
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"delete.js","sourceRoot":"","sources":["../../../../../src/http/controllers/user-permission/handlers/delete.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,qCAA2D;AAC3D,uCAAuE;AAEvE,mCAAuD;AACvD,yDAAkD;AAClD,iDAA2D;AAC3D,4CAAmD;AAEnD;;;;;GAKG;AACI,KAAK,UAAU,gCAAgC,CAAC,GAAY,EAAE,GAAa;IAC9E,MAAM,EAAE,GAAG,IAAA,wBAAe,EAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IAEtC,MAAM,OAAO,GAAG,IAAA,mBAAa,EAAC,GAAG,EAAE,SAAS,CAAC,CAAC;IAC9C,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,qBAAc,CAAC,oBAAoB,CAAC,EAAE,CAAC;QACpD,MAAM,IAAI,qBAAc,EAAE,CAAC;IAC/B,CAAC;IAED,MAAM,UAAU,GAAG,MAAM,IAAA,iCAAa,GAAE,CAAC;IACzC,MAAM,UAAU,GAAG,UAAU,CAAC,aAAa,CAAC,8BAAoB,CAAC,CAAC;IAClE,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;IAElD,IAAI,CAAC,MAAM,EAAE,CAAC;QACV,MAAM,IAAI,oBAAa,EAAE,CAAC;IAC9B,CAAC;IAED,iDAAiD;IAEjD,IACI,CAAC,IAAA,8BAAuB,EAAC,IAAA,mBAAa,EAAC,GAAG,EAAE,OAAO,CAAC,EAAE,MAAM,CAAC,aAAa,CAAC,EAC7E,CAAC;QACC,MAAM,IAAI,qBAAc,EAAE,CAAC;IAC/B,CAAC;IAED,iDAAiD;IAEjD,IAAI,CAAC,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"delete.js","sourceRoot":"","sources":["../../../../../src/http/controllers/user-permission/handlers/delete.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,qCAA2D;AAC3D,uCAAuE;AAEvE,mCAAuD;AACvD,yDAAkD;AAClD,iDAA2D;AAC3D,4CAAmD;AAEnD;;;;;GAKG;AACI,KAAK,UAAU,gCAAgC,CAAC,GAAY,EAAE,GAAa;IAC9E,MAAM,EAAE,GAAG,IAAA,wBAAe,EAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IAEtC,MAAM,OAAO,GAAG,IAAA,mBAAa,EAAC,GAAG,EAAE,SAAS,CAAC,CAAC;IAC9C,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,qBAAc,CAAC,oBAAoB,CAAC,EAAE,CAAC;QACpD,MAAM,IAAI,qBAAc,EAAE,CAAC;IAC/B,CAAC;IAED,MAAM,UAAU,GAAG,MAAM,IAAA,iCAAa,GAAE,CAAC;IACzC,MAAM,UAAU,GAAG,UAAU,CAAC,aAAa,CAAC,8BAAoB,CAAC,CAAC;IAClE,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;IAElD,IAAI,CAAC,MAAM,EAAE,CAAC;QACV,MAAM,IAAI,oBAAa,EAAE,CAAC;IAC9B,CAAC;IAED,iDAAiD;IAEjD,IACI,CAAC,IAAA,8BAAuB,EAAC,IAAA,mBAAa,EAAC,GAAG,EAAE,OAAO,CAAC,EAAE,MAAM,CAAC,aAAa,CAAC,EAC7E,CAAC;QACC,MAAM,IAAI,qBAAc,EAAE,CAAC;IAC/B,CAAC;IAED,iDAAiD;IAEjD,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,qBAAc,CAAC,oBAAoB,EAAE,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC;QACnF,MAAM,IAAI,qBAAc,CAAC,uDAAuD,CAAC,CAAC;IACtF,CAAC;IAED,iDAAiD;IAEjD,MAAM,EAAE,EAAE,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC;IAEhC,MAAM,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAEhC,MAAM,CAAC,EAAE,GAAG,QAAQ,CAAC;IAErB,iDAAiD;IAEjD,OAAO,IAAA,qBAAY,EAAC,GAAG,EAAE,MAAM,CAAC,CAAC;AACrC,CAAC;AAzCD,4EAyCC"}
|
|
@@ -58,9 +58,9 @@ async function runUserPermissionValidation(req, operation) {
|
|
|
58
58
|
throw new http_1.ForbiddenError('It is only allowed to assign user permissions, which are also owned.');
|
|
59
59
|
}
|
|
60
60
|
}
|
|
61
|
-
const permissionTarget = ability.
|
|
61
|
+
const permissionTarget = ability.findOne(core_1.PermissionName.USER_PERMISSION_ADD);
|
|
62
62
|
if (permissionTarget) {
|
|
63
|
-
result.data.target = permissionTarget;
|
|
63
|
+
result.data.target = permissionTarget.target;
|
|
64
64
|
}
|
|
65
65
|
// ----------------------------------------------
|
|
66
66
|
await (0, validation_1.extendExpressValidationResultWithRelation)(result, domains_1.UserEntity, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validation.js","sourceRoot":"","sources":["../../../../../src/http/controllers/user-permission/utils/validation.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,yDAA4D;AAC5D,qCAA6D;AAC7D,uCAAuE;AAGvE,iDAE6B;AAC7B,0CAAkE;AAElE,oDAM6B;AAC7B,0DAAqE;AAE9D,KAAK,UAAU,2BAA2B,CAC7C,GAAY,EACZ,SAAoF;IAEpF,MAAM,MAAM,GAAmD,IAAA,wCAA2B,GAAE,CAAC;IAE7F,IAAI,SAAS,KAAK,mCAAuB,CAAC,MAAM,EAAE,CAAC;QAC/C,MAAM,IAAA,yBAAK,EAAC,SAAS,CAAC;aACjB,MAAM,EAAE;aACR,MAAM,EAAE;aACR,GAAG,CAAC,GAAG,CAAC,CAAC;QAEd,MAAM,IAAA,yBAAK,EAAC,eAAe,CAAC;aACvB,MAAM,EAAE;aACR,QAAQ,EAAE;aACV,GAAG,CAAC,GAAG,CAAC,CAAC;QAEd,MAAM,IAAA,yBAAK,EAAC,QAAQ,CAAC;aAChB,MAAM,EAAE;aACR,QAAQ,EAAE;aACV,QAAQ,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC;aAC7B,QAAQ,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;aAC5B,GAAG,CAAC,GAAG,CAAC,CAAC;IAClB,CAAC;IAED,MAAM,IAAA,yBAAK,EAAC,WAAW,CAAC;SACnB,MAAM,EAAE;SACR,QAAQ,EAAE;SACV,QAAQ,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;SAC5B,GAAG,CAAC,GAAG,CAAC,CAAC;IAEd,iDAAiD;IAEjD,MAAM,UAAU,GAAG,IAAA,oCAAgB,EAAC,GAAG,CAAC,CAAC;IACzC,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC;QACxB,MAAM,IAAI,mCAAsB,CAAC,UAAU,CAAC,CAAC;IACjD,CAAC;IAED,MAAM,CAAC,IAAI,GAAG,IAAA,kCAAqB,EAAC,GAAG,EAAE,EAAE,gBAAgB,EAAE,IAAI,EAAE,CAAC,CAAC;IAErE,iDAAiD;IAEjD,MAAM,OAAO,GAAG,IAAA,qBAAa,EAAC,GAAG,EAAE,SAAS,CAAC,CAAC;IAE9C,MAAM,IAAA,sDAAyC,EAAC,MAAM,EAAE,0BAAgB,EAAE;QACtE,EAAE,EAAE,eAAe;QACnB,MAAM,EAAE,YAAY;KACvB,CAAC,CAAC;IAEH,IAAI,MAAM,CAAC,QAAQ,CAAC,UAAU,EAAE,CAAC;QAC7B,IAAI,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC;YACpC,MAAM,CAAC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,MAAM,CAAC;QAC3D,CAAC;QAED,IACI,CAAC,IAAA,yBAAiB,EAAC,GAAG,CAAC;YACvB,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,EAC/C,CAAC;YACC,MAAM,IAAI,qBAAc,CAAC,sEAAsE,CAAC,CAAC;QACrG,CAAC;IACL,CAAC;IAED,MAAM,gBAAgB,GAAG,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"validation.js","sourceRoot":"","sources":["../../../../../src/http/controllers/user-permission/utils/validation.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"module.d.ts","sourceRoot":"","sources":["../../../../../src/http/middleware/built-in/auth/module.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EACW,MAAM,EAC5B,MAAM,QAAQ,CAAC;AA0BhB,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"module.d.ts","sourceRoot":"","sources":["../../../../../src/http/middleware/built-in/auth/module.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EACW,MAAM,EAC5B,MAAM,QAAQ,CAAC;AA0BhB,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,MAAM,QAgCpD"}
|
|
@@ -34,9 +34,14 @@ function registerAuthMiddleware(router) {
|
|
|
34
34
|
let { authorization: headerValue } = request.headers;
|
|
35
35
|
(0, utils_1.setRequestEnv)(request, 'ability', new core_1.AbilityManager());
|
|
36
36
|
try {
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
37
|
+
if (typeof headerValue === 'undefined') {
|
|
38
|
+
const cookie = parseRequestAccessTokenCookie(request);
|
|
39
|
+
if (cookie) {
|
|
40
|
+
headerValue = (0, hapic_1.stringifyAuthorizationHeader)({
|
|
41
|
+
type: 'Bearer',
|
|
42
|
+
token: cookie,
|
|
43
|
+
});
|
|
44
|
+
}
|
|
40
45
|
}
|
|
41
46
|
if (typeof headerValue !== 'string') {
|
|
42
47
|
next();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"module.js","sourceRoot":"","sources":["../../../../../src/http/middleware/built-in/auth/module.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,iCAA+E;AAC/E,uCAA+B;AAC/B,mCAAqC;AAKrC,iDAA6E;AAC7E,uCAA0D;AAC1D,yDAAoD;AACpD,+CAA+C;AAC/C,0CAA+C;AAC/C,qCAAqD;AAErD,SAAS,6BAA6B,CAAC,OAAgB;IACnD,OAAO,IAAA,yBAAgB,EAAC,OAAO,EAAE,iBAAU,CAAC,YAAY,CAAC,CAAC;AAC9D,CAAC;AAED,SAAS,YAAY,CAAC,GAAa;IAC/B,MAAM,MAAM,GAAG,IAAA,kBAAS,GAAE,CAAC;IAC3B,MAAM,aAAa,GAAsB,EAAE,CAAC;IAE5C,IAAI,MAAM,CAAC,GAAG,KAAK,mCAAe,CAAC,UAAU,EAAE,CAAC;QAC5C,aAAa,CAAC,MAAM,GAAG,IAAI,cAAG,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC;IAC9D,CAAC;IAED,IAAA,4BAAmB,EAAC,GAAG,EAAE,iBAAU,CAAC,YAAY,EAAE,aAAa,CAAC,CAAC;IACjE,IAAA,4BAAmB,EAAC,GAAG,EAAE,iBAAU,CAAC,aAAa,EAAE,aAAa,CAAC,CAAC;IAClE,IAAA,4BAAmB,EAAC,GAAG,EAAE,iBAAU,CAAC,wBAAwB,EAAE,aAAa,CAAC,CAAC;AACjF,CAAC;AAED,SAAgB,sBAAsB,CAAC,MAAc;IACjD,MAAM,CAAC,GAAG,CAAC,IAAA,oBAAW,EAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE;QACrD,IAAI,EAAE,aAAa,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;QAErD,IAAA,qBAAa,EAAC,OAAO,EAAE,SAAS,EAAE,IAAI,qBAAc,EAAE,CAAC,CAAC;QAExD,IAAI,CAAC;YACD,MAAM,MAAM,GAAG,6BAA6B,CAAC,OAAO,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"module.js","sourceRoot":"","sources":["../../../../../src/http/middleware/built-in/auth/module.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,iCAA+E;AAC/E,uCAA+B;AAC/B,mCAAqC;AAKrC,iDAA6E;AAC7E,uCAA0D;AAC1D,yDAAoD;AACpD,+CAA+C;AAC/C,0CAA+C;AAC/C,qCAAqD;AAErD,SAAS,6BAA6B,CAAC,OAAgB;IACnD,OAAO,IAAA,yBAAgB,EAAC,OAAO,EAAE,iBAAU,CAAC,YAAY,CAAC,CAAC;AAC9D,CAAC;AAED,SAAS,YAAY,CAAC,GAAa;IAC/B,MAAM,MAAM,GAAG,IAAA,kBAAS,GAAE,CAAC;IAC3B,MAAM,aAAa,GAAsB,EAAE,CAAC;IAE5C,IAAI,MAAM,CAAC,GAAG,KAAK,mCAAe,CAAC,UAAU,EAAE,CAAC;QAC5C,aAAa,CAAC,MAAM,GAAG,IAAI,cAAG,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC;IAC9D,CAAC;IAED,IAAA,4BAAmB,EAAC,GAAG,EAAE,iBAAU,CAAC,YAAY,EAAE,aAAa,CAAC,CAAC;IACjE,IAAA,4BAAmB,EAAC,GAAG,EAAE,iBAAU,CAAC,aAAa,EAAE,aAAa,CAAC,CAAC;IAClE,IAAA,4BAAmB,EAAC,GAAG,EAAE,iBAAU,CAAC,wBAAwB,EAAE,aAAa,CAAC,CAAC;AACjF,CAAC;AAED,SAAgB,sBAAsB,CAAC,MAAc;IACjD,MAAM,CAAC,GAAG,CAAC,IAAA,oBAAW,EAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE;QACrD,IAAI,EAAE,aAAa,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;QAErD,IAAA,qBAAa,EAAC,OAAO,EAAE,SAAS,EAAE,IAAI,qBAAc,EAAE,CAAC,CAAC;QAExD,IAAI,CAAC;YACD,IAAI,OAAO,WAAW,KAAK,WAAW,EAAE,CAAC;gBACrC,MAAM,MAAM,GAAG,6BAA6B,CAAC,OAAO,CAAC,CAAC;gBACtD,IAAI,MAAM,EAAE,CAAC;oBACT,WAAW,GAAG,IAAA,oCAA4B,EAAC;wBACvC,IAAI,EAAE,QAAQ;wBACd,KAAK,EAAE,MAAM;qBAChB,CAAC,CAAC;gBACP,CAAC;YACL,CAAC;YAED,IAAI,OAAO,WAAW,KAAK,QAAQ,EAAE,CAAC;gBAClC,IAAI,EAAE,CAAC;gBACP,OAAO;YACX,CAAC;YAED,MAAM,MAAM,GAAG,IAAA,gCAAwB,EAAC,WAAW,CAAC,CAAC;YAErD,MAAM,IAAA,kCAAyB,EAAC,OAAO,EAAE,MAAM,CAAC,CAAC;YAEjD,IAAI,EAAE,CAAC;QACX,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACT,YAAY,CAAC,QAAQ,CAAC,CAAC;YACvB,IAAI,CAAC,CAAC,CAAC,CAAC;QACZ,CAAC;IACL,CAAC,CAAC,CAAC,CAAC;AACR,CAAC;AAhCD,wDAgCC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"verify.d.ts","sourceRoot":"","sources":["../../../../../src/http/middleware/built-in/auth/verify.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"verify.d.ts","sourceRoot":"","sources":["../../../../../src/http/middleware/built-in/auth/verify.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EACR,mBAAmB,EAGtB,MAAM,OAAO,CAAC;AAKf,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;AAoItC,wBAAsB,yBAAyB,CAC3C,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,mBAAmB,GAC3B,OAAO,CAAC,IAAI,CAAC,CAShB"}
|
|
@@ -63,42 +63,42 @@ async function verifyBasicAuthorizationHeader(request, header) {
|
|
|
63
63
|
let permissions = [];
|
|
64
64
|
const config = (0, config_1.useConfig)();
|
|
65
65
|
const dataSource = await (0, typeorm_extension_1.useDataSource)();
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
if (config.env !== typeorm_extension_1.EnvironmentName.PRODUCTION) {
|
|
66
|
+
if (config.userAuthBasic) {
|
|
67
|
+
const userRepository = new domains_1.UserRepository(dataSource);
|
|
68
|
+
const user = await userRepository.verifyCredentials(header.username, header.password);
|
|
69
|
+
if (user) {
|
|
70
|
+
await userRepository.appendAttributes(user);
|
|
72
71
|
permissions = await userRepository.getOwnedPermissions(user.id);
|
|
72
|
+
(0, utils_1.setRequestEnv)(request, 'ability', new core_1.AbilityManager(permissions));
|
|
73
|
+
(0, utils_1.setRequestEnv)(request, 'scopes', [core_1.ScopeName.GLOBAL]);
|
|
74
|
+
(0, utils_1.setRequestEnv)(request, 'user', user);
|
|
75
|
+
(0, utils_1.setRequestEnv)(request, 'userId', user.id);
|
|
76
|
+
(0, utils_1.setRequestEnv)(request, 'realm', user.realm);
|
|
77
|
+
return;
|
|
73
78
|
}
|
|
74
|
-
(0, utils_1.setRequestEnv)(request, 'ability', new core_1.AbilityManager(permissions));
|
|
75
|
-
(0, utils_1.setRequestEnv)(request, 'scopes', [core_1.ScopeName.GLOBAL]);
|
|
76
|
-
(0, utils_1.setRequestEnv)(request, 'user', user);
|
|
77
|
-
(0, utils_1.setRequestEnv)(request, 'userId', user.id);
|
|
78
|
-
(0, utils_1.setRequestEnv)(request, 'realm', user.realm);
|
|
79
|
-
return;
|
|
80
79
|
}
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
if (config.env !== typeorm_extension_1.EnvironmentName.PRODUCTION) {
|
|
80
|
+
if (config.robotAuthBasic) {
|
|
81
|
+
const robotRepository = new domains_1.RobotRepository(dataSource);
|
|
82
|
+
const robot = await robotRepository.verifyCredentials(header.username, header.password);
|
|
83
|
+
if (robot) {
|
|
86
84
|
permissions = await robotRepository.getOwnedPermissions(robot.id);
|
|
85
|
+
(0, utils_1.setRequestEnv)(request, 'ability', new core_1.AbilityManager(permissions));
|
|
86
|
+
(0, utils_1.setRequestEnv)(request, 'scopes', [core_1.ScopeName.GLOBAL]);
|
|
87
|
+
(0, utils_1.setRequestEnv)(request, 'robot', robot);
|
|
88
|
+
(0, utils_1.setRequestEnv)(request, 'robotId', robot.id);
|
|
89
|
+
(0, utils_1.setRequestEnv)(request, 'realm', robot.realm);
|
|
87
90
|
}
|
|
88
|
-
(0, utils_1.setRequestEnv)(request, 'ability', new core_1.AbilityManager(permissions));
|
|
89
|
-
(0, utils_1.setRequestEnv)(request, 'scopes', [core_1.ScopeName.GLOBAL]);
|
|
90
|
-
(0, utils_1.setRequestEnv)(request, 'robot', robot);
|
|
91
|
-
(0, utils_1.setRequestEnv)(request, 'robotId', robot.id);
|
|
92
|
-
(0, utils_1.setRequestEnv)(request, 'realm', robot.realm);
|
|
93
91
|
}
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
(
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
92
|
+
if (config.clientAuthBasic) {
|
|
93
|
+
const clientRepository = new domains_1.ClientRepository(dataSource);
|
|
94
|
+
const oauth2Client = await clientRepository.verifyCredentials(header.username, header.password);
|
|
95
|
+
if (oauth2Client) {
|
|
96
|
+
(0, utils_1.setRequestEnv)(request, 'ability', new core_1.AbilityManager());
|
|
97
|
+
(0, utils_1.setRequestEnv)(request, 'scopes', [core_1.ScopeName.GLOBAL]);
|
|
98
|
+
(0, utils_1.setRequestEnv)(request, 'client', oauth2Client);
|
|
99
|
+
(0, utils_1.setRequestEnv)(request, 'clientId', oauth2Client.id);
|
|
100
|
+
(0, utils_1.setRequestEnv)(request, 'realm', oauth2Client.realm);
|
|
101
|
+
}
|
|
102
102
|
}
|
|
103
103
|
}
|
|
104
104
|
async function verifyAuthorizationHeader(request, header) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"verify.js","sourceRoot":"","sources":["../../../../../src/http/middleware/built-in/auth/verify.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAGH,
|
|
1
|
+
{"version":3,"file":"verify.js","sourceRoot":"","sources":["../../../../../src/http/middleware/built-in/auth/verify.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rate-limit.d.ts","sourceRoot":"","sources":["../../../../src/http/middleware/built-in/rate-limit.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAEvD,OAAO,KAAK,EAAW,MAAM,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"rate-limit.d.ts","sourceRoot":"","sources":["../../../../src/http/middleware/built-in/rate-limit.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAEvD,OAAO,KAAK,EAAW,MAAM,EAAE,MAAM,QAAQ,CAAC;AAK9C,wBAAgB,2BAA2B,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,YAAY,QAoC/E"}
|
|
@@ -10,15 +10,17 @@ exports.registerRateLimitMiddleware = void 0;
|
|
|
10
10
|
const core_1 = require("@authup/core");
|
|
11
11
|
const rate_limit_1 = require("@routup/rate-limit");
|
|
12
12
|
const smob_1 = require("smob");
|
|
13
|
+
const config_1 = require("../../../config");
|
|
13
14
|
const utils_1 = require("../../utils");
|
|
14
15
|
function registerRateLimitMiddleware(router, input) {
|
|
16
|
+
const config = (0, config_1.useConfig)();
|
|
15
17
|
let options = {
|
|
16
18
|
skip(req) {
|
|
17
19
|
const robot = (0, utils_1.useRequestEnv)(req, 'robot');
|
|
18
20
|
if (robot) {
|
|
19
21
|
const { name } = (0, utils_1.useRequestEnv)(req, 'realm');
|
|
20
22
|
if (name === core_1.REALM_MASTER_NAME &&
|
|
21
|
-
robot.name ===
|
|
23
|
+
robot.name === config.robotAdminName) {
|
|
22
24
|
return true;
|
|
23
25
|
}
|
|
24
26
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rate-limit.js","sourceRoot":"","sources":["../../../../src/http/middleware/built-in/rate-limit.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,
|
|
1
|
+
{"version":3,"file":"rate-limit.js","sourceRoot":"","sources":["../../../../src/http/middleware/built-in/rate-limit.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,uCAAiD;AAEjD,mDAA+C;AAE/C,+BAA6B;AAC7B,4CAA4C;AAC5C,uCAA4C;AAE5C,SAAgB,2BAA2B,CAAC,MAAc,EAAE,KAAoB;IAC5E,MAAM,MAAM,GAAG,IAAA,kBAAS,GAAE,CAAC;IAC3B,IAAI,OAAO,GAAkB;QACzB,IAAI,CAAC,GAAY;YACb,MAAM,KAAK,GAAG,IAAA,qBAAa,EAAC,GAAG,EAAE,OAAO,CAAC,CAAC;YAC1C,IAAI,KAAK,EAAE,CAAC;gBACR,MAAM,EAAE,IAAI,EAAE,GAAG,IAAA,qBAAa,EAAC,GAAG,EAAE,OAAO,CAAC,CAAC;gBAE7C,IACI,IAAI,KAAK,wBAAiB;oBAC1B,KAAK,CAAC,IAAI,KAAK,MAAM,CAAC,cAAc,EACtC,CAAC;oBACC,OAAO,IAAI,CAAC;gBAChB,CAAC;YACL,CAAC;YAED,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,GAAG,CAAC,GAAY;YACZ,IAAI,IAAA,qBAAa,EAAC,GAAG,EAAE,QAAQ,CAAC,EAAE,CAAC;gBAC/B,OAAO,EAAE,GAAG,GAAG,CAAC,CAAC,iBAAiB;YACtC,CAAC;YAED,MAAM,KAAK,GAAG,IAAA,qBAAa,EAAC,GAAG,EAAE,OAAO,CAAC,CAAC;YAC1C,IAAI,KAAK,EAAE,CAAC;gBACR,OAAO,EAAE,GAAG,IAAI,CAAC,CAAC,kBAAkB;YACxC,CAAC;YAED,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC,gBAAgB;QACpC,CAAC;QACD,QAAQ,EAAE,EAAE,GAAG,IAAI,EAAE,SAAS;KACjC,CAAC;IAEF,OAAO,GAAG,IAAA,YAAK,EAAC,KAAK,IAAI,EAAE,EAAE,OAAO,CAAC,CAAC;IAEtC,MAAM,CAAC,GAAG,CAAC,IAAA,sBAAS,EAAC,OAAO,CAAC,CAAC,CAAC;AACnC,CAAC;AApCD,kEAoCC"}
|