zibri 2.1.7 → 2.2.1

package/src/application.ts

@@ -4,25 +4,35 @@ import cors from 'cors';
 import express, { RequestHandler } from 'express';
 
 import { ZibriApplicationOptions } from './application-options.model';
-import { AssetServiceInterface } from './assets';
-import { AuthServiceInterface, JwtAuthStrategy, OtpTwoFactorMethod, TwoFactorServiceInterface } from './auth';
-import { BackupServiceInterface } from './backup';
-import { CronServiceInterface } from './cron';
-import { DataSourceServiceInterface } from './data-source';
-import { ZIBRI_DI_TOKENS, inject } from './di';
+import { AssetServiceInterface } from './assets/asset-service.interface';
+import { OtpTwoFactorMethod } from './auth/2fa/methods/otp/otp.two-factor-method';
+import { TwoFactorServiceInterface } from './auth/2fa/two-factor-service.interface';
+import { AuthServiceInterface } from './auth/auth-service.interface';
+import { JwtAuthStrategy } from './auth/strategies/jwt/jwt.auth-strategy';
+import { BackupServiceInterface } from './backup/backup-service.interface';
+import { CronServiceInterface } from './cron/cron-service.interface';
+import { DataSourceServiceInterface } from './data-source/data-source-service.interface';
+import { ZIBRI_DI_TOKENS } from './di/default/zibri-di-tokens.default';
+import { inject } from './di/inject.function';
 import { register } from './di/register.function';
-import { EmailServiceInterface, MailingListServiceInterface } from './email';
-import { UnmatchedRouteError } from './error-handling';
-import { GlobalRegistry } from './global';
+import { EmailServiceInterface } from './email/email-service.interface';
+import { MailingListServiceInterface } from './email/mailing-list/mailing-list-service.interface';
+import { GlobalErrorHandler } from './error-handling/error-handler.model';
+import { UnmatchedRouteError } from './error-handling/errors/unmatched-route.error';
+import { GlobalRegistry } from './global/global-registry';
 import { HandlebarUtilities } from './handlebars/handlebar.utilities';
-import { LoggerInterface } from './logging';
-import { MetricsServiceInterface } from './metrics';
-import { MultithreadingServiceInterface } from './multithreading';
-import { OpenApiServiceInterface } from './open-api';
-import { FormDataBodyParser, JsonBodyParser, ParserInterface } from './parsing';
-import { Route, RouterInterface } from './routing';
-import { OmitStrict } from './types';
-import { BaseWebsocketConnection, WebsocketServiceInterface } from './websocket';
+import { LoggerInterface } from './logging/logger.interface';
+import { MetricsServiceInterface } from './metrics/metrics-service.interface';
+import { MultithreadingServiceInterface } from './multithreading/services/multithreading-service.interface';
+import { OpenApiServiceInterface } from './open-api/open-api-service.interface';
+import { FormDataBodyParser } from './parsing/form-data/form-data.body-parser';
+import { JsonBodyParser } from './parsing/json/json.body-parser';
+import { ParserInterface } from './parsing/parser.interface';
+import { Route } from './routing/controller-route-configuration.model';
+import { RouterInterface } from './routing/router.interface';
+import { OmitStrict } from './types/omit-strict.type';
+import { BaseWebsocketConnection } from './websocket/models/connection/base-websocket-connection.model';
+import { WebsocketServiceInterface } from './websocket/services/websocket-service.interface';
 
 // eslint-disable-next-line jsdoc/require-jsdoc
 type FullZibriApplicationOptions = Required<OmitStrict<ZibriApplicationOptions, 'plugins'>>;
@@ -76,7 +86,9 @@ export class ZibriApplication {
     }
 
     // eslint-disable-next-line jsdoc/require-jsdoc
-    use(handler: RequestHandler): express.Express;
+    use(handler: RequestHandler): void;
+    // eslint-disable-next-line jsdoc/require-jsdoc
+    use(errorHandler: GlobalErrorHandler): void;
     // eslint-disable-next-line jsdoc/require-jsdoc
     use(...handlers: RequestHandler[]): void;
     // eslint-disable-next-line jsdoc/require-jsdoc
@@ -84,9 +96,9 @@ export class ZibriApplication {
     // eslint-disable-next-line jsdoc/require-jsdoc
     use(path: Route, handlers: RequestHandler[]): void;
     // eslint-disable-next-line jsdoc/require-jsdoc, typescript/no-explicit-any
-    use(...args: any[]): express.Express {
+    use(...args: any[]): void {
         // eslint-disable-next-line typescript/no-unsafe-argument
-        return this.express.use(...args);
+        this.express.use(...args);
     }
 
     /**
@@ -94,7 +106,7 @@ export class ZibriApplication {
      * @param H - The global handlebars instance, needed to provide some helpers used in templating.
      */
     async init(H: typeof Handlebars): Promise<void> {
-        HandlebarUtilities.init(H);
+        await HandlebarUtilities.init(H);
         GlobalRegistry.setAppData(this.options);
 
         for (const provider of this.options.providers) {
@@ -167,7 +179,7 @@ export class ZibriApplication {
         this.multithreadingService = inject(ZIBRI_DI_TOKENS.MULTITHREADING_SERVICE);
         await this.multithreadingService.init();
 
-        this.websocketService = inject(ZIBRI_DI_TOKENS.WEBSOCKET_SERVICE);
+        this.websocketService = inject<WebsocketServiceInterface<BaseWebsocketConnection>>(ZIBRI_DI_TOKENS.WEBSOCKET_SERVICE);
         await this.websocketService.attachTo(this);
 
         this.backupService = inject(ZIBRI_DI_TOKENS.BACKUP_SERVICE);

package/src/assets/asset-service.interface.ts

@@ -1,5 +1,7 @@
 import { ZibriApplication } from '../application';
-import { Route } from '../routing';
+import { TreeNode } from './asset.service';
+import { Route } from '../routing/controller-route-configuration.model';
+import { Path } from '../utilities/fs.utilities';
 
 /**
  * Interface for an asset service.
@@ -8,27 +10,34 @@ export interface AssetServiceInterface {
     /**
      * The path of the assets.
      */
-    readonly assetsPath: string,
+    readonly assetsPath: Path,
     /**
      * The path of the assets which are also publicly registered on the online file explorer.
      */
-    readonly publicAssetsPath: string,
+    readonly publicAssetsPath: Path,
     /**
      * The path of the email templates.
      */
-    readonly emailTemplatePath: string,
+    readonly emailTemplatePath: Path,
     /**
      * The path of the page templates.
      */
-    readonly pageTemplatePath: string,
+    readonly pageTemplatePath: Path,
+    /**
+     * The path of the component templates.
+     */
+    readonly componentTemplatePath: Path,
     /**
      * The route under which the file explorer with the public assets is registered.
      */
     readonly assetsRoute: Route,
-
     /**
      * Attaches the service to the application.
      */
     // eslint-disable-next-line typescript/no-explicit-any
-    attachTo: (app: ZibriApplication, ...params: any[]) => void | Promise<void>
+    attachTo: (app: ZibriApplication, ...params: any[]) => void | Promise<void>,
+    /**
+     * Builds a file tree.
+     */
+    buildFileTree: () => TreeNode[] | Promise<TreeNode[]>
 }

package/src/assets/asset-service.test.ts

@@ -1,12 +1,14 @@
-import * as path from 'path';
 
 import { beforeEach, describe, expect, it } from '@jest/globals';
 
-import { AssetService, TreeNode } from './asset.service';
-import { inject, ZIBRI_DI_TOKENS } from '../di';
+import { AssetServiceInterface } from './asset-service.interface';
+import { TreeNode } from './asset.service';
+import { ZIBRI_DI_TOKENS } from '../di/default/zibri-di-tokens.default';
+import { inject } from '../di/inject.function';
+import { FsUtilities, Path } from '../utilities/fs.utilities';
 
 describe('AssetService', () => {
-    let assetService: AssetService;
+    let assetService: AssetServiceInterface;
 
     beforeEach(() => {
         assetService = inject(ZIBRI_DI_TOKENS.ASSET_SERVICE);
@@ -14,15 +16,15 @@ describe('AssetService', () => {
 
     describe('buildFileTree', () => {
         it('should build a file tree for a given directory', async () => {
-            const mockDirPath: string = path.join(__dirname, '..', '__testing__', 'mocks', 'tree');
-            (assetService.publicAssetsPath as unknown as string) = mockDirPath;
+            const mockDirPath: Path = FsUtilities.getPath(__dirname, '..', '__testing__', 'mocks', 'tree');
+            (assetService.publicAssetsPath as unknown as Path) = mockDirPath;
             const expectedTree: TreeNode[] = [
                 // Mocked file tree structure
                 { name: 'file1.txt', type: 'file', route: '/assets/file1.txt' },
                 { name: 'subdir', type: 'directory', children: [{ name: 'file2.txt', type: 'file', route: '/assets/subdir/file2.txt' }] }
             ];
 
-            const fileTree: TreeNode[] = await assetService['buildFileTree']();
+            const fileTree: TreeNode[] = await assetService.buildFileTree();
             expect(fileTree).toEqual(expectedTree);
         });
     });

package/src/assets/asset.service.ts

@@ -1,19 +1,17 @@
-import { Dirent } from 'fs';
-import { readdir } from 'fs/promises';
-import path from 'path';
+import { Dirent } from 'node:fs';
 
 import express from 'express';
 
 import { AssetServiceInterface } from './asset-service.interface';
 import { ZibriApplication } from '../application';
-import { Inject, ZIBRI_DI_TOKENS } from '../di';
-import { GlobalRegistry } from '../global';
-import { renderPageTemplate } from '../handlebars';
-import { HttpMethod } from '../http';
-import type { LoggerInterface } from '../logging';
+import { Inject } from '../di/decorators/inject.decorator';
+import { ZIBRI_DI_TOKENS } from '../di/default/zibri-di-tokens.default';
+import { HttpMethod } from '../http/http-method.enum';
+import { type LoggerInterface } from '../logging/logger.interface';
 import { FileResponse } from '../parsing/form-data/file-response.model';
-import { HtmlResponse } from '../parsing/html/html-response.model';
-import { Route } from '../routing';
+import { Route } from '../routing/controller-route-configuration.model';
+import { FsUtilities, Path } from '../utilities/fs.utilities';
+import { ObjectUtilities } from '../utilities/object.utilities';
 
 // eslint-disable-next-line jsdoc/require-jsdoc
 type FileNode = { type: 'file', name: string, route: string };
@@ -35,13 +33,15 @@ type WalkedPath = { relPath: string, isFile: boolean };
  */
 export class AssetService implements AssetServiceInterface {
     // eslint-disable-next-line jsdoc/require-jsdoc
-    readonly assetsPath: string = path.join(__dirname, 'assets');
+    readonly assetsPath: Path = FsUtilities.getPath(__dirname, 'assets');
     // eslint-disable-next-line jsdoc/require-jsdoc
-    readonly publicAssetsPath: string = path.join(this.assetsPath, 'public');
+    readonly publicAssetsPath: Path = FsUtilities.getPath(this.assetsPath, 'public');
     // eslint-disable-next-line jsdoc/require-jsdoc
-    readonly pageTemplatePath: string = path.join(this.assetsPath, 'templates', 'pages');
+    readonly pageTemplatePath: Path = FsUtilities.getPath(this.assetsPath, 'templates', 'pages');
     // eslint-disable-next-line jsdoc/require-jsdoc
-    readonly emailTemplatePath: string = path.join(this.assetsPath, 'templates', 'emails');
+    readonly emailTemplatePath: Path = FsUtilities.getPath(this.assetsPath, 'templates', 'emails');
+    // eslint-disable-next-line jsdoc/require-jsdoc
+    readonly componentTemplatePath: Path = FsUtilities.getPath(this.assetsPath, 'templates', 'components');
     // eslint-disable-next-line jsdoc/require-jsdoc
     readonly assetsRoute: Route = '/assets';
 
@@ -54,49 +54,16 @@ export class AssetService implements AssetServiceInterface {
     async attachTo(app: ZibriApplication): Promise<void> {
         await this.logger.info(`registers public static assets from folder "${this.publicAssetsPath}" at ${this.assetsRoute}`);
         app.use(this.assetsRoute, express.static(this.publicAssetsPath));
-        await app.router.register({
-            httpMethod: HttpMethod.GET,
-            route: '/',
-            handler: async () => {
-                const html: string = await renderPageTemplate(
-                    'index.hbs',
-                    {
-                        name: GlobalRegistry.getAppData('name'),
-                        base: {
-                            title: GlobalRegistry.getAppData('name') ?? ''
-                        }
-                    }
-                );
-                return HtmlResponse.fromString(html);
-            }
-        });
-        await app.router.register({
-            httpMethod: HttpMethod.GET,
-            route: this.assetsRoute,
-            handler: async () => {
-                const tree: TreeNode[] = await this.buildFileTree();
-                const html: string = await renderPageTemplate(
-                    'assets.hbs',
-                    {
-                        name: GlobalRegistry.getAppData('name'),
-                        base: {
-                            title: GlobalRegistry.getAppData('name') ?? ''
-                        },
-                        tree
-                    }
-                );
-                return HtmlResponse.fromString(html);
-            }
-        });
         await app.router.register({
             httpMethod: HttpMethod.GET,
             route: '/favicon.ico',
-            handler: () => FileResponse.fromPath(path.join(this.publicAssetsPath, 'favicon.png'))
+            handler: () => FileResponse.fromPath(FsUtilities.getPath(this.publicAssetsPath, 'favicon.png'))
         });
 
     }
 
-    private async buildFileTree(): Promise<TreeNode[]> {
+    // eslint-disable-next-line jsdoc/require-jsdoc
+    async buildFileTree(): Promise<TreeNode[]> {
         // 1) Gather every path relative to assetsPath
         const items: WalkedPath[] = await this.walk(this.publicAssetsPath);
 
@@ -104,7 +71,7 @@ export class AssetService implements AssetServiceInterface {
         const root: NodeMap = {};
 
         for (const item of items) {
-            const segments: string[] = item.relPath.split(path.sep);
+            const segments: string[] = item.relPath.split(FsUtilities.separator);
             let current: NodeMap = root;
 
             for (let i: number = 0; i < segments.length; i++) {
@@ -131,7 +98,7 @@ export class AssetService implements AssetServiceInterface {
     }
 
     private mapToTree(nodes: NodeMap): TreeNode[] {
-        return Object.entries(nodes).map(([name, info]) => {
+        return ObjectUtilities.entries(nodes).map(([name, info]) => {
             if (!info) {
                 throw new Error('Error building the assets tree');
             }
@@ -150,14 +117,14 @@ export class AssetService implements AssetServiceInterface {
     }
 
     private async walk(
-        dir: string,
-        base: string = dir
+        dir: Path,
+        base: Path = dir
     ): Promise<WalkedPath[]> {
-        const entries: Dirent[] = await readdir(dir, { withFileTypes: true });
+        const entries: Dirent[] = await FsUtilities.readdir(dir);
         const results: WalkedPath[] = [];
         for (const entry of entries) {
-            const abs: string = path.join(dir, entry.name);
-            const rel: string = path.relative(base, abs);
+            const abs: Path = FsUtilities.getPath(dir, entry.name);
+            const rel: Path = FsUtilities.relative(base, abs);
             if (entry.isDirectory()) {
                 results.push({ relPath: rel, isFile: false });
                 results.push(...await this.walk(abs, base));

package/src/auth/2fa/methods/otp/otp-credentials.model.ts

@@ -1,5 +1,7 @@
-import { Entity, OmitClass, Property } from '../../../../entity';
 import { BaseEntity } from '../../../../entity/base-entity.model';
+import { Entity } from '../../../../entity/decorators/entity.decorator';
+import { Property } from '../../../../entity/decorators/property.decorator';
+import { OmitClass } from '../../../../entity/omit-class.model';
 
 /**
  * Credentials for a one time password.

package/src/auth/2fa/methods/otp/otp.two-factor-method.ts

@@ -1,16 +1,20 @@
 import { randomBytes } from 'node:crypto';
 
 import { HiBase32Utilities } from './hi-base32.utilities';
-import { Repository } from '../../../../data-source';
-import { inject, Inject, repositoryTokenFor, ZIBRI_DI_TOKENS } from '../../../../di';
-import { UnauthorizedError } from '../../../../error-handling';
-import { HttpRequest, KnownHeader } from '../../../../http';
-import { validateEntitiesRegistered } from '../../../../utilities';
-import { WebsocketRequest } from '../../../../websocket';
-import { BaseUser } from '../../../models';
 import { TwoFactorMethod } from '../two-factor-method.interface';
 import { OtpCredentials, OtpCredentialsCreateData } from './otp-credentials.model';
 import { OtpUtilities } from './otp.utilities';
+import { Repository } from '../../../../data-source/repository';
+import { repositoryTokenFor } from '../../../../di/decorators/inject-repository.decorator';
+import { Inject } from '../../../../di/decorators/inject.decorator';
+import { ZIBRI_DI_TOKENS } from '../../../../di/default/zibri-di-tokens.default';
+import { inject } from '../../../../di/inject.function';
+import { UnauthorizedError } from '../../../../error-handling/errors/unauthorized.error';
+import { HttpRequest } from '../../../../http/http-request.model';
+import { KnownHeader } from '../../../../http/known-header.enum';
+import { validateEntitiesRegistered } from '../../../../utilities/validate-entities-registered.function';
+import { WebsocketRequest } from '../../../../websocket/models/websocket-request.model';
+import { BaseUser } from '../../../models/base-user.model';
 
 /**
  * The data for confirming the registration of the otp two factor method.

package/src/auth/2fa/methods/two-factor-method.interface.ts

@@ -1,6 +1,6 @@
-import { HttpRequest } from '../../../http';
-import { WebsocketRequest } from '../../../websocket';
-import { BaseUser } from '../../models';
+import { HttpRequest } from '../../../http/http-request.model';
+import { WebsocketRequest } from '../../../websocket/models/websocket-request.model';
+import { BaseUser } from '../../models/base-user.model';
 
 /**
  * Interface for a two factor method.

package/src/auth/2fa/two-factor-methods.model.ts

@@ -1,5 +1,5 @@
-import { TwoFactorMethod } from './methods';
-import { Newable } from '../../types';
+import { TwoFactorMethod } from './methods/two-factor-method.interface';
+import { Newable } from '../../types/newable.type';
 
 /**
  * A generic two factor method array.

package/src/auth/2fa/two-factor-service.interface.ts

@@ -1,8 +1,8 @@
-import { HttpRequest } from '../../http';
-import { WebsocketRequest } from '../../websocket';
-import { BaseUser } from '../models';
-import { TwoFactorMethod } from './methods';
+import { TwoFactorMethod } from './methods/two-factor-method.interface';
 import { TwoFactorMethods } from './two-factor-methods.model';
+import { HttpRequest } from '../../http/http-request.model';
+import { WebsocketRequest } from '../../websocket/models/websocket-request.model';
+import { BaseUser } from '../models/base-user.model';
 
 /**
  * Interface for a two factor service.

package/src/auth/2fa/two-factor.service.ts

@@ -1,10 +1,11 @@
-import { inject, ZIBRI_DI_TOKENS } from '../../di';
+import { ZIBRI_DI_TOKENS } from '../../di/default/zibri-di-tokens.default';
+import { inject } from '../../di/inject.function';
 import { register } from '../../di/register.function';
-import { HttpRequest } from '../../http';
-import { LoggerInterface } from '../../logging';
-import { WebsocketRequest } from '../../websocket';
-import { BaseUser } from '../models';
-import { TwoFactorMethod } from './methods';
+import { HttpRequest } from '../../http/http-request.model';
+import { LoggerInterface } from '../../logging/logger.interface';
+import { WebsocketRequest } from '../../websocket/models/websocket-request.model';
+import { BaseUser } from '../models/base-user.model';
+import { TwoFactorMethod } from './methods/two-factor-method.interface';
 import { TwoFactorMethods } from './two-factor-methods.model';
 import { TwoFactorServiceInterface } from './two-factor-service.interface';
 
@@ -90,10 +91,7 @@ export class TwoFactorService implements TwoFactorServiceInterface {
     ): Promise<boolean> {
         try {
             await Promise.any(
-                allowedMethods.map(async m => {
-                    const twoFactorMethod: TwoFactorMethod<unknown, unknown> = inject(m);
-                    await twoFactorMethod.validate(user, request);
-                })
+                allowedMethods.map(m => inject(m).validate(user, request))
             );
             return true;
         }

package/src/auth/auth-service.interface.ts

@@ -1,9 +1,15 @@
 import { BaseEntity } from '../entity/base-entity.model';
-import { HttpRequest } from '../http';
-import { Newable } from '../types';
-import { WebsocketRequest } from '../websocket';
-import { BaseUser, BelongsToMetadata, HasRoleMetadata, IsLoggedInMetadata, IsNotLoggedInMetadata, Require2faMetadata } from './models';
-import { AuthStrategies, AuthStrategyInterface } from './strategies';
+import { HttpRequest } from '../http/http-request.model';
+import { Newable } from '../types/newable.type';
+import { BaseUser } from './models/base-user.model';
+import { BelongsToMetadata } from './models/belongs-to-metadata.model';
+import { HasRoleMetadata } from './models/has-role-metadata.model';
+import { IsLoggedInMetadata } from './models/is-logged-in-metadata.model';
+import { IsNotLoggedInMetadata } from './models/is-not-logged-in-metadata.model';
+import { Require2faMetadata } from './models/require-2fa-metadata.model';
+import { AuthStrategies } from './strategies/auth-strategies.model';
+import { AuthStrategyInterface } from './strategies/auth-strategy.interface';
+import { WebsocketRequest } from '../websocket/models/websocket-request.model';
 
 /**
  * Interface for an auth service.

package/src/auth/auth.service.ts

@@ -1,16 +1,25 @@
-import { inject, ZIBRI_DI_TOKENS } from '../di';
+import { AuthServiceInterface } from './auth-service.interface';
 import { register } from '../di/register.function';
 import { BaseEntity } from '../entity/base-entity.model';
-import { UnauthorizedError } from '../error-handling';
-import { HttpRequest } from '../http';
-import { LoggerInterface } from '../logging';
-import { Newable } from '../types';
-import { MetadataUtilities } from '../utilities';
-import { WebsocketRequest } from '../websocket';
-import { TwoFactorServiceInterface } from './2fa';
-import { AuthServiceInterface } from './auth-service.interface';
-import { BaseUser, BelongsToMetadata, HasRoleMetadata, IsLoggedInMetadata, IsNotLoggedInMetadata, Require2faMetadata, SkipAuthMetadata, SkipBelongsToMetadata, SkipHasRoleMetadata, SkipIsLoggedInMetadata, SkipIsNotLoggedInMetadata, SkipRequire2faMetadata } from './models';
-import { AuthStrategies, AuthStrategyInterface } from './strategies';
+import { TwoFactorServiceInterface } from './2fa/two-factor-service.interface';
+import { BaseUser } from './models/base-user.model';
+import { BelongsToMetadata, SkipBelongsToMetadata } from './models/belongs-to-metadata.model';
+import { HasRoleMetadata, SkipHasRoleMetadata } from './models/has-role-metadata.model';
+import { IsLoggedInMetadata, SkipIsLoggedInMetadata } from './models/is-logged-in-metadata.model';
+import { IsNotLoggedInMetadata, SkipIsNotLoggedInMetadata } from './models/is-not-logged-in-metadata.model';
+import { Require2faMetadata, SkipRequire2faMetadata } from './models/require-2fa-metadata.model';
+import { SkipAuthMetadata } from './models/skip-auth-metadata.model';
+import { AuthStrategies } from './strategies/auth-strategies.model';
+import { AuthStrategyInterface } from './strategies/auth-strategy.interface';
+import { ZIBRI_DI_TOKENS } from '../di/default/zibri-di-tokens.default';
+import { inject } from '../di/inject.function';
+import { UnauthorizedError } from '../error-handling/errors/unauthorized.error';
+import { HttpRequest } from '../http/http-request.model';
+import { LoggerInterface } from '../logging/logger.interface';
+import { Newable } from '../types/newable.type';
+import { MetadataUtilities } from '../utilities/metadata.utilities';
+import { PromiseUtilities } from '../utilities/promise.utilities';
+import { WebsocketRequest } from '../websocket/models/websocket-request.model';
 
 /**
  * Default auth service implementation of Zibri.
@@ -274,7 +283,7 @@ export class AuthService implements AuthServiceInterface {
         // eslint-disable-next-line stylistic/max-len
         const strategies: AuthStrategyInterface<string, BaseUser<string>, unknown, unknown, unknown, unknown, unknown, unknown>[] = allowedStrategies.map(s => inject(s));
         try {
-            return await Promise.any(strategies.map(s => s.isLoggedIn(request)));
+            return await PromiseUtilities.anyValueTrue(strategies, s => s.isLoggedIn(request));
         }
         catch {
             return false;
@@ -290,7 +299,7 @@ export class AuthService implements AuthServiceInterface {
         // eslint-disable-next-line stylistic/max-len
         const strategies: AuthStrategyInterface<string, BaseUser<string>, unknown, unknown, unknown, unknown, unknown, unknown>[] = allowedStrategies.map(s => inject(s));
         try {
-            return await Promise.any(strategies.map(s => s.hasRole(request, allowedRoles)));
+            return await PromiseUtilities.anyValueTrue(strategies, s => s.hasRole(request, allowedRoles));
         }
         catch {
             return false;
@@ -308,7 +317,10 @@ export class AuthService implements AuthServiceInterface {
         // eslint-disable-next-line stylistic/max-len
         const strategies: AuthStrategyInterface<string, BaseUser<string>, unknown, unknown, unknown, unknown, unknown, unknown>[] = allowedStrategies.map(s => inject(s));
         try {
-            return await Promise.any(strategies.map(s => s.belongsTo(request, targetEntity, targetUserIdKey, targetIdParamKey)));
+            return await PromiseUtilities.anyValueTrue(
+                strategies,
+                s => s.belongsTo(request, targetEntity, targetUserIdKey, targetIdParamKey)
+            );
         }
         catch {
             return false;

package/src/auth/decorators/auth.decorator.ts

@@ -3,7 +3,7 @@ import { hasRoleDecorator, HasRoleFn } from './has-role.decorator';
 import { isLoggedInDecorator, IsLoggedInFn } from './is-logged-in.decorator';
 import { isNotLoggedInDecorator, IsNotLoggedInFn } from './is-not-logged-in.decorator';
 import { require2faDecorator, Require2faFn } from './require-2fa.decorator';
-import { MetadataUtilities } from '../../utilities';
+import { MetadataUtilities } from '../../utilities/metadata.utilities';
 
 /**
  * Bundles decorators for marking controller endpoints for authentication and authorization.
@@ -40,7 +40,6 @@ export namespace Auth {
      */
     export const require2fa: Require2faFn = require2faDecorator;
 
-    // eslint-disable-next-line jsdoc/require-returns
     /**
      * Skips all auth related validation.
      */

package/src/auth/decorators/belongs-to.decorator.ts

@@ -1,8 +1,8 @@
 import { BaseEntity } from '../../entity/base-entity.model';
-import { Newable } from '../../types';
-import { MetadataUtilities } from '../../utilities';
-import { BelongsToMetadata } from '../models';
-import { AuthStrategies } from '../strategies';
+import { Newable } from '../../types/newable.type';
+import { MetadataUtilities } from '../../utilities/metadata.utilities';
+import { BelongsToMetadata } from '../models/belongs-to-metadata.model';
+import { AuthStrategies } from '../strategies/auth-strategies.model';
 
 /**
  * The type of the belongs to decorator.

package/src/auth/decorators/current-user.decorator.ts

@@ -1,5 +1,5 @@
-import { MetadataUtilities } from '../../utilities';
-import { AuthStrategies } from '../strategies';
+import { MetadataUtilities } from '../../utilities/metadata.utilities';
+import { AuthStrategies } from '../strategies/auth-strategies.model';
 
 /**
  * Metadata of the \@CurrentUser decorator.
@@ -20,7 +20,6 @@ export type CurrentUserMetadata = {
     allowedStrategies?: AuthStrategies
 };
 
-// eslint-disable-next-line jsdoc/require-returns
 /**
  * Marks the parameter to be injected as the currently logged in user.
  * @param required - If set to false, the injected user is allowed to be undefined.

package/src/auth/decorators/has-role.decorator.ts

@@ -1,6 +1,6 @@
-import { MetadataUtilities } from '../../utilities';
-import { HasRoleMetadata } from '../models';
-import { AuthStrategies } from '../strategies';
+import { MetadataUtilities } from '../../utilities/metadata.utilities';
+import { HasRoleMetadata } from '../models/has-role-metadata.model';
+import { AuthStrategies } from '../strategies/auth-strategies.model';
 
 /**
  * The type of the has role decorator.

package/src/auth/decorators/is-logged-in.decorator.ts

@@ -1,6 +1,6 @@
-import { MetadataUtilities } from '../../utilities';
-import { IsLoggedInMetadata } from '../models';
-import { AuthStrategies } from '../strategies';
+import { MetadataUtilities } from '../../utilities/metadata.utilities';
+import { IsLoggedInMetadata } from '../models/is-logged-in-metadata.model';
+import { AuthStrategies } from '../strategies/auth-strategies.model';
 
 /**
  * The type of the is logged in decorator.

package/src/auth/decorators/is-not-logged-in.decorator.ts

@@ -1,6 +1,6 @@
-import { MetadataUtilities } from '../../utilities';
-import { IsNotLoggedInMetadata } from '../models';
-import { AuthStrategies } from '../strategies';
+import { MetadataUtilities } from '../../utilities/metadata.utilities';
+import { IsNotLoggedInMetadata } from '../models/is-not-logged-in-metadata.model';
+import { AuthStrategies } from '../strategies/auth-strategies.model';
 
 /**
  * The type of the is not logged in decorator.

package/src/auth/decorators/require-2fa.decorator.ts

@@ -1,6 +1,6 @@
-import { MetadataUtilities } from '../../utilities';
-import { TwoFactorMethods } from '../2fa';
-import { Require2faMetadata } from '../models';
+import { MetadataUtilities } from '../../utilities/metadata.utilities';
+import { TwoFactorMethods } from '../2fa/two-factor-methods.model';
+import { Require2faMetadata } from '../models/require-2fa-metadata.model';
 
 /**
  * The type of the require 2fa decorator.

package/src/auth/decorators/user-repo.decorator.ts

@@ -1,10 +1,11 @@
-import { DiToken } from '../../di';
-import { GlobalRegistry } from '../../global';
-import { Newable } from '../../types';
-import { MetadataUtilities } from '../../utilities';
-import { BaseUser, UserRepositories } from '../models';
 
-// eslint-disable-next-line jsdoc/require-returns
+import { DiToken } from '../../di/models/di-token.model';
+import { GlobalRegistry } from '../../global/global-registry';
+import { Newable } from '../../types/newable.type';
+import { MetadataUtilities } from '../../utilities/metadata.utilities';
+import { BaseUser } from '../models/base-user.model';
+import { UserRepositories } from '../models/user-repositories.model';
+
 /**
  * Marks the given class as a user repository.
  * This registers it to be injected directly, without using "@InjectRepository".