@privateaim/server-http-kit 0.8.3 → 0.8.5

package/src/services/authup/utils.ts

@@ -5,13 +5,13 @@
  * view the LICENSE file that was distributed with this source code.
  */
 
-import type { Ability } from '@authup/kit';
-import { Abilities } from '@authup/kit';
-import { PermissionName as AuthupPermissionName, REALM_MASTER_NAME } from '@authup/core-kit';
-import type { TokenVerificationData } from '@authup/server-core-plugin-kit';
-import { PermissionName } from '@privateaim/kit';
+import type { PermissionProvider } from '@authup/access';
+import { PermissionChecker, PermissionMemoryProvider } from '@authup/access';
+import { REALM_MASTER_NAME, transformOAuth2ScopeToArray } from '@authup/core-kit';
+import type { TokenVerificationData } from '@authup/server-adapter-kit';
 import type { Request } from 'routup';
-import { setRequestEnv } from '../../request';
+import { RequestPermissionChecker, setRequestEnv } from '../../request';
+import { FakePermissionProvider } from './permission-provider';
 
 type TokenVerificationDataMinimal = Pick<
 TokenVerificationData,
@@ -20,18 +20,10 @@ TokenVerificationData,
 'realm_name' |
 'sub' |
 'sub_kind' |
-'sub_name'
+'sub_name' |
+'scope'
 >;
 
-function generateAbilities(): Ability[] {
-    return Object.values({
-        ...PermissionName,
-        ...AuthupPermissionName,
-    }).map((name) => ({
-        name,
-    } satisfies Ability));
-}
-
 export function createFakeTokenVerificationData(): TokenVerificationDataMinimal {
     return {
         realm_id: 'd94b2f28-29e3-4ced-b8f1-6923a01dc1ee',
@@ -41,7 +33,7 @@ export function createFakeTokenVerificationData(): TokenVerificationDataMinimal
         sub: 'd94b2f28-29e3-4ced-b8f1-6923a01dc1ee',
         sub_name: 'admin',
 
-        permissions: generateAbilities(),
+        permissions: [],
     };
 }
 
@@ -50,33 +42,29 @@ export function applyTokenVerificationData(
     data: TokenVerificationDataMinimal,
     fakeAbilities?: boolean,
 ) {
-    let abilities: Ability[];
+    let provider : PermissionProvider;
     if (fakeAbilities) {
-        abilities = generateAbilities();
+        provider = new FakePermissionProvider();
     } else {
-        abilities = data.permissions;
+        provider = new PermissionMemoryProvider(data.permissions);
     }
 
-    const ability = new Abilities(abilities);
-    setRequestEnv(req, 'abilities', ability);
+    const permissionChecker = new PermissionChecker({
+        provider,
+    });
+    const requestPermissionChecker = new RequestPermissionChecker(req, permissionChecker);
+    setRequestEnv(req, 'permissionChecker', requestPermissionChecker);
 
-    setRequestEnv(req, 'realmId', data.realm_id);
-    setRequestEnv(req, 'realmName', data.realm_name);
-    setRequestEnv(req, 'realm', {
-        id: data.realm_id,
-        name: data.realm_name,
+    setRequestEnv(req, 'identity', {
+        id: data.sub,
+        type: data.sub_kind,
+        realmId: data.realm_id,
+        realmName: data.realm_name,
+        attributes: {
+            id: data.sub,
+            name: data.sub_name,
+        },
     });
 
-    switch (data.sub_kind) {
-        case 'user': {
-            setRequestEnv(req, 'userId', data.sub);
-            setRequestEnv(req, 'userName', data.sub_name);
-            break;
-        }
-        case 'robot': {
-            setRequestEnv(req, 'robotId', data.sub);
-            setRequestEnv(req, 'robotName', data.sub_name);
-            break;
-        }
-    }
+    setRequestEnv(req, 'scopes', transformOAuth2ScopeToArray(data.scope));
 }

package/dist/validation/index.d.ts

@@ -1,5 +0,0 @@
-export * from './message';
-export * from './module';
-export * from './type';
-export * from './result';
-//# sourceMappingURL=index.d.ts.map

package/dist/validation/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/validation/index.ts"],"names":[],"mappings":"AAOA,cAAc,WAAW,CAAC;AAC1B,cAAc,UAAU,CAAC;AACzB,cAAc,QAAQ,CAAC;AACvB,cAAc,UAAU,CAAC"}

package/dist/validation/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/validation/index.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;;;;;;;;;;;;;AAEH,4CAA0B;AAC1B,2CAAyB;AACzB,yCAAuB;AACvB,2CAAyB"}

package/dist/validation/message.d.ts

@@ -1,2 +0,0 @@
-export declare function buildHTTPValidationErrorMessage<T extends Record<string, any> = Record<string, any>>(name: keyof T | (keyof T)[]): string;
-//# sourceMappingURL=message.d.ts.map

package/dist/validation/message.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"message.d.ts","sourceRoot":"","sources":["../../src/validation/message.ts"],"names":[],"mappings":"AAOA,wBAAgB,+BAA+B,CAC3C,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EACrD,IAAI,EAAE,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,EAAE,UAO5B"}

package/dist/validation/message.js

@@ -1,17 +0,0 @@
-"use strict";
-/*
- * Copyright (c) 2024.
- * 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.buildHTTPValidationErrorMessage = buildHTTPValidationErrorMessage;
-function buildHTTPValidationErrorMessage(name) {
-    const names = Array.isArray(name) ? name : [name];
-    if (names.length > 1) {
-        return `The parameters ${names.join(', ')} is invalid.`;
-    }
-    return `The parameter ${String(names[0])} is invalid.`;
-}
-//# sourceMappingURL=message.js.map

package/dist/validation/message.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"message.js","sourceRoot":"","sources":["../../src/validation/message.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AAEH,0EASC;AATD,SAAgB,+BAA+B,CAE7C,IAA2B;IACzB,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IAElD,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACnB,OAAO,kBAAkB,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC;IAC5D,CAAC;IACD,OAAO,iBAAiB,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC;AAC3D,CAAC"}

package/dist/validation/module.d.ts

@@ -1,6 +0,0 @@
-import { BadRequestError } from '@ebec/http';
-import type { Result, ValidationError } from 'express-validator';
-export declare class HTTPValidationError extends BadRequestError {
-    constructor(validation: Result<ValidationError>);
-}
-//# sourceMappingURL=module.d.ts.map

package/dist/validation/module.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"module.d.ts","sourceRoot":"","sources":["../../src/validation/module.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAC7C,OAAO,KAAK,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAGjE,qBAAa,mBAAoB,SAAQ,eAAe;gBACxC,UAAU,EAAE,MAAM,CAAC,eAAe,CAAC;CAoClD"}

package/dist/validation/module.js

@@ -1,45 +0,0 @@
-"use strict";
-/*
- * Copyright (c) 2022-2024.
- * 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.HTTPValidationError = void 0;
-const http_1 = require("@ebec/http");
-const message_1 = require("./message");
-class HTTPValidationError extends http_1.BadRequestError {
-    constructor(validation) {
-        const errors = validation.array();
-        const parameterNames = [];
-        for (let i = 0; i < errors.length; i++) {
-            const item = errors[i];
-            switch (item.type) {
-                case 'field': {
-                    parameterNames.push(item.path);
-                    break;
-                }
-                case 'alternative': {
-                    parameterNames.push(item.nestedErrors.map(((el) => el.path)).join('|'));
-                    break;
-                }
-            }
-        }
-        let message;
-        if (parameterNames.length > 0) {
-            message = (0, message_1.buildHTTPValidationErrorMessage)(Array.from(new Set(parameterNames)));
-        }
-        else {
-            message = 'An unexpected validation error occurred.';
-        }
-        super({
-            message,
-            data: {
-                errors,
-            },
-        });
-    }
-}
-exports.HTTPValidationError = HTTPValidationError;
-//# sourceMappingURL=module.js.map

package/dist/validation/module.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"module.js","sourceRoot":"","sources":["../../src/validation/module.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,qCAA6C;AAE7C,uCAA4D;AAE5D,MAAa,mBAAoB,SAAQ,sBAAe;IACpD,YAAY,UAAmC;QAC3C,MAAM,MAAM,GAAuB,UAAU,CAAC,KAAK,EAAE,CAAC;QAEtD,MAAM,cAAc,GAAG,EAAE,CAAC;QAC1B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YACrC,MAAM,IAAI,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;YAEvB,QAAQ,IAAI,CAAC,IAAI,EAAE,CAAC;gBAChB,KAAK,OAAO,CAAC,CAAC,CAAC;oBACX,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;oBAC/B,MAAM;gBACV,CAAC;gBACD,KAAK,aAAa,CAAC,CAAC,CAAC;oBACjB,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG,CACrC,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,CACpB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;oBACb,MAAM;gBACV,CAAC;YACL,CAAC;QACL,CAAC;QAED,IAAI,OAAgB,CAAC;QAErB,IAAI,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC5B,OAAO,GAAG,IAAA,yCAA+B,EAAC,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC;QACnF,CAAC;aAAM,CAAC;YACJ,OAAO,GAAG,0CAA0C,CAAC;QACzD,CAAC;QAED,KAAK,CAAC;YACF,OAAO;YACP,IAAI,EAAE;gBACF,MAAM;aACT;SACJ,CAAC,CAAC;IACP,CAAC;CACJ;AArCD,kDAqCC"}

package/dist/validation/result.d.ts

@@ -1,7 +0,0 @@
-import type { MatchedDataOptions } from 'express-validator';
-import type { Request } from 'routup';
-import type { EntityTarget } from 'typeorm';
-import type { HTTPValidationExtendKeys, HTTPValidationResult } from './type';
-export declare function createHTTPValidationResult<R extends Record<string, any>, M extends Record<string, any> = Record<string, any>>(req: Request, options?: Partial<MatchedDataOptions>): HTTPValidationResult<R, M>;
-export declare function extendHTTPValidationResultWithRelation<R extends Record<string, any>>(result: HTTPValidationResult<R>, target: EntityTarget<any>, keys: HTTPValidationExtendKeys<R>): Promise<HTTPValidationResult<R>>;
-//# sourceMappingURL=result.d.ts.map

package/dist/validation/result.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"result.d.ts","sourceRoot":"","sources":["../../src/validation/result.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAE5D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAI5C,OAAO,KAAK,EAAE,wBAAwB,EAAE,oBAAoB,EAAE,MAAM,QAAQ,CAAC;AAE7E,wBAAgB,0BAA0B,CACtC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAC7B,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EACrD,GAAG,EAAE,OAAO,EAAE,OAAO,GAAE,OAAO,CAAC,kBAAkB,CAAM,GAAI,oBAAoB,CAAC,CAAC,EAAE,CAAC,CAAC,CActF;AAED,wBAAsB,sCAAsC,CACxD,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAE7B,MAAM,EAAE,oBAAoB,CAAC,CAAC,CAAC,EAC/B,MAAM,EAAE,YAAY,CAAC,GAAG,CAAC,EACzB,IAAI,EAAE,wBAAwB,CAAC,CAAC,CAAC,GACjC,OAAO,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC,CAcnC"}

package/dist/validation/result.js

@@ -1,43 +0,0 @@
-"use strict";
-/*
- * Copyright (c) 2022-2024.
- * 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.createHTTPValidationResult = createHTTPValidationResult;
-exports.extendHTTPValidationResultWithRelation = extendHTTPValidationResultWithRelation;
-const http_1 = require("@ebec/http");
-const kit_1 = require("@privateaim/kit");
-const express_validator_1 = require("express-validator");
-const typeorm_extension_1 = require("typeorm-extension");
-const message_1 = require("./message");
-const module_1 = require("./module");
-function createHTTPValidationResult(req, options = {}) {
-    const validation = (0, express_validator_1.validationResult)(req);
-    if (!validation.isEmpty()) {
-        throw new module_1.HTTPValidationError(validation);
-    }
-    return {
-        data: (0, kit_1.deleteUndefinedObjectProperties)((0, express_validator_1.matchedData)(req, {
-            includeOptionals: true,
-            ...options,
-        })),
-        meta: {},
-        relation: {},
-    };
-}
-async function extendHTTPValidationResultWithRelation(result, target, keys) {
-    if (result.data[keys.id]) {
-        const dataSource = await (0, typeorm_extension_1.useDataSource)();
-        const repository = dataSource.getRepository(target);
-        const entity = await repository.findOneBy({ id: result.data[keys.id] });
-        if (!entity) {
-            throw new http_1.BadRequestError((0, message_1.buildHTTPValidationErrorMessage)(keys.id));
-        }
-        result.relation[keys.entity] = entity;
-    }
-    return result;
-}
-//# sourceMappingURL=result.js.map

package/dist/validation/result.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"result.js","sourceRoot":"","sources":["../../src/validation/result.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AAaH,gEAiBC;AAED,wFAoBC;AAlDD,qCAA6C;AAC7C,yCAAkE;AAElE,yDAAkE;AAGlE,yDAAkD;AAClD,uCAA4D;AAC5D,qCAA+C;AAG/C,SAAgB,0BAA0B,CAGxC,GAAY,EAAE,UAAuC,EAAE;IACrD,MAAM,UAAU,GAAG,IAAA,oCAAgB,EAAC,GAAG,CAAC,CAAC;IACzC,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC;QACxB,MAAM,IAAI,4BAAmB,CAAC,UAAU,CAAC,CAAC;IAC9C,CAAC;IAED,OAAO;QACH,IAAI,EAAE,IAAA,qCAA+B,EAAC,IAAA,+BAAW,EAAC,GAAG,EAAE;YACnD,gBAAgB,EAAE,IAAI;YACtB,GAAG,OAAO;SACb,CAAC,CAAM;QACR,IAAI,EAAE,EAAO;QACb,QAAQ,EAAE,EAAE;KACf,CAAC;AACN,CAAC;AAEM,KAAK,UAAU,sCAAsC,CAGxD,MAA+B,EAC/B,MAAyB,EACzB,IAAiC;IAEjC,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC;QACvB,MAAM,UAAU,GAAG,MAAM,IAAA,iCAAa,GAAE,CAAC;QAEzC,MAAM,UAAU,GAAG,UAAU,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;QACpD,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;QACxE,IAAI,CAAC,MAAM,EAAE,CAAC;YACV,MAAM,IAAI,sBAAe,CAAC,IAAA,yCAA+B,EAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;QACxE,CAAC;QAED,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAmD,CAAC,GAAG,MAAM,CAAC;IACvF,CAAC;IAED,OAAO,MAAM,CAAC;AAClB,CAAC"}

package/dist/validation/type.d.ts

@@ -1,15 +0,0 @@
-export type HTTPValidationResultMetaKey<T extends Record<string, any>> = ({
-    [K in keyof T]?: T[K] extends Record<string, any> ? T[K] extends Date ? never : K : never;
-})[keyof T];
-export type HTTPValidationResult<T extends Record<string, any>, M extends Record<string, any> = Record<string, any>> = {
-    data: Partial<T>;
-    relation: {
-        [K in HTTPValidationResultMetaKey<T>]?: T[K];
-    };
-    meta: M;
-};
-export type HTTPValidationExtendKeys<T extends Record<string, any>> = {
-    id: keyof T;
-    entity: HTTPValidationResultMetaKey<T>;
-};
-//# sourceMappingURL=type.d.ts.map

package/dist/validation/type.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"type.d.ts","sourceRoot":"","sources":["../../src/validation/type.ts"],"names":[],"mappings":"AAOA,MAAM,MAAM,2BAA2B,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC;KACrE,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAC7C,CAAC,CAAC,CAAC,CAAC,SAAS,IAAI,GAAG,KAAK,GAAG,CAAC,GAC7B,KAAK;CACZ,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;AAEZ,MAAM,MAAM,oBAAoB,CAC5B,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAC7B,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,IAC/C;IACA,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC;IACjB,QAAQ,EAAE;SACL,CAAC,IAAI,2BAA2B,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;KAC/C,CAAC;IACF,IAAI,EAAE,CAAC,CAAA;CACV,CAAC;AAEN,MAAM,MAAM,wBAAwB,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,IAAI;IAClE,EAAE,EAAE,MAAM,CAAC,CAAC;IACZ,MAAM,EAAE,2BAA2B,CAAC,CAAC,CAAC,CAAA;CACzC,CAAC"}

package/dist/validation/type.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"type.js","sourceRoot":"","sources":["../../src/validation/type.ts"],"names":[],"mappings":";AAAA;;;;;GAKG"}

package/src/validation/message.ts

@@ -1,17 +0,0 @@
-/*
- * Copyright (c) 2024.
- * Author Peter Placzek (tada5hi)
- * For the full copyright and license information,
- * view the LICENSE file that was distributed with this source code.
- */
-
-export function buildHTTPValidationErrorMessage<
-    T extends Record<string, any> = Record<string, any>,
->(name: keyof T | (keyof T)[]) {
-    const names = Array.isArray(name) ? name : [name];
-
-    if (names.length > 1) {
-        return `The parameters ${names.join(', ')} is invalid.`;
-    }
-    return `The parameter ${String(names[0])} is invalid.`;
-}

package/src/validation/module.ts

@@ -1,49 +0,0 @@
-/*
- * Copyright (c) 2022-2024.
- * Author Peter Placzek (tada5hi)
- * For the full copyright and license information,
- * view the LICENSE file that was distributed with this source code.
- */
-
-import { BadRequestError } from '@ebec/http';
-import type { Result, ValidationError } from 'express-validator';
-import { buildHTTPValidationErrorMessage } from './message';
-
-export class HTTPValidationError extends BadRequestError {
-    constructor(validation: Result<ValidationError>) {
-        const errors : ValidationError[] = validation.array();
-
-        const parameterNames = [];
-        for (let i = 0; i < errors.length; i++) {
-            const item = errors[i];
-
-            switch (item.type) {
-                case 'field': {
-                    parameterNames.push(item.path);
-                    break;
-                }
-                case 'alternative': {
-                    parameterNames.push(item.nestedErrors.map(
-                        ((el) => el.path),
-                    ).join('|'));
-                    break;
-                }
-            }
-        }
-
-        let message : string;
-
-        if (parameterNames.length > 0) {
-            message = buildHTTPValidationErrorMessage(Array.from(new Set(parameterNames)));
-        } else {
-            message = 'An unexpected validation error occurred.';
-        }
-
-        super({
-            message,
-            data: {
-                errors,
-            },
-        });
-    }
-}

package/src/validation/result.ts

@@ -1,58 +0,0 @@
-/*
- * Copyright (c) 2022-2024.
- * Author Peter Placzek (tada5hi)
- * For the full copyright and license information,
- * view the LICENSE file that was distributed with this source code.
- */
-
-import { BadRequestError } from '@ebec/http';
-import { deleteUndefinedObjectProperties } from '@privateaim/kit';
-import type { MatchedDataOptions } from 'express-validator';
-import { matchedData, validationResult } from 'express-validator';
-import type { Request } from 'routup';
-import type { EntityTarget } from 'typeorm';
-import { useDataSource } from 'typeorm-extension';
-import { buildHTTPValidationErrorMessage } from './message';
-import { HTTPValidationError } from './module';
-import type { HTTPValidationExtendKeys, HTTPValidationResult } from './type';
-
-export function createHTTPValidationResult<
-    R extends Record<string, any>,
-    M extends Record<string, any> = Record<string, any>,
->(req: Request, options: Partial<MatchedDataOptions> = {}) : HTTPValidationResult<R, M> {
-    const validation = validationResult(req);
-    if (!validation.isEmpty()) {
-        throw new HTTPValidationError(validation);
-    }
-
-    return {
-        data: deleteUndefinedObjectProperties(matchedData(req, {
-            includeOptionals: true,
-            ...options,
-        })) as R,
-        meta: {} as M,
-        relation: {},
-    };
-}
-
-export async function extendHTTPValidationResultWithRelation<
-    R extends Record<string, any>,
-    >(
-    result: HTTPValidationResult<R>,
-    target: EntityTarget<any>,
-    keys: HTTPValidationExtendKeys<R>,
-) : Promise<HTTPValidationResult<R>> {
-    if (result.data[keys.id]) {
-        const dataSource = await useDataSource();
-
-        const repository = dataSource.getRepository(target);
-        const entity = await repository.findOneBy({ id: result.data[keys.id] });
-        if (!entity) {
-            throw new BadRequestError(buildHTTPValidationErrorMessage(keys.id));
-        }
-
-        result.relation[keys.entity as keyof HTTPValidationResult<R>['relation']] = entity;
-    }
-
-    return result;
-}

package/src/validation/type.ts

@@ -1,28 +0,0 @@
-/*
- * Copyright (c) 2022-2024.
- * Author Peter Placzek (tada5hi)
- * For the full copyright and license information,
- * view the LICENSE file that was distributed with this source code.
- */
-
-export type HTTPValidationResultMetaKey<T extends Record<string, any>> = ({
-    [K in keyof T]?: T[K] extends Record<string, any> ?
-        T[K] extends Date ? never : K :
-        never
-})[keyof T];
-
-export type HTTPValidationResult<
-    T extends Record<string, any>,
-    M extends Record<string, any> = Record<string, any>,
-    > = {
-        data: Partial<T>,
-        relation: {
-            [K in HTTPValidationResultMetaKey<T>]?: T[K]
-        },
-        meta: M
-    };
-
-export type HTTPValidationExtendKeys<T extends Record<string, any>> = {
-    id: keyof T,
-    entity: HTTPValidationResultMetaKey<T>
-};