zibri 2.3.0 → 2.4.1

package/dist/cjs/data-source/repository.d.ts

@@ -4,6 +4,9 @@ import { LoggerInterface } from '../logging/logger.interface';
 import { PaginationResult } from '../open-api/pagination-result.model';
 import { DeepPartial } from '../types/deep-partial.type';
 import { Newable } from '../types/newable.type';
+import { DataSourceInterface } from './data-sources/data-source.interface';
+import { BeforeReturnHook } from './hooks/before-return';
+import { BeforeSaveHook } from './hooks/before-save';
 import { CreateAllOptions } from './models/options/create-all-options.model';
 import { CreateOptions } from './models/options/create-options.model';
 import { DeleteAllOptions } from './models/options/delete-all-options.model';
@@ -15,18 +18,28 @@ import { FindOneOptions } from './models/options/find-one-options.model';
 import { UpdateAllOptions } from './models/options/update-all-options.model';
 import { UpdateByIdOptions } from './models/options/update-by-id-options.model';
 import { Where } from './models/where/where-filter.model';
+import { EntityMetadata } from '../entity/decorators/entity.decorator';
 /**
  * A repository that handles data source related things for its entity.
  */
 export declare class Repository<T extends BaseEntity, CreateData extends DeepPartial<T> = DeepPartial<T>, UpdateData extends DeepPartial<T> = DeepPartial<T>> {
     protected readonly entityClass: Newable<T>;
     protected readonly logger: LoggerInterface;
+    private readonly beforeSave;
+    private readonly beforeReturn;
     private readonly typeOrmRepository;
-    constructor(entityClass: Newable<T>, repo: TORepository<T> | Repository<T>, logger: LoggerInterface);
+    private readonly _dataSource;
+    /**
+     * The metadata of entity that this repository manages.
+     */
+    protected readonly entityMetadata: EntityMetadata;
+    /**
+     * The data source that this repository is connected to.
+     */
+    get dataSource(): DataSourceInterface;
+    constructor(entityClass: Newable<T>, repo: TORepository<T> | Repository<T>, logger: LoggerInterface, dataSource: DataSourceInterface, beforeSave: BeforeSaveHook<T, CreateData, UpdateData>, beforeReturn: BeforeReturnHook<T>);
     private getManager;
     private resolveFindOptionsWhere;
-    private setDefaultValues;
-    private setDefaultValuesForArray;
     /**
      * Creates a new entity from the given data.
      * @param data - The create data.
@@ -89,14 +102,15 @@ export declare class Repository<T extends BaseEntity, CreateData extends DeepPar
      * Deletes an entity with the provided id.
      * @param id - The id of the entity to deleted.
      * @param options - Additional options, like a transaction.
+     * @returns The deleted entity.
      */
-    deleteById(id: T['id'], options?: DeleteByIdOptions): Promise<void>;
+    deleteById(id: T['id'], options?: DeleteByIdOptions): Promise<T>;
     /**
      * Deletes all entities that match the provided where filter.
      * @param where - The where filter to find the entities that should be deleted.
      * @param options - Additional options, like a transaction.
-     * @returns An array of all the updated entities.
+     * @returns An array of all the deleted entities.
      */
-    deleteAll(where: Where<T>, options?: DeleteAllOptions<T>): Promise<T[]>;
+    deleteAll(where: Where<T>, options?: DeleteAllOptions): Promise<T[]>;
 }
 //# sourceMappingURL=repository.d.ts.map

package/dist/cjs/data-source/repository.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"repository.d.ts","sourceRoot":"","sources":["../../../src/data-source/repository.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"repository.d.ts","sourceRoot":"","sources":["../../../src/data-source/repository.ts"],"names":[],"mappings":"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"}

package/dist/cjs/data-source/repository.js

@@ -3,21 +3,47 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Repository = void 0;
 const typeorm_1 = require("typeorm");
 const query_failed_error_1 = require("./query-failed.error");
-const relation_enum_1 = require("../entity/models/relation.enum");
-const metadata_utilities_1 = require("../utilities/metadata.utilities");
-const where_filter_to_find_options_where_function_1 = require("./models/where/where-filter-to-find-options-where.function");
 const not_found_error_1 = require("../error-handling/errors/not-found.error");
+const model_registry_1 = require("../global/model-registry/model.registry");
+const metadata_utilities_1 = require("../utilities/metadata.utilities");
+const entity_metadata_missing_error_1 = require("../entity/entity-metadata-missing.error");
 /**
  * A repository that handles data source related things for its entity.
  */
 class Repository {
     entityClass;
     logger;
+    beforeSave;
+    beforeReturn;
     typeOrmRepository;
-    constructor(entityClass, repo, logger) {
+    _dataSource;
+    /**
+     * The metadata of entity that this repository manages.
+     */
+    entityMetadata;
+    // eslint-disable-next-line jsdoc/require-returns
+    /**
+     * The data source that this repository is connected to.
+     */
+    get dataSource() {
+        return this._dataSource;
+    }
+    constructor(entityClass, repo, logger, dataSource, beforeSave, beforeReturn) {
         this.entityClass = entityClass;
         this.logger = logger;
+        this.beforeSave = beforeSave;
+        this.beforeReturn = beforeReturn;
         this.typeOrmRepository = repo instanceof Repository ? repo.typeOrmRepository : repo;
+        model_registry_1.ModelRegistry.get(this.entityClass);
+        const metadata = metadata_utilities_1.MetadataUtilities.getEntityMetadata(this.entityClass);
+        if (!metadata) {
+            throw new entity_metadata_missing_error_1.EntityMetadataMissingError(this.entityClass);
+        }
+        if (!('whereFilterToFindOptionsWhere' in dataSource)) {
+            throw new Error('Zibri\'s default repositories only work with TypeOrmBaseDataSource');
+        }
+        this._dataSource = dataSource;
+        this.entityMetadata = metadata;
     }
     getManager(transaction) {
         return transaction ? transaction.queryRunner.manager : this.typeOrmRepository.manager;
@@ -26,88 +52,7 @@ class Repository {
         if (!where) {
             return undefined;
         }
-        return (0, where_filter_to_find_options_where_function_1.whereFilterToFindOptionsWhere)(where, this.entityClass);
-    }
-    async setDefaultValues(data, entityClass) {
-        const props = metadata_utilities_1.MetadataUtilities.getModelProperties(entityClass);
-        for (const key in props) {
-            const property = props[key];
-            if (data[key] !== undefined) {
-                switch (property.type) {
-                    case 'string':
-                    case 'number':
-                    case 'boolean':
-                    case 'date':
-                    case 'file':
-                    case 'unknown': {
-                        break;
-                    }
-                    case relation_enum_1.Relation.MANY_TO_ONE:
-                    case relation_enum_1.Relation.ONE_TO_ONE: {
-                        await this.setDefaultValues(data[key], property.target());
-                        break;
-                    }
-                    case 'object': {
-                        await this.setDefaultValues(data[key], property.cls());
-                        break;
-                    }
-                    case 'array': {
-                        await this.setDefaultValuesForArray(data[key], property);
-                        break;
-                    }
-                    case relation_enum_1.Relation.MANY_TO_MANY:
-                    case relation_enum_1.Relation.ONE_TO_MANY: {
-                        await this.setDefaultValuesForArray(data[key], {
-                            ...property,
-                            type: 'array',
-                            totalMaxSize: '50mb',
-                            items: {
-                                type: 'object',
-                                cls: property.target,
-                                description: undefined,
-                                allowAdditionalProperties: false,
-                                excludeFromChangeSets: property.excludeFromChangeSets,
-                                required: property.required
-                            }
-                        });
-                        break;
-                    }
-                }
-                continue;
-            }
-            if (!('default' in property) || property.default == undefined) {
-                continue;
-            }
-            if (typeof property.default === 'string'
-                || typeof property.default === 'number'
-                || typeof property.default === 'boolean'
-                || property.default instanceof Date) {
-                data[key] = property.default;
-                continue;
-            }
-            data[key] = await property.default(data);
-        }
-    }
-    async setDefaultValuesForArray(values, property) {
-        for (const item of values) {
-            switch (property.items.type) {
-                case 'string':
-                case 'number':
-                case 'boolean':
-                case 'date':
-                case 'file':
-                case 'unknown': {
-                    break;
-                }
-                case 'object': {
-                    await this.setDefaultValues(item, property.items.cls());
-                    break;
-                }
-                case 'array': {
-                    await this.setDefaultValuesForArray(item, property.items);
-                }
-            }
-        }
+        return this._dataSource.whereFilterToFindOptionsWhere(where, this.entityClass);
     }
     /**
      * Creates a new entity from the given data.
@@ -120,10 +65,12 @@ class Repository {
             await this.logger.warn('Found an id on the create data, it will be ignored.');
             delete data.id;
         }
-        await this.setDefaultValues(data, this.entityClass);
+        await this.beforeSave(data, true, this.entityClass);
         const manager = this.getManager(options?.transaction);
         try {
-            return await manager.save(this.entityClass, data);
+            const res = await manager.save(this.entityClass, data);
+            await this.beforeReturn(res, this.entityClass);
+            return res;
         }
         catch (error) {
             if (error instanceof typeorm_1.QueryFailedError) {
@@ -139,20 +86,23 @@ class Repository {
      * @returns All newly created entities.
      */
     async createAll(data, options) {
-        let entitiesWithIdCount = 0;
-        for (const d of data) {
+        const entitiesWithIdCount = (await Promise.all(data.map(async (d) => {
+            let hadId = false;
             if (d.id != undefined && options?.allowId != true) {
                 delete d.id;
-                entitiesWithIdCount++;
+                hadId = true;
             }
-            await this.setDefaultValues(d, this.entityClass);
-        }
+            await this.beforeSave(d, true, this.entityClass);
+            return hadId;
+        }))).filter(Boolean).length;
         if (entitiesWithIdCount) {
             await this.logger.warn(`Found an id on ${entitiesWithIdCount} out of ${data.length} entries of the create data. These ids will be ignored.`);
         }
         const manager = this.getManager(options?.transaction);
         try {
-            return await manager.save(this.entityClass, data);
+            const res = await manager.save(this.entityClass, data);
+            await Promise.all(res.map(r => this.beforeReturn(r, this.entityClass)));
+            return res;
         }
         catch (error) {
             if (error instanceof typeorm_1.QueryFailedError) {
@@ -182,10 +132,18 @@ class Repository {
      */
     async findOne(options, required = true) {
         const where = this.resolveFindOptionsWhere(options.where);
+        // eslint-disable-next-line typescript/no-explicit-any
+        const relations = options.relations ?? this.entityMetadata.defaultRelations;
         const manager = this.getManager(options?.transaction);
         let res;
         try {
-            res = await manager.findOne(this.entityClass, { ...options, relations: options.relations, where, transaction: undefined });
+            res = await manager.findOne(this.entityClass, {
+                order: this.entityMetadata.defaultOrder,
+                ...options,
+                relations: relations,
+                where,
+                transaction: undefined
+            });
         }
         catch (error) {
             if (error instanceof typeorm_1.QueryFailedError) {
@@ -196,7 +154,11 @@ class Repository {
         if (!res && required) {
             throw new not_found_error_1.NotFoundError(`Could not find ${this.entityClass.name}.`);
         }
-        return (res ?? undefined);
+        if (!res) {
+            return undefined;
+        }
+        await this.beforeReturn(res, this.entityClass);
+        return res;
     }
     /**
      * Finds all entities with the given options.
@@ -206,8 +168,18 @@ class Repository {
     async findAll(options) {
         const manager = this.getManager(options?.transaction);
         const where = this.resolveFindOptionsWhere(options?.where);
+        // eslint-disable-next-line typescript/no-explicit-any
+        const relations = options?.relations ?? this.entityMetadata.defaultRelations;
         try {
-            return await manager.find(this.entityClass, { ...options, where, relations: options?.relations, transaction: undefined });
+            const res = await manager.find(this.entityClass, {
+                order: this.entityMetadata.defaultOrder,
+                ...options,
+                where,
+                relations: relations,
+                transaction: undefined
+            });
+            await Promise.all(res.map(r => this.beforeReturn(r, this.entityClass)));
+            return res;
         }
         catch (error) {
             if (error instanceof typeorm_1.QueryFailedError) {
@@ -252,14 +224,15 @@ class Repository {
      * @returns The updated entity.
      */
     async updateById(id, data, options) {
-        if (data.id != undefined && options?.allowId != true) {
+        if (data.id != undefined) {
             await this.logger.warn('Found an id on the update data, it will be ignored.');
-            delete data.id;
         }
         const manager = this.getManager(options?.transaction);
-        const dataWithId = { id, ...data };
+        data.id = id;
+        await this.beforeSave(data, false, this.entityClass);
         try {
-            return await manager.save(this.entityClass, dataWithId);
+            await manager.save(this.entityClass, data, { reload: false });
+            return await this.findById(id, options);
         }
         catch (error) {
             if (error instanceof typeorm_1.QueryFailedError) {
@@ -276,14 +249,16 @@ class Repository {
      * @returns An array of all the updated entities.
      */
     async updateAll(where, data, options) {
-        if (data.id != undefined && options?.allowId != true) {
+        if (data.id != undefined) {
             await this.logger.warn('Found an id on the update data, it will be ignored.');
             delete data.id;
         }
+        await this.beforeSave(data, false, this.entityClass);
         const toUpdate = (await this.findAll({ where, ...options })).map(t => ({ id: t.id, ...data }));
         const manager = this.getManager(options?.transaction);
         try {
-            return await manager.save(this.entityClass, toUpdate);
+            await manager.save(this.entityClass, toUpdate);
+            return await this.findAll({ where, ...options });
         }
         catch (error) {
             if (error instanceof typeorm_1.QueryFailedError) {
@@ -296,12 +271,16 @@ class Repository {
      * Deletes an entity with the provided id.
      * @param id - The id of the entity to deleted.
      * @param options - Additional options, like a transaction.
+     * @returns The deleted entity.
      */
     async deleteById(id, options) {
         const entityToDelete = await this.findById(id, options);
+        await this.beforeSave(entityToDelete, false, this.entityClass);
         const manager = this.getManager(options?.transaction);
         try {
-            await manager.remove(this.entityClass, entityToDelete);
+            const res = await manager.remove(this.entityClass, entityToDelete);
+            await this.beforeReturn(res, this.entityClass);
+            return res;
         }
         catch (error) {
             if (error instanceof typeorm_1.QueryFailedError) {
@@ -314,13 +293,16 @@ class Repository {
      * Deletes all entities that match the provided where filter.
      * @param where - The where filter to find the entities that should be deleted.
      * @param options - Additional options, like a transaction.
-     * @returns An array of all the updated entities.
+     * @returns An array of all the deleted entities.
      */
     async deleteAll(where, options) {
         const toDelete = await this.findAll({ where, ...options });
+        await Promise.all(toDelete.map(r => this.beforeSave(r, false, this.entityClass)));
         const manager = this.getManager(options?.transaction);
         try {
-            return await manager.remove(this.entityClass, toDelete);
+            const res = await manager.remove(this.entityClass, toDelete);
+            await Promise.all(res.map(r => this.beforeReturn(r, this.entityClass)));
+            return res;
         }
         catch (error) {
             if (error instanceof typeorm_1.QueryFailedError) {

package/dist/cjs/data-source/repository.js.map

@@ -1 +1 @@
-{"version":3,"file":"repository.js","sourceRoot":"","sources":["../../../src/data-source/repository.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"repository.js","sourceRoot":"","sources":["../../../src/data-source/repository.ts"],"names":[],"mappings":"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"}

package/dist/cjs/di/decorators/inject-repository.decorator.d.ts

@@ -1,4 +1,4 @@
-import { Repository } from '../../data-source/repository';
+import { RepositoryTypeForEntity } from '../../data-source/data-sources/data-source.interface';
 import { BaseEntity } from '../../entity/base-entity.model';
 import { Newable } from '../../types/newable.type';
 import { DiToken } from '../models/di-token.model';
@@ -7,7 +7,7 @@ import { DiToken } from '../models/di-token.model';
  * @param entity - The entity class to resolve the repository token for.
  * @returns The DI token.
  */
-export declare function repositoryTokenFor<T extends Newable<BaseEntity>>(entity: T): DiToken<Repository<InstanceType<T>>>;
+export declare function repositoryTokenFor<T extends Newable<BaseEntity>>(entity: T): DiToken<RepositoryTypeForEntity<InstanceType<T>>>;
 /**
  * Marks the parameter to be injected as a Repository of the provided class.
  * @param entityClass - The class of which the Repository should be injected.

package/dist/cjs/di/decorators/inject-repository.decorator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"inject-repository.decorator.d.ts","sourceRoot":"","sources":["../../../../src/di/decorators/inject-repository.decorator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAC5D,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAEnD,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAKnD;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,CAAC,SAAS,OAAO,CAAC,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC,GAAG,OAAO,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAIjH;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,CAAC,SAAS,UAAU,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC,CAAC,GAAG,kBAAkB,CASlG"}
+{"version":3,"file":"inject-repository.decorator.d.ts","sourceRoot":"","sources":["../../../../src/di/decorators/inject-repository.decorator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,sDAAsD,CAAC;AAE/F,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAC5D,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAEnD,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAKnD;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,CAAC,SAAS,OAAO,CAAC,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC,GAAG,OAAO,CAAC,uBAAuB,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAI9H;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,CAAC,SAAS,UAAU,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC,CAAC,GAAG,kBAAkB,CASlG"}

package/dist/cjs/di/decorators/inject-repository.decorator.js.map

@@ -1 +1 @@
-{"version":3,"file":"inject-repository.decorator.js","sourceRoot":"","sources":["../../../../src/di/decorators/inject-repository.decorator.ts"],"names":[],"mappings":";;AAcA,gDAIC;AAMD,4CASC;AA9BD,2EAAuE;AAEvE,2EAAiE;AAEjE,MAAM,mBAAmB,GAAoD,EAAE,CAAC;AAEhF;;;;GAIG;AACH,SAAgB,kBAAkB,CAAgC,MAAS;IACvE,MAAM,GAAG,GAAW,cAAc,MAAM,CAAC,IAAI,GAAG,CAAC;IACjD,mBAAmB,CAAC,GAAG,CAAC,KAAK,IAAI,sCAAc,CAAC,GAAG,CAAC,CAAC;IACrD,OAAO,mBAAmB,CAAC,GAAG,CAAyC,CAAC;AAC5E,CAAC;AAED;;;GAGG;AACH,SAAgB,gBAAgB,CAAuB,WAAuB;IAC1E,OAAO,CAAC,MAAM,EAAE,YAAY,EAAE,cAAc,EAAE,EAAE;QAC5C,iDAAiD;QACjD,MAAM,KAAK,GAAW,IAAI,KAAK,EAAE,CAAC,KAAK,IAAI,EAAE,CAAC;QAC9C,sCAAiB,CAAC,WAAW,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QAC7C,MAAM,MAAM,GAAqC,sCAAiB,CAAC,oBAAoB,CAAC,MAAM,CAAC,CAAC;QAChG,MAAM,CAAC,cAAc,CAAC,GAAG,kBAAkB,CAAC,WAAW,CAAC,CAAC;QACzD,sCAAiB,CAAC,oBAAoB,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC3D,CAAC,CAAC;AACN,CAAC"}
+{"version":3,"file":"inject-repository.decorator.js","sourceRoot":"","sources":["../../../../src/di/decorators/inject-repository.decorator.ts"],"names":[],"mappings":";;AAeA,gDAIC;AAMD,4CASC;AA9BD,2EAAuE;AAEvE,2EAAiE;AAEjE,MAAM,mBAAmB,GAAoD,EAAE,CAAC;AAEhF;;;;GAIG;AACH,SAAgB,kBAAkB,CAAgC,MAAS;IACvE,MAAM,GAAG,GAAW,cAAc,MAAM,CAAC,IAAI,GAAG,CAAC;IACjD,mBAAmB,CAAC,GAAG,CAAC,KAAK,IAAI,sCAAc,CAAC,GAAG,CAAC,CAAC;IACrD,OAAO,mBAAmB,CAAC,GAAG,CAAsD,CAAC;AACzF,CAAC;AAED;;;GAGG;AACH,SAAgB,gBAAgB,CAAuB,WAAuB;IAC1E,OAAO,CAAC,MAAM,EAAE,YAAY,EAAE,cAAc,EAAE,EAAE;QAC5C,iDAAiD;QACjD,MAAM,KAAK,GAAW,IAAI,KAAK,EAAE,CAAC,KAAK,IAAI,EAAE,CAAC;QAC9C,sCAAiB,CAAC,WAAW,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QAC7C,MAAM,MAAM,GAAqC,sCAAiB,CAAC,oBAAoB,CAAC,MAAM,CAAC,CAAC;QAChG,MAAM,CAAC,cAAc,CAAC,GAAG,kBAAkB,CAAC,WAAW,CAAC,CAAC;QACzD,sCAAiB,CAAC,oBAAoB,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC3D,CAAC,CAAC;AACN,CAAC"}

package/dist/cjs/di/default/zibri-di-providers.default.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"zibri-di-providers.default.d.ts","sourceRoot":"","sources":["../../../../src/di/default/zibri-di-providers.default.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAyB5D,OAAO,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AAYjE,eAAO,MAAM,kBAAkB,EAAE,qBAAqB,CAAC,OAAO,eAAe,CAsE5E,CAAC"}
+{"version":3,"file":"zibri-di-providers.default.d.ts","sourceRoot":"","sources":["../../../../src/di/default/zibri-di-providers.default.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAmC5D,OAAO,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AAYjE,eAAO,MAAM,kBAAkB,EAAE,qBAAqB,CAAC,OAAO,eAAe,CAiI5E,CAAC"}

package/dist/cjs/di/default/zibri-di-providers.default.js

@@ -14,12 +14,20 @@ const zibri_di_tokens_default_1 = require("./zibri-di-tokens.default");
 const asset_service_1 = require("../../assets/asset.service");
 const two_factor_service_1 = require("../../auth/2fa/two-factor.service");
 const auth_service_1 = require("../../auth/auth.service");
+const encryption_service_1 = require("../../auth/encryption/encryption.service");
+const aes_gcm_encryption_strategy_1 = require("../../auth/encryption/strategies/aes-gcm.encryption-strategy");
+const hash_service_1 = require("../../auth/hash/hash.service");
+const bcrypt_hash_strategy_1 = require("../../auth/hash/strategies/bcrypt.hash-strategy");
 const user_service_1 = require("../../auth/user/user.service");
 const backup_service_1 = require("../../backup/backup.service");
+const cache_service_1 = require("../../caching/cache.service");
+const als_utilities_1 = require("../../context/als.utilities");
+const request_context_token_model_1 = require("../../context/request/request-context-token.model");
 const cron_service_1 = require("../../cron/cron.service");
 const data_source_service_1 = require("../../data-source/data-source.service");
 const email_service_1 = require("../../email/email.service");
 const error_handler_1 = require("../../error-handling/error-handler");
+const event_service_1 = require("../../event/event.service");
 const http_client_1 = require("../../http-client/http-client");
 const log_level_enum_1 = require("../../logging/log-level.enum");
 const logger_1 = require("../../logging/logger");
@@ -28,7 +36,6 @@ const metrics_service_1 = require("../../metrics/metrics.service");
 const multithreading_service_1 = require("../../multithreading/services/multithreading.service");
 const open_api_service_1 = require("../../open-api/open-api.service");
 const parser_1 = require("../../parsing/parser");
-const request_context_1 = require("../../routing/request.context");
 const router_1 = require("../../routing/router");
 const fs_utilities_1 = require("../../utilities/fs.utilities");
 const ms_1 = require("../../utilities/ms");
@@ -69,12 +76,12 @@ exports.ZIBRI_DI_PROVIDERS = {
     DATA_SOURCE_SERVICE: { useClass: data_source_service_1.DataSourceService },
     AUTH_SERVICE: { useClass: auth_service_1.AuthService },
     TWO_FACTOR_SERVICE: { useClass: two_factor_service_1.TwoFactorService },
-    OTP_HEADER: { useFactory: () => 'X-Authorization-OTP' },
+    OTP_HEADER: { useFactory: () => 'x-authorization-otp' },
     OTP_LENGTH: { useFactory: () => 6 },
     USER_SERVICE: { useClass: user_service_1.UserService },
     JWT_ACCESS_TOKEN_SECRET: { useFactory: () => undefined },
     JWT_REFRESH_TOKEN_SECRET: { useFactory: () => undefined },
-    JWT_PASSWORD_RESET_EMAIL_TEMPLATE: { useFactory: () => undefined },
+    PASSWORD_RESET_EMAIL_TEMPLATE: { useFactory: () => undefined },
     JWT_ACCESS_TOKEN_EXPIRES_IN_MS: { useFactory: () => ms_1.Ms.HOUR },
     JWT_REFRESH_TOKEN_EXPIRES_IN_MS: { useFactory: () => 100 * ms_1.Ms.DAY },
     CRON_SERVICE: { useClass: cron_service_1.CronService },
@@ -95,9 +102,8 @@ exports.ZIBRI_DI_PROVIDERS = {
     FORMAT_PRICE: { useFactory: () => format_price_function_1.formatPrice },
     FORMAT_PERCENT: { useFactory: () => format_percent_function_1.formatPercent },
     EMAIL_CONFIG: { useFactory: () => undefined },
-    JWT_PASSWORD_RESET_TOKEN_EXPIRES_IN_MS: { useFactory: () => 300000 },
-    JWT_CONFIRM_PASSWORD_RESET_URL: { useFactory: () => undefined },
-    CURRENT_REQUEST: { useFactory: () => (0, request_context_1.getCurrentRequest)() },
+    PASSWORD_RESET_TOKEN_EXPIRES_IN_MS: { useFactory: () => 300000 },
+    CONFIRM_PASSWORD_RESET_URL: { useFactory: () => undefined },
     MULTITHREADING_OPTIONS: {
         useFactory: () => ({
             maxThreads,
@@ -109,6 +115,66 @@ exports.ZIBRI_DI_PROVIDERS = {
     MULTITHREADING_SERVICE: { useClass: multithreading_service_1.MultithreadingService },
     WEBSOCKET_SERVICE: { useClass: websocket_service_1.WebsocketService },
     WEBSOCKET_OPTIONS: { useFactory: () => ({ timeoutInMs: ms_1.Ms.SECOND * 5, isAllowedToConnect: () => true }) },
-    HTTP_CLIENT: { useClass: http_client_1.HttpClient }
+    HTTP_CLIENT: { useClass: http_client_1.HttpClient },
+    EVENT_SERVICE: { useClass: event_service_1.EventService },
+    CORRELATION_ID_HEADER: { useValue: 'x-correlation-id' },
+    CSRF_TOKEN_HEADER: { useValue: 'x-csrf-token' },
+    COOKIE_AUTH_SESSION_OPTIONS: {
+        useValue: {
+            name: 'sessionId',
+            sameSite: 'lax',
+            path: '/'
+        }
+    },
+    COOKIE_AUTH_REFRESH_SESSION_OPTIONS: {
+        useValue: {
+            name: 'refreshSessionId',
+            sameSite: 'lax',
+            path: '/'
+        }
+    },
+    COOKIE_SIGN_SECRET: { useValue: undefined },
+    COOKIE_AUTH_SESSION_EXPIRES_IN_MS: { useValue: ms_1.Ms.DAY },
+    COOKIE_AUTH_REFRESH_SESSION_EXPIRES_IN_MS: { useValue: ms_1.Ms.DAY * 100 },
+    HASH_SERVICE: { useClass: hash_service_1.HashService },
+    HASH_STRATEGIES: { useValue: [bcrypt_hash_strategy_1.BcryptHashStrategy] },
+    ENCRYPTION_SERVICE: { useClass: encryption_service_1.EncryptionService },
+    ENCRYPTION_STRATEGIES: { useValue: [aes_gcm_encryption_strategy_1.AesGcmEncryptionStrategy] },
+    ENCRYPTION_MASTER_OPTIONS: { useValue: undefined },
+    CACHE_SERVICE: { useClass: cache_service_1.CacheService },
+    // dynamic
+    CURRENT_REQUEST_CONTEXT: {
+        useFactory: () => als_utilities_1.AlsUtilities.getCurrentRequestContext(),
+        cache: false
+    },
+    DEFAULT_CSP_OPTIONS: {
+        useFactory: () => {
+            const context = (0, inject_function_1.inject)(zibri_di_tokens_default_1.ZIBRI_DI_TOKENS.CURRENT_REQUEST_CONTEXT);
+            const nonce = context?.get(request_context_token_model_1.ZIBRI_REQUEST_CONTEXT_TOKENS.NONCE);
+            const nonceSrc = nonce ? `'nonce-${nonce}'` : undefined;
+            return {
+                baseUri: ['\'self\''],
+                connectSrc: [],
+                defaultSrc: ['\'self\''],
+                fontSrc: [],
+                formAction: ['\'self\''],
+                frameAncestors: ['\'self\''],
+                imgSrc: [],
+                mediaSrc: [],
+                objectSrc: ['\'none\''],
+                scriptSrc: [
+                    '\'self\'',
+                    ...nonceSrc ? [nonceSrc] : []
+                ],
+                scriptSrcAttr: ['\'none\''],
+                styleSrc: []
+            };
+        },
+        cache: false
+    },
+    CURRENT_CACHE_CONTEXT: {
+        useFactory: () => als_utilities_1.AlsUtilities.getCurrentCacheContext(),
+        cache: false
+    }
 };
 //# sourceMappingURL=zibri-di-providers.default.js.map

package/dist/cjs/di/default/zibri-di-providers.default.js.map

@@ -1 +1 @@
-{"version":3,"file":"zibri-di-providers.default.js","sourceRoot":"","sources":["../../../../src/di/default/zibri-di-providers.default.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"zibri-di-providers.default.js","sourceRoot":"","sources":["../../../../src/di/default/zibri-di-providers.default.ts"],"names":[],"mappings":"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"}