Remove document manager

package.json

@@ -7,7 +7,7 @@
     "build": "webpack --color",
     "fix-imports": "node fix-imports.js",
     "fix-eslint": "npx eslint --fix src",
-    "fix": "yarn run fix-eslint && yarn run fix-imports",
+    "fix": "yarn run fix-imports && yarn run fix-eslint",
     "start": "node ./dist/app.js",
     "dev": "nodemon --watch src --ext ts --exec ts-node -r tsconfig-paths/register ./src/app.ts",
     "dev:tinker": "nodemon --watch src --ext ts --exec ts-node -r tsconfig-paths/register ./src/tinker.ts",

src/app/models/auth/ApiToken.ts

@@ -3,7 +3,8 @@ import ApiTokenObserver from '@src/app/observers/ApiTokenObserver';
 import IApiTokenModel, { IApiTokenData } from '@src/core/domains/auth/interfaces/IApitokenModel';
 import IUserModel from '@src/core/domains/auth/interfaces/IUserModel';
 import Scopes from '@src/core/domains/auth/services/Scopes';
-import { ICtor } from '@src/core/interfaces/ICtor';
+import BelongsTo from '@src/core/domains/eloquent/relational/BelongsTo';
+import { ModelConstructor } from '@src/core/interfaces/IModel';
 import Model from '@src/core/models/base/Model';
 
 /**
@@ -16,7 +17,7 @@ class ApiToken extends Model<IApiTokenData> implements IApiTokenModel {
     /**
      * The user model constructor
      */
-    protected userModelCtor: ICtor<IUserModel> = User
+    protected userModelCtor: ModelConstructor<IUserModel> = User
 
     /**
      * Required ApiToken fields
@@ -36,6 +37,10 @@ class ApiToken extends Model<IApiTokenData> implements IApiTokenModel {
         'scopes'
     ]
 
+    public relationships: string[] = [
+        'user'
+    ]
+
     public timestamps: boolean = false;
 
     /**
@@ -52,30 +57,31 @@ class ApiToken extends Model<IApiTokenData> implements IApiTokenModel {
 
     /**
      * Sets the user model constructor to use for fetching the user of this ApiToken
-     * @param {ICtor<IUserModel>} userModelCtor The user model constructor
+     * @param {ModelConstructor<IUserModel>} userModelCtor The user model constructor
      */
-    setUserModelCtor(userModelCtor: ICtor<IUserModel>): void {
+    setUserModelCtor(userModelCtor: ModelConstructor<IUserModel>): void {
         this.userModelCtor = userModelCtor
     }
 
     /**
      * Retrieves the constructor for the user model associated with this ApiToken.
-     * @returns {ICtor<IUserModel>} The user model constructor.
+     * @returns {ModelConstructor<IUserModel>} The user model constructor.
      */
-    getUserModelCtor(): ICtor<IUserModel> {
+    getUserModelCtor(): ModelConstructor<IUserModel> {
         return this.userModelCtor
     }
 
     /**
-     * Finds the related user for this ApiToken
-     * @returns The user model if found, or null if not
+     * Fetches the user that this ApiToken belongs to.
+     *
+     * @returns A BelongsTo relationship that resolves to the user model.
      */
-    async user(): Promise<IUserModel | null> {
-        return this.belongsToLegacy(this.userModelCtor, {
+    user(): BelongsTo {
+        return this.belongsTo(this.userModelCtor, {
             localKey: 'userId',
             foreignKey: 'id',
         })
-    }   
+    }
 
     /**
      * Checks if the given scope(s) are present in the scopes of this ApiToken

src/app/models/auth/User.ts

@@ -1,4 +1,3 @@
-import ApiToken from "@src/app/models/auth/ApiToken";
 import UserObserver from "@src/app/observers/UserObserver";
 import IUserModel from "@src/core/domains/auth/interfaces/IUserModel";
 import IModelAttributes from "@src/core/interfaces/IModelData";
@@ -121,19 +120,4 @@ export default class User extends Model<IUserData> implements IUserModel {
         return true;
     }
 
-    /**
-     * @returns The tokens associated with this user
-     *
-     * Retrieves the ApiToken models associated with this user.
-     */
-    async tokens(active: boolean = true): Promise<ApiToken[]> {
-        const filters = active ? { revokedAt: null } : {};
-
-        return this.hasMany(ApiToken, {
-            localKey: 'id',
-            foreignKey: 'userId',
-            filters
-        }) 
-    }
-
 }

src/core/Kernel.ts

@@ -12,7 +12,7 @@ export type KernelOptions = {
 
 export default class Kernel<Config extends IAppConfig> extends Singleton<Config> {
 
-    private appConfig!: IAppConfig;
+    private readonly appConfig!: IAppConfig;
 
     public containers: Map<keyof Containers, Containers[keyof Containers]> = new Map();
 

src/core/base/BaseModel.ts

@@ -1,26 +1,25 @@
 /* eslint-disable no-unused-vars */
 
 import HasObserverConcern from '@src/core/concerns/HasObserverConcern';
-import HasPrepareDocumentConcern from '@src/core/concerns/HasPrepareDocumentConcern';
 import Broadcaster from '@src/core/domains/broadcast/abstract/Broadcaster';
-import compose from '@src/core/util/compose';
 import { ObserveConstructor } from '@src/core/domains/observer/interfaces/IHasObserver';
 import { IObserver } from '@src/core/domains/observer/interfaces/IObserver';
-import IModelAttributes from '@src/core/interfaces/IModelData';
-
-class BaseModel<Attributes extends IModelAttributes = IModelAttributes> extends compose(
-    class extends Broadcaster {},
-    HasPrepareDocumentConcern,
-    HasObserverConcern
-) {
+import compose from '@src/core/util/compose';
+import { IBroadcastEvent } from '@src/core/domains/broadcast/interfaces/IBroadcastEvent';
+import { BroadcastCallback } from '@src/core/domains/broadcast/interfaces/IBroadcaster';
 
+class BaseModel extends compose(class extends Broadcaster {}, HasObserverConcern) {
 
     /**
-      * Declare HasPrepareDocument concern
-      */
-    declare json: string[];
-
-    declare prepareDocument: <T>() => T;
+   * Declare HasBroadcaster concern
+   */
+    declare broadcast: (event: IBroadcastEvent) => Promise<void>;
+
+    declare createBroadcastListener: (eventName: string) => void;
+
+    declare subscribeToBroadcastListener: (id: string, eventName: string, callback: BroadcastCallback) => void;
+
+    declare unsubscribeFromBroadcastListener: (id: string, eventName: string) => void;
 
 
     /**

src/core/base/Factory.ts

@@ -37,7 +37,7 @@ export default abstract class Factory<Model extends IModel = IModel> implements
      * @returns A new instance of the model.
      */
     createWithData<Data extends IModelAttributes = IModelAttributes>(data: Data | null = null): Model {
-        return new this.modelCtor(data)
+        return this.modelCtor.create(data);
     }
 
 }

src/core/base/Provider.ts

@@ -51,13 +51,4 @@ export default abstract class BaseProvider implements IProvider {
         App.container('logger').info(message, ...args);
     }
 
-    /**
-     * Gets the name of the provider
-     *
-     * @returns {string|null} - The name of the provider, or null if not set
-     */
-    public getProviderName(): string | null {
-        return this.providerName;
-    }
-
 }

src/core/base/Repository.ts

@@ -1,8 +1,8 @@
+import { IEloquent } from "@src/core/domains/eloquent/interfaces/IEloquent";
+import { queryBuilder } from "@src/core/domains/eloquent/services/EloquentQueryBuilderService";
 import ModelNotFound from "@src/core/exceptions/ModelNotFound";
 import { IModel, ModelConstructor } from "@src/core/interfaces/IModel";
 import { IRepository } from "@src/core/interfaces/IRepository";
-import { IEloquent } from "@src/core/domains/eloquent/interfaces/IEloquent";
-import { queryBuilder } from "@src/core/domains/eloquent/services/EloquentQueryBuilderService";
 
 /**
  * Base class for repositories
@@ -88,8 +88,7 @@ export default class Repository<Model extends IModel> implements IRepository<Mod
             builder.where(key, filter[key]);
         })
 
-        const data = await builder.first();
-        return data ? this.modelConstructor.create(data) : null;
+        return await builder.first();
     }
 
     /**

src/core/domains/auth/factory/apiTokenFactory.ts

@@ -22,7 +22,7 @@ class ApiTokenFactory extends Factory<IApiTokenModel> implements IApiTokenFactor
      */
     createFromUser(user: IUserModel, scopes: string[] = []): IApiTokenModel {
         return this.createWithData({
-            userId: user.attributes?.id,
+            userId: user?.id,
             token: tokenFactory(),
             scopes: scopes,
             revokedAt: null,

src/core/domains/auth/interfaces/IApitokenModel.ts

@@ -3,17 +3,19 @@ import IUserModel from "@src/core/domains/auth/interfaces/IUserModel";
 import { ICtor } from "@src/core/interfaces/ICtor";
 import { IModel } from "@src/core/interfaces/IModel";
 import IModelAttributes from "@src/core/interfaces/IModelData";
+import BelongsTo from "@src/core/domains/eloquent/relational/BelongsTo";
 
 export interface IApiTokenData extends IModelAttributes {
     userId: string;
     token: string;
     scopes: string[];
     revokedAt: Date | null;
+    user: IUserModel | null;
 }
 
 export default interface IApiTokenModel extends IModel<IApiTokenData> {
     setUserModelCtor(userModelCtor: ICtor<IUserModel>): void;
     getUserModelCtor(): ICtor<IUserModel>;
-    user(): Promise<IUserModel | null>;
+    user(): BelongsTo;
     hasScope(scopes: string | string[], exactMatch?: boolean): boolean;
 }

src/core/domains/auth/interfaces/IUserModel.ts

@@ -3,7 +3,6 @@ import { IUserData } from "@src/app/models/auth/User";
 import { IModel } from "@src/core/interfaces/IModel";
 
 export default interface IUserModel extends IModel<IUserData> {
-    tokens(...args: any[]): Promise<any>;
     hasRole(...args: any[]): any;
     hasGroup(...args: any[]): any;
 }

src/core/domains/auth/services/AuthRequest.ts

@@ -1,4 +1,6 @@
 import UnauthorizedError from "@src/core/domains/auth/exceptions/UnauthorizedError";
+import IUserModel from "@src/core/domains/auth/interfaces/IUserModel";
+import { auth } from "@src/core/domains/auth/services/AuthService";
 import { BaseRequest } from "@src/core/domains/express/types/BaseRequest.t";
 import { App } from "@src/core/services/App";
 
@@ -16,9 +18,9 @@ class AuthRequest {
     public static async attemptAuthorizeRequest(req: BaseRequest): Promise<BaseRequest> {
         const authorization = (req.headers.authorization ?? '').replace('Bearer ', '');
 
-        const apiToken = await App.container('auth').attemptAuthenticateToken(authorization)
+        const apiToken = await auth().attemptAuthenticateToken(authorization)
 
-        const user = await apiToken?.user()
+        const user = await apiToken?.getAttribute('user') as IUserModel | null;
 
         if(!user || !apiToken) {
             throw new UnauthorizedError();

src/core/domains/auth/services/AuthService.ts

@@ -15,6 +15,7 @@ import decodeJwt from '@src/core/domains/auth/utils/decodeJwt';
 import { IRoute } from '@src/core/domains/express/interfaces/IRoute';
 import { app } from '@src/core/services/App';
 import { JsonWebTokenError } from 'jsonwebtoken';
+import { queryBuilder } from '@src/core/domains/eloquent/services/EloquentQueryBuilderService';
 
 /**
  * Shorthand for accessing the auth service
@@ -90,11 +91,14 @@ export default class AuthService extends Service<IAuthConfig> implements IAuthSe
      * @returns 
      */
     jwt(apiToken: IApiTokenModel): string {
-        if (!apiToken?.attributes?.userId) {
+        if (!apiToken?.userId) {
             throw new Error('Invalid token');
         }
 
-        const payload = JWTTokenFactory.create(apiToken.attributes?.userId?.toString(), apiToken.attributes?.token);
+        const userId = apiToken.getAttributeSync('userId')?.toString() ?? '';
+        const token = apiToken.getAttributeSync('token') ?? '';
+
+        const payload = JWTTokenFactory.create(userId, token);
         return createJwt(this.config.jwtSecret, payload, `${this.config.expiresInMinutes}m`);
     }
 
@@ -104,12 +108,13 @@ export default class AuthService extends Service<IAuthConfig> implements IAuthSe
      * @returns 
      */
     async revokeToken(apiToken: IApiTokenModel): Promise<void> {
-        if (apiToken?.attributes?.revokedAt) {
+        if (apiToken?.revokedAt) {
             return;
         }
 
-        apiToken.setAttribute('revokedAt', new Date());
-        await apiToken.save();
+        await queryBuilder(this.apiTokenRepository.modelConstructor)
+            .where('userId', apiToken.userId as string)
+            .update({ revokedAt: new Date() });
     }
 
     /**
@@ -151,17 +156,19 @@ export default class AuthService extends Service<IAuthConfig> implements IAuthSe
      * @returns 
      */
     async attemptCredentials(email: string, password: string, scopes: string[] = []): Promise<string> {
-        const user = await this.userRepository.findOneByEmail(email) as IUserModel;
+        const user = await this.userRepository.findOneByEmail(email);
 
-        if (!user?.attributes?.id) {
+        if (!user) {
             throw new UnauthorizedError()
         }
 
-        if (user?.attributes?.hashedPassword && !comparePassword(password, user.attributes?.hashedPassword)) {
+        const hashedPassword = user.getAttributeSync('hashedPassword')
+
+        if (hashedPassword && !comparePassword(password, hashedPassword)) {
             throw new UnauthorizedError()
         }
 
-        return this.createJwtFromUser(user, scopes)
+        return await this.createJwtFromUser(user, scopes)
     }
 
     /**

src/core/domains/console/service/CommandReader.ts

@@ -6,15 +6,19 @@ import { App } from "@src/core/services/App";
 
 export default class CommandReader implements ICommandReader {
 
-    private argv: string[] = [];
-
     /**
      * Command signature
      * 
      *  Example:
-     *      my:command --id=123 --name="My Name"
+            ["--id=123", "--name=\"My Name\""]
+     */
+    private readonly argv: string[] = [];
+
+    /**
+     * Command signature
      * 
-     * @param argv 
+     *  Example:
+            ["my:command", "--id=123", "--name=\"My Name\""]
      */
     constructor(argv: string[]) {
         this.argv = argv;