zibri 2.3.0 → 2.4.1

package/src/preact/generate-client-scripts.function.ts

@@ -1,6 +1,7 @@
 import { createRequire } from 'node:module';
 
 import { FsUtilities, FsPath } from '../utilities/fs.utilities';
+import { JsonUtilities } from '../utilities/json.utilities';
 import { toKebabCase } from '../utilities/to-kebab-case.function';
 
 const defaultGlobs: string[] = ['src/templates/pages/**/*.tsx', 'src/templates/components/**/*.tsx'];
@@ -53,7 +54,7 @@ export async function generateClientScripts(glob: string | string[] = defaultGlo
     const sorted: Record<string, string[]> = Object.fromEntries(
         Object.entries(packagesByComponent).sort(([a], [b]) => a.localeCompare(b))
     );
-    const newManifestContent: string = JSON.stringify(sorted, undefined, 4);
+    const newManifestContent: string = JsonUtilities.stringify(sorted, undefined, 4);
     if (await FsUtilities.exists(manifestFile)) {
         const oldFileContent: string = await FsUtilities.readFile(manifestFile);
         if (oldFileContent.trim() === newManifestContent.trim()) {
@@ -91,8 +92,8 @@ async function resolveBrowserDist(pkg: string): Promise<string> {
     // eslint-disable-next-line sonar/no-duplicate-string
     const userRequire: NodeJS.Require = createRequire(FsUtilities.getPath(process.cwd(), 'package.json'));
     const pkgDir: string = await findPackageDir(pkg, userRequire);
-    // eslint-disable-next-line typescript/no-unsafe-assignment
-    const pkgJson: Record<string, unknown> = JSON.parse(await FsUtilities.readFile(FsUtilities.getPath(pkgDir, 'package.json')));
+
+    const pkgJson: Record<string, unknown> = JsonUtilities.parse(await FsUtilities.readFile(FsUtilities.getPath(pkgDir, 'package.json')));
 
     const browserEntry: string | undefined = resolveBrowserEntry(pkgJson);
     if (!browserEntry) {
@@ -122,8 +123,8 @@ async function findPackageDir(pkg: string, userRequire: NodeJS.Require): Promise
     while (true) {
         const candidate: FsPath = FsUtilities.getPath(dir, 'package.json');
         try {
-            // eslint-disable-next-line typescript/no-unsafe-assignment
-            const json: Record<string, unknown> = JSON.parse(await FsUtilities.readFile(candidate));
+
+            const json: Record<string, unknown> = JsonUtilities.parse(await FsUtilities.readFile(candidate));
             if (json['name'] === pkg) {
                 return dir;
             }

package/src/preact/preact.utilities.ts

@@ -7,8 +7,13 @@ import { preactHooks } from './hooks/hooks';
 import { PreactComponent } from './preact-component.model';
 import { PreactEmailComponent } from './preact-email-component.model';
 import { findStringEnd, stringAwareReplace } from './string-aware-replace.function';
-import { HtmlResponse } from '../parsing/html/html-response.model';
+import { HttpRequestContext } from '../context/request/http-request.context';
+import { ZIBRI_REQUEST_CONTEXT_TOKENS } from '../context/request/request-context-token.model';
+import { WebsocketRequestContext } from '../context/request/websocket-request.context';
+import { ZIBRI_DI_TOKENS } from '../di/default/zibri-di-tokens.default';
+import { inject } from '../di/inject.function';
 import { FsUtilities, FsPath } from '../utilities/fs.utilities';
+import { JsonUtilities } from '../utilities/json.utilities';
 import { ObjectUtilities } from '../utilities/object.utilities';
 
 /**
@@ -230,43 +235,23 @@ export abstract class PreactUtilities {
                 .join('\n')
                 .replaceAll('</script>', '\\u003c/script>');
 
+            const context: HttpRequestContext | WebsocketRequestContext | undefined = inject(ZIBRI_DI_TOKENS.CURRENT_REQUEST_CONTEXT);
+            const nonce: string | undefined = await context?.get(ZIBRI_REQUEST_CONTEXT_TOKENS.NONCE);
+            const nonceAttr: string = nonce ? ` nonce="${nonce}"` : '';
             if (html.includes('</body>')) {
                 html = html.replace(
                     '</body>',
-                    `<script>\n${scriptContent}\n</script>\n</body>`
+                    `<script ${nonceAttr}>\n${scriptContent}\n</script>\n</body>`
                 );
             }
             else {
-                html += `\n<script>\n${scriptContent}\n</script>`;
+                html += `\n<script ${nonceAttr}>\n${scriptContent}\n</script>`;
             }
         }
 
         return '<!DOCTYPE html>\n' + html;
     }
 
-    /**
-     * Render a component and inline the component "body" (everything before the top-level return)
-     * into the same <script> tag that also contains the handler bootstrap. Then wrap it into a html response..
-     * @example
-     * ```ts
-     * PreactUtilities.renderResponse(TestPage, { initialCount: 1 });
-     * ```
-     * @param args - Component and props.
-     * @param args.component - The function component to render.
-     * @param args.props - The properties to pass into the component.
-     * @returns The fully rendered html as a ready to return html response.
-     */
-    static async renderResponse<P = {}>(
-        ...args: keyof P extends never
-            ? [component: PreactComponent<P>]
-            : [component: PreactComponent<P>, props: P]
-    ): Promise<HtmlResponse> {
-        const [component, props] = args;
-        // eslint-disable-next-line typescript/no-explicit-any
-        const htmlString: string = await this.renderPage<any>(component, props);
-        return HtmlResponse.fromString(htmlString);
-    }
-
     private static unescapeConditionalComments(html: string): string {
         let result: string = html;
         // Standard MSO blocks — both opening and closing are escaped
@@ -340,8 +325,7 @@ export abstract class PreactUtilities {
         }
         try {
             const manifestPath: FsPath = FsUtilities.getPath(process.cwd(), 'assets', 'public', 'vendor', 'manifest.json');
-            // eslint-disable-next-line typescript/no-unsafe-assignment
-            this.clientManifest = JSON.parse(await FsUtilities.readFile(manifestPath));
+            this.clientManifest = JsonUtilities.parse(await FsUtilities.readFile(manifestPath));
         }
         catch {
             this.clientManifest = {};
@@ -760,7 +744,7 @@ export abstract class PreactUtilities {
             }
         }
 
-        const safe: string = JSON.stringify(serializableProps, undefined, 4)
+        const safe: string = JsonUtilities.stringify(serializableProps, undefined, 4)
             .split('\n')
             .map((l, i) => i === 0 ? l : '    ' + l)
             .join('\n')
@@ -1046,8 +1030,7 @@ export abstract class PreactUtilities {
 
             for (const [key, value] of ObjectUtilities.entries(propBindings)) {
                 if (key.startsWith('__propsObj_')) {
-                    // eslint-disable-next-line typescript/no-unsafe-assignment
-                    const parsed: Record<string, string> = JSON.parse(value);
+                    const parsed: Record<string, string> = JsonUtilities.parse(value);
                     for (const [propName, resolvedName] of ObjectUtilities.entries(parsed)) {
                         entries.push(`${propName}: ${resolveValue(resolvedName)}`);
                     }
@@ -1066,7 +1049,7 @@ export abstract class PreactUtilities {
             }
 
             for (const [propName, val] of ObjectUtilities.entries(propValues)) {
-                entries.push(`${propName}: ${JSON.stringify(val)}`);
+                entries.push(`${propName}: ${JsonUtilities.stringify(val)}`);
             }
 
             if (entries.length) {
@@ -1106,7 +1089,7 @@ export abstract class PreactUtilities {
                 const propName: string = destructureRenameMap.get(localName) ?? localName;
 
                 if (propName in propValues) {
-                    lines.push(`    const ${prefix}${localName} = ${JSON.stringify(propValues[propName])};`);
+                    lines.push(`    const ${prefix}${localName} = ${JsonUtilities.stringify(propValues[propName])};`);
                     continue;
                 }
                 if (defaultSrc !== undefined) {

package/src/rate-limiting/rate-limiter.ts

@@ -52,6 +52,16 @@ export class RateLimiter {
         return new this(max, Ms.SECOND);
     }
 
+    /**
+     * Creates a rate limiter with a custom interval.
+     * @param max - The maximum available per the given interval.
+     * @param intervalInMs - The interval in ms.
+     * @returns The RateLimiter.
+     */
+    static custom(max: number, intervalInMs: number): RateLimiter {
+        return new this(max, intervalInMs);
+    }
+
     private refill(): void {
         const now: number = Date.now();
         const elapsedMs: number = now - this.lastRefill;

package/src/routing/decorators/body.decorator.ts

@@ -7,11 +7,12 @@ import { Newable } from '../../types/newable.type';
 import { OmitStrict } from '../../types/omit-strict.type';
 import { MetadataUtilities } from '../../utilities/metadata.utilities';
 import { Ms } from '../../utilities/ms';
+import { BigNumber } from '../../utilities/number.utilities';
 
 /**
  * Base metadata shared by all possible http request body properties.
  */
-type BaseBodyMetadata = OmitStrict<BasePropertyMetadata, 'excludeFromChangeSets'> & {
+type BaseBodyMetadata = OmitStrict<BasePropertyMetadata, 'excludeFromChangeSets' | 'exclude'> & {
     /**
      * The class that defines the structure of the body.
      */
@@ -134,7 +135,8 @@ function resolveMaxSize(bytes: BigNumber, properties: Record<string, PropertyMet
                 bytes = bytes.plus(resolveMaxSize(bytes, objectProperties));
                 break;
             }
-            case Relation.ONE_TO_ONE:
+            case Relation.HAS_ONE:
+            case Relation.BELONGS_TO_ONE:
             case Relation.ONE_TO_MANY:
             case Relation.MANY_TO_ONE:
             case Relation.MANY_TO_MANY:

package/src/routing/decorators/param.decorator.ts

@@ -11,7 +11,8 @@ import { createHeaderParamMetadata, createPathParamMetadata, createQueryParamMet
 /**
  * Metadata of path parameters.
  */
-export type PathParamMetadata = StringParamMetadata
+// eslint-disable-next-line typescript/no-explicit-any
+export type PathParamMetadata = StringParamMetadata<any, any, any, any, any>
     | NumberParamMetadata
     | BooleanParamMetadata
     | DateParamMetadata;
@@ -19,7 +20,8 @@ export type PathParamMetadata = StringParamMetadata
 /**
  * Metadata Input of path parameters.
  */
-export type PathParamMetadataInput = StringParamMetadataInput
+// eslint-disable-next-line typescript/no-explicit-any
+export type PathParamMetadataInput = StringParamMetadataInput<any, any, any, any, any>
     | NumberParamMetadataInput
     | BooleanParamMetadataInput
     | DateParamMetadataInput;
@@ -27,7 +29,8 @@ export type PathParamMetadataInput = StringParamMetadataInput
 /**
  * Metadata of query parameters.
  */
-export type QueryParamMetadata = StringParamMetadata
+// eslint-disable-next-line typescript/no-explicit-any
+export type QueryParamMetadata = StringParamMetadata<any, any, any, any, any>
     | NumberParamMetadata
     | BooleanParamMetadata
     | DateParamMetadata
@@ -37,7 +40,8 @@ export type QueryParamMetadata = StringParamMetadata
 /**
  * Metadata Input of query parameters.
  */
-export type QueryParamMetadataInput = StringParamMetadataInput
+// eslint-disable-next-line typescript/no-explicit-any
+export type QueryParamMetadataInput = StringParamMetadataInput<any, any, any, any, any>
     | NumberParamMetadataInput
     | BooleanParamMetadataInput
     | DateParamMetadataInput
@@ -48,7 +52,8 @@ export type QueryParamMetadataInput = StringParamMetadataInput
  * Metadata of header parameters.
  */
 export type HeaderParamMetadata = (
-    StringParamMetadata
+    // eslint-disable-next-line typescript/no-explicit-any
+    StringParamMetadata<any, any, any, any, any>
     | NumberParamMetadata
     | BooleanParamMetadata
     | DateParamMetadata
@@ -64,7 +69,8 @@ export type HeaderParamMetadata = (
 /**
  * Metadata Input of path parameters.
  */
-export type HeaderParamMetadataInput = StringParamMetadataInput
+// eslint-disable-next-line typescript/no-explicit-any
+export type HeaderParamMetadataInput = StringParamMetadataInput<any, any, any, any, any>
     | NumberParamMetadataInput
     | BooleanParamMetadataInput
     | DateParamMetadataInput

package/src/routing/models/array-param-metadata.model.ts

@@ -10,7 +10,8 @@ import { OmitStrict } from '../../types/omit-strict.type';
 /**
  * Metadata for an item of an array parameter.
  */
-export type ArrayParamItemMetadata = OmitStrict<StringParamMetadata, 'name'>
+// eslint-disable-next-line typescript/no-explicit-any
+export type ArrayParamItemMetadata = OmitStrict<StringParamMetadata<any, any, any, any, any>, 'name'>
     | OmitStrict<NumberParamMetadata, 'name'>
     | OmitStrict<BooleanParamMetadata, 'name'>
     | OmitStrict<DateParamMetadata, 'name'>
@@ -20,7 +21,8 @@ export type ArrayParamItemMetadata = OmitStrict<StringParamMetadata, 'name'>
 /**
  * Input metadata for an item of an array parameter.
  */
-export type ArrayParamItemMetadataInput = StringParamMetadataInput
+// eslint-disable-next-line typescript/no-explicit-any
+export type ArrayParamItemMetadataInput = StringParamMetadataInput<any, any, any, any, any>
     | NumberParamMetadataInput
     | BooleanParamMetadataInput
     | DateParamMetadataInput
@@ -30,7 +32,7 @@ export type ArrayParamItemMetadataInput = StringParamMetadataInput
 /**
  * Metadata for array parameters.
  */
-export type ArrayParamMetadata = BaseParamMetadata & OmitStrict<ArrayPropertyMetadata, 'excludeFromChangeSets' | 'items'> & {
+export type ArrayParamMetadata = BaseParamMetadata & OmitStrict<ArrayPropertyMetadata, 'excludeFromChangeSets' | 'exclude' | 'items'> & {
     /**
      * Metadata for the items inside this array parameter.
      */

package/src/routing/models/boolean-param-metadata.model.ts

@@ -5,7 +5,7 @@ import { OmitStrict } from '../../types/omit-strict.type';
 /**
  * Metadata for boolean parameters.
  */
-export type BooleanParamMetadata = BaseParamMetadata & OmitStrict<BooleanPropertyMetadata, 'default' | 'excludeFromChangeSets'>;
+export type BooleanParamMetadata = BaseParamMetadata & OmitStrict<BooleanPropertyMetadata, 'default' | 'exclude' | 'excludeFromChangeSets'>;
 
 /**
  * Metadata Input for boolean parameters.

package/src/routing/models/date-param-metadata.model.ts

@@ -5,7 +5,7 @@ import { OmitStrict } from '../../types/omit-strict.type';
 /**
  * Metadata for Date parameters.
  */
-export type DateParamMetadata = BaseParamMetadata & OmitStrict<DatePropertyMetadata, 'default' | 'excludeFromChangeSets'>;
+export type DateParamMetadata = BaseParamMetadata & OmitStrict<DatePropertyMetadata, 'default' | 'exclude' | 'excludeFromChangeSets'>;
 
 /**
  * Metadata Input for Date parameters.

package/src/routing/models/number-param-metadata.model.ts

@@ -5,7 +5,10 @@ import { OmitStrict } from '../../types/omit-strict.type';
 /**
  * Metadata for number parameters.
  */
-export type NumberParamMetadata = BaseParamMetadata & OmitStrict<NumberPropertyMetadata, 'primary' | 'default' | 'excludeFromChangeSets'>;
+export type NumberParamMetadata = BaseParamMetadata & OmitStrict<
+    NumberPropertyMetadata,
+    'primary' | 'default' | 'exclude' | 'excludeFromChangeSets'
+>;
 
 /**
  * Metadata Input for number parameters.

package/src/routing/models/object-param-metadata.model.ts

@@ -5,7 +5,10 @@ import { OmitStrict } from '../../types/omit-strict.type';
 /**
  * Metadata for object parameters.
  */
-export type ObjectParamMetadata = BaseParamMetadata & OmitStrict<ObjectPropertyMetadata, 'excludeFromChangeSets'>;
+export type ObjectParamMetadata = BaseParamMetadata & OmitStrict<
+    ObjectPropertyMetadata,
+    'exclude' | 'excludeFromChangeSets'
+>;
 
 /**
  * Metadata Input for object parameters.

package/src/routing/models/string-param-metadata.model.ts

@@ -1,13 +1,31 @@
 import { BaseParamMetadata } from './base-param-metadata.model';
+import { BaseDecryptOptions, BaseEncryptOptions } from '../../auth/encryption/strategies/encryption-strategy.interface';
+import { AnyObject } from '../../entity/any-object.model';
 import { StringPropertyMetadata } from '../../entity/models/string-property-metadata.model';
 import { OmitStrict } from '../../types/omit-strict.type';
 
 /**
  * Metadata for string parameters.
  */
-export type StringParamMetadata = BaseParamMetadata & OmitStrict<StringPropertyMetadata, 'primary' | 'default' | 'excludeFromChangeSets'>;
+export type StringParamMetadata<
+    Data,
+    TKey,
+    TEncryptOptions extends BaseEncryptOptions<TKey>,
+    TDecryptOptions extends BaseDecryptOptions<TKey>,
+    THashOptions extends AnyObject
+> = BaseParamMetadata & OmitStrict<
+    StringPropertyMetadata<Data, TKey, TEncryptOptions, TDecryptOptions, THashOptions>,
+    'primary' | 'default' | 'exclude' | 'excludeFromChangeSets'
+>;
 
 /**
  * Metadata Input for string parameters.
  */
-export type StringParamMetadataInput = Partial<OmitStrict<StringParamMetadata, 'name'>> & Pick<StringParamMetadata, 'type'>;
+export type StringParamMetadataInput<
+    Data,
+    TKey,
+    TEncryptOptions extends BaseEncryptOptions<TKey>,
+    TDecryptOptions extends BaseDecryptOptions<TKey>,
+    THashOptions extends AnyObject
+> = Partial<OmitStrict<StringParamMetadata<Data, TKey, TEncryptOptions, TDecryptOptions, THashOptions>, 'name'>>
+    & Pick<StringParamMetadata<Data, TKey, TEncryptOptions, TDecryptOptions, THashOptions>, 'type'>;

package/src/routing/param-metdata.helpers.ts

@@ -20,6 +20,8 @@ export function createPathParamMetadata(name: string, data: PathParamMetadataInp
                 minLength: undefined,
                 regex: undefined,
                 enum: undefined,
+                encryption: false,
+                hash: false,
                 ...data
             };
         }
@@ -75,6 +77,8 @@ export function createQueryParamMetadata(name: string, data: QueryParamMetadataI
                 minLength: undefined,
                 regex: undefined,
                 enum: undefined,
+                encryption: false,
+                hash: false,
                 ...data
             };
         }
@@ -167,6 +171,8 @@ export function createArrayParamItemMetadata(
                 minLength: undefined,
                 regex: undefined,
                 enum: undefined,
+                hash: false,
+                encryption: false,
                 ...data
             };
         }

package/src/routing/resolve-route-params.function.ts

@@ -1,29 +1,64 @@
-import { AuthServiceInterface } from '../auth/auth-service.interface';
+import { BodyMetadata } from './decorators/body.decorator';
+import { PathParamMetadata, QueryParamMetadata, HeaderParamMetadata } from './decorators/param.decorator';
 import { CurrentUserMetadata } from '../auth/decorators/current-user.decorator';
-import { HttpRequest } from '../http/http-request.model';
+import { BaseUser } from '../auth/models/base-user.model';
+import { HttpRequestContext } from '../context/request/http-request.context';
+import { ZIBRI_REQUEST_CONTEXT_TOKENS } from '../context/request/request-context-token.model';
+import { WebsocketRequestContext } from '../context/request/websocket-request.context';
+import { ZIBRI_DI_TOKENS } from '../di/default/zibri-di-tokens.default';
+import { inject } from '../di/inject.function';
+import { KnownHeader } from '../http/known-header.enum';
 import { ParserInterface } from '../parsing/parser.interface';
 import { Newable } from '../types/newable.type';
 import { MetadataUtilities } from '../utilities/metadata.utilities';
 import { ObjectUtilities } from '../utilities/object.utilities';
 import { ValidationServiceInterface } from '../validation/validation-service.interface';
-import { BodyMetadata } from './decorators/body.decorator';
-import { PathParamMetadata, QueryParamMetadata, HeaderParamMetadata } from './decorators/param.decorator';
 import { CurrentWebsocketConnectionMetadata } from '../websocket/decorators/current-websocket-connection.decorator';
-import { BaseWebsocketConnection } from '../websocket/models/connection/base-websocket-connection.model';
-import { WebsocketRequest } from '../websocket/models/websocket-request.model';
 
 // eslint-disable-next-line jsdoc/require-jsdoc
 export async function resolveRouteParams(
     controllerClass: Newable<unknown>,
     controllerMethod: string,
     totalParamCount: number,
-    req: HttpRequest | WebsocketRequest,
-    parser: ParserInterface,
-    validationService: ValidationServiceInterface,
-    authService: AuthServiceInterface,
-    currentWebsocketConnection: BaseWebsocketConnection | undefined
+    context: HttpRequestContext | WebsocketRequestContext
+): Promise<unknown[]> {
+    const params: unknown[] = await parseRouteParams(controllerClass, controllerMethod, totalParamCount, context);
+
+    const validationService: ValidationServiceInterface = inject(ZIBRI_DI_TOKENS.VALIDATION_SERVICE);
+
+    // validate
+    const pathParams: Record<string, PathParamMetadata> = MetadataUtilities.getRoutePathParams(controllerClass, controllerMethod);
+    const queryParams: Record<string, QueryParamMetadata> = MetadataUtilities.getRouteQueryParams(controllerClass, controllerMethod);
+    const headerParams: Record<string, HeaderParamMetadata> = MetadataUtilities.getRouteHeaderParams(controllerClass, controllerMethod);
+    const requestBody: BodyMetadata | undefined = MetadataUtilities.getRouteBody(controllerClass, controllerMethod);
+
+    await Promise.all([
+        ...ObjectUtilities.entries(pathParams).map(async ([indexStr, metadata]) => {
+            const idx: number = Number(indexStr);
+            await validationService.validatePathParam(params[idx], metadata);
+        }),
+        ...ObjectUtilities.entries(queryParams).map(async ([indexStr, metadata]) => {
+            const idx: number = Number(indexStr);
+            await validationService.validateQueryParam(params[idx], metadata);
+        }),
+        ...ObjectUtilities.entries(headerParams).map(async ([indexStr, metadata]) => {
+            const idx: number = Number(indexStr);
+            await validationService.validateHeaderParam(params[idx], metadata);
+        }),
+        ...requestBody ? [validationService.validateBody(params[requestBody.index], requestBody)] : []
+    ]);
+
+    return params;
+}
+
+// eslint-disable-next-line jsdoc/require-jsdoc
+async function parseRouteParams(
+    controllerClass: Newable<unknown>,
+    controllerMethod: string,
+    totalParamCount: number,
+    context: HttpRequestContext | WebsocketRequestContext
 ): Promise<unknown[]> {
-    // TODO: validate that no additional parameters have been provided that are unused in the controller.
+    const parser: ParserInterface = inject(ZIBRI_DI_TOKENS.PARSER);
 
     let resolvedParamCount: number = 0;
     const params: unknown[] = new Array(totalParamCount).fill(undefined);
@@ -32,25 +67,19 @@ export async function resolveRouteParams(
     const pathParams: Record<string, PathParamMetadata> = MetadataUtilities.getRoutePathParams(controllerClass, controllerMethod);
     for (const [indexStr, metadata] of ObjectUtilities.entries(pathParams)) {
         const idx: number = Number(indexStr);
-        params[idx] = parser.parsePathParam(req, metadata);
-        validationService.validatePathParam(params[idx], metadata);
+        context.request.params ??= {};
+        context.request.params[metadata.name] = parser.parsePathParam(context.request, metadata) as string | undefined;
+        params[idx] = context.request.params[metadata.name];
     }
     resolvedParamCount += ObjectUtilities.keys(pathParams).length;
 
-    // 2) Body decorator
-    const requestBody: BodyMetadata | undefined = MetadataUtilities.getRouteBody(controllerClass, controllerMethod);
-    if (requestBody) {
-        resolvedParamCount++;
-        params[requestBody.index] = await parser.parseBody(req, requestBody);
-        validationService.validateBody(params[requestBody.index], requestBody);
-    }
-
-    // 3) Query decorators
+    // 2) Query decorators
     const queryParams: Record<string, QueryParamMetadata> = MetadataUtilities.getRouteQueryParams(controllerClass, controllerMethod);
     for (const [indexStr, metadata] of ObjectUtilities.entries(queryParams)) {
         const idx: number = Number(indexStr);
-        params[idx] = parser.parseQueryParam(req, metadata);
-        validationService.validateQueryParam(params[idx], metadata);
+        context.request.query ??= {};
+        context.request.query[metadata.name] = parser.parseQueryParam(context.request, metadata) as string | undefined;
+        params[idx] = context.request.query[metadata.name];
     }
     resolvedParamCount += ObjectUtilities.keys(queryParams).length;
 
@@ -58,28 +87,41 @@ export async function resolveRouteParams(
     const headerParams: Record<string, HeaderParamMetadata> = MetadataUtilities.getRouteHeaderParams(controllerClass, controllerMethod);
     for (const [indexStr, metadata] of ObjectUtilities.entries(headerParams)) {
         const idx: number = Number(indexStr);
-        params[idx] = parser.parseHeaderParam(req, metadata);
-        validationService.validateHeaderParam(params[idx], metadata);
+        context.request.headers[metadata.name as KnownHeader] = parser.parseHeaderParam(context.request, metadata) as string | undefined;
+        params[idx] = context.request.headers[metadata.name as KnownHeader];
     }
     resolvedParamCount += ObjectUtilities.keys(headerParams).length;
 
-    // 4) CurrentUser decorator
-    const currentUser: CurrentUserMetadata | undefined = MetadataUtilities.getRouteCurrentUser(controllerClass, controllerMethod);
-    if (currentUser) {
+    // 4) Body decorator
+    const requestBody: BodyMetadata | undefined = MetadataUtilities.getRouteBody(controllerClass, controllerMethod);
+    if (requestBody) {
+        context.request.body = await parser.parseBody(context.request, requestBody);
+        params[requestBody.index] = context.request.body;
+        resolvedParamCount++;
+    }
+
+    // 5) CurrentUser decorator
+    const currentUserMetadata: CurrentUserMetadata | undefined = MetadataUtilities.getRouteCurrentUser(controllerClass, controllerMethod);
+    if (currentUserMetadata) {
+        const currentUser: BaseUser<string> | undefined = await context.get(ZIBRI_REQUEST_CONTEXT_TOKENS.CURRENT_USER);
+        params[currentUserMetadata.index] = currentUser;
         resolvedParamCount++;
-        params[currentUser.index] = await authService.getCurrentUser(
-            req,
-            currentUser.allowedStrategies ?? authService.strategies,
-            currentUser.required
-        );
     }
 
-    // 4) CurrentWebsocketConnection decorator
+    // 6) CurrentWebsocketConnection decorator
     // eslint-disable-next-line stylistic/max-len
     const currentWebsocketConnectionMetadata: CurrentWebsocketConnectionMetadata | undefined = MetadataUtilities.getRouteCurrentWebsocketConnection(controllerClass, controllerMethod);
     if (currentWebsocketConnectionMetadata) {
+        switch (context.type) {
+            case 'http-request': {
+                throw new Error('Tried to inject a websocket connection on a http request.');
+            }
+            case 'websocket-request': {
+                params[currentWebsocketConnectionMetadata.index] = context.connection;
+                break;
+            }
+        }
         resolvedParamCount++;
-        params[currentWebsocketConnectionMetadata.index] = currentWebsocketConnection;
     }
 
     if (resolvedParamCount < totalParamCount) {

package/src/routing/route-configuration.model.ts

@@ -63,8 +63,10 @@ export type HeaderMetaInputObjectToMetaObject<HeaderMetaInputObject extends Reco
 
 // eslint-disable-next-line stylistic/max-len, jsdoc/require-jsdoc
 type ParamMetadataInputToMeta<M extends (PathParamMetadataInput | QueryParamMetadataInput | HeaderParamMetadataInput | ArrayPropertyItemMetadataInput)>
-    = M extends StringParamMetadataInput
-        ? StringParamMetadata
+    // eslint-disable-next-line typescript/no-explicit-any
+    = M extends StringParamMetadataInput<any, any, any, any, any>
+        // eslint-disable-next-line typescript/no-explicit-any
+        ? StringParamMetadata<any, any, any, any, any>
         : M extends NumberParamMetadataInput
             ? NumberParamMetadata
             : M extends BooleanParamMetadataInput
@@ -85,7 +87,8 @@ type RawParamMetadataToType<M extends (
     PathParamMetadata | QueryParamMetadata | HeaderParamMetadata | ArrayPropertyItemMetadata
     | OmitStrict<PathParamMetadata, 'name'> | OmitStrict<QueryParamMetadata, 'name'> | OmitStrict<HeaderParamMetadata, 'name'>
 )>
-    = M extends StringParamMetadata
+    // eslint-disable-next-line typescript/no-explicit-any
+    = M extends StringParamMetadata<any, any, any, any, any>
         ? string
         : M extends NumberParamMetadata
             ? number