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

package/dist/http/controllers/role-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 an permission by id to a specific user.
  *
@@ -22,16 +23,46 @@ const constants_1 = require("../../../request/constants");
  * @param res
  */
 async function createRolePermissionRouteHandler(req, res) {
-    const ability = (0, env_1.useRequestEnv)(req, 'abilities');
-    if (!ability.has(core_kit_1.PermissionName.ROLE_PERMISSION_ADD)) {
+    const abilities = (0, utils_2.useRequestEnv)(req, 'abilities');
+    if (!abilities.has(core_kit_1.PermissionName.ROLE_PERMISSION_ADD)) {
         throw new http_1.ForbiddenError();
     }
     // ----------------------------------------------
-    const result = await (0, utils_1.runRolePermissionValidation)(req, constants_1.RequestHandlerOperation.CREATE);
+    const validator = new utils_3.RolePermissionRequestValidator();
+    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;
+        if (!data.role || data.role.name !== core_kit_1.ROLE_ADMIN_NAME) {
+            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.role) {
+        if (!(0, core_kit_1.isRealmResourceWritable)((0, utils_2.useRequestEnv)(req, 'realm'), data.role.realm_id)) {
+            throw new http_1.BadRequestError((0, utils_1.buildErrorMessageForAttribute)('role_id'));
+        }
+        data.role_realm_id = data.role.realm_id;
+    }
+    // ----------------------------------------------
+    if (!abilities.has(core_kit_1.PermissionName.USER_ROLE_ADD, policyEvaluationContext)) {
+        throw new http_1.ForbiddenError();
+    }
     // ----------------------------------------------
     const dataSource = await (0, typeorm_extension_1.useDataSource)();
     const repository = dataSource.getRepository(domains_1.RolePermissionEntity);
-    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/role-permission/handlers/create.js.map

@@ -1 +1 @@
-{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../../../src/http/controllers/role-permission/handlers/create.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,qCAA4C;AAC5C,+CAAkD;AAElD,mCAAqC;AACrC,yDAAkD;AAClD,iDAE6B;AAC7B,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/role-permission/handlers/create.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAGH,qCAA6D;AAC7D,+CAE0B;AAE1B,mCAAqC;AACrC,yDAAkD;AAClD,iDAE6B;AAC7B,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,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,0BAAe,EAAE,CAAC;YACnD,MAAM,OAAO,GAAG,IAAA,qCAA0B,EAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YAC5D,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,OAAO,EAAE,uBAAuB,CAAC,EAAE,CAAC;gBACnD,MAAM,IAAI,qBAAc,CAAC,qCAAqC,CAAC,CAAC;YACpE,CAAC;QACL,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,aAAa,EAAE,uBAAuB,CAAC,EAAE,CAAC;QACxE,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;AA3DD,4EA2DC"}

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

@@ -1 +1 @@
-{"version":3,"file":"delete.d.ts","sourceRoot":"","sources":["../../../../../src/http/controllers/role-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,CAuCjG"}
+{"version":3,"file":"delete.d.ts","sourceRoot":"","sources":["../../../../../src/http/controllers/role-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/role-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 deleteRolePermissionRouteHandler(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.ROLE_PERMISSION_DROP)) {
         throw new http_1.ForbiddenError();
     }
     const dataSource = await (0, typeorm_extension_1.useDataSource)();
     const repository = dataSource.getRepository(domains_1.RolePermissionEntity);
-    const entity = await repository.findOneBy({ id });
+    const entity = await repository.findOne({
+        where: {
+            id,
+        },
+        relations: {
+            role: true,
+            permission: true,
+        },
+    });
     if (!entity) {
         throw new http_1.NotFoundError();
     }
     // ----------------------------------------------
-    if (!(0, core_kit_1.isRealmResourceWritable)((0, env_1.useRequestEnv)(req, 'realm'), entity.role_realm_id)) {
+    if (!(0, core_kit_1.isRealmResourceWritable)((0, utils_1.useRequestEnv)(req, 'realm'), entity.role_realm_id)) {
         throw new http_1.ForbiddenError();
     }
     // ----------------------------------------------
-    if (!ability.satisfy(core_kit_1.PermissionName.ROLE_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.ROLE_PERMISSION_DROP, { resource: entity })) {
+        throw new http_1.ForbiddenError();
     }
     // ----------------------------------------------
     const { id: entityId } = entity;

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

@@ -1 +1 @@
-{"version":3,"file":"delete.js","sourceRoot":"","sources":["../../../../../src/http/controllers/role-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,IAAI,CAAC,IAAA,kCAAuB,EAAC,IAAA,mBAAa,EAAC,GAAG,EAAE,OAAO,CAAC,EAAE,MAAM,CAAC,aAAa,CAAC,EAAE,CAAC;QAC9E,MAAM,IAAI,qBAAc,EAAE,CAAC;IAC/B,CAAC;IAED,iDAAiD;IAEjD,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,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;AAvCD,4EAuCC"}
+{"version":3,"file":"delete.js","sourceRoot":"","sources":["../../../../../src/http/controllers/role-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/role-permission/utils/validation.d.ts

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

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

@@ -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,CAkFzD"}
+{"version":3,"file":"validation.d.ts","sourceRoot":"","sources":["../../../../../src/http/controllers/role-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/role-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.runRolePermissionValidation = void 0;
-const express_validator_1 = require("express-validator");
-const http_1 = require("@ebec/http");
-const core_kit_1 = require("@authup/core-kit");
+exports.RolePermissionRequestValidator = 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 runRolePermissionValidation(req, operation) {
-    const result = (0, validation_1.initExpressValidationResult)();
-    if (operation === constants_1.RequestHandlerOperation.CREATE) {
-        await (0, express_validator_1.check)('role_id')
+const request_1 = require("../../../request");
+class RolePermissionRequestValidator extends core_1.RequestDatabaseValidator {
+    constructor() {
+        super(domains_1.RolePermissionEntity);
+        this.mount();
+    }
+    mount() {
+        this.addTo(request_1.RequestHandlerOperation.CREATE, 'role_id')
             .exists()
-            .isUUID()
-            .run(req);
-        await (0, express_validator_1.check)('permission_id')
+            .isUUID();
+        this.addTo(request_1.RequestHandlerOperation.CREATE, 'permission_id')
             .exists()
+            .isUUID();
+        this.add('policy_id')
             .isUUID()
-            .run(req);
-        await (0, express_validator_1.check)('target')
-            .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 role permissions, which are also owned.');
-        }
-    }
-    const permission = ability.findOne(core_kit_1.PermissionName.ROLE_PERMISSION_ADD);
-    if (permission) {
-        result.data.target = permission.target;
-    }
-    // ----------------------------------------------
-    await (0, validation_1.extendExpressValidationResultWithRelation)(result, domains_1.RoleEntity, {
-        id: 'role_id',
-        entity: 'role',
-    });
-    if (result.relation.role) {
-        if (!(0, core_kit_1.isRealmResourceWritable)((0, utils_1.useRequestEnv)(req, 'realm'), result.relation.role.realm_id)) {
-            throw new http_1.BadRequestError((0, validation_1.buildRequestValidationErrorMessage)('role_id'));
-        }
-        result.data.role_realm_id = result.relation.role.realm_id;
+            .optional({ values: 'null' })
+            .default(null);
     }
-    // ----------------------------------------------
-    return result;
 }
-exports.runRolePermissionValidation = runRolePermissionValidation;
+exports.RolePermissionRequestValidator = RolePermissionRequestValidator;
 //# sourceMappingURL=validation.js.map

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

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

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

package/dist/http/controllers/root/base/handlers/activate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"activate.d.ts","sourceRoot":"","sources":["../../../../../../src/http/controllers/root/base/handlers/activate.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAMhD,wBAAsB,8BAA8B,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,GAAI,OAAO,CAAC,GAAG,CAAC,CAmC/F"}
+{"version":3,"file":"activate.d.ts","sourceRoot":"","sources":["../../../../../../src/http/controllers/root/base/handlers/activate.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAGhD,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAGvD,qBAAa,0BAA2B,SAAQ,gBAAgB,CAAC;IAAE,KAAK,EAAE,MAAM,CAAA;CAAC,CAAC;;CASjF;AAED,wBAAsB,8BAA8B,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,GAAI,OAAO,CAAC,GAAG,CAAC,CAyB/F"}

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

@@ -6,24 +6,25 @@
  * view the LICENSE file that was distributed with this source code.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createAuthActivateRouteHandler = void 0;
-const express_validator_1 = require("express-validator");
+exports.createAuthActivateRouteHandler = exports.AuthActiveRequestValidator = void 0;
 const http_1 = require("@ebec/http");
 const routup_1 = require("routup");
 const typeorm_extension_1 = require("typeorm-extension");
+const core_1 = require("../../../../../core");
 const domains_1 = require("../../../../../domains");
-const validation_1 = require("../../../../validation");
-async function createAuthActivateRouteHandler(req, res) {
-    await (0, express_validator_1.check)('token')
-        .exists()
-        .notEmpty()
-        .isLength({ min: 3, max: 256 })
-        .run(req);
-    const validation = (0, express_validator_1.validationResult)(req);
-    if (!validation.isEmpty()) {
-        throw new validation_1.RequestValidationError(validation);
+class AuthActiveRequestValidator extends core_1.RequestValidator {
+    constructor() {
+        super();
+        this.add('token')
+            .exists()
+            .notEmpty()
+            .isLength({ min: 3, max: 256 });
     }
-    const data = (0, validation_1.matchedValidationData)(req, { includeOptionals: true });
+}
+exports.AuthActiveRequestValidator = AuthActiveRequestValidator;
+async function createAuthActivateRouteHandler(req, res) {
+    const validator = new AuthActiveRequestValidator();
+    const data = await validator.execute(req);
     // todo: log attempt ( token, ip_address, user_agent, created_at)
     const dataSource = await (0, typeorm_extension_1.useDataSource)();
     const repository = new domains_1.UserRepository(dataSource);

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

@@ -1 +1 @@
-{"version":3,"file":"activate.js","sourceRoot":"","sources":["../../../../../../src/http/controllers/root/base/handlers/activate.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,yDAA4D;AAC5D,qCAA2C;AAE3C,mCAAsC;AACtC,yDAAkD;AAClD,oDAAwD;AACxD,uDAAuF;AAEhF,KAAK,UAAU,8BAA8B,CAAC,GAAY,EAAE,GAAa;IAC5E,MAAM,IAAA,yBAAK,EAAC,OAAO,CAAC;SACf,MAAM,EAAE;SACR,QAAQ,EAAE;SACV,QAAQ,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC;SAC9B,GAAG,CAAC,GAAG,CAAC,CAAC;IAEd,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,IAAI,GAAG,IAAA,kCAAqB,EAAC,GAAG,EAAE,EAAE,gBAAgB,EAAE,IAAI,EAAE,CAAC,CAAC;IAEpE,iEAAiE;IAEjE,MAAM,UAAU,GAAG,MAAM,IAAA,iCAAa,GAAE,CAAC;IACzC,MAAM,UAAU,GAAG,IAAI,wBAAc,CAAC,UAAU,CAAC,CAAC;IAElD,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,SAAS,CAAC;QACtC,aAAa,EAAE,IAAI,CAAC,KAAK;KAC5B,CAAC,CAAC;IAEH,IAAI,CAAC,MAAM,EAAE,CAAC;QACV,MAAM,IAAI,oBAAa,EAAE,CAAC;IAC9B,CAAC;IAED,MAAM,CAAC,MAAM,GAAG,IAAI,CAAC;IACrB,MAAM,CAAC,aAAa,GAAG,IAAI,CAAC;IAE5B,MAAM,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAE9B,iCAAiC;IAEjC,OAAO,IAAA,qBAAY,EAAC,GAAG,EAAE,MAAM,CAAC,CAAC;AACrC,CAAC;AAnCD,wEAmCC"}
+{"version":3,"file":"activate.js","sourceRoot":"","sources":["../../../../../../src/http/controllers/root/base/handlers/activate.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,qCAA2C;AAE3C,mCAAsC;AACtC,yDAAkD;AAClD,8CAAuD;AACvD,oDAAwD;AAExD,MAAa,0BAA2B,SAAQ,uBAAkC;IAC9E;QACI,KAAK,EAAE,CAAC;QAER,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC;aACZ,MAAM,EAAE;aACR,QAAQ,EAAE;aACV,QAAQ,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC;IACxC,CAAC;CACJ;AATD,gEASC;AAEM,KAAK,UAAU,8BAA8B,CAAC,GAAY,EAAE,GAAa;IAC5E,MAAM,SAAS,GAAG,IAAI,0BAA0B,EAAE,CAAC;IACnD,MAAM,IAAI,GAAG,MAAM,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAE1C,iEAAiE;IAEjE,MAAM,UAAU,GAAG,MAAM,IAAA,iCAAa,GAAE,CAAC;IACzC,MAAM,UAAU,GAAG,IAAI,wBAAc,CAAC,UAAU,CAAC,CAAC;IAElD,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,SAAS,CAAC;QACtC,aAAa,EAAE,IAAI,CAAC,KAAK;KAC5B,CAAC,CAAC;IAEH,IAAI,CAAC,MAAM,EAAE,CAAC;QACV,MAAM,IAAI,oBAAa,EAAE,CAAC;IAC9B,CAAC;IAED,MAAM,CAAC,MAAM,GAAG,IAAI,CAAC;IACrB,MAAM,CAAC,aAAa,GAAG,IAAI,CAAC;IAE5B,MAAM,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAE9B,iCAAiC;IAEjC,OAAO,IAAA,qBAAY,EAAC,GAAG,EAAE,MAAM,CAAC,CAAC;AACrC,CAAC;AAzBD,wEAyBC"}

package/dist/http/controllers/root/base/handlers/password-forgot.d.ts

@@ -1,3 +1,8 @@
+import type { User } from '@authup/core-kit';
 import type { Request, Response } from 'routup';
+import { RequestValidator } from '../../../../../core';
+export declare class AuthPasswordForgotRequestValidator extends RequestValidator<User> {
+    constructor();
+}
 export declare function createAuthPasswordForgotRouteHandler(req: Request, res: Response): Promise<any>;
 //# sourceMappingURL=password-forgot.d.ts.map

package/dist/http/controllers/root/base/handlers/password-forgot.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"password-forgot.d.ts","sourceRoot":"","sources":["../../../../../../src/http/controllers/root/base/handlers/password-forgot.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAWhD,wBAAsB,oCAAoC,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,GAAI,OAAO,CAAC,GAAG,CAAC,CA+ErG"}
+{"version":3,"file":"password-forgot.d.ts","sourceRoot":"","sources":["../../../../../../src/http/controllers/root/base/handlers/password-forgot.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAIhD,OAAO,EAAE,gBAAgB,EAAqC,MAAM,qBAAqB,CAAC;AAM1F,qBAAa,kCAAmC,SAAQ,gBAAgB,CAAC,IAAI,CAAC;;CAoB7E;AAED,wBAAsB,oCAAoC,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,GAAI,OAAO,CAAC,GAAG,CAAC,CAyDrG"}

package/dist/http/controllers/root/base/handlers/password-forgot.js

@@ -6,16 +6,34 @@
  * view the LICENSE file that was distributed with this source code.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createAuthPasswordForgotRouteHandler = void 0;
+exports.createAuthPasswordForgotRouteHandler = exports.AuthPasswordForgotRequestValidator = void 0;
 const node_crypto_1 = require("node:crypto");
 const http_1 = require("@ebec/http");
-const express_validator_1 = require("express-validator");
 const routup_1 = require("routup");
 const typeorm_extension_1 = require("typeorm-extension");
 const core_1 = require("../../../../../core");
 const domains_1 = require("../../../../../domains");
 const config_1 = require("../../../../../config");
-const validation_1 = require("../../../../validation");
+class AuthPasswordForgotRequestValidator extends core_1.RequestValidator {
+    constructor() {
+        super();
+        this.addOneOf([
+            this.create('email')
+                .exists()
+                .notEmpty()
+                .isEmail(),
+            this.create('name')
+                .exists()
+                .notEmpty()
+                .isString(),
+        ]);
+        this.add('realm_id')
+            .exists()
+            .isUUID()
+            .optional({ nullable: true });
+    }
+}
+exports.AuthPasswordForgotRequestValidator = AuthPasswordForgotRequestValidator;
 async function createAuthPasswordForgotRouteHandler(req, res) {
     const config = (0, config_1.useConfig)();
     if (!config.registration) {
@@ -28,27 +46,8 @@ async function createAuthPasswordForgotRouteHandler(req, res) {
         config.env !== 'test') {
         throw new http_1.BadRequestError('SMTP modul is not configured.');
     }
-    await (0, express_validator_1.oneOf)([
-        (0, express_validator_1.check)('email')
-            .exists()
-            .notEmpty()
-            .isEmail(),
-        (0, express_validator_1.check)('name')
-            .exists()
-            .notEmpty()
-            .isString(),
-    ])
-        .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 AuthPasswordForgotRequestValidator();
+    const data = await validator.execute(req);
     const where = {
         ...(data.name ? { name: data.name } : {}),
         ...(data.email ? { email: data.email } : {}),

package/dist/http/controllers/root/base/handlers/password-forgot.js.map

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

package/dist/http/controllers/root/base/handlers/password-reset.d.ts

@@ -1,3 +1,10 @@
+import type { User } from '@authup/core-kit';
 import type { Request, Response } from 'routup';
+import { RequestValidator } from '../../../../../core';
+export declare class AuthPasswordResetRequestValidator extends RequestValidator<User & {
+    token: string;
+}> {
+    constructor();
+}
 export declare function createAuthPasswordResetRouteHandler(req: Request, res: Response): Promise<any>;
 //# sourceMappingURL=password-reset.d.ts.map

package/dist/http/controllers/root/base/handlers/password-reset.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"password-reset.d.ts","sourceRoot":"","sources":["../../../../../../src/http/controllers/root/base/handlers/password-reset.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAQhD,wBAAsB,mCAAmC,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,GAAI,OAAO,CAAC,GAAG,CAAC,CAgEpG"}
+{"version":3,"file":"password-reset.d.ts","sourceRoot":"","sources":["../../../../../../src/http/controllers/root/base/handlers/password-reset.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAKhD,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAGvD,qBAAa,iCAAkC,SAAQ,gBAAgB,CAAC,IAAI,GAAG;IAAE,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;;CA8BhG;AAED,wBAAsB,mCAAmC,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,GAAI,OAAO,CAAC,GAAG,CAAC,CA8BpG"}

package/dist/http/controllers/root/base/handlers/password-reset.js

@@ -6,45 +6,43 @@
  * view the LICENSE file that was distributed with this source code.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createAuthPasswordResetRouteHandler = void 0;
-const express_validator_1 = require("express-validator");
+exports.createAuthPasswordResetRouteHandler = exports.AuthPasswordResetRequestValidator = void 0;
 const routup_1 = require("routup");
 const http_1 = require("@ebec/http");
 const typeorm_extension_1 = require("typeorm-extension");
+const core_1 = require("../../../../../core");
 const domains_1 = require("../../../../../domains");
-const validation_1 = require("../../../../validation");
-async function createAuthPasswordResetRouteHandler(req, res) {
-    await (0, express_validator_1.oneOf)([
-        (0, express_validator_1.check)('email')
+class AuthPasswordResetRequestValidator extends core_1.RequestValidator {
+    constructor() {
+        super();
+        this.addOneOf([
+            this.create('email')
+                .exists()
+                .notEmpty()
+                .isEmail(),
+            this.create('name')
+                .exists()
+                .notEmpty()
+                .isString(),
+        ]);
+        this.add('realm_id')
+            .exists()
+            .isUUID()
+            .optional({ nullable: true });
+        this.add('token')
             .exists()
             .notEmpty()
-            .isEmail(),
-        (0, express_validator_1.check)('name')
+            .isLength({ min: 3, max: 256 });
+        this.add('password')
             .exists()
             .notEmpty()
-            .isString(),
-    ])
-        .run(req);
-    await (0, express_validator_1.check)('realm_id')
-        .exists()
-        .isUUID()
-        .optional({ nullable: true })
-        .run(req);
-    await (0, express_validator_1.check)('token')
-        .exists()
-        .notEmpty()
-        .isLength({ min: 3, max: 256 })
-        .run(req);
-    await (0, express_validator_1.check)('password')
-        .exists()
-        .notEmpty()
-        .isLength({ min: 5, max: 512 })
-        .run(req);
-    const validation = (0, express_validator_1.validationResult)(req);
-    if (!validation.isEmpty()) {
-        throw new validation_1.RequestValidationError(validation);
+            .isLength({ min: 5, max: 512 });
     }
-    const data = (0, validation_1.matchedValidationData)(req, { includeOptionals: true });
+}
+exports.AuthPasswordResetRequestValidator = AuthPasswordResetRequestValidator;
+async function createAuthPasswordResetRouteHandler(req, res) {
+    const validator = new AuthPasswordResetRequestValidator();
+    const data = await validator.execute(req);
     // todo: log attempt (email, token, ip_address, user_agent)
     const where = {
         ...(data.name ? { name: data.name } : {}),

package/dist/http/controllers/root/base/handlers/password-reset.js.map

@@ -1 +1 @@
-{"version":3,"file":"password-reset.js","sourceRoot":"","sources":["../../../../../../src/http/controllers/root/base/handlers/password-reset.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,yDAAmE;AAGnE,mCAAsC;AAEtC,qCAA2C;AAC3C,yDAAkD;AAClD,oDAAsE;AACtE,uDAAuF;AAEhF,KAAK,UAAU,mCAAmC,CAAC,GAAY,EAAE,GAAa;IACjF,MAAM,IAAA,yBAAK,EAAC;QACR,IAAA,yBAAK,EAAC,OAAO,CAAC;aACT,MAAM,EAAE;aACR,QAAQ,EAAE;aACV,OAAO,EAAE;QACd,IAAA,yBAAK,EAAC,MAAM,CAAC;aACR,MAAM,EAAE;aACR,QAAQ,EAAE;aACV,QAAQ,EAAE;KAClB,CAAC;SACG,GAAG,CAAC,GAAG,CAAC,CAAC;IAEd,MAAM,IAAA,yBAAK,EAAC,UAAU,CAAC;SAClB,MAAM,EAAE;SACR,MAAM,EAAE;SACR,QAAQ,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;SAC5B,GAAG,CAAC,GAAG,CAAC,CAAC;IAEd,MAAM,IAAA,yBAAK,EAAC,OAAO,CAAC;SACf,MAAM,EAAE;SACR,QAAQ,EAAE;SACV,QAAQ,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC;SAC9B,GAAG,CAAC,GAAG,CAAC,CAAC;IAEd,MAAM,IAAA,yBAAK,EAAC,UAAU,CAAC;SAClB,MAAM,EAAE;SACR,QAAQ,EAAE;SACV,QAAQ,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC;SAC9B,GAAG,CAAC,GAAG,CAAC,CAAC;IAEd,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,IAAI,GAAG,IAAA,kCAAqB,EAAC,GAAG,EAAE,EAAE,gBAAgB,EAAE,IAAI,EAAE,CAAsC,CAAC;IAEzG,2DAA2D;IAE3D,MAAM,KAAK,GAA4B;QACnC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACzC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC5C,UAAU,EAAE,IAAI,CAAC,KAAK;KACzB,CAAC;IAEF,MAAM,KAAK,GAAG,MAAM,IAAA,sBAAY,EAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;IACtD,KAAK,CAAC,QAAQ,GAAG,KAAK,CAAC,EAAE,CAAC;IAE1B,MAAM,UAAU,GAAG,MAAM,IAAA,iCAAa,GAAE,CAAC;IACzC,MAAM,UAAU,GAAG,IAAI,wBAAc,CAAC,UAAU,CAAC,CAAC;IAElD,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;IACjD,IAAI,CAAC,MAAM,EAAE,CAAC;QACV,MAAM,IAAI,oBAAa,EAAE,CAAC;IAC9B,CAAC;IAED,MAAM,CAAC,QAAQ,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;IAC3C,MAAM,CAAC,UAAU,GAAG,IAAI,CAAC;IACzB,MAAM,CAAC,aAAa,GAAG,IAAI,CAAC;IAE5B,MAAM,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAE9B,OAAO,IAAA,qBAAY,EAAC,GAAG,CAAC,CAAC;AAC7B,CAAC;AAhED,kFAgEC"}
+{"version":3,"file":"password-reset.js","sourceRoot":"","sources":["../../../../../../src/http/controllers/root/base/handlers/password-reset.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAIH,mCAAsC;AAEtC,qCAA2C;AAC3C,yDAAkD;AAClD,8CAAuD;AACvD,oDAAsE;AAEtE,MAAa,iCAAkC,SAAQ,uBAA0C;IAC7F;QACI,KAAK,EAAE,CAAC;QAER,IAAI,CAAC,QAAQ,CAAC;YACV,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC;iBACf,MAAM,EAAE;iBACR,QAAQ,EAAE;iBACV,OAAO,EAAE;YACd,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC;iBACd,MAAM,EAAE;iBACR,QAAQ,EAAE;iBACV,QAAQ,EAAE;SAClB,CAAC,CAAC;QAEH,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC;aACf,MAAM,EAAE;aACR,MAAM,EAAE;aACR,QAAQ,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;QAElC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC;aACZ,MAAM,EAAE;aACR,QAAQ,EAAE;aACV,QAAQ,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC;QAEpC,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC;aACf,MAAM,EAAE;aACR,QAAQ,EAAE;aACV,QAAQ,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC;IACxC,CAAC;CACJ;AA9BD,8EA8BC;AAEM,KAAK,UAAU,mCAAmC,CAAC,GAAY,EAAE,GAAa;IACjF,MAAM,SAAS,GAAG,IAAI,iCAAiC,EAAE,CAAC;IAC1D,MAAM,IAAI,GAAG,MAAM,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAE1C,2DAA2D;IAE3D,MAAM,KAAK,GAA4B;QACnC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACzC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC5C,UAAU,EAAE,IAAI,CAAC,KAAK;KACzB,CAAC;IAEF,MAAM,KAAK,GAAG,MAAM,IAAA,sBAAY,EAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;IACtD,KAAK,CAAC,QAAQ,GAAG,KAAK,CAAC,EAAE,CAAC;IAE1B,MAAM,UAAU,GAAG,MAAM,IAAA,iCAAa,GAAE,CAAC;IACzC,MAAM,UAAU,GAAG,IAAI,wBAAc,CAAC,UAAU,CAAC,CAAC;IAElD,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;IACjD,IAAI,CAAC,MAAM,EAAE,CAAC;QACV,MAAM,IAAI,oBAAa,EAAE,CAAC;IAC9B,CAAC;IAED,MAAM,CAAC,QAAQ,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;IAC3C,MAAM,CAAC,UAAU,GAAG,IAAI,CAAC;IACzB,MAAM,CAAC,aAAa,GAAG,IAAI,CAAC;IAE5B,MAAM,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAE9B,OAAO,IAAA,qBAAY,EAAC,GAAG,CAAC,CAAC;AAC7B,CAAC;AA9BD,kFA8BC"}

package/dist/http/controllers/root/base/handlers/register.d.ts

@@ -1,3 +1,8 @@
+import type { User } from '@authup/core-kit';
 import type { Request, Response } from 'routup';
+import { RequestValidator } from '../../../../../core';
+export declare class AuthRegisterRequestValidator extends RequestValidator<User> {
+    constructor();
+}
 export declare function createAuthRegisterRouteHandler(req: Request, res: Response): Promise<any>;
 //# sourceMappingURL=register.d.ts.map

package/dist/http/controllers/root/base/handlers/register.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"register.d.ts","sourceRoot":"","sources":["../../../../../../src/http/controllers/root/base/handlers/register.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAWhD,wBAAsB,8BAA8B,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,GAAI,OAAO,CAAC,GAAG,CAAC,CA8F/F"}
+{"version":3,"file":"register.d.ts","sourceRoot":"","sources":["../../../../../../src/http/controllers/root/base/handlers/register.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAG7C,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAIhD,OAAO,EAAE,gBAAgB,EAAqC,MAAM,qBAAqB,CAAC;AAM1F,qBAAa,4BAA6B,SAAQ,gBAAgB,CAAC,IAAI,CAAC;;CA+BvE;AAED,wBAAsB,8BAA8B,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,GAAI,OAAO,CAAC,GAAG,CAAC,CA4D/F"}