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

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

@@ -0,0 +1,82 @@
+"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.UserRequestValidator = void 0;
+const core_kit_1 = require("@authup/core-kit");
+const http_1 = require("@ebec/http");
+const core_1 = require("../../../../core");
+const domains_1 = require("../../../../domains");
+const request_1 = require("../../../request");
+class UserRequestValidator extends core_1.RequestDatabaseValidator {
+    constructor() {
+        super(domains_1.UserEntity);
+        this.mount();
+    }
+    mount() {
+        this.add('name')
+            .exists()
+            .notEmpty()
+            .custom((value) => {
+            const isValid = (0, core_kit_1.isValidUserName)(value);
+            if (!isValid) {
+                throw new http_1.BadRequestError('Only the characters [A-Za-z0-9-_.]+ are allowed.');
+            }
+            return isValid;
+        })
+            .optional({ nullable: true });
+        this.add('name_locked')
+            .isBoolean()
+            .optional();
+        // ----------------------------------------------
+        this.add('first_name')
+            .notEmpty()
+            .isLength({ min: 3, max: 128 })
+            .optional({ nullable: true });
+        this.add('last_name')
+            .notEmpty()
+            .isLength({ min: 3, max: 128 })
+            .optional({ nullable: true });
+        // ----------------------------------------------
+        this.add('display_name')
+            .exists()
+            .notEmpty()
+            .isLength({ min: 3, max: 128 })
+            .optional();
+        // ----------------------------------------------
+        this.add('email')
+            .exists()
+            .isEmail()
+            .optional({ nullable: true });
+        // ----------------------------------------------
+        this.add('password')
+            .exists()
+            .isLength({ min: 5, max: 512 })
+            .optional({ nullable: true });
+        // ----------------------------------------------
+        this.add('active')
+            .isBoolean()
+            .optional();
+        this.add('name_locked')
+            .isBoolean()
+            .optional();
+        this.addTo(request_1.RequestHandlerOperation.CREATE, 'realm_id')
+            .exists()
+            .isUUID()
+            .optional();
+        this.add('status')
+            .exists()
+            .isLength({ min: 5, max: 256 })
+            .optional({ nullable: true });
+        this.add('status_message')
+            .exists()
+            .isLength({ min: 5, max: 256 })
+            .optional({ nullable: true });
+    }
+}
+exports.UserRequestValidator = UserRequestValidator;
+//# sourceMappingURL=validator.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"validator.js","sourceRoot":"","sources":["../../../../../src/http/controllers/user/utils/validator.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,+CAE0B;AAC1B,qCAA6C;AAC7C,2CAA4D;AAC5D,iDAAiD;AACjD,8CAA2D;AAE3D,MAAa,oBAAqB,SAAQ,+BAEzC;IACG;QACI,KAAK,CAAC,oBAAU,CAAC,CAAC;QAElB,IAAI,CAAC,KAAK,EAAE,CAAC;IACjB,CAAC;IAED,KAAK;QACD,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC;aACX,MAAM,EAAE;aACR,QAAQ,EAAE;aACV,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE;YACd,MAAM,OAAO,GAAG,IAAA,0BAAe,EAAC,KAAK,CAAC,CAAC;YACvC,IAAI,CAAC,OAAO,EAAE,CAAC;gBACX,MAAM,IAAI,sBAAe,CAAC,kDAAkD,CAAC,CAAC;YAClF,CAAC;YAED,OAAO,OAAO,CAAC;QACnB,CAAC,CAAC;aACD,QAAQ,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;QAElC,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC;aAClB,SAAS,EAAE;aACX,QAAQ,EAAE,CAAC;QAEhB,iDAAiD;QAEjD,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC;aACjB,QAAQ,EAAE;aACV,QAAQ,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC;aAC9B,QAAQ,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;QAElC,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC;aAChB,QAAQ,EAAE;aACV,QAAQ,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC;aAC9B,QAAQ,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;QAElC,iDAAiD;QAEjD,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC;aACnB,MAAM,EAAE;aACR,QAAQ,EAAE;aACV,QAAQ,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC;aAC9B,QAAQ,EAAE,CAAC;QAEhB,iDAAiD;QAEjD,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC;aACZ,MAAM,EAAE;aACR,OAAO,EAAE;aACT,QAAQ,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;QAElC,iDAAiD;QAEjD,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC;aACf,MAAM,EAAE;aACR,QAAQ,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC;aAC9B,QAAQ,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;QAElC,iDAAiD;QAEjD,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC;aACb,SAAS,EAAE;aACX,QAAQ,EAAE,CAAC;QAEhB,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC;aAClB,SAAS,EAAE;aACX,QAAQ,EAAE,CAAC;QAEhB,IAAI,CAAC,KAAK,CAAC,iCAAuB,CAAC,MAAM,EAAE,UAAU,CAAC;aACjD,MAAM,EAAE;aACR,MAAM,EAAE;aACR,QAAQ,EAAE,CAAC;QAEhB,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC;aACb,MAAM,EAAE;aACR,QAAQ,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC;aAC9B,QAAQ,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;QAElC,IAAI,CAAC,GAAG,CAAC,gBAAgB,CAAC;aACrB,MAAM,EAAE;aACR,QAAQ,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC;aAC9B,QAAQ,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;IACtC,CAAC;CACJ;AAtFD,oDAsFC"}

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

@@ -1 +1 @@
-{"version":3,"file":"create.d.ts","sourceRoot":"","sources":["../../../../../src/http/controllers/user-attribute/handlers/create.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAQhD,wBAAsB,+BAA+B,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,GAAI,OAAO,CAAC,GAAG,CAAC,CAyBhG"}
+{"version":3,"file":"create.d.ts","sourceRoot":"","sources":["../../../../../src/http/controllers/user-attribute/handlers/create.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAQhD,wBAAsB,+BAA+B,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,GAAI,OAAO,CAAC,GAAG,CAAC,CAmChG"}

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

@@ -12,23 +12,32 @@ 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 request_1 = require("../../../request");
 async function createUserAttributeRouteHandler(req, res) {
-    const result = await (0, utils_1.runUserAttributeValidation)(req, constants_1.RequestHandlerOperation.CREATE);
-    if (!result) {
-        return (0, routup_1.sendAccepted)(res);
+    const validator = new utils_2.UserAttributeRequestValidator();
+    const data = await validator.execute(req, {
+        group: request_1.RequestHandlerOperation.CREATE,
+    });
+    if (data.user) {
+        data.realm_id = data.user.realm_id;
+        data.user_id = data.user.id;
     }
-    if (result.data.user_id !== (0, env_1.useRequestEnv)(req, 'userId')) {
-        if (!(0, env_1.useRequestEnv)(req, 'abilities').has(core_kit_1.PermissionName.USER_EDIT) ||
-            !(0, core_kit_1.isRealmResourceWritable)((0, env_1.useRequestEnv)(req, 'realm'), result.data.realm_id)) {
+    else {
+        const { id } = (0, utils_1.useRequestEnv)(req, 'realm');
+        data.realm_id = id;
+        data.user_id = (0, utils_1.useRequestEnv)(req, 'userId');
+    }
+    if (data.user_id !== (0, utils_1.useRequestEnv)(req, 'userId')) {
+        if (!(0, utils_1.useRequestEnv)(req, 'abilities').has(core_kit_1.PermissionName.USER_EDIT) ||
+            !(0, core_kit_1.isRealmResourceWritable)((0, utils_1.useRequestEnv)(req, 'realm'), data.realm_id)) {
             throw new http_1.ForbiddenError('You are not permitted to set an attribute for the given user...');
         }
     }
     const dataSource = await (0, typeorm_extension_1.useDataSource)();
     const repository = dataSource.getRepository(domains_1.UserAttributeEntity);
-    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/user-attribute/handlers/create.js.map

@@ -1 +1 @@
-{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../../../src/http/controllers/user-attribute/handlers/create.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,qCAA4C;AAC5C,+CAG0B;AAE1B,mCAAmD;AACnD,yDAAkD;AAClD,iDAA0D;AAC1D,4CAAmD;AACnD,oCAAsD;AACtD,0DAAqE;AAE9D,KAAK,UAAU,+BAA+B,CAAC,GAAY,EAAE,GAAa;IAC7E,MAAM,MAAM,GAAG,MAAM,IAAA,kCAA0B,EAAC,GAAG,EAAE,mCAAuB,CAAC,MAAM,CAAC,CAAC;IACrF,IAAI,CAAC,MAAM,EAAE,CAAC;QACV,OAAO,IAAA,qBAAY,EAAC,GAAG,CAAC,CAAC;IAC7B,CAAC;IAED,IACI,MAAM,CAAC,IAAI,CAAC,OAAO,KAAK,IAAA,mBAAa,EAAC,GAAG,EAAE,QAAQ,CAAC,EACtD,CAAC;QACC,IACI,CAAC,IAAA,mBAAa,EAAC,GAAG,EAAE,WAAW,CAAC,CAAC,GAAG,CAAC,yBAAc,CAAC,SAAS,CAAC;YAC9D,CAAC,IAAA,kCAAuB,EAAC,IAAA,mBAAa,EAAC,GAAG,EAAE,OAAO,CAAC,EAAE,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,EAC7E,CAAC;YACC,MAAM,IAAI,qBAAc,CAAC,iEAAiE,CAAC,CAAC;QAChG,CAAC;IACL,CAAC;IAED,MAAM,UAAU,GAAG,MAAM,IAAA,iCAAa,GAAE,CAAC;IACzC,MAAM,UAAU,GAAG,UAAU,CAAC,aAAa,CAAC,6BAAmB,CAAC,CAAC;IAEjE,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;AAzBD,0EAyBC"}
+{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../../../src/http/controllers/user-attribute/handlers/create.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,qCAA4C;AAC5C,+CAG0B;AAE1B,mCAAqC;AACrC,yDAAkD;AAClD,iDAA0D;AAC1D,0CAA+C;AAC/C,oCAAyD;AACzD,8CAA2D;AAEpD,KAAK,UAAU,+BAA+B,CAAC,GAAY,EAAE,GAAa;IAC7E,MAAM,SAAS,GAAG,IAAI,qCAA6B,EAAE,CAAC;IAEtD,MAAM,IAAI,GAAG,MAAM,SAAS,CAAC,OAAO,CAAC,GAAG,EAAE;QACtC,KAAK,EAAE,iCAAuB,CAAC,MAAM;KACxC,CAAC,CAAC;IAEH,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;QACZ,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC;QACnC,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;IAChC,CAAC;SAAM,CAAC;QACJ,MAAM,EAAE,EAAE,EAAE,GAAG,IAAA,qBAAa,EAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QAC3C,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAC;QACnB,IAAI,CAAC,OAAO,GAAG,IAAA,qBAAa,EAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;IAChD,CAAC;IAED,IACI,IAAI,CAAC,OAAO,KAAK,IAAA,qBAAa,EAAC,GAAG,EAAE,QAAQ,CAAC,EAC/C,CAAC;QACC,IACI,CAAC,IAAA,qBAAa,EAAC,GAAG,EAAE,WAAW,CAAC,CAAC,GAAG,CAAC,yBAAc,CAAC,SAAS,CAAC;YAC9D,CAAC,IAAA,kCAAuB,EAAC,IAAA,qBAAa,EAAC,GAAG,EAAE,OAAO,CAAC,EAAE,IAAI,CAAC,QAAQ,CAAC,EACtE,CAAC;YACC,MAAM,IAAI,qBAAc,CAAC,iEAAiE,CAAC,CAAC;QAChG,CAAC;IACL,CAAC;IAED,MAAM,UAAU,GAAG,MAAM,IAAA,iCAAa,GAAE,CAAC;IACzC,MAAM,UAAU,GAAG,UAAU,CAAC,aAAa,CAAC,6BAAmB,CAAC,CAAC;IAEjE,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;AAnCD,0EAmCC"}

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

@@ -17,17 +17,17 @@ const utils_2 = require("../utils");
 const request_1 = require("../../../request");
 async function updateUserAttributeRouteHandler(req, res) {
     const id = (0, routup_1.useRequestParam)(req, 'id');
-    const result = await (0, utils_2.runUserAttributeValidation)(req, request_1.RequestHandlerOperation.UPDATE);
-    if (!result) {
-        return (0, routup_1.sendAccepted)(res);
-    }
+    const validator = new utils_2.UserAttributeRequestValidator();
+    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.UserAttributeEntity);
     let entity = await repository.findOneBy({ id });
     if (!entity) {
         throw new http_1.NotFoundError();
     }
-    entity = repository.merge(entity, result.data);
+    entity = repository.merge(entity, data);
     if (entity.user_id !== (0, utils_1.useRequestEnv)(req, 'userId')) {
         if (!(0, utils_1.useRequestEnv)(req, 'abilities').has(core_kit_1.PermissionName.USER_EDIT) ||
             !(0, core_kit_1.isRealmResourceWritable)((0, utils_1.useRequestEnv)(req, 'realm'), entity.realm_id)) {

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

@@ -1 +1 @@
-{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../../../src/http/controllers/user-attribute/handlers/update.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,qCAA2D;AAC3D,+CAA2E;AAE3E,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,IACI,MAAM,CAAC,OAAO,KAAK,IAAA,qBAAa,EAAC,GAAG,EAAE,QAAQ,CAAC,EACjD,CAAC;QACC,IACI,CAAC,IAAA,qBAAa,EAAC,GAAG,EAAE,WAAW,CAAC,CAAC,GAAG,CAAC,yBAAc,CAAC,SAAS,CAAC;YAC9D,CAAC,IAAA,kCAAuB,EAAC,IAAA,qBAAa,EAAC,GAAG,EAAE,OAAO,CAAC,EAAE,MAAM,CAAC,QAAQ,CAAC,EACxE,CAAC;YACC,MAAM,IAAI,qBAAc,CAAC,oEAAoE,CAAC,CAAC;QACnG,CAAC;IACL,CAAC;IAED,MAAM,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAE9B,OAAO,IAAA,qBAAY,EAAC,GAAG,EAAE,MAAM,CAAC,CAAC;AACrC,CAAC;AAhCD,0EAgCC"}
+{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../../../src/http/controllers/user-attribute/handlers/update.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,qCAA2D;AAC3D,+CAA2E;AAE3E,mCAAuD;AACvD,yDAAkD;AAClD,iDAA0D;AAC1D,0CAA+C;AAC/C,oCAAyD;AACzD,8CAA2D;AAEpD,KAAK,UAAU,+BAA+B,CAAC,GAAY,EAAE,GAAa;IAC7E,MAAM,EAAE,GAAG,IAAA,wBAAe,EAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IAEtC,MAAM,SAAS,GAAG,IAAI,qCAA6B,EAAE,CAAC;IACtD,MAAM,IAAI,GAAG,MAAM,SAAS,CAAC,OAAO,CAAC,GAAG,EAAE;QACtC,KAAK,EAAE,iCAAuB,CAAC,MAAM;KACxC,CAAC,CAAC;IAEH,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,IAAI,CAAC,CAAC;IAExC,IACI,MAAM,CAAC,OAAO,KAAK,IAAA,qBAAa,EAAC,GAAG,EAAE,QAAQ,CAAC,EACjD,CAAC;QACC,IACI,CAAC,IAAA,qBAAa,EAAC,GAAG,EAAE,WAAW,CAAC,CAAC,GAAG,CAAC,yBAAc,CAAC,SAAS,CAAC;YAC9D,CAAC,IAAA,kCAAuB,EAAC,IAAA,qBAAa,EAAC,GAAG,EAAE,OAAO,CAAC,EAAE,MAAM,CAAC,QAAQ,CAAC,EACxE,CAAC;YACC,MAAM,IAAI,qBAAc,CAAC,oEAAoE,CAAC,CAAC;QACnG,CAAC;IACL,CAAC;IAED,MAAM,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAE9B,OAAO,IAAA,qBAAY,EAAC,GAAG,EAAE,MAAM,CAAC,CAAC;AACrC,CAAC;AAhCD,0EAgCC"}

package/dist/http/controllers/user-attribute/utils/validation.d.ts

@@ -1,6 +1,7 @@
-import type { Request } from 'routup';
-import type { UserAttributeEntity } from '../../../../domains';
-import type { ExpressValidationResult } from '../../../validation';
-import { RequestHandlerOperation } from '../../../request/constants';
-export declare function runUserAttributeValidation(req: Request, operation: `${RequestHandlerOperation.CREATE}` | `${RequestHandlerOperation.UPDATE}`): Promise<ExpressValidationResult<UserAttributeEntity>>;
+import { RequestDatabaseValidator } from '../../../../core';
+import { UserAttributeEntity } from '../../../../domains';
+export declare class UserAttributeRequestValidator extends RequestDatabaseValidator<UserAttributeEntity> {
+    constructor();
+    mount(): void;
+}
 //# sourceMappingURL=validation.d.ts.map

package/dist/http/controllers/user-attribute/utils/validation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"validation.d.ts","sourceRoot":"","sources":["../../../../../src/http/controllers/user-attribute/utils/validation.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAG/D,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,qBAAqB,CAAC;AAMnE,OAAO,EAAE,uBAAuB,EAAE,MAAM,4BAA4B,CAAC;AAErE,wBAAsB,0BAA0B,CAC5C,GAAG,EAAE,OAAO,EACZ,SAAS,EAAE,GAAG,uBAAuB,CAAC,MAAM,EAAE,GAAG,GAAG,uBAAuB,CAAC,MAAM,EAAE,GACpF,OAAO,CAAC,uBAAuB,CAAC,mBAAmB,CAAC,CAAC,CAmDxD"}
+{"version":3,"file":"validation.d.ts","sourceRoot":"","sources":["../../../../../src/http/controllers/user-attribute/utils/validation.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,wBAAwB,EAAE,MAAM,kBAAkB,CAAC;AAC5D,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAG1D,qBAAa,6BAA8B,SAAQ,wBAAwB,CAC3E,mBAAmB,CAClB;;IAOG,KAAK;CAkBR"}

package/dist/http/controllers/user-attribute/utils/validation.js

@@ -6,55 +6,31 @@
  * view the LICENSE file that was distributed with this source code.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.runUserAttributeValidation = void 0;
-const express_validator_1 = require("express-validator");
+exports.UserAttributeRequestValidator = void 0;
+const core_1 = require("../../../../core");
 const domains_1 = require("../../../../domains");
-const env_1 = require("../../../utils/env");
-const validation_1 = require("../../../validation");
-const constants_1 = require("../../../request/constants");
-async function runUserAttributeValidation(req, operation) {
-    const result = (0, validation_1.initExpressValidationResult)();
-    if (operation === constants_1.RequestHandlerOperation.CREATE) {
-        await (0, express_validator_1.check)('name')
+const request_1 = require("../../../request");
+class UserAttributeRequestValidator extends core_1.RequestDatabaseValidator {
+    constructor() {
+        super(domains_1.UserAttributeEntity);
+        this.mount();
+    }
+    mount() {
+        this.addTo(request_1.RequestHandlerOperation.CREATE, 'name')
             .exists()
             .notEmpty()
             .isString()
-            .isLength({ min: 3, max: 255 })
-            .run(req);
-        await (0, express_validator_1.check)('user_id')
+            .isLength({ min: 3, max: 255 });
+        this.addTo(request_1.RequestHandlerOperation.CREATE, 'user_id')
             .exists()
-            .isUUID()
-            .optional();
-    }
-    await (0, express_validator_1.check)('value')
-        .exists()
-        .notEmpty()
-        .isString()
-        .isLength({ min: 3, max: 512 })
-        .optional({ nullable: true })
-        .run(req);
-    // ----------------------------------------------
-    const validation = (0, express_validator_1.validationResult)(req);
-    if (!validation.isEmpty()) {
-        throw new validation_1.RequestValidationError(validation);
-    }
-    result.data = (0, validation_1.matchedValidationData)(req, { includeOptionals: true });
-    if (operation === constants_1.RequestHandlerOperation.CREATE) {
-        await (0, validation_1.extendExpressValidationResultWithRelation)(result, domains_1.UserEntity, {
-            id: 'user_id',
-            entity: 'user',
-        });
-        if (result.relation.user) {
-            result.data.realm_id = result.relation.user.realm_id;
-            result.data.user_id = result.relation.user.id;
-        }
-        else {
-            const { id } = (0, env_1.useRequestEnv)(req, 'realm');
-            result.data.realm_id = id;
-            result.data.user_id = (0, env_1.useRequestEnv)(req, 'userId');
-        }
+            .isUUID();
+        this.add('value')
+            .exists()
+            .notEmpty()
+            .isString()
+            .isLength({ min: 3, max: 512 })
+            .optional({ nullable: true });
     }
-    return result;
 }
-exports.runUserAttributeValidation = runUserAttributeValidation;
+exports.UserAttributeRequestValidator = UserAttributeRequestValidator;
 //# sourceMappingURL=validation.js.map

package/dist/http/controllers/user-attribute/utils/validation.js.map

@@ -1 +1 @@
-{"version":3,"file":"validation.js","sourceRoot":"","sources":["../../../../../src/http/controllers/user-attribute/utils/validation.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,yDAA4D;AAG5D,iDAAiD;AACjD,4CAAmD;AAEnD,oDAI6B;AAC7B,0DAAqE;AAE9D,KAAK,UAAU,0BAA0B,CAC5C,GAAY,EACZ,SAAoF;IAEpF,MAAM,MAAM,GAAkD,IAAA,wCAA2B,GAAE,CAAC;IAE5F,IAAI,SAAS,KAAK,mCAAuB,CAAC,MAAM,EAAE,CAAC;QAC/C,MAAM,IAAA,yBAAK,EAAC,MAAM,CAAC;aACd,MAAM,EAAE;aACR,QAAQ,EAAE;aACV,QAAQ,EAAE;aACV,QAAQ,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC;aAC9B,GAAG,CAAC,GAAG,CAAC,CAAC;QAEd,MAAM,IAAA,yBAAK,EAAC,SAAS,CAAC;aACjB,MAAM,EAAE;aACR,MAAM,EAAE;aACR,QAAQ,EAAE,CAAC;IACpB,CAAC;IAED,MAAM,IAAA,yBAAK,EAAC,OAAO,CAAC;SACf,MAAM,EAAE;SACR,QAAQ,EAAE;SACV,QAAQ,EAAE;SACV,QAAQ,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC;SAC9B,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,IAAI,SAAS,KAAK,mCAAuB,CAAC,MAAM,EAAE,CAAC;QAC/C,MAAM,IAAA,sDAAyC,EAAC,MAAM,EAAE,oBAAU,EAAE;YAChE,EAAE,EAAE,SAAS;YACb,MAAM,EAAE,MAAM;SACjB,CAAC,CAAC;QAEH,IAAI,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;YACvB,MAAM,CAAC,IAAI,CAAC,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC;YACrD,MAAM,CAAC,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;QAClD,CAAC;aAAM,CAAC;YACJ,MAAM,EAAE,EAAE,EAAE,GAAG,IAAA,mBAAa,EAAC,GAAG,EAAE,OAAO,CAAC,CAAC;YAC3C,MAAM,CAAC,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAC;YAC1B,MAAM,CAAC,IAAI,CAAC,OAAO,GAAG,IAAA,mBAAa,EAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;QACvD,CAAC;IACL,CAAC;IAED,OAAO,MAAM,CAAC;AAClB,CAAC;AAtDD,gEAsDC"}
+{"version":3,"file":"validation.js","sourceRoot":"","sources":["../../../../../src/http/controllers/user-attribute/utils/validation.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,2CAA4D;AAC5D,iDAA0D;AAC1D,8CAA2D;AAE3D,MAAa,6BAA8B,SAAQ,+BAElD;IACG;QACI,KAAK,CAAC,6BAAmB,CAAC,CAAC;QAE3B,IAAI,CAAC,KAAK,EAAE,CAAC;IACjB,CAAC;IAED,KAAK;QACD,IAAI,CAAC,KAAK,CAAC,iCAAuB,CAAC,MAAM,EAAE,MAAM,CAAC;aAC7C,MAAM,EAAE;aACR,QAAQ,EAAE;aACV,QAAQ,EAAE;aACV,QAAQ,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC;QAEpC,IAAI,CAAC,KAAK,CAAC,iCAAuB,CAAC,MAAM,EAAE,SAAS,CAAC;aAChD,MAAM,EAAE;aACR,MAAM,EAAE,CAAC;QAEd,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC;aACZ,MAAM,EAAE;aACR,QAAQ,EAAE;aACV,QAAQ,EAAE;aACV,QAAQ,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC;aAC9B,QAAQ,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;IACtC,CAAC;CACJ;AA3BD,sEA2BC"}

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

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

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

@@ -12,9 +12,10 @@ 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");
 /**
  * Add a permission by id to a specific user.
  *
@@ -22,16 +23,44 @@ const constants_1 = require("../../../request/constants");
  * @param res
  */
 async function createUserPermissionRouteHandler(req, res) {
-    const ability = (0, env_1.useRequestEnv)(req, 'abilities');
-    if (!ability.has(core_kit_1.PermissionName.USER_PERMISSION_ADD)) {
+    const abilities = (0, utils_2.useRequestEnv)(req, 'abilities');
+    if (!abilities.has(core_kit_1.PermissionName.USER_PERMISSION_ADD)) {
         throw new http_1.ForbiddenError();
     }
     // ----------------------------------------------
-    const result = await (0, utils_1.runUserPermissionValidation)(req, constants_1.RequestHandlerOperation.CREATE);
+    const validator = new utils_3.UserPermissionRequestValidator();
+    const data = await validator.execute(req, {
+        group: request_1.RequestHandlerOperation.CREATE,
+    });
+    const policyEvaluationContext = {
+        resource: data,
+    };
+    // ----------------------------------------------
+    if (data.permission) {
+        if (!(0, core_kit_1.isRealmResourceWritable)((0, utils_2.useRequestEnv)(req, 'realm'), data.permission.realm_id)) {
+            throw new http_1.BadRequestError((0, utils_1.buildErrorMessageForAttribute)('permission_id'));
+        }
+        data.permission_realm_id = data.permission.realm_id;
+        const ability = (0, core_kit_1.buildAbilityFromPermission)(data.permission);
+        if (!abilities.has(ability, policyEvaluationContext)) {
+            throw new http_1.ForbiddenError('The target permission is not owned.');
+        }
+    }
+    // ----------------------------------------------
+    if (data.user) {
+        if (!(0, core_kit_1.isRealmResourceWritable)((0, utils_2.useRequestEnv)(req, 'realm'), data.user.realm_id)) {
+            throw new http_1.BadRequestError((0, utils_1.buildErrorMessageForAttribute)('user_id'));
+        }
+        data.user_realm_id = data.user.realm_id;
+    }
+    // ----------------------------------------------
+    if (!abilities.has(core_kit_1.PermissionName.USER_PERMISSION_ADD, policyEvaluationContext)) {
+        throw new http_1.ForbiddenError();
+    }
     // ----------------------------------------------
     const dataSource = await (0, typeorm_extension_1.useDataSource)();
     const repository = dataSource.getRepository(domains_1.UserPermissionEntity);
-    let entity = repository.create(result.data);
+    let entity = repository.create(data);
     entity = await repository.save(entity);
     return (0, routup_1.sendCreated)(res, entity);
 }

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

@@ -1 +1 @@
-{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../../../src/http/controllers/user-permission/handlers/create.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,qCAA4C;AAC5C,+CAAkD;AAElD,mCAAqC;AACrC,yDAAkD;AAClD,iDAA2D;AAC3D,4CAAmD;AACnD,oCAAuD;AACvD,0DAAqE;AAErE;;;;;GAKG;AACI,KAAK,UAAU,gCAAgC,CAAC,GAAY,EAAE,GAAa;IAC9E,MAAM,OAAO,GAAG,IAAA,mBAAa,EAAC,GAAG,EAAE,WAAW,CAAC,CAAC;IAChD,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,yBAAc,CAAC,mBAAmB,CAAC,EAAE,CAAC;QACnD,MAAM,IAAI,qBAAc,EAAE,CAAC;IAC/B,CAAC;IAED,iDAAiD;IAEjD,MAAM,MAAM,GAAG,MAAM,IAAA,mCAA2B,EAAC,GAAG,EAAE,mCAAuB,CAAC,MAAM,CAAC,CAAC;IAEtF,iDAAiD;IAEjD,MAAM,UAAU,GAAG,MAAM,IAAA,iCAAa,GAAE,CAAC;IACzC,MAAM,UAAU,GAAG,UAAU,CAAC,aAAa,CAAC,8BAAoB,CAAC,CAAC;IAClE,IAAI,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAE5C,MAAM,GAAG,MAAM,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAEvC,OAAO,IAAA,oBAAW,EAAC,GAAG,EAAE,MAAM,CAAC,CAAC;AACpC,CAAC;AAnBD,4EAmBC"}
+{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../../../src/http/controllers/user-permission/handlers/create.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAGH,qCAA6D;AAC7D,+CAE0B;AAE1B,mCAAqC;AACrC,yDAAkD;AAClD,iDAA2D;AAC3D,6CAAkE;AAClE,0CAA+C;AAC/C,oCAA0D;AAC1D,8CAA2D;AAE3D;;;;;GAKG;AACI,KAAK,UAAU,gCAAgC,CAAC,GAAY,EAAE,GAAa;IAC9E,MAAM,SAAS,GAAG,IAAA,qBAAa,EAAC,GAAG,EAAE,WAAW,CAAC,CAAC;IAClD,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,yBAAc,CAAC,mBAAmB,CAAC,EAAE,CAAC;QACrD,MAAM,IAAI,qBAAc,EAAE,CAAC;IAC/B,CAAC;IAED,iDAAiD;IAEjD,MAAM,SAAS,GAAG,IAAI,sCAA8B,EAAE,CAAC;IACvD,MAAM,IAAI,GAAG,MAAM,SAAS,CAAC,OAAO,CAAC,GAAG,EAAE;QACtC,KAAK,EAAE,iCAAuB,CAAC,MAAM;KACxC,CAAC,CAAC;IAEH,MAAM,uBAAuB,GAA6B;QACtD,QAAQ,EAAE,IAA4C;KACzD,CAAC;IAEF,iDAAiD;IAEjD,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;QAClB,IAAI,CAAC,IAAA,kCAAuB,EAAC,IAAA,qBAAa,EAAC,GAAG,EAAE,OAAO,CAAC,EAAE,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;YAClF,MAAM,IAAI,sBAAe,CAAC,IAAA,qCAA6B,EAAC,eAAe,CAAC,CAAC,CAAC;QAC9E,CAAC;QAED,IAAI,CAAC,mBAAmB,GAAG,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC;QAEpD,MAAM,OAAO,GAAG,IAAA,qCAA0B,EAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAC5D,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,OAAO,EAAE,uBAAuB,CAAC,EAAE,CAAC;YACnD,MAAM,IAAI,qBAAc,CAAC,qCAAqC,CAAC,CAAC;QACpE,CAAC;IACL,CAAC;IAED,iDAAiD;IAEjD,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;QACZ,IAAI,CAAC,IAAA,kCAAuB,EAAC,IAAA,qBAAa,EAAC,GAAG,EAAE,OAAO,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC5E,MAAM,IAAI,sBAAe,CAAC,IAAA,qCAA6B,EAAC,SAAS,CAAC,CAAC,CAAC;QACxE,CAAC;QAED,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC;IAC5C,CAAC;IAED,iDAAiD;IAEjD,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,yBAAc,CAAC,mBAAmB,EAAE,uBAAuB,CAAC,EAAE,CAAC;QAC9E,MAAM,IAAI,qBAAc,EAAE,CAAC;IAC/B,CAAC;IAED,iDAAiD;IAEjD,MAAM,UAAU,GAAG,MAAM,IAAA,iCAAa,GAAE,CAAC;IACzC,MAAM,UAAU,GAAG,UAAU,CAAC,aAAa,CAAC,8BAAoB,CAAC,CAAC;IAClE,IAAI,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAErC,MAAM,GAAG,MAAM,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAEvC,OAAO,IAAA,oBAAW,EAAC,GAAG,EAAE,MAAM,CAAC,CAAC;AACpC,CAAC;AAzDD,4EAyDC"}

package/dist/http/controllers/user-permission/handlers/delete.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"delete.d.ts","sourceRoot":"","sources":["../../../../../src/http/controllers/user-permission/handlers/delete.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAMhD;;;;;GAKG;AACH,wBAAsB,gCAAgC,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,GAAI,OAAO,CAAC,GAAG,CAAC,CAyCjG"}
+{"version":3,"file":"delete.d.ts","sourceRoot":"","sources":["../../../../../src/http/controllers/user-permission/handlers/delete.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAMhD;;;;;GAKG;AACH,wBAAsB,gCAAgC,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,GAAI,OAAO,CAAC,GAAG,CAAC,CA+CjG"}

package/dist/http/controllers/user-permission/handlers/delete.js

@@ -12,7 +12,7 @@ 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");
 /**
  * Drop a permission by id of a specific user.
  *
@@ -21,23 +21,31 @@ const env_1 = require("../../../utils/env");
  */
 async function deleteUserPermissionRouteHandler(req, res) {
     const id = (0, routup_1.useRequestParam)(req, 'id');
-    const ability = (0, env_1.useRequestEnv)(req, 'abilities');
+    const ability = (0, utils_1.useRequestEnv)(req, 'abilities');
     if (!ability.has(core_kit_1.PermissionName.USER_PERMISSION_DROP)) {
         throw new http_1.ForbiddenError();
     }
     const dataSource = await (0, typeorm_extension_1.useDataSource)();
     const repository = dataSource.getRepository(domains_1.UserPermissionEntity);
-    const entity = await repository.findOneBy({ id });
+    const entity = await repository.findOne({
+        where: {
+            id,
+        },
+        relations: {
+            user: true,
+            permission: true,
+        },
+    });
     if (!entity) {
         throw new http_1.NotFoundError();
     }
     // ----------------------------------------------
-    if (!(0, core_kit_1.isRealmResourceWritable)((0, env_1.useRequestEnv)(req, 'realm'), entity.user_realm_id)) {
+    if (!(0, core_kit_1.isRealmResourceWritable)((0, utils_1.useRequestEnv)(req, 'realm'), entity.user_realm_id)) {
         throw new http_1.ForbiddenError();
     }
     // ----------------------------------------------
-    if (!ability.satisfy(core_kit_1.PermissionName.USER_PERMISSION_DROP, { target: entity.target })) {
-        throw new http_1.ForbiddenError('You are not permitted for the role-permission target.');
+    if (!ability.has(core_kit_1.PermissionName.USER_PERMISSION_DROP, { resource: entity })) {
+        throw new http_1.ForbiddenError();
     }
     // ----------------------------------------------
     const { id: entityId } = entity;

package/dist/http/controllers/user-permission/handlers/delete.js.map

@@ -1 +1 @@
-{"version":3,"file":"delete.js","sourceRoot":"","sources":["../../../../../src/http/controllers/user-permission/handlers/delete.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,qCAA2D;AAC3D,+CAA2E;AAE3E,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,WAAW,CAAC,CAAC;IAChD,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,yBAAc,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,kCAAuB,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,yBAAc,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"}
+{"version":3,"file":"delete.js","sourceRoot":"","sources":["../../../../../src/http/controllers/user-permission/handlers/delete.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,qCAA2D;AAC3D,+CAA2E;AAE3E,mCAAuD;AACvD,yDAAkD;AAClD,iDAA2D;AAC3D,0CAA+C;AAE/C;;;;;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,qBAAa,EAAC,GAAG,EAAE,WAAW,CAAC,CAAC;IAChD,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,yBAAc,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,OAAO,CAAC;QACpC,KAAK,EAAE;YACH,EAAE;SACL;QACD,SAAS,EAAE;YACP,IAAI,EAAE,IAAI;YACV,UAAU,EAAE,IAAI;SACnB;KACJ,CAAC,CAAC;IAEH,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,aAAa,CAAC,EAAE,CAAC;QAC9E,MAAM,IAAI,qBAAc,EAAE,CAAC;IAC/B,CAAC;IAED,iDAAiD;IAEjD,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,yBAAc,CAAC,oBAAoB,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC;QAC1E,MAAM,IAAI,qBAAc,EAAE,CAAC;IAC/B,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;AA/CD,4EA+CC"}

package/dist/http/controllers/user-permission/utils/validation.d.ts

@@ -1,6 +1,7 @@
-import type { Request } from 'routup';
-import type { UserPermissionEntity } from '../../../../domains';
-import type { ExpressValidationResult } from '../../../validation';
-import { RequestHandlerOperation } from '../../../request/constants';
-export declare function runUserPermissionValidation(req: Request, operation: `${RequestHandlerOperation.CREATE}` | `${RequestHandlerOperation.UPDATE}`): Promise<ExpressValidationResult<UserPermissionEntity>>;
+import { RequestDatabaseValidator } from '../../../../core';
+import { UserPermissionEntity } from '../../../../domains';
+export declare class UserPermissionRequestValidator extends RequestDatabaseValidator<UserPermissionEntity> {
+    constructor();
+    mount(): void;
+}
 //# sourceMappingURL=validation.d.ts.map

package/dist/http/controllers/user-permission/utils/validation.d.ts.map

@@ -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,CAoFzD"}
+{"version":3,"file":"validation.d.ts","sourceRoot":"","sources":["../../../../../src/http/controllers/user-permission/utils/validation.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,wBAAwB,EAAE,MAAM,kBAAkB,CAAC;AAC5D,OAAO,EACH,oBAAoB,EACvB,MAAM,qBAAqB,CAAC;AAG7B,qBAAa,8BAA+B,SAAQ,wBAAwB,CAC5E,oBAAoB,CACnB;;IAOG,KAAK;CAcR"}

package/dist/http/controllers/user-permission/utils/validation.js

@@ -6,75 +6,27 @@
  * view the LICENSE file that was distributed with this source code.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.runUserPermissionValidation = void 0;
-const express_validator_1 = require("express-validator");
-const http_1 = require("@ebec/http");
-const core_kit_1 = require("@authup/core-kit");
+exports.UserPermissionRequestValidator = void 0;
+const core_1 = require("../../../../core");
 const domains_1 = require("../../../../domains");
-const utils_1 = require("../../../utils");
-const validation_1 = require("../../../validation");
-const constants_1 = require("../../../request/constants");
-async function runUserPermissionValidation(req, operation) {
-    const result = (0, validation_1.initExpressValidationResult)();
-    if (operation === constants_1.RequestHandlerOperation.CREATE) {
-        await (0, express_validator_1.check)('user_id')
-            .exists()
-            .isUUID()
-            .run(req);
-        await (0, express_validator_1.check)('permission_id')
+const request_1 = require("../../../request");
+class UserPermissionRequestValidator extends core_1.RequestDatabaseValidator {
+    constructor() {
+        super(domains_1.UserPermissionEntity);
+        this.mount();
+    }
+    mount() {
+        this.addTo(request_1.RequestHandlerOperation.CREATE, 'user_id')
             .exists()
-            .isString()
-            .run(req);
-        await (0, express_validator_1.check)('target')
+            .isUUID();
+        this.addTo(request_1.RequestHandlerOperation.CREATE, 'permission_id')
             .exists()
-            .isString()
-            .isLength({ min: 3, max: 16 })
-            .optional({ nullable: true })
-            .run(req);
-    }
-    await (0, express_validator_1.check)('condition')
-        .exists()
-        .isObject()
-        .optional({ nullable: true })
-        .run(req);
-    // ----------------------------------------------
-    const validation = (0, express_validator_1.validationResult)(req);
-    if (!validation.isEmpty()) {
-        throw new validation_1.RequestValidationError(validation);
-    }
-    result.data = (0, validation_1.matchedValidationData)(req, { includeOptionals: true });
-    // ----------------------------------------------
-    const ability = (0, utils_1.useRequestEnv)(req, 'abilities');
-    await (0, validation_1.extendExpressValidationResultWithRelation)(result, domains_1.PermissionEntity, {
-        id: 'permission_id',
-        entity: 'permission',
-    });
-    if (result.relation.permission) {
-        if (result.relation.permission.target) {
-            result.data.target = result.relation.permission.target;
-        }
-        if (!(0, utils_1.isRequestSubOwner)(req) &&
-            !ability.has(result.relation.permission.name)) {
-            throw new http_1.ForbiddenError('It is only allowed to assign user permissions, which are also owned.');
-        }
-    }
-    const permissionTarget = ability.findOne(core_kit_1.PermissionName.USER_PERMISSION_ADD);
-    if (permissionTarget) {
-        result.data.target = permissionTarget.target;
-    }
-    // ----------------------------------------------
-    await (0, validation_1.extendExpressValidationResultWithRelation)(result, domains_1.UserEntity, {
-        id: 'user_id',
-        entity: 'user',
-    });
-    if (result.relation.user) {
-        if (!(0, core_kit_1.isRealmResourceWritable)((0, utils_1.useRequestEnv)(req, 'realm'), result.relation.user.realm_id)) {
-            throw new http_1.BadRequestError((0, validation_1.buildRequestValidationErrorMessage)('user_id'));
-        }
-        result.data.user_realm_id = result.relation.user.realm_id;
+            .isUUID();
+        this.add('policy_id')
+            .isUUID()
+            .optional({ values: 'null' })
+            .default(null);
     }
-    // ----------------------------------------------
-    return result;
 }
-exports.runUserPermissionValidation = runUserPermissionValidation;
+exports.UserPermissionRequestValidator = UserPermissionRequestValidator;
 //# sourceMappingURL=validation.js.map

package/dist/http/controllers/user-permission/utils/validation.js.map

@@ -1 +1 @@
-{"version":3,"file":"validation.js","sourceRoot":"","sources":["../../../../../src/http/controllers/user-permission/utils/validation.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"validation.js","sourceRoot":"","sources":["../../../../../src/http/controllers/user-permission/utils/validation.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,2CAA4D;AAC5D,iDAE6B;AAC7B,8CAA2D;AAE3D,MAAa,8BAA+B,SAAQ,+BAEnD;IACG;QACI,KAAK,CAAC,8BAAoB,CAAC,CAAC;QAE5B,IAAI,CAAC,KAAK,EAAE,CAAC;IACjB,CAAC;IAED,KAAK;QACD,IAAI,CAAC,KAAK,CAAC,iCAAuB,CAAC,MAAM,EAAE,SAAS,CAAC;aAChD,MAAM,EAAE;aACR,MAAM,EAAE,CAAC;QAEd,IAAI,CAAC,KAAK,CAAC,iCAAuB,CAAC,MAAM,EAAE,eAAe,CAAC;aACtD,MAAM,EAAE;aACR,MAAM,EAAE,CAAC;QAEd,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC;aAChB,MAAM,EAAE;aACR,QAAQ,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;aAC5B,OAAO,CAAC,IAAI,CAAC,CAAC;IACvB,CAAC;CACJ;AAvBD,wEAuBC"}

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

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