@authup/server-core 1.0.0-beta.13 → 1.0.0-beta.17

package/dist/http/controllers/root/base/handlers/register.js

@@ -6,9 +6,8 @@
  * view the LICENSE file that was distributed with this source code.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createAuthRegisterRouteHandler = void 0;
+exports.createAuthRegisterRouteHandler = exports.AuthRegisterRequestValidator = void 0;
 const node_crypto_1 = require("node:crypto");
-const express_validator_1 = require("express-validator");
 const core_kit_1 = require("@authup/core-kit");
 const http_1 = require("@ebec/http");
 const routup_1 = require("routup");
@@ -16,8 +15,35 @@ const typeorm_extension_1 = require("typeorm-extension");
 const server_kit_1 = require("@authup/server-kit");
 const core_1 = require("../../../../../core");
 const domains_1 = require("../../../../../domains");
-const validation_1 = require("../../../../validation");
 const config_1 = require("../../../../../config");
+class AuthRegisterRequestValidator extends core_1.RequestValidator {
+    constructor() {
+        super();
+        this.add('email')
+            .exists()
+            .notEmpty()
+            .isEmail();
+        this.add('name')
+            .exists()
+            .custom((value) => {
+            const isValid = (0, core_kit_1.isValidUserName)(value);
+            if (!isValid) {
+                throw new http_1.BadRequestError('Only the characters [a-z0-9-_]+ are allowed.');
+            }
+            return isValid;
+        })
+            .optional({ nullable: true });
+        this.add('password')
+            .exists()
+            .notEmpty()
+            .isLength({ min: 5, max: 512 });
+        this.add('realm_id')
+            .exists()
+            .isUUID()
+            .optional({ nullable: true });
+    }
+}
+exports.AuthRegisterRequestValidator = AuthRegisterRequestValidator;
 async function createAuthRegisterRouteHandler(req, res) {
     const config = (0, config_1.useConfig)();
     if (!config.registration) {
@@ -28,37 +54,8 @@ async function createAuthRegisterRouteHandler(req, res) {
         !(0, core_1.isSMTPClientUsable)()) {
         throw new http_1.BadRequestError('SMTP options are not defined.');
     }
-    await (0, express_validator_1.check)('email')
-        .exists()
-        .notEmpty()
-        .isEmail()
-        .run(req);
-    await (0, express_validator_1.check)('name')
-        .exists()
-        .custom((value) => {
-        const isValid = (0, core_kit_1.isValidUserName)(value);
-        if (!isValid) {
-            throw new http_1.BadRequestError('Only the characters [a-z0-9-_]+ are allowed.');
-        }
-        return isValid;
-    })
-        .optional({ nullable: true })
-        .run(req);
-    await (0, express_validator_1.check)('password')
-        .exists()
-        .notEmpty()
-        .isLength({ min: 5, max: 512 })
-        .run(req);
-    await (0, express_validator_1.check)('realm_id')
-        .exists()
-        .isUUID()
-        .optional({ nullable: true })
-        .run(req);
-    const validation = (0, express_validator_1.validationResult)(req);
-    if (!validation.isEmpty()) {
-        throw new validation_1.RequestValidationError(validation);
-    }
-    const data = (0, validation_1.matchedValidationData)(req, { includeOptionals: true });
+    const validator = new AuthRegisterRequestValidator();
+    const data = await validator.execute(req);
     data.name ?? (data.name = data.email);
     if (config.emailVerification) {
         data.active = false;

package/dist/http/controllers/root/base/handlers/register.js.map

@@ -1 +1 @@
-{"version":3,"file":"register.js","sourceRoot":"","sources":["../../../../../../src/http/controllers/root/base/handlers/register.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"register.js","sourceRoot":"","sources":["../../../../../../src/http/controllers/root/base/handlers/register.ts"],"names":[],"mappings":"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"}

package/dist/http/controllers/root/token/handlers/introspect.d.ts

@@ -1,3 +1,9 @@
 import type { Request, Response } from 'routup';
+import { RequestValidator } from '../../../../../core';
+export declare class TokenIntrospectRequestValidator extends RequestValidator<{
+    token: string;
+}> {
+    constructor();
+}
 export declare function introspectTokenRouteHandler(req: Request, res: Response): Promise<any>;
 //# sourceMappingURL=introspect.d.ts.map

package/dist/http/controllers/root/token/handlers/introspect.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"introspect.d.ts","sourceRoot":"","sources":["../../../../../../src/http/controllers/root/token/handlers/introspect.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAShD,wBAAsB,2BAA2B,CAC7C,GAAG,EAAE,OAAO,EACZ,GAAG,EAAE,QAAQ,GACb,OAAO,CAAC,GAAG,CAAC,CAsCf"}
+{"version":3,"file":"introspect.d.ts","sourceRoot":"","sources":["../../../../../../src/http/controllers/root/token/handlers/introspect.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAGhD,OAAO,EAAE,gBAAgB,EAA+B,MAAM,qBAAqB,CAAC;AAOpF,qBAAa,+BAAgC,SAAQ,gBAAgB,CAAC;IAAE,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;;CAiBvF;AAED,wBAAsB,2BAA2B,CAC7C,GAAG,EAAE,OAAO,EACZ,GAAG,EAAE,QAAQ,GACb,OAAO,CAAC,GAAG,CAAC,CAqBf"}

package/dist/http/controllers/root/token/handlers/introspect.js

@@ -6,33 +6,35 @@
  * view the LICENSE file that was distributed with this source code.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.introspectTokenRouteHandler = void 0;
-const express_validator_1 = require("express-validator");
+exports.introspectTokenRouteHandler = exports.TokenIntrospectRequestValidator = void 0;
 const routup_1 = require("routup");
+const core_1 = require("../../../../../core");
 const oauth2_1 = require("../../../../oauth2");
 const utils_1 = require("../../../../utils");
-const validation_1 = require("../../../../validation");
-async function introspectTokenRouteHandler(req, res) {
-    const chains = [
-        (0, express_validator_1.body)('token'),
-        (0, express_validator_1.query)('token'),
-        (0, express_validator_1.param)('token'),
-    ].map((chain) => chain
-        .exists()
-        .notEmpty()
-        .isString()
-        .isLength({ min: 16, max: 2048 }));
-    await (0, express_validator_1.oneOf)(chains)
-        .run(req);
-    const validation = (0, express_validator_1.validationResult)(req);
-    if (!validation.isEmpty() && !(0, utils_1.useRequestEnv)(req, 'token')) {
-        throw new validation_1.RequestValidationError(validation);
+class TokenIntrospectRequestValidator extends core_1.RequestValidator {
+    constructor() {
+        super();
+        const chains = [
+            this.createFor('token', core_1.RequestValidatorFieldSource.BODY),
+            this.createFor('token', core_1.RequestValidatorFieldSource.QUERY),
+            this.createFor('token', core_1.RequestValidatorFieldSource.PARAMS),
+            // todo: this might not work due routup context
+        ].map((chain) => chain
+            .exists()
+            .notEmpty()
+            .isString()
+            .isLength({ min: 16, max: 2048 }));
+        this.addOneOf(chains);
     }
-    const validationData = (0, validation_1.matchedValidationData)(req, { includeOptionals: true });
-    if (!validationData.token) {
-        validationData.token = (0, utils_1.useRequestEnv)(req, 'token');
+}
+exports.TokenIntrospectRequestValidator = TokenIntrospectRequestValidator;
+async function introspectTokenRouteHandler(req, res) {
+    const validator = new TokenIntrospectRequestValidator();
+    const data = await validator.execute(req);
+    if (!data.token) {
+        data.token = (0, utils_1.useRequestEnv)(req, 'token');
     }
-    const payload = await (0, oauth2_1.readOAuth2TokenPayload)(validationData.token);
+    const payload = await (0, oauth2_1.readOAuth2TokenPayload)(data.token);
     const permissions = await (0, oauth2_1.loadOAuth2SubPermissions)(payload.sub_kind, payload.sub, payload.scope);
     const output = {
         active: true,

package/dist/http/controllers/root/token/handlers/introspect.js.map

@@ -1 +1 @@
-{"version":3,"file":"introspect.js","sourceRoot":"","sources":["../../../../../../src/http/controllers/root/token/handlers/introspect.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAIH,yDAE2B;AAE3B,mCAA8B;AAC9B,+CAG4B;AAC5B,6CAAkD;AAClD,uDAAuF;AAEhF,KAAK,UAAU,2BAA2B,CAC7C,GAAY,EACZ,GAAa;IAEb,MAAM,MAAM,GAAuB;QAC/B,IAAA,wBAAI,EAAC,OAAO,CAAC;QACb,IAAA,yBAAK,EAAC,OAAO,CAAC;QACd,IAAA,yBAAK,EAAC,OAAO,CAAC;KACjB,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK;SACjB,MAAM,EAAE;SACR,QAAQ,EAAE;SACV,QAAQ,EAAE;SACV,QAAQ,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;IAEvC,MAAM,IAAA,yBAAK,EAAC,MAAM,CAAC;SACd,GAAG,CAAC,GAAG,CAAC,CAAC;IAEd,MAAM,UAAU,GAAG,IAAA,oCAAgB,EAAC,GAAG,CAAC,CAAC;IACzC,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,IAAI,CAAC,IAAA,qBAAa,EAAC,GAAG,EAAE,OAAO,CAAC,EAAE,CAAC;QACxD,MAAM,IAAI,mCAAsB,CAAC,UAAU,CAAC,CAAC;IACjD,CAAC;IAED,MAAM,cAAc,GAAG,IAAA,kCAAqB,EAAC,GAAG,EAAE,EAAE,gBAAgB,EAAE,IAAI,EAAE,CAAsB,CAAC;IACnG,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,CAAC;QACxB,cAAc,CAAC,KAAK,GAAG,IAAA,qBAAa,EAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IACvD,CAAC;IAED,MAAM,OAAO,GAAG,MAAM,IAAA,+BAAsB,EAAC,cAAc,CAAC,KAAK,CAAC,CAAC;IACnE,MAAM,WAAW,GAAG,MAAM,IAAA,iCAAwB,EAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC;IAEjG,MAAM,MAAM,GAAsC;QAC9C,MAAM,EAAE,IAAI;QACZ,WAAW;QACX,GAAG,OAAO;QACV,GAAG,IAAA,yCAAgC,EAC/B,OAAO,CAAC,QAAQ,EAChB,MAAM,IAAA,4BAAmB,EAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,KAAK,CAAC,CAC1E;KACJ,CAAC;IAEF,OAAO,IAAA,aAAI,EAAC,GAAG,EAAE,MAAM,CAAC,CAAC;AAC7B,CAAC;AAzCD,kEAyCC"}
+{"version":3,"file":"introspect.js","sourceRoot":"","sources":["../../../../../../src/http/controllers/root/token/handlers/introspect.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAIH,mCAA8B;AAE9B,8CAAoF;AACpF,+CAG4B;AAC5B,6CAAkD;AAElD,MAAa,+BAAgC,SAAQ,uBAAmC;IACpF;QACI,KAAK,EAAE,CAAC;QAER,MAAM,MAAM,GAA8B;YACtC,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,kCAA2B,CAAC,IAAI,CAAC;YACzD,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,kCAA2B,CAAC,KAAK,CAAC;YAC1D,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,kCAA2B,CAAC,MAAM,CAAC;YAC3D,+CAA+C;SAClD,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK;aACjB,MAAM,EAAE;aACR,QAAQ,EAAE;aACV,QAAQ,EAAE;aACV,QAAQ,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;QAEvC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IAC1B,CAAC;CACJ;AAjBD,0EAiBC;AAEM,KAAK,UAAU,2BAA2B,CAC7C,GAAY,EACZ,GAAa;IAEb,MAAM,SAAS,GAAG,IAAI,+BAA+B,EAAE,CAAC;IACxD,MAAM,IAAI,GAAG,MAAM,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAC1C,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;QACd,IAAI,CAAC,KAAK,GAAG,IAAA,qBAAa,EAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IAC7C,CAAC;IAED,MAAM,OAAO,GAAG,MAAM,IAAA,+BAAsB,EAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACzD,MAAM,WAAW,GAAG,MAAM,IAAA,iCAAwB,EAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC;IAEjG,MAAM,MAAM,GAAsC;QAC9C,MAAM,EAAE,IAAI;QACZ,WAAW;QACX,GAAG,OAAO;QACV,GAAG,IAAA,yCAAgC,EAC/B,OAAO,CAAC,QAAQ,EAChB,MAAM,IAAA,4BAAmB,EAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,KAAK,CAAC,CAC1E;KACJ,CAAC;IAEF,OAAO,IAAA,aAAI,EAAC,GAAG,EAAE,MAAM,CAAC,CAAC;AAC7B,CAAC;AAxBD,kEAwBC"}

package/dist/http/controllers/scope/handlers/create.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"create.d.ts","sourceRoot":"","sources":["../../../../../src/http/controllers/scope/handlers/create.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,CAkBxF"}
+{"version":3,"file":"create.d.ts","sourceRoot":"","sources":["../../../../../src/http/controllers/scope/handlers/create.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAUhD,wBAAsB,uBAAuB,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,GAAI,OAAO,CAAC,GAAG,CAAC,CA+BxF"}

package/dist/http/controllers/scope/handlers/create.js

@@ -13,20 +13,31 @@ const routup_1 = require("routup");
 const typeorm_extension_1 = require("typeorm-extension");
 const database_1 = require("../../../../database");
 const domains_1 = require("../../../../domains");
-const utils_1 = require("../../../utils");
-const utils_2 = require("../utils");
+const utils_1 = require("../../../../utils");
+const utils_2 = require("../../../utils");
+const utils_3 = require("../utils");
 const request_1 = require("../../../request");
 async function createScopeRouteHandler(req, res) {
-    const ability = (0, utils_1.useRequestEnv)(req, 'abilities');
+    const ability = (0, utils_2.useRequestEnv)(req, 'abilities');
     if (!ability.has(core_kit_1.PermissionName.SCOPE_ADD)) {
         throw new http_1.ForbiddenError();
     }
-    const result = await (0, utils_2.runScopeValidation)(req, request_1.RequestHandlerOperation.CREATE);
-    await (0, database_1.enforceUniquenessForDatabaseEntity)(domains_1.ScopeEntity, result.data);
+    const validator = new utils_3.ScopeRequestValidator();
+    const data = await validator.execute(req, {
+        group: request_1.RequestHandlerOperation.CREATE,
+    });
+    if (!data.realm_id && !(0, request_1.isRequestMasterRealm)(req)) {
+        const { id } = (0, utils_2.useRequestEnv)(req, 'realm');
+        data.realm_id = id;
+    }
+    if (!(0, core_kit_1.isRealmResourceWritable)((0, utils_2.useRequestEnv)(req, 'realm'), data.realm_id)) {
+        throw new http_1.BadRequestError((0, utils_1.buildErrorMessageForAttribute)('realm_id'));
+    }
+    await (0, database_1.enforceUniquenessForDatabaseEntity)(domains_1.ScopeEntity, data);
     // ----------------------------------------------
     const dataSource = await (0, typeorm_extension_1.useDataSource)();
     const repository = dataSource.getRepository(domains_1.ScopeEntity);
-    const entity = repository.create(result.data);
+    const entity = repository.create(data);
     await repository.save(entity);
     return (0, routup_1.sendCreated)(res, entity);
 }

package/dist/http/controllers/scope/handlers/create.js.map

@@ -1 +1 @@
-{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../../../src/http/controllers/scope/handlers/create.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,qCAA4C;AAC5C,+CAE0B;AAE1B,mCAAqC;AACrC,yDAAkD;AAClD,mDAA0E;AAC1E,iDAAkD;AAClD,0CAA+C;AAC/C,oCAA8C;AAC9C,8CAA2D;AAEpD,KAAK,UAAU,uBAAuB,CAAC,GAAY,EAAE,GAAa;IACrE,MAAM,OAAO,GAAG,IAAA,qBAAa,EAAC,GAAG,EAAE,WAAW,CAAC,CAAC;IAChD,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,yBAAc,CAAC,SAAS,CAAC,EAAE,CAAC;QACzC,MAAM,IAAI,qBAAc,EAAE,CAAC;IAC/B,CAAC;IAED,MAAM,MAAM,GAAG,MAAM,IAAA,0BAAkB,EAAC,GAAG,EAAE,iCAAuB,CAAC,MAAM,CAAC,CAAC;IAC7E,MAAM,IAAA,6CAAkC,EAAC,qBAAW,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;IAEnE,iDAAiD;IAEjD,MAAM,UAAU,GAAG,MAAM,IAAA,iCAAa,GAAE,CAAC;IACzC,MAAM,UAAU,GAAG,UAAU,CAAC,aAAa,CAAC,qBAAW,CAAC,CAAC;IACzD,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAE9C,MAAM,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAE9B,OAAO,IAAA,oBAAW,EAAC,GAAG,EAAE,MAAM,CAAC,CAAC;AACpC,CAAC;AAlBD,0DAkBC"}
+{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../../../src/http/controllers/scope/handlers/create.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,qCAA6D;AAC7D,+CAG0B;AAE1B,mCAAqC;AACrC,yDAAkD;AAClD,mDAA0E;AAC1E,iDAAkD;AAClD,6CAAkE;AAClE,0CAA+C;AAC/C,oCAAiD;AACjD,8CAAiF;AAE1E,KAAK,UAAU,uBAAuB,CAAC,GAAY,EAAE,GAAa;IACrE,MAAM,OAAO,GAAG,IAAA,qBAAa,EAAC,GAAG,EAAE,WAAW,CAAC,CAAC;IAChD,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,yBAAc,CAAC,SAAS,CAAC,EAAE,CAAC;QACzC,MAAM,IAAI,qBAAc,EAAE,CAAC;IAC/B,CAAC;IAED,MAAM,SAAS,GAAG,IAAI,6BAAqB,EAAE,CAAC;IAC9C,MAAM,IAAI,GAAG,MAAM,SAAS,CAAC,OAAO,CAAC,GAAG,EAAE;QACtC,KAAK,EAAE,iCAAuB,CAAC,MAAM;KACxC,CAAC,CAAC;IAEH,IAAI,CAAC,IAAI,CAAC,QAAQ,IAAI,CAAC,IAAA,8BAAoB,EAAC,GAAG,CAAC,EAAE,CAAC;QAC/C,MAAM,EAAE,EAAE,EAAE,GAAG,IAAA,qBAAa,EAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QAC3C,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAC;IACvB,CAAC;IAED,IAAI,CAAC,IAAA,kCAAuB,EAAC,IAAA,qBAAa,EAAC,GAAG,EAAE,OAAO,CAAC,EAAE,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;QACvE,MAAM,IAAI,sBAAe,CAAC,IAAA,qCAA6B,EAAC,UAAU,CAAC,CAAC,CAAC;IACzE,CAAC;IAED,MAAM,IAAA,6CAAkC,EAAC,qBAAW,EAAE,IAAI,CAAC,CAAC;IAE5D,iDAAiD;IAEjD,MAAM,UAAU,GAAG,MAAM,IAAA,iCAAa,GAAE,CAAC;IACzC,MAAM,UAAU,GAAG,UAAU,CAAC,aAAa,CAAC,qBAAW,CAAC,CAAC;IACzD,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAEvC,MAAM,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAE9B,OAAO,IAAA,oBAAW,EAAC,GAAG,EAAE,MAAM,CAAC,CAAC;AACpC,CAAC;AA/BD,0DA+BC"}

package/dist/http/controllers/scope/handlers/update.js

@@ -22,10 +22,10 @@ async function updateScopeRouteHandler(req, res) {
     if (!ability.has(core_kit_1.PermissionName.SCOPE_EDIT)) {
         throw new http_1.NotFoundError();
     }
-    const result = await (0, utils_2.runScopeValidation)(req, request_1.RequestHandlerOperation.UPDATE);
-    if (!result.data) {
-        return (0, routup_1.sendAccepted)(res);
-    }
+    const validator = new utils_2.ScopeRequestValidator();
+    const data = await validator.execute(req, {
+        group: request_1.RequestHandlerOperation.UPDATE,
+    });
     // ----------------------------------------------
     const dataSource = await (0, typeorm_extension_1.useDataSource)();
     const repository = dataSource.getRepository(domains_1.ScopeEntity);
@@ -38,11 +38,11 @@ async function updateScopeRouteHandler(req, res) {
         throw new http_1.ForbiddenError();
     }
     // ----------------------------------------------
-    await (0, database_1.enforceUniquenessForDatabaseEntity)(domains_1.ScopeEntity, result.data, {
+    await (0, database_1.enforceUniquenessForDatabaseEntity)(domains_1.ScopeEntity, data, {
         id: entity.id,
     });
     // ----------------------------------------------
-    entity = repository.merge(entity, result.data);
+    entity = repository.merge(entity, data);
     await repository.save(entity);
     return (0, routup_1.sendAccepted)(res, entity);
 }

package/dist/http/controllers/scope/handlers/update.js.map

@@ -1 +1 @@
-{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../../../src/http/controllers/scope/handlers/update.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,qCAA2D;AAC3D,+CAA2E;AAE3E,mCAAuD;AACvD,yDAAkD;AAClD,mDAA0E;AAC1E,iDAAkD;AAClD,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,OAAO,GAAG,IAAA,qBAAa,EAAC,GAAG,EAAE,WAAW,CAAC,CAAC;IAChD,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,yBAAc,CAAC,UAAU,CAAC,EAAE,CAAC;QAC1C,MAAM,IAAI,oBAAa,EAAE,CAAC;IAC9B,CAAC;IAED,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,iDAAiD;IAEjD,MAAM,UAAU,GAAG,MAAM,IAAA,iCAAa,GAAE,CAAC;IACzC,MAAM,UAAU,GAAG,UAAU,CAAC,aAAa,CAAC,qBAAW,CAAC,CAAC;IACzD,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,kCAAuB,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,MAAM,IAAA,6CAAkC,EAAC,qBAAW,EAAE,MAAM,CAAC,IAAI,EAAE;QAC/D,EAAE,EAAE,MAAM,CAAC,EAAE;KAChB,CAAC,CAAC;IAEH,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,0DA0CC"}
+{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../../../src/http/controllers/scope/handlers/update.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,qCAA2D;AAC3D,+CAA2E;AAE3E,mCAAuD;AACvD,yDAAkD;AAClD,mDAA0E;AAC1E,iDAAkD;AAClD,0CAA+C;AAC/C,oCAAiD;AACjD,8CAA2D;AAEpD,KAAK,UAAU,uBAAuB,CAAC,GAAY,EAAE,GAAa;IACrE,MAAM,EAAE,GAAG,IAAA,wBAAe,EAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IAEtC,MAAM,OAAO,GAAG,IAAA,qBAAa,EAAC,GAAG,EAAE,WAAW,CAAC,CAAC;IAChD,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,yBAAc,CAAC,UAAU,CAAC,EAAE,CAAC;QAC1C,MAAM,IAAI,oBAAa,EAAE,CAAC;IAC9B,CAAC;IAED,MAAM,SAAS,GAAG,IAAI,6BAAqB,EAAE,CAAC;IAC9C,MAAM,IAAI,GAAG,MAAM,SAAS,CAAC,OAAO,CAAC,GAAG,EAAE;QACtC,KAAK,EAAE,iCAAuB,CAAC,MAAM;KACxC,CAAC,CAAC;IAEH,iDAAiD;IAEjD,MAAM,UAAU,GAAG,MAAM,IAAA,iCAAa,GAAE,CAAC;IACzC,MAAM,UAAU,GAAG,UAAU,CAAC,aAAa,CAAC,qBAAW,CAAC,CAAC;IACzD,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,kCAAuB,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,MAAM,IAAA,6CAAkC,EAAC,qBAAW,EAAE,IAAI,EAAE;QACxD,EAAE,EAAE,MAAM,CAAC,EAAE;KAChB,CAAC,CAAC;IAEH,iDAAiD;IAEjD,MAAM,GAAG,UAAU,CAAC,KAAK,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAExC,MAAM,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAE9B,OAAO,IAAA,qBAAY,EAAC,GAAG,EAAE,MAAM,CAAC,CAAC;AACrC,CAAC;AA1CD,0DA0CC"}

package/dist/http/controllers/scope/utils/index.d.ts

@@ -1,2 +1,2 @@
-export * from './validaiton';
+export * from './validaitor';
 //# sourceMappingURL=index.d.ts.map

package/dist/http/controllers/scope/utils/index.js

@@ -20,5 +20,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./validaiton"), exports);
+__exportStar(require("./validaitor"), exports);
 //# sourceMappingURL=index.js.map

package/dist/http/controllers/scope/utils/validaitor.d.ts

@@ -0,0 +1,9 @@
+import type { Request } from 'routup';
+import { RequestDatabaseValidator, type RequestValidatorExecuteOptions } from '../../../../core';
+import { ScopeEntity } from '../../../../domains';
+export declare class ScopeRequestValidator extends RequestDatabaseValidator<ScopeEntity> {
+    constructor();
+    mount(): void;
+    execute(req: Request, options?: RequestValidatorExecuteOptions<ScopeEntity>): Promise<ScopeEntity>;
+}
+//# sourceMappingURL=validaitor.d.ts.map

package/dist/http/controllers/scope/utils/validaitor.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"validaitor.d.ts","sourceRoot":"","sources":["../../../../../src/http/controllers/scope/utils/validaitor.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,EAAE,wBAAwB,EAAE,KAAK,8BAA8B,EAAE,MAAM,kBAAkB,CAAC;AACjG,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAIlD,qBAAa,qBAAsB,SAAQ,wBAAwB,CACnE,WAAW,CACV;;IAOG,KAAK;IAkBC,OAAO,CACT,GAAG,EAAE,OAAO,EACZ,OAAO,GAAE,8BAA8B,CAAC,WAAW,CAAM,GAC1D,OAAO,CAAC,WAAW,CAAC;CAS1B"}

package/dist/http/controllers/scope/utils/validaitor.js

@@ -0,0 +1,44 @@
+"use strict";
+/*
+ * Copyright (c) 2022.
+ * Author Peter Placzek (tada5hi)
+ * For the full copyright and license information,
+ * view the LICENSE file that was distributed with this source code.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ScopeRequestValidator = void 0;
+const http_1 = require("@ebec/http");
+const core_1 = require("../../../../core");
+const domains_1 = require("../../../../domains");
+const utils_1 = require("../../../../utils");
+const request_1 = require("../../../request");
+class ScopeRequestValidator extends core_1.RequestDatabaseValidator {
+    constructor() {
+        super(domains_1.ScopeEntity);
+        this.mount();
+    }
+    mount() {
+        this.add('name')
+            .exists()
+            .notEmpty()
+            .isString()
+            .optional({ nullable: true });
+        this.add('description')
+            .optional({ nullable: true })
+            .notEmpty()
+            .isString()
+            .isLength({ min: 5, max: 4096 });
+        this.addTo(request_1.RequestHandlerOperation.CREATE, 'realm_id')
+            .isUUID()
+            .optional({ values: 'null' });
+    }
+    async execute(req, options = {}) {
+        const data = await super.execute(req, options);
+        if (options.group === request_1.RequestHandlerOperation.CREATE && !data.name) {
+            throw new http_1.BadRequestError((0, utils_1.buildErrorMessageForAttribute)('name'));
+        }
+        return data;
+    }
+}
+exports.ScopeRequestValidator = ScopeRequestValidator;
+//# sourceMappingURL=validaitor.js.map

package/dist/http/controllers/scope/utils/validaitor.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"validaitor.js","sourceRoot":"","sources":["../../../../../src/http/controllers/scope/utils/validaitor.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,qCAA6C;AAE7C,2CAAiG;AACjG,iDAAkD;AAClD,6CAAkE;AAClE,8CAA2D;AAE3D,MAAa,qBAAsB,SAAQ,+BAE1C;IACG;QACI,KAAK,CAAC,qBAAW,CAAC,CAAC;QAEnB,IAAI,CAAC,KAAK,EAAE,CAAC;IACjB,CAAC;IAED,KAAK;QACD,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC;aACX,MAAM,EAAE;aACR,QAAQ,EAAE;aACV,QAAQ,EAAE;aACV,QAAQ,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;QAElC,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC;aAClB,QAAQ,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;aAC5B,QAAQ,EAAE;aACV,QAAQ,EAAE;aACV,QAAQ,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC;QAErC,IAAI,CAAC,KAAK,CAAC,iCAAuB,CAAC,MAAM,EAAE,UAAU,CAAC;aACjD,MAAM,EAAE;aACR,QAAQ,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IACtC,CAAC;IAED,KAAK,CAAC,OAAO,CACT,GAAY,EACZ,UAAuD,EAAE;QAEzD,MAAM,IAAI,GAAG,MAAM,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QAE/C,IAAI,OAAO,CAAC,KAAK,KAAK,iCAAuB,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;YACjE,MAAM,IAAI,sBAAe,CAAC,IAAA,qCAA6B,EAAC,MAAM,CAAC,CAAC,CAAC;QACrE,CAAC;QAED,OAAO,IAAI,CAAC;IAChB,CAAC;CACJ;AAvCD,sDAuCC"}

package/dist/http/controllers/user/handlers/create.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"create.d.ts","sourceRoot":"","sources":["../../../../../src/http/controllers/user/handlers/create.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAQhD,wBAAsB,sBAAsB,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,GAAI,OAAO,CAAC,GAAG,CAAC,CAiBvF"}
+{"version":3,"file":"create.d.ts","sourceRoot":"","sources":["../../../../../src/http/controllers/user/handlers/create.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAShD,wBAAsB,sBAAsB,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,GAAI,OAAO,CAAC,GAAG,CAAC,CAoCvF"}

package/dist/http/controllers/user/handlers/create.js

@@ -12,18 +12,35 @@ const core_kit_1 = require("@authup/core-kit");
 const routup_1 = require("routup");
 const typeorm_extension_1 = require("typeorm-extension");
 const domains_1 = require("../../../../domains");
-const env_1 = require("../../../utils/env");
-const utils_1 = require("../utils");
-const constants_1 = require("../../../request/constants");
+const utils_1 = require("../../../../utils");
+const utils_2 = require("../../../utils");
+const utils_3 = require("../utils");
+const request_1 = require("../../../request");
 async function createUserRouteHandler(req, res) {
-    const ability = (0, env_1.useRequestEnv)(req, 'abilities');
+    const ability = (0, utils_2.useRequestEnv)(req, 'abilities');
     if (!ability.has(core_kit_1.PermissionName.USER_ADD)) {
         throw new http_1.ForbiddenError('You are not permitted to add a user.');
     }
-    const result = await (0, utils_1.runUserValidation)(req, constants_1.RequestHandlerOperation.CREATE);
+    const validator = new utils_3.UserRequestValidator();
+    const data = await validator.execute(req, {
+        group: request_1.RequestHandlerOperation.CREATE,
+    });
+    if (!ability.has(core_kit_1.PermissionName.USER_ADD)) {
+        delete data.name_locked;
+        delete data.active;
+        delete data.status;
+        delete data.status_message;
+    }
+    if (!data.realm_id) {
+        const { id: realmId } = (0, utils_2.useRequestEnv)(req, 'realm');
+        data.realm_id = realmId;
+    }
+    if (!(0, core_kit_1.isRealmResourceWritable)((0, utils_2.useRequestEnv)(req, 'realm'), data.realm_id)) {
+        throw new http_1.BadRequestError((0, utils_1.buildErrorMessageForAttribute)('realm_id'));
+    }
     const dataSource = await (0, typeorm_extension_1.useDataSource)();
     const repository = new domains_1.UserRepository(dataSource);
-    const { entity } = await repository.createWithPassword(result.data);
+    const { entity } = await repository.createWithPassword(data);
     await repository.save(entity);
     delete entity.password;
     return (0, routup_1.sendCreated)(res, entity);

package/dist/http/controllers/user/handlers/create.js.map

@@ -1 +1 @@
-{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../../../src/http/controllers/user/handlers/create.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,qCAA4C;AAC5C,+CAAkD;AAElD,mCAAqC;AACrC,yDAAkD;AAClD,iDAAqD;AACrD,4CAAmD;AACnD,oCAA6C;AAC7C,0DAAqE;AAE9D,KAAK,UAAU,sBAAsB,CAAC,GAAY,EAAE,GAAa;IACpE,MAAM,OAAO,GAAG,IAAA,mBAAa,EAAC,GAAG,EAAE,WAAW,CAAC,CAAC;IAChD,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,yBAAc,CAAC,QAAQ,CAAC,EAAE,CAAC;QACxC,MAAM,IAAI,qBAAc,CAAC,sCAAsC,CAAC,CAAC;IACrE,CAAC;IAED,MAAM,MAAM,GAAG,MAAM,IAAA,yBAAiB,EAAC,GAAG,EAAE,mCAAuB,CAAC,MAAM,CAAC,CAAC;IAE5E,MAAM,UAAU,GAAG,MAAM,IAAA,iCAAa,GAAE,CAAC;IACzC,MAAM,UAAU,GAAG,IAAI,wBAAc,CAAC,UAAU,CAAC,CAAC;IAClD,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,UAAU,CAAC,kBAAkB,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAEpE,MAAM,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAE9B,OAAO,MAAM,CAAC,QAAQ,CAAC;IAEvB,OAAO,IAAA,oBAAW,EAAC,GAAG,EAAE,MAAM,CAAC,CAAC;AACpC,CAAC;AAjBD,wDAiBC"}
+{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../../../src/http/controllers/user/handlers/create.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,qCAA6D;AAC7D,+CAA2E;AAE3E,mCAAqC;AACrC,yDAAkD;AAClD,iDAAqD;AACrD,6CAAkE;AAClE,0CAA+C;AAC/C,oCAAgD;AAChD,8CAA2D;AAEpD,KAAK,UAAU,sBAAsB,CAAC,GAAY,EAAE,GAAa;IACpE,MAAM,OAAO,GAAG,IAAA,qBAAa,EAAC,GAAG,EAAE,WAAW,CAAC,CAAC;IAChD,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,yBAAc,CAAC,QAAQ,CAAC,EAAE,CAAC;QACxC,MAAM,IAAI,qBAAc,CAAC,sCAAsC,CAAC,CAAC;IACrE,CAAC;IAED,MAAM,SAAS,GAAG,IAAI,4BAAoB,EAAE,CAAC;IAC7C,MAAM,IAAI,GAAG,MAAM,SAAS,CAAC,OAAO,CAAC,GAAG,EAAE;QACtC,KAAK,EAAE,iCAAuB,CAAC,MAAM;KACxC,CAAC,CAAC;IAEH,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,yBAAc,CAAC,QAAQ,CAAC,EAAE,CAAC;QACxC,OAAO,IAAI,CAAC,WAAW,CAAC;QACxB,OAAO,IAAI,CAAC,MAAM,CAAC;QACnB,OAAO,IAAI,CAAC,MAAM,CAAC;QACnB,OAAO,IAAI,CAAC,cAAc,CAAC;IAC/B,CAAC;IAED,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;QACjB,MAAM,EAAE,EAAE,EAAE,OAAO,EAAE,GAAG,IAAA,qBAAa,EAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QACpD,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;IAC5B,CAAC;IAED,IAAI,CAAC,IAAA,kCAAuB,EAAC,IAAA,qBAAa,EAAC,GAAG,EAAE,OAAO,CAAC,EAAE,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;QACvE,MAAM,IAAI,sBAAe,CAAC,IAAA,qCAA6B,EAAC,UAAU,CAAC,CAAC,CAAC;IACzE,CAAC;IAED,MAAM,UAAU,GAAG,MAAM,IAAA,iCAAa,GAAE,CAAC;IACzC,MAAM,UAAU,GAAG,IAAI,wBAAc,CAAC,UAAU,CAAC,CAAC;IAClD,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,UAAU,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC;IAE7D,MAAM,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAE9B,OAAO,MAAM,CAAC,QAAQ,CAAC;IAEvB,OAAO,IAAA,oBAAW,EAAC,GAAG,EAAE,MAAM,CAAC,CAAC;AACpC,CAAC;AApCD,wDAoCC"}

package/dist/http/controllers/user/handlers/read.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"read.d.ts","sourceRoot":"","sources":["../../../../../src/http/controllers/user/handlers/read.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AA8ChD,wBAAsB,uBAAuB,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,GAAI,OAAO,CAAC,GAAG,CAAC,CAiCxF;AAED,wBAAsB,sBAAsB,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,GAAI,OAAO,CAAC,GAAG,CAAC,CAmDvF"}
+{"version":3,"file":"read.d.ts","sourceRoot":"","sources":["../../../../../src/http/controllers/user/handlers/read.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AA8ChD,wBAAsB,uBAAuB,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,GAAI,OAAO,CAAC,GAAG,CAAC,CAiCxF;AAED,wBAAsB,sBAAsB,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,GAAI,OAAO,CAAC,GAAG,CAAC,CA6DvF"}

package/dist/http/controllers/user/handlers/read.js

@@ -75,14 +75,19 @@ async function getOneUserRouteHandler(req, res) {
     const id = (0, routup_1.useRequestParam)(req, 'id');
     const dataSource = await (0, typeorm_extension_1.useDataSource)();
     const userRepository = new domains_1.UserRepository(dataSource);
-    const query = await userRepository.createQueryBuilder('user');
+    const query = userRepository.createQueryBuilder('user');
+    const scopes = (0, utils_2.useRequestEnv)(req, 'scopes');
     let attributes = [];
     if ((0, utils_1.isSelfId)(id) &&
         (0, utils_2.useRequestEnv)(req, 'userId')) {
-        attributes = (0, oauth2_1.resolveOAuth2SubAttributesForScope)(kit_1.OAuth2SubKind.USER, (0, utils_2.useRequestEnv)(req, 'scopes'));
+        attributes = (0, oauth2_1.resolveOAuth2SubAttributesForScope)(kit_1.OAuth2SubKind.USER, scopes);
+        const validAttributes = userRepository.metadata.columns.map((column) => column.databaseName);
         for (let i = 0; i < attributes.length; i++) {
-            // todo: only select valid entity attributes :)
-            query.addSelect(`user.${attributes[i]}`);
+            const isValid = validAttributes.includes(attributes[i]);
+            if (isValid) {
+                // todo: remove attribute from attributes
+                query.addSelect(`user.${attributes[i]}`);
+            }
         }
         query.where('user.id = :id', { id: (0, utils_2.useRequestEnv)(req, 'userId') });
     }
@@ -106,8 +111,9 @@ async function getOneUserRouteHandler(req, res) {
     if (!entity) {
         throw new http_1.NotFoundError();
     }
-    if ((0, utils_1.isSelfId)(id) && (0, utils_2.useRequestEnv)(req, 'userId')) {
-        await userRepository.appendAttributes(entity, attributes);
+    if ((0, utils_1.isSelfId)(id) &&
+        (0, oauth2_1.hasOAuth2Scope)(scopes, core_kit_1.ScopeName.GLOBAL)) {
+        await userRepository.findAndAppendExtraAttributesTo(entity);
     }
     return (0, routup_1.send)(res, entity);
 }

package/dist/http/controllers/user/handlers/read.js.map

@@ -1 +1 @@
-{"version":3,"file":"read.js","sourceRoot":"","sources":["../../../../../src/http/controllers/user/handlers/read.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"read.js","sourceRoot":"","sources":["../../../../../src/http/controllers/user/handlers/read.ts"],"names":[],"mappings":"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"}

package/dist/http/controllers/user/handlers/update.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"update.d.ts","sourceRoot":"","sources":["../../../../../src/http/controllers/user/handlers/update.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAShD,wBAAsB,sBAAsB,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,GAAI,OAAO,CAAC,GAAG,CAAC,CA6DvF"}
+{"version":3,"file":"update.d.ts","sourceRoot":"","sources":["../../../../../src/http/controllers/user/handlers/update.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAShD,wBAAsB,sBAAsB,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,GAAI,OAAO,CAAC,GAAG,CAAC,CAqEvF"}

package/dist/http/controllers/user/handlers/update.js

@@ -18,19 +18,26 @@ const utils_2 = require("../utils");
 const request_1 = require("../../../request");
 async function updateUserRouteHandler(req, res) {
     const id = (0, routup_1.useRequestParam)(req, 'id');
+    const ability = (0, utils_1.useRequestEnv)(req, 'abilities');
     const env = (0, utils_1.useRequestEnv)(req);
-    if (!env.abilities.has(core_kit_1.PermissionName.USER_EDIT) &&
+    if (!ability.has(core_kit_1.PermissionName.USER_EDIT) &&
         env.userId !== id) {
         throw new http_1.ForbiddenError('You are not authorized to modify a user.');
     }
-    const result = await (0, utils_2.runUserValidation)(req, request_1.RequestHandlerOperation.UPDATE);
-    if (!result.data) {
-        return (0, routup_1.sendAccepted)(res);
+    const validator = new utils_2.UserRequestValidator();
+    const data = await validator.execute(req, {
+        group: request_1.RequestHandlerOperation.UPDATE,
+    });
+    if (!ability.has(core_kit_1.PermissionName.USER_EDIT)) {
+        delete data.name_locked;
+        delete data.active;
+        delete data.status;
+        delete data.status_message;
     }
     const dataSource = await (0, typeorm_extension_1.useDataSource)();
     const repository = new domains_1.UserRepository(dataSource);
-    if (result.data.password) {
-        result.data.password = await repository.hashPassword(result.data.password);
+    if (data.password) {
+        data.password = await repository.hashPassword(data.password);
     }
     const query = repository.createQueryBuilder('user')
         .addSelect('user.email')
@@ -42,20 +49,20 @@ async function updateUserRouteHandler(req, res) {
     if (!(0, core_kit_1.isRealmResourceWritable)(env.realm, entity.realm_id)) {
         throw new http_1.ForbiddenError(`You are not allowed to edit users of the realm ${entity.realm_id}`);
     }
-    if (result.data.name &&
-        result.data.name !== entity.name) {
-        if (result.data.name_locked) {
-            entity.name_locked = result.data.name_locked;
+    if (data.name &&
+        data.name !== entity.name) {
+        if (data.name_locked) {
+            entity.name_locked = data.name_locked;
         }
         if (entity.name_locked) {
-            delete result.data.name;
+            delete data.name;
         }
         const config = (0, config_1.useConfig)();
         if (entity.name === config.userAdminName) {
             throw new http_1.BadRequestError('The default user name can not be changed.');
         }
     }
-    entity = repository.merge(entity, result.data);
+    entity = repository.merge(entity, data);
     await repository.save(entity);
     return (0, routup_1.sendAccepted)(res, entity);
 }

package/dist/http/controllers/user/handlers/update.js.map

@@ -1 +1 @@
-{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../../../src/http/controllers/user/handlers/update.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,qCAA4E;AAC5E,+CAA2E;AAE3E,mCAAuD;AACvD,yDAAkD;AAClD,+CAA+C;AAC/C,iDAAqD;AACrD,0CAA+C;AAC/C,oCAA6C;AAC7C,8CAA2D;AAEpD,KAAK,UAAU,sBAAsB,CAAC,GAAY,EAAE,GAAa;IACpE,MAAM,EAAE,GAAG,IAAA,wBAAe,EAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IAEtC,MAAM,GAAG,GAAG,IAAA,qBAAa,EAAC,GAAG,CAAC,CAAC;IAE/B,IACI,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,yBAAc,CAAC,SAAS,CAAC;QAC5C,GAAG,CAAC,MAAM,KAAK,EAAE,EACnB,CAAC;QACC,MAAM,IAAI,qBAAc,CAAC,0CAA0C,CAAC,CAAC;IACzE,CAAC;IAED,MAAM,MAAM,GAAG,MAAM,IAAA,yBAAiB,EAAC,GAAG,EAAE,iCAAuB,CAAC,MAAM,CAAC,CAAC;IAC5E,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,wBAAc,CAAC,UAAU,CAAC,CAAC;IAElD,IAAI,MAAM,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;QACvB,MAAM,CAAC,IAAI,CAAC,QAAQ,GAAG,MAAM,UAAU,CAAC,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC/E,CAAC;IAED,MAAM,KAAK,GAAG,UAAU,CAAC,kBAAkB,CAAC,MAAM,CAAC;SAC9C,SAAS,CAAC,YAAY,CAAC;SACvB,KAAK,CAAC,eAAe,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;IAEpC,IAAI,MAAM,GAAG,MAAM,KAAK,CAAC,MAAM,EAAE,CAAC;IAClC,IAAI,CAAC,MAAM,EAAE,CAAC;QACV,MAAM,IAAI,oBAAa,EAAE,CAAC;IAC9B,CAAC;IAED,IAAI,CAAC,IAAA,kCAAuB,EAAC,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC;QACvD,MAAM,IAAI,qBAAc,CAAC,kDAAkD,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;IAClG,CAAC;IAED,IACI,MAAM,CAAC,IAAI,CAAC,IAAI;QAChB,MAAM,CAAC,IAAI,CAAC,IAAI,KAAK,MAAM,CAAC,IAAI,EAClC,CAAC;QACC,IAAI,MAAM,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;YAC1B,MAAM,CAAC,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC;QACjD,CAAC;QAED,IAAI,MAAM,CAAC,WAAW,EAAE,CAAC;YACrB,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC;QAC5B,CAAC;QAED,MAAM,MAAM,GAAG,IAAA,kBAAS,GAAE,CAAC;QAE3B,IAAI,MAAM,CAAC,IAAI,KAAK,MAAM,CAAC,aAAa,EAAE,CAAC;YACvC,MAAM,IAAI,sBAAe,CAAC,2CAA2C,CAAC,CAAC;QAC3E,CAAC;IACL,CAAC;IAED,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;AA7DD,wDA6DC"}
+{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../../../src/http/controllers/user/handlers/update.ts"],"names":[],"mappings":"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"}

package/dist/http/controllers/user/utils/index.d.ts

@@ -1,2 +1,2 @@
-export * from './validation';
+export * from './validator';
 //# sourceMappingURL=index.d.ts.map

package/dist/http/controllers/user/utils/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/http/controllers/user/utils/index.ts"],"names":[],"mappings":"AAOA,cAAc,cAAc,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/http/controllers/user/utils/index.ts"],"names":[],"mappings":"AAOA,cAAc,aAAa,CAAC"}

package/dist/http/controllers/user/utils/index.js

@@ -20,5 +20,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./validation"), exports);
+__exportStar(require("./validator"), exports);
 //# sourceMappingURL=index.js.map

package/dist/http/controllers/user/utils/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/http/controllers/user/utils/index.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;;;;;;;;;;;;;AAEH,+CAA6B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/http/controllers/user/utils/index.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;;;;;;;;;;;;;AAEH,8CAA4B"}

package/dist/http/controllers/user/utils/validator.d.ts

@@ -0,0 +1,7 @@
+import { RequestDatabaseValidator } from '../../../../core';
+import { UserEntity } from '../../../../domains';
+export declare class UserRequestValidator extends RequestDatabaseValidator<UserEntity> {
+    constructor();
+    mount(): void;
+}
+//# sourceMappingURL=validator.d.ts.map

package/dist/http/controllers/user/utils/validator.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"validator.d.ts","sourceRoot":"","sources":["../../../../../src/http/controllers/user/utils/validator.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,wBAAwB,EAAE,MAAM,kBAAkB,CAAC;AAC5D,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAGjD,qBAAa,oBAAqB,SAAQ,wBAAwB,CAClE,UAAU,CACT;;IAOG,KAAK;CA6ER"}