@authup/server-core 1.0.0-beta.2 → 1.0.0-beta.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/LICENSE +201 -21
- package/README.md +1 -1
- package/dist/config/build.d.ts.map +1 -1
- package/dist/config/build.js +2 -1
- package/dist/config/build.js.map +1 -1
- package/dist/config/utils/env.d.ts.map +1 -1
- package/dist/config/utils/env.js +69 -41
- package/dist/config/utils/env.js.map +1 -1
- package/dist/core/index.d.ts +1 -0
- package/dist/core/index.d.ts.map +1 -1
- package/dist/core/index.js +1 -0
- package/dist/core/index.js.map +1 -1
- package/dist/core/ldap/index.d.ts +3 -0
- package/dist/core/ldap/index.d.ts.map +1 -0
- package/dist/core/ldap/index.js +25 -0
- package/dist/core/ldap/index.js.map +1 -0
- package/dist/core/ldap/module.d.ts +19 -0
- package/dist/core/ldap/module.d.ts.map +1 -0
- package/dist/core/ldap/module.js +192 -0
- package/dist/core/ldap/module.js.map +1 -0
- package/dist/core/ldap/types.d.ts +10 -0
- package/dist/core/ldap/types.d.ts.map +1 -0
- package/dist/core/ldap/types.js +9 -0
- package/dist/core/ldap/types.js.map +1 -0
- package/dist/core/logger/module.js +2 -2
- package/dist/core/logger/module.js.map +1 -1
- package/dist/domains/identity-provider/flow/core/index.d.ts +1 -0
- package/dist/domains/identity-provider/flow/core/index.d.ts.map +1 -1
- package/dist/domains/identity-provider/flow/core/index.js +1 -0
- package/dist/domains/identity-provider/flow/core/index.js.map +1 -1
- package/dist/domains/identity-provider/flow/core/ldap.d.ts +14 -0
- package/dist/domains/identity-provider/flow/core/ldap.d.ts.map +1 -0
- package/dist/domains/identity-provider/flow/core/ldap.js +150 -0
- package/dist/domains/identity-provider/flow/core/ldap.js.map +1 -0
- package/dist/domains/identity-provider/flow/types.d.ts +7 -3
- package/dist/domains/identity-provider/flow/types.d.ts.map +1 -1
- package/dist/domains/identity-provider/protocol/ldap/extract.d.ts.map +1 -1
- package/dist/domains/identity-provider/protocol/ldap/extract.js +31 -2
- package/dist/domains/identity-provider/protocol/ldap/extract.js.map +1 -1
- package/dist/domains/identity-provider/protocol/ldap/validation.d.ts +5 -1
- package/dist/domains/identity-provider/protocol/ldap/validation.d.ts.map +1 -1
- package/dist/domains/identity-provider/protocol/ldap/validation.js +39 -4
- package/dist/domains/identity-provider/protocol/ldap/validation.js.map +1 -1
- package/dist/domains/identity-provider/protocol/oauth2/validation.d.ts +2 -2
- package/dist/domains/identity-provider/protocol/oauth2/validation.d.ts.map +1 -1
- package/dist/domains/identity-provider/protocol/oauth2/validation.js +6 -7
- package/dist/domains/identity-provider/protocol/oauth2/validation.js.map +1 -1
- package/dist/domains/identity-provider-account/utils.d.ts +1 -1
- package/dist/domains/identity-provider-account/utils.d.ts.map +1 -1
- package/dist/domains/identity-provider-account/utils.js +43 -14
- package/dist/domains/identity-provider-account/utils.js.map +1 -1
- package/dist/domains/identity-provider-attribute/entity.d.ts.map +1 -1
- package/dist/domains/identity-provider-attribute/entity.js +13 -1
- package/dist/domains/identity-provider-attribute/entity.js.map +1 -1
- package/dist/domains/robot/repository.js +1 -1
- package/dist/domains/robot/repository.js.map +1 -1
- package/dist/domains/robot-permission/entity.d.ts +2 -2
- package/dist/domains/robot-permission/entity.d.ts.map +1 -1
- package/dist/domains/robot-permission/entity.js +15 -2
- package/dist/domains/robot-permission/entity.js.map +1 -1
- package/dist/domains/role/repository.js +1 -1
- package/dist/domains/role/repository.js.map +1 -1
- package/dist/domains/role-attribute/entity.d.ts.map +1 -1
- package/dist/domains/role-attribute/entity.js +13 -1
- package/dist/domains/role-attribute/entity.js.map +1 -1
- package/dist/domains/role-permission/entity.d.ts +2 -2
- package/dist/domains/role-permission/entity.d.ts.map +1 -1
- package/dist/domains/role-permission/entity.js +15 -2
- package/dist/domains/role-permission/entity.js.map +1 -1
- package/dist/domains/user/repository.js +1 -1
- package/dist/domains/user/repository.js.map +1 -1
- package/dist/domains/user-attribute/entity.d.ts.map +1 -1
- package/dist/domains/user-attribute/entity.js +13 -1
- package/dist/domains/user-attribute/entity.js.map +1 -1
- package/dist/domains/user-permission/entity.d.ts +2 -2
- package/dist/domains/user-permission/entity.d.ts.map +1 -1
- package/dist/domains/user-permission/entity.js +15 -2
- package/dist/domains/user-permission/entity.js.map +1 -1
- package/dist/domains/utils/attribute.js +1 -1
- package/dist/domains/utils/attribute.js.map +1 -1
- package/dist/http/controllers/identity-provider/handlers/custom.js +1 -1
- package/dist/http/controllers/identity-provider/handlers/custom.js.map +1 -1
- package/dist/http/controllers/identity-provider/handlers/read.js +1 -1
- package/dist/http/controllers/identity-provider/handlers/read.js.map +1 -1
- package/dist/http/controllers/identity-provider/utils/validation.d.ts.map +1 -1
- package/dist/http/controllers/identity-provider/utils/validation.js +4 -0
- package/dist/http/controllers/identity-provider/utils/validation.js.map +1 -1
- package/dist/http/controllers/robot-permission/utils/validation.d.ts.map +1 -1
- package/dist/http/controllers/robot-permission/utils/validation.js +5 -0
- package/dist/http/controllers/robot-permission/utils/validation.js.map +1 -1
- package/dist/http/controllers/role-attribute/handlers/update.js +6 -6
- package/dist/http/controllers/role-attribute/handlers/update.js.map +1 -1
- package/dist/http/controllers/role-permission/utils/validation.d.ts.map +1 -1
- package/dist/http/controllers/role-permission/utils/validation.js +5 -0
- package/dist/http/controllers/role-permission/utils/validation.js.map +1 -1
- package/dist/http/controllers/user-permission/utils/validation.d.ts.map +1 -1
- package/dist/http/controllers/user-permission/utils/validation.js +5 -0
- package/dist/http/controllers/user-permission/utils/validation.js.map +1 -1
- package/dist/http/oauth2/grant-types/password.d.ts +2 -1
- package/dist/http/oauth2/grant-types/password.d.ts.map +1 -1
- package/dist/http/oauth2/grant-types/password.js +57 -4
- package/dist/http/oauth2/grant-types/password.js.map +1 -1
- package/dist/http/validation/utils.d.ts +2 -0
- package/dist/http/validation/utils.d.ts.map +1 -1
- package/dist/http/validation/utils.js +15 -2
- package/dist/http/validation/utils.js.map +1 -1
- package/package.json +16 -12
|
@@ -50,7 +50,7 @@ async function authorizeCallbackIdentityProviderRouteHandler(req, res) {
|
|
|
50
50
|
}
|
|
51
51
|
const flow = (0, domains_1.createOAuth2IdentityProviderFlow)(entity);
|
|
52
52
|
const identity = await flow.getIdentityForRequest(req);
|
|
53
|
-
const account = await (0, domains_1.
|
|
53
|
+
const account = await (0, domains_1.createIdentityProviderAccount)(entity, identity);
|
|
54
54
|
const grant = new oauth2_1.InternalGrantType();
|
|
55
55
|
(0, utils_1.setRequestEnv)(req, 'userId', account.user_id);
|
|
56
56
|
(0, utils_1.setRequestEnv)(req, 'realm', entity.realm);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"custom.js","sourceRoot":"","sources":["../../../../../src/http/controllers/identity-provider/handlers/custom.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,uCAA+B;AAC/B,qCAA4D;AAC5D,uCAGsB;AAEtB,iDAAyD;AAEzD,mCAAuD;AACvD,yDAAmE;AACnE,
|
|
1
|
+
{"version":3,"file":"custom.js","sourceRoot":"","sources":["../../../../../src/http/controllers/identity-provider/handlers/custom.ts"],"names":[],"mappings":"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"}
|
|
@@ -37,7 +37,7 @@ async function getManyIdentityProviderRouteHandler(req, res) {
|
|
|
37
37
|
],
|
|
38
38
|
},
|
|
39
39
|
filters: {
|
|
40
|
-
allowed: ['name', 'realm_id', 'realm.name'],
|
|
40
|
+
allowed: ['name', 'protocol', 'enabled', 'realm_id', 'realm.name'],
|
|
41
41
|
},
|
|
42
42
|
sort: {
|
|
43
43
|
allowed: ['id', 'created_at', 'updated_at'],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"read.js","sourceRoot":"","sources":["../../../../../src/http/controllers/identity-provider/handlers/read.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,+CAAsD;AAEtD,mCAA+C;AAC/C,yDAG2B;AAC3B,qCAA2C;AAC3C,uCAAsD;AACtD,iDAAuG;AACvG,0CAA+C;AAExC,KAAK,UAAU,mCAAmC,CAAC,GAAY,EAAE,GAAa;IACjF,MAAM,UAAU,GAAG,MAAM,IAAA,iCAAa,GAAE,CAAC;IACzC,MAAM,UAAU,GAAG,UAAU,CAAC,aAAa,CAAC,gCAAsB,CAAC,CAAC;IAEpE,MAAM,KAAK,GAAG,UAAU,CAAC,kBAAkB,CAAC,UAAU,CAAC,CAAC;IAExD,MAAM,EAAE,UAAU,EAAE,GAAG,IAAA,8BAAU,EAAC,KAAK,EAAE,IAAA,uBAAe,EAAC,GAAG,CAAC,EAAE;QAC3D,YAAY,EAAE,UAAU;QACxB,SAAS,EAAE;YACP,OAAO,EAAE,CAAC,OAAO,CAAC;SACrB;QACD,MAAM,EAAE;YACJ,OAAO,EAAE;gBACL,IAAI;gBACJ,MAAM;gBACN,MAAM;gBACN,UAAU;gBACV,QAAQ;gBACR,SAAS;gBACT,UAAU;gBACV,YAAY;gBACZ,YAAY;aACf;SACJ;QACD,OAAO,EAAE;YACL,OAAO,EAAE,CAAC,MAAM,EAAE,UAAU,EAAE,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"read.js","sourceRoot":"","sources":["../../../../../src/http/controllers/identity-provider/handlers/read.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validation.d.ts","sourceRoot":"","sources":["../../../../../src/http/controllers/identity-provider/utils/validation.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"validation.d.ts","sourceRoot":"","sources":["../../../../../src/http/controllers/identity-provider/utils/validation.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;AAEtC,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAOlE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,qBAAqB,CAAC;AASnE,OAAO,EAAE,uBAAuB,EAAE,MAAM,kBAAkB,CAAC;AAE3D,wBAAsB,2BAA2B,CAC7C,GAAG,EAAE,OAAO,EACZ,SAAS,EAAE,GAAG,uBAAuB,CAAC,MAAM,EAAE,GAAG,GAAG,uBAAuB,CAAC,MAAM,EAAE,GACpF,OAAO,CAAC,uBAAuB,CAAC,sBAAsB,EAAE;IAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;CAAC,CAAC,CAAC,CAsH9F"}
|
|
@@ -10,6 +10,7 @@ exports.runOauth2ProviderValidation = void 0;
|
|
|
10
10
|
const express_validator_1 = require("express-validator");
|
|
11
11
|
const core_1 = require("@authup/core");
|
|
12
12
|
const http_1 = require("@ebec/http");
|
|
13
|
+
const zod_1 = require("zod");
|
|
13
14
|
const domains_1 = require("../../../../domains");
|
|
14
15
|
const utils_1 = require("../../../utils");
|
|
15
16
|
const validation_1 = require("../../../validation");
|
|
@@ -86,6 +87,9 @@ async function runOauth2ProviderValidation(req, operation) {
|
|
|
86
87
|
}
|
|
87
88
|
}
|
|
88
89
|
catch (e) {
|
|
90
|
+
if (e instanceof zod_1.ZodError) {
|
|
91
|
+
throw new http_1.BadRequestError((0, validation_1.buildRequestValidationErrorMessageForZodError)(e));
|
|
92
|
+
}
|
|
89
93
|
if (e instanceof Error) {
|
|
90
94
|
throw new http_1.BadRequestError(e.message, {
|
|
91
95
|
cause: e,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validation.js","sourceRoot":"","sources":["../../../../../src/http/controllers/identity-provider/utils/validation.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,yDAAmE;AACnE,uCAMsB;AACtB,qCAA6C;
|
|
1
|
+
{"version":3,"file":"validation.js","sourceRoot":"","sources":["../../../../../src/http/controllers/identity-provider/utils/validation.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validation.d.ts","sourceRoot":"","sources":["../../../../../src/http/controllers/robot-permission/utils/validation.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAC;AAGjE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,qBAAqB,CAAC;AAQnE,OAAO,EAAE,uBAAuB,EAAE,MAAM,4BAA4B,CAAC;AAErE,wBAAsB,4BAA4B,CAC9C,GAAG,EAAE,OAAO,EACZ,SAAS,EAAE,GAAG,uBAAuB,CAAC,MAAM,EAAE,GAAG,GAAG,uBAAuB,CAAC,MAAM,EAAE,GACpF,OAAO,CAAC,uBAAuB,CAAC,qBAAqB,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"validation.d.ts","sourceRoot":"","sources":["../../../../../src/http/controllers/robot-permission/utils/validation.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAC;AAGjE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,qBAAqB,CAAC;AAQnE,OAAO,EAAE,uBAAuB,EAAE,MAAM,4BAA4B,CAAC;AAErE,wBAAsB,4BAA4B,CAC9C,GAAG,EAAE,OAAO,EACZ,SAAS,EAAE,GAAG,uBAAuB,CAAC,MAAM,EAAE,GAAG,GAAG,uBAAuB,CAAC,MAAM,EAAE,GACpF,OAAO,CAAC,uBAAuB,CAAC,qBAAqB,CAAC,CAAC,CAsF1D"}
|
|
@@ -32,6 +32,11 @@ async function runRobotPermissionValidation(req, operation) {
|
|
|
32
32
|
.optional({ nullable: true })
|
|
33
33
|
.run(req);
|
|
34
34
|
}
|
|
35
|
+
await (0, express_validator_1.check)('condition')
|
|
36
|
+
.exists()
|
|
37
|
+
.isObject()
|
|
38
|
+
.optional({ nullable: true })
|
|
39
|
+
.run(req);
|
|
35
40
|
// ----------------------------------------------
|
|
36
41
|
const validation = (0, express_validator_1.validationResult)(req);
|
|
37
42
|
if (!validation.isEmpty()) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validation.js","sourceRoot":"","sources":["../../../../../src/http/controllers/robot-permission/utils/validation.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"validation.js","sourceRoot":"","sources":["../../../../../src/http/controllers/robot-permission/utils/validation.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,12 +12,12 @@ const core_1 = require("@authup/core");
|
|
|
12
12
|
const routup_1 = require("routup");
|
|
13
13
|
const typeorm_extension_1 = require("typeorm-extension");
|
|
14
14
|
const domains_1 = require("../../../../domains");
|
|
15
|
-
const
|
|
16
|
-
const
|
|
17
|
-
const
|
|
15
|
+
const utils_1 = require("../../../utils");
|
|
16
|
+
const utils_2 = require("../utils");
|
|
17
|
+
const request_1 = require("../../../request");
|
|
18
18
|
async function updateRoleAttributeRouteHandler(req, res) {
|
|
19
19
|
const id = (0, routup_1.useRequestParam)(req, 'id');
|
|
20
|
-
const result = await (0,
|
|
20
|
+
const result = await (0, utils_2.runRoleAttributeValidation)(req, request_1.RequestHandlerOperation.UPDATE);
|
|
21
21
|
if (!result) {
|
|
22
22
|
return (0, routup_1.sendAccepted)(res);
|
|
23
23
|
}
|
|
@@ -28,9 +28,9 @@ async function updateRoleAttributeRouteHandler(req, res) {
|
|
|
28
28
|
throw new http_1.NotFoundError();
|
|
29
29
|
}
|
|
30
30
|
entity = repository.merge(entity, result.data);
|
|
31
|
-
const ability = (0,
|
|
31
|
+
const ability = (0, utils_1.useRequestEnv)(req, 'ability');
|
|
32
32
|
if (!ability.has(core_1.PermissionName.ROLE_EDIT) ||
|
|
33
|
-
!(0, core_1.isRealmResourceWritable)((0,
|
|
33
|
+
!(0, core_1.isRealmResourceWritable)((0, utils_1.useRequestEnv)(req, 'realm'), entity.realm_id)) {
|
|
34
34
|
throw new http_1.ForbiddenError('You are not permitted to update an attribute for this role...');
|
|
35
35
|
}
|
|
36
36
|
await repository.save(entity);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../../../src/http/controllers/role-attribute/handlers/update.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,qCAA2D;AAE3D,uCAAuE;AAEvE,mCAAuD;AACvD,yDAAkD;AAClD,iDAA0D;AAC1D,
|
|
1
|
+
{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../../../src/http/controllers/role-attribute/handlers/update.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,qCAA2D;AAE3D,uCAAuE;AAEvE,mCAAuD;AACvD,yDAAkD;AAClD,iDAA0D;AAC1D,0CAA+C;AAC/C,oCAAsD;AACtD,8CAA2D;AAEpD,KAAK,UAAU,+BAA+B,CAAC,GAAY,EAAE,GAAa;IAC7E,MAAM,EAAE,GAAG,IAAA,wBAAe,EAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IAEtC,MAAM,MAAM,GAAG,MAAM,IAAA,kCAA0B,EAAC,GAAG,EAAE,iCAAuB,CAAC,MAAM,CAAC,CAAC;IACrF,IAAI,CAAC,MAAM,EAAE,CAAC;QACV,OAAO,IAAA,qBAAY,EAAC,GAAG,CAAC,CAAC;IAC7B,CAAC;IAED,MAAM,UAAU,GAAG,MAAM,IAAA,iCAAa,GAAE,CAAC;IACzC,MAAM,UAAU,GAAG,UAAU,CAAC,aAAa,CAAC,6BAAmB,CAAC,CAAC;IAEjE,IAAI,MAAM,GAAG,MAAM,UAAU,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;IAChD,IAAI,CAAC,MAAM,EAAE,CAAC;QACV,MAAM,IAAI,oBAAa,EAAE,CAAC;IAC9B,CAAC;IAED,MAAM,GAAG,UAAU,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;IAE/C,MAAM,OAAO,GAAG,IAAA,qBAAa,EAAC,GAAG,EAAE,SAAS,CAAC,CAAC;IAC9C,IACI,CAAC,OAAO,CAAC,GAAG,CAAC,qBAAc,CAAC,SAAS,CAAC;QACtC,CAAC,IAAA,8BAAuB,EAAC,IAAA,qBAAa,EAAC,GAAG,EAAE,OAAO,CAAC,EAAE,MAAM,CAAC,QAAQ,CAAC,EACxE,CAAC;QACC,MAAM,IAAI,qBAAc,CAAC,+DAA+D,CAAC,CAAC;IAC9F,CAAC;IAED,MAAM,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAE9B,OAAO,IAAA,qBAAY,EAAC,GAAG,EAAE,MAAM,CAAC,CAAC;AACrC,CAAC;AA7BD,0EA6BC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validation.d.ts","sourceRoot":"","sources":["../../../../../src/http/controllers/role-permission/utils/validation.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAGhE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,qBAAqB,CAAC;AAQnE,OAAO,EAAE,uBAAuB,EAAE,MAAM,4BAA4B,CAAC;AAErE,wBAAsB,2BAA2B,CAC7C,GAAG,EAAE,OAAO,EACZ,SAAS,EAAE,GAAG,uBAAuB,CAAC,MAAM,EAAE,GAAG,GAAG,uBAAuB,CAAC,MAAM,EAAE,GACpF,OAAO,CAAC,uBAAuB,CAAC,oBAAoB,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"validation.d.ts","sourceRoot":"","sources":["../../../../../src/http/controllers/role-permission/utils/validation.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAGhE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,qBAAqB,CAAC;AAQnE,OAAO,EAAE,uBAAuB,EAAE,MAAM,4BAA4B,CAAC;AAErE,wBAAsB,2BAA2B,CAC7C,GAAG,EAAE,OAAO,EACZ,SAAS,EAAE,GAAG,uBAAuB,CAAC,MAAM,EAAE,GAAG,GAAG,uBAAuB,CAAC,MAAM,EAAE,GACpF,OAAO,CAAC,uBAAuB,CAAC,oBAAoB,CAAC,CAAC,CAkFzD"}
|
|
@@ -32,6 +32,11 @@ async function runRolePermissionValidation(req, operation) {
|
|
|
32
32
|
.optional({ nullable: true })
|
|
33
33
|
.run(req);
|
|
34
34
|
}
|
|
35
|
+
await (0, express_validator_1.check)('condition')
|
|
36
|
+
.exists()
|
|
37
|
+
.isObject()
|
|
38
|
+
.optional({ nullable: true })
|
|
39
|
+
.run(req);
|
|
35
40
|
// ----------------------------------------------
|
|
36
41
|
const validation = (0, express_validator_1.validationResult)(req);
|
|
37
42
|
if (!validation.isEmpty()) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validation.js","sourceRoot":"","sources":["../../../../../src/http/controllers/role-permission/utils/validation.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"validation.js","sourceRoot":"","sources":["../../../../../src/http/controllers/role-permission/utils/validation.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validation.d.ts","sourceRoot":"","sources":["../../../../../src/http/controllers/user-permission/utils/validation.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAKhE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,qBAAqB,CAAC;AAQnE,OAAO,EAAE,uBAAuB,EAAE,MAAM,4BAA4B,CAAC;AAErE,wBAAsB,2BAA2B,CAC7C,GAAG,EAAE,OAAO,EACZ,SAAS,EAAE,GAAG,uBAAuB,CAAC,MAAM,EAAE,GAAG,GAAG,uBAAuB,CAAC,MAAM,EAAE,GACpF,OAAO,CAAC,uBAAuB,CAAC,oBAAoB,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"validation.d.ts","sourceRoot":"","sources":["../../../../../src/http/controllers/user-permission/utils/validation.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAKhE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,qBAAqB,CAAC;AAQnE,OAAO,EAAE,uBAAuB,EAAE,MAAM,4BAA4B,CAAC;AAErE,wBAAsB,2BAA2B,CAC7C,GAAG,EAAE,OAAO,EACZ,SAAS,EAAE,GAAG,uBAAuB,CAAC,MAAM,EAAE,GAAG,GAAG,uBAAuB,CAAC,MAAM,EAAE,GACpF,OAAO,CAAC,uBAAuB,CAAC,oBAAoB,CAAC,CAAC,CAoFzD"}
|
|
@@ -32,6 +32,11 @@ async function runUserPermissionValidation(req, operation) {
|
|
|
32
32
|
.optional({ nullable: true })
|
|
33
33
|
.run(req);
|
|
34
34
|
}
|
|
35
|
+
await (0, express_validator_1.check)('condition')
|
|
36
|
+
.exists()
|
|
37
|
+
.isObject()
|
|
38
|
+
.optional({ nullable: true })
|
|
39
|
+
.run(req);
|
|
35
40
|
// ----------------------------------------------
|
|
36
41
|
const validation = (0, express_validator_1.validationResult)(req);
|
|
37
42
|
if (!validation.isEmpty()) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validation.js","sourceRoot":"","sources":["../../../../../src/http/controllers/user-permission/utils/validation.ts"],"names":[],"mappings":"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
|
|
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,SAAS,CAAC,qBAAc,CAAC,mBAAmB,CAAC,CAAC;IAC/E,IAAI,gBAAgB,EAAE,CAAC;QACnB,MAAM,CAAC,IAAI,CAAC,MAAM,GAAG,gBAAgB,CAAC;IAC1C,CAAC;IAED,iDAAiD;IAEjD,MAAM,IAAA,sDAAyC,EAAC,MAAM,EAAE,oBAAU,EAAE;QAChE,EAAE,EAAE,SAAS;QACb,MAAM,EAAE,MAAM;KACjB,CAAC,CAAC;IAEH,IAAI,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;QACvB,IACI,CAAC,IAAA,8BAAuB,EAAC,IAAA,qBAAa,EAAC,GAAG,EAAE,OAAO,CAAC,EAAE,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,EACtF,CAAC;YACC,MAAM,IAAI,sBAAe,CAAC,IAAA,+CAAkC,EAAC,SAAS,CAAC,CAAC,CAAC;QAC7E,CAAC;QAED,MAAM,CAAC,IAAI,CAAC,aAAa,GAAG,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC;IAC9D,CAAC;IAED,iDAAiD;IAEjD,OAAO,MAAM,CAAC;AAClB,CAAC;AAvFD,kEAuFC"}
|
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
import type { OAuth2TokenGrantResponse } from '@authup/core';
|
|
2
2
|
import type { Request } from 'routup';
|
|
3
|
-
import
|
|
3
|
+
import { UserEntity } from '../../../domains';
|
|
4
4
|
import { AbstractGrant } from './abstract';
|
|
5
5
|
import type { Grant } from './type';
|
|
6
6
|
export declare class PasswordGrantType extends AbstractGrant implements Grant {
|
|
7
7
|
run(request: Request): Promise<OAuth2TokenGrantResponse>;
|
|
8
8
|
validate(request: Request): Promise<UserEntity>;
|
|
9
|
+
protected verifyCredentialsByLDAP(user: string, password: string, realmId?: string): Promise<UserEntity>;
|
|
9
10
|
}
|
|
10
11
|
//# sourceMappingURL=password.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"password.d.ts","sourceRoot":"","sources":["../../../../src/http/oauth2/grant-types/password.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"password.d.ts","sourceRoot":"","sources":["../../../../src/http/oauth2/grant-types/password.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAA2B,wBAAwB,EAAE,MAAM,cAAc,CAAC;AAKtF,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;AAItC,OAAO,EAEuB,UAAU,EAEvC,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAC3C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AAEpC,qBAAa,iBAAkB,SAAQ,aAAc,YAAW,KAAK;IAC3D,GAAG,CAAC,OAAO,EAAE,OAAO,GAAI,OAAO,CAAC,wBAAwB,CAAC;IAsBzD,QAAQ,CAAC,OAAO,EAAE,OAAO,GAAI,OAAO,CAAC,UAAU,CAAC;cAgCtC,uBAAuB,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAI,OAAO,CAAC,UAAU,CAAC;CA2DlH"}
|
|
@@ -12,8 +12,8 @@ const body_1 = require("@routup/basic/body");
|
|
|
12
12
|
const routup_1 = require("routup");
|
|
13
13
|
const typeorm_extension_1 = require("typeorm-extension");
|
|
14
14
|
const domains_1 = require("../../../domains");
|
|
15
|
-
const abstract_1 = require("./abstract");
|
|
16
15
|
const response_1 = require("../response");
|
|
16
|
+
const abstract_1 = require("./abstract");
|
|
17
17
|
class PasswordGrantType extends abstract_1.AbstractGrant {
|
|
18
18
|
async run(request) {
|
|
19
19
|
const user = await this.validate(request);
|
|
@@ -34,11 +34,15 @@ class PasswordGrantType extends abstract_1.AbstractGrant {
|
|
|
34
34
|
});
|
|
35
35
|
}
|
|
36
36
|
async validate(request) {
|
|
37
|
-
const { username, password, realm_id:
|
|
38
|
-
const realm = await (0, domains_1.resolveRealm)((0, routup_1.useRequestParam)(request, 'realmId') ||
|
|
37
|
+
const { username, password, realm_id: requestRealmId } = (0, body_1.useRequestBody)(request);
|
|
38
|
+
const realm = await (0, domains_1.resolveRealm)((0, routup_1.useRequestParam)(request, 'realmId') || requestRealmId);
|
|
39
39
|
const dataSource = await (0, typeorm_extension_1.useDataSource)();
|
|
40
40
|
const repository = new domains_1.UserRepository(dataSource);
|
|
41
|
-
const
|
|
41
|
+
const realmId = (0, core_1.extractObjectProperty)(realm, 'id');
|
|
42
|
+
let entity = await repository.verifyCredentials(username, password, realmId);
|
|
43
|
+
if (!entity) {
|
|
44
|
+
entity = await this.verifyCredentialsByLDAP(username, password, realmId);
|
|
45
|
+
}
|
|
42
46
|
if (!entity) {
|
|
43
47
|
throw core_1.UserError.credentialsInvalid();
|
|
44
48
|
}
|
|
@@ -47,6 +51,55 @@ class PasswordGrantType extends abstract_1.AbstractGrant {
|
|
|
47
51
|
}
|
|
48
52
|
return entity;
|
|
49
53
|
}
|
|
54
|
+
async verifyCredentialsByLDAP(user, password, realmId) {
|
|
55
|
+
const dataSource = await (0, typeorm_extension_1.useDataSource)();
|
|
56
|
+
const repository = new domains_1.IdentityProviderRepository(dataSource);
|
|
57
|
+
let entities = [];
|
|
58
|
+
if (realmId) {
|
|
59
|
+
entities = await repository.createQueryBuilder('provider')
|
|
60
|
+
.where('provider.realm_id = :realmId', { realmId })
|
|
61
|
+
.andWhere('provider.protocol = :protocol', { protocol: core_1.IdentityProviderProtocol.LDAP })
|
|
62
|
+
.getMany();
|
|
63
|
+
}
|
|
64
|
+
else {
|
|
65
|
+
entities = await repository.createQueryBuilder('provider')
|
|
66
|
+
.andWhere('provider.protocol = :protocol', { protocol: core_1.IdentityProviderProtocol.LDAP })
|
|
67
|
+
.getMany();
|
|
68
|
+
}
|
|
69
|
+
let account;
|
|
70
|
+
let identity;
|
|
71
|
+
for (let i = 0; i < entities.length; i++) {
|
|
72
|
+
const entity = await repository.extendEntity(entities[i]);
|
|
73
|
+
if (entity.protocol !== core_1.IdentityProviderProtocol.LDAP) {
|
|
74
|
+
continue;
|
|
75
|
+
}
|
|
76
|
+
const flow = new domains_1.LdapIdentityProviderFlow(entity);
|
|
77
|
+
try {
|
|
78
|
+
identity = await flow.getIdentityForCredentials(user, password);
|
|
79
|
+
await flow.unbind();
|
|
80
|
+
}
|
|
81
|
+
catch (e) {
|
|
82
|
+
await flow.unbind();
|
|
83
|
+
continue;
|
|
84
|
+
}
|
|
85
|
+
account = await (0, domains_1.createIdentityProviderAccount)(entity, identity);
|
|
86
|
+
break;
|
|
87
|
+
}
|
|
88
|
+
if (!account) {
|
|
89
|
+
return undefined;
|
|
90
|
+
}
|
|
91
|
+
if (account.user &&
|
|
92
|
+
account.user.realm) {
|
|
93
|
+
return account.user;
|
|
94
|
+
}
|
|
95
|
+
const userRepository = dataSource.getRepository(domains_1.UserEntity);
|
|
96
|
+
return userRepository.findOne({
|
|
97
|
+
where: {
|
|
98
|
+
id: account.user_id,
|
|
99
|
+
},
|
|
100
|
+
relations: ['realm'],
|
|
101
|
+
});
|
|
102
|
+
}
|
|
50
103
|
}
|
|
51
104
|
exports.PasswordGrantType = PasswordGrantType;
|
|
52
105
|
//# sourceMappingURL=password.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"password.js","sourceRoot":"","sources":["../../../../src/http/oauth2/grant-types/password.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAGH,
|
|
1
|
+
{"version":3,"file":"password.js","sourceRoot":"","sources":["../../../../src/http/oauth2/grant-types/password.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,10 @@
|
|
|
1
1
|
import type { MatchedDataOptions } from 'express-validator';
|
|
2
2
|
import type { Request } from 'routup';
|
|
3
3
|
import type { EntityTarget } from 'typeorm';
|
|
4
|
+
import type { ZodError } from 'zod';
|
|
4
5
|
import type { ExpressValidationExtendKeys, ExpressValidationResult } from './type';
|
|
5
6
|
export declare function buildRequestValidationErrorMessage<T extends Record<string, any> = Record<string, any>>(name: keyof T | (keyof T)[]): string;
|
|
7
|
+
export declare function buildRequestValidationErrorMessageForZodError(error: ZodError): string;
|
|
6
8
|
export declare function matchedValidationData(req: Request, options?: Partial<MatchedDataOptions>): Record<string, any>;
|
|
7
9
|
export declare function initExpressValidationResult<R extends Record<string, any>, M extends Record<string, any> = Record<string, any>>(): ExpressValidationResult<R, M>;
|
|
8
10
|
export declare function extendExpressValidationResultWithRelation<R extends Record<string, any>>(result: ExpressValidationResult<R>, target: EntityTarget<any>, keys: Partial<ExpressValidationExtendKeys<R>>): Promise<ExpressValidationResult<R>>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/http/validation/utils.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAG5D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;AAEtC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAG5C,OAAO,KAAK,EAAE,2BAA2B,EAAE,uBAAuB,EAAE,MAAM,QAAQ,CAAC;AAEnF,wBAAgB,kCAAkC,CAC9C,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EACjD,IAAI,EAAE,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,EAAE,UAOhC;AAED,wBAAgB,qBAAqB,CACjC,GAAG,EAAE,OAAO,EACZ,OAAO,CAAC,EAAE,OAAO,CAAC,kBAAkB,CAAC,GACtC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAErB;AAED,wBAAgB,2BAA2B,CACvC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAC7B,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,KACjD,uBAAuB,CAAC,CAAC,EAAE,CAAC,CAAC,CAMlC;AAED,wBAAsB,yCAAyC,CAC3D,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAE7B,MAAM,EAAE,uBAAuB,CAAC,CAAC,CAAC,EAClC,MAAM,EAAE,YAAY,CAAC,GAAG,CAAC,EACzB,IAAI,EAAE,OAAO,CAAC,2BAA2B,CAAC,CAAC,CAAC,CAAC,GAC7C,OAAO,CAAC,uBAAuB,CAAC,CAAC,CAAC,CAAC,CAkBtC"}
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/http/validation/utils.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAG5D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;AAEtC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAG5C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,KAAK,CAAC;AACpC,OAAO,KAAK,EAAE,2BAA2B,EAAE,uBAAuB,EAAE,MAAM,QAAQ,CAAC;AAEnF,wBAAgB,kCAAkC,CAC9C,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EACjD,IAAI,EAAE,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,EAAE,UAOhC;AAED,wBAAgB,6CAA6C,CAAC,KAAK,EAAE,QAAQ,UAY5E;AAED,wBAAgB,qBAAqB,CACjC,GAAG,EAAE,OAAO,EACZ,OAAO,CAAC,EAAE,OAAO,CAAC,kBAAkB,CAAC,GACtC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAErB;AAED,wBAAgB,2BAA2B,CACvC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAC7B,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,KACjD,uBAAuB,CAAC,CAAC,EAAE,CAAC,CAAC,CAMlC;AAED,wBAAsB,yCAAyC,CAC3D,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAE7B,MAAM,EAAE,uBAAuB,CAAC,CAAC,CAAC,EAClC,MAAM,EAAE,YAAY,CAAC,GAAG,CAAC,EACzB,IAAI,EAAE,OAAO,CAAC,2BAA2B,CAAC,CAAC,CAAC,CAAC,GAC7C,OAAO,CAAC,uBAAuB,CAAC,CAAC,CAAC,CAAC,CAkBtC"}
|
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
* view the LICENSE file that was distributed with this source code.
|
|
7
7
|
*/
|
|
8
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
|
-
exports.extendExpressValidationResultWithRelation = exports.initExpressValidationResult = exports.matchedValidationData = exports.buildRequestValidationErrorMessage = void 0;
|
|
9
|
+
exports.extendExpressValidationResultWithRelation = exports.initExpressValidationResult = exports.matchedValidationData = exports.buildRequestValidationErrorMessageForZodError = exports.buildRequestValidationErrorMessage = void 0;
|
|
10
10
|
const express_validator_1 = require("express-validator");
|
|
11
11
|
const core_1 = require("@authup/core");
|
|
12
12
|
const smob_1 = require("smob");
|
|
@@ -15,11 +15,24 @@ const typeorm_extension_1 = require("typeorm-extension");
|
|
|
15
15
|
function buildRequestValidationErrorMessage(name) {
|
|
16
16
|
const names = (0, smob_1.distinctArray)(Array.isArray(name) ? name : [name]);
|
|
17
17
|
if (names.length > 1) {
|
|
18
|
-
return `The parameters ${names.join(', ')}
|
|
18
|
+
return `The parameters ${names.join(', ')} are invalid.`;
|
|
19
19
|
}
|
|
20
20
|
return `The parameter ${String(names[0])} is invalid.`;
|
|
21
21
|
}
|
|
22
22
|
exports.buildRequestValidationErrorMessage = buildRequestValidationErrorMessage;
|
|
23
|
+
function buildRequestValidationErrorMessageForZodError(error) {
|
|
24
|
+
const names = [];
|
|
25
|
+
for (let i = 0; i < error.issues.length; i++) {
|
|
26
|
+
for (let j = 0; j < error.issues[i].path.length; j++) {
|
|
27
|
+
names.push(`${error.issues[i].path[j]}`);
|
|
28
|
+
}
|
|
29
|
+
}
|
|
30
|
+
if (names.length > 1) {
|
|
31
|
+
return `The parameters ${names.join(', ')} are invalid.`;
|
|
32
|
+
}
|
|
33
|
+
return `The parameter ${String(names[0])} is invalid.`;
|
|
34
|
+
}
|
|
35
|
+
exports.buildRequestValidationErrorMessageForZodError = buildRequestValidationErrorMessageForZodError;
|
|
23
36
|
function matchedValidationData(req, options) {
|
|
24
37
|
return (0, core_1.deleteUndefinedObjectProperties)((0, express_validator_1.matchedData)(req, options));
|
|
25
38
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/http/validation/utils.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAGH,yDAAgD;AAChD,uCAA+D;AAE/D,+BAAqC;AAErC,qCAA6C;AAC7C,yDAAkD;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/http/validation/utils.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAGH,yDAAgD;AAChD,uCAA+D;AAE/D,+BAAqC;AAErC,qCAA6C;AAC7C,yDAAkD;AAIlD,SAAgB,kCAAkC,CAE5C,IAA2B;IAC7B,MAAM,KAAK,GAAG,IAAA,oBAAa,EAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;IAEjE,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACnB,OAAO,kBAAkB,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC;IAC7D,CAAC;IACD,OAAO,iBAAiB,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC;AAC3D,CAAC;AATD,gFASC;AAED,SAAgB,6CAA6C,CAAC,KAAe;IACzE,MAAM,KAAK,GAAc,EAAE,CAAC;IAC5B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QAC3C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YACnD,KAAK,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QAC7C,CAAC;IACL,CAAC;IAED,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACnB,OAAO,kBAAkB,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC;IAC7D,CAAC;IACD,OAAO,iBAAiB,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC;AAC3D,CAAC;AAZD,sGAYC;AAED,SAAgB,qBAAqB,CACjC,GAAY,EACZ,OAAqC;IAErC,OAAO,IAAA,sCAA+B,EAAC,IAAA,+BAAW,EAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAAC;AACtE,CAAC;AALD,sDAKC;AAED,SAAgB,2BAA2B;IAIvC,OAAO;QACH,IAAI,EAAE,EAAE;QACR,QAAQ,EAAE,EAAE;QACZ,IAAI,EAAE,EAAO;KAChB,CAAC;AACN,CAAC;AATD,kEASC;AAEM,KAAK,UAAU,yCAAyC,CAG3D,MAAkC,EAClC,MAAyB,EACzB,IAA6C;IAE7C,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC;QACvB,MAAM,UAAU,GAAG,MAAM,IAAA,iCAAa,GAAE,CAAC;QAEzC,MAAM,UAAU,GAAG,UAAU,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;QACpD,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC;YACpC,KAAK,EAAE;gBACH,EAAE,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;aAC3B;SACJ,CAAC,CAAC;QACH,IAAI,CAAC,MAAM,EAAE,CAAC;YACV,MAAM,IAAI,sBAAe,CAAC,kCAAkC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;QAC3E,CAAC;QAED,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAsD,CAAC,GAAG,MAAM,CAAC;IAC1F,CAAC;IAED,OAAO,MAAM,CAAC;AAClB,CAAC;AAxBD,8FAwBC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@authup/server-core",
|
|
3
|
-
"version": "1.0.0-beta.
|
|
3
|
+
"version": "1.0.0-beta.4",
|
|
4
4
|
"description": "This is a standalone application.",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"scripts": {
|
|
@@ -34,7 +34,7 @@
|
|
|
34
34
|
"email": "contact@tada5hi.net",
|
|
35
35
|
"url": "https://github.com/tada5hi"
|
|
36
36
|
},
|
|
37
|
-
"license": "
|
|
37
|
+
"license": "Apache-2.0",
|
|
38
38
|
"repository": {
|
|
39
39
|
"type": "git",
|
|
40
40
|
"url": "git+https://github.com/authup/authup.git",
|
|
@@ -45,9 +45,9 @@
|
|
|
45
45
|
},
|
|
46
46
|
"homepage": "https://github.com/authup/authup#readme",
|
|
47
47
|
"dependencies": {
|
|
48
|
-
"@authup/config": "^1.0.0-beta.
|
|
49
|
-
"@authup/core": "^1.0.0-beta.
|
|
50
|
-
"@authup/server-kit": "^1.0.0-beta.
|
|
48
|
+
"@authup/config": "^1.0.0-beta.4",
|
|
49
|
+
"@authup/core": "^1.0.0-beta.4",
|
|
50
|
+
"@authup/server-kit": "^1.0.0-beta.4",
|
|
51
51
|
"@ebec/http": "^2.3.0",
|
|
52
52
|
"@hapic/oauth2": "^2.4.1",
|
|
53
53
|
"@hapic/vault": "^2.3.2",
|
|
@@ -55,14 +55,16 @@
|
|
|
55
55
|
"@routup/decorators": "^3.3.1",
|
|
56
56
|
"@routup/prometheus": "^2.3.0",
|
|
57
57
|
"@routup/rate-limit": "^2.3.0",
|
|
58
|
-
"@routup/swagger": "^2.3.
|
|
59
|
-
"better-sqlite3": "^9.
|
|
58
|
+
"@routup/swagger": "^2.3.5",
|
|
59
|
+
"better-sqlite3": "^9.4.1",
|
|
60
60
|
"cors": "^2.8.5",
|
|
61
|
-
"dotenv": "^16.
|
|
61
|
+
"dotenv": "^16.4.4",
|
|
62
62
|
"dycraft": "^1.1.0",
|
|
63
|
+
"envix": "^1.5.0",
|
|
63
64
|
"express-validator": "^7.0.1",
|
|
64
65
|
"hapic": "^2.5.0",
|
|
65
|
-
"
|
|
66
|
+
"ldapjs": "^3.0.7",
|
|
67
|
+
"locter": "^2.0.2",
|
|
66
68
|
"morgan": "^1.10.0",
|
|
67
69
|
"mysql": "^2.18.1",
|
|
68
70
|
"node-cron": "^3.0.3",
|
|
@@ -71,20 +73,22 @@
|
|
|
71
73
|
"reflect-metadata": "^0.2.1",
|
|
72
74
|
"routup": "^3.2.0",
|
|
73
75
|
"smob": "^1.4.1",
|
|
74
|
-
"typeorm": "^0.3.
|
|
75
|
-
"typeorm-extension": "^3.
|
|
76
|
+
"typeorm": "^0.3.20",
|
|
77
|
+
"typeorm-extension": "^3.5.0",
|
|
76
78
|
"winston": "^3.11.0",
|
|
77
79
|
"yargs": "^17.7.2",
|
|
78
80
|
"zod": "^3.22.4"
|
|
79
81
|
},
|
|
80
82
|
"devDependencies": {
|
|
81
83
|
"@types/cors": "^2.8.17",
|
|
84
|
+
"@types/ldapjs": "^3.0.6",
|
|
82
85
|
"@types/morgan": "^1.9.9",
|
|
83
86
|
"@types/node-cron": "^3.0.11",
|
|
84
87
|
"@types/supertest": "^6.0.2",
|
|
85
88
|
"@types/yargs": "^17.0.32",
|
|
86
89
|
"jest-serial-runner": "^1.2.1",
|
|
87
|
-
"supertest": "^6.3.
|
|
90
|
+
"supertest": "^6.3.4",
|
|
91
|
+
"testcontainers": "^10.7.1",
|
|
88
92
|
"ts-node": "^10.8.2"
|
|
89
93
|
},
|
|
90
94
|
"publishConfig": {
|