mongodb-dynamic-api 2.3.0 → 2.3.2

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 Changelog
 
+## [2.3.2](https://github.com/MikeDev75015/mongodb-dynamic-api/compare/v2.3.1...v2.3.2) (2024-05-07)
+
+## [2.3.1](https://github.com/MikeDev75015/mongodb-dynamic-api/compare/v2.3.0...v2.3.1) (2024-05-05)
+
 ## [2.3.0](https://github.com/MikeDev75015/mongodb-dynamic-api/compare/v2.2.1...v2.3.0) (2024-05-02)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mongodb-dynamic-api",
-  "version": "2.3.0",
+  "version": "2.3.2",
   "description": "Auto generated CRUD API for MongoDB using NestJS",
   "readmeFilename": "README.md",
   "main": "index.js",
@@ -86,7 +86,7 @@
     "jest-mock-extended": "^3.0.5",
     "jest-sonar-reporter": "^2.0.0",
     "prettier": "^3.2.5",
-    "release-it": "^17.1.1",
+    "release-it": "^17.2.1",
     "source-map-support": "^0.5.21",
     "supertest": "^6.3.4",
     "ts-jest": "^29.1.2",
@@ -97,7 +97,6 @@
   },
   "jest": {
     "clearMocks": true,
-    "resetMocks": true,
     "moduleFileExtensions": [
       "js",
       "json",

package/src/dynamic-api.module.d.ts

@@ -7,6 +7,5 @@ export declare class DynamicApiModule {
     static forRoot<Entity extends BaseEntity = any>(uri: string, { useGlobalCache, cacheOptions, useAuth, routesConfig, }?: DynamicApiForRootOptions<Entity>): DynamicModule;
     static forFeature<Entity extends BaseEntity>({ entity, controllerOptions, routes, }: DynamicApiForFeatureOptions<Entity>): Promise<DynamicModule>;
     private static buildStateFromOptions;
-    private static initializeAuthOptions;
     private static setDefaultRoutes;
 }

package/src/dynamic-api.module.js

@@ -28,7 +28,7 @@ let DynamicApiModule = DynamicApiModule_1 = class DynamicApiModule {
         }
         this.state.set([
             'partial',
-            this.buildStateFromOptions(useGlobalCache, cacheOptions, useAuth, routesConfig),
+            this.buildStateFromOptions(uri, useGlobalCache, cacheOptions, useAuth, routesConfig),
         ]);
         return {
             module: DynamicApiModule_1,
@@ -36,8 +36,8 @@ let DynamicApiModule = DynamicApiModule_1 = class DynamicApiModule {
                 modules_1.DynamicApiConfigModule.register(this.state.get()),
                 cache_manager_1.CacheModule.register({ isGlobal: true, ...cacheOptions }),
                 mongoose_1.MongooseModule.forRoot(uri, { connectionName: this.state.get('connectionName') }),
-                ...(useAuth?.user ? [
-                    modules_1.AuthModule.forRoot(this.initializeAuthOptions(useAuth)),
+                ...(useAuth?.userEntity ? [
+                    modules_1.AuthModule.forRoot(useAuth),
                 ] : []),
             ],
             exports: [modules_1.DynamicApiConfigModule],
@@ -46,7 +46,7 @@ let DynamicApiModule = DynamicApiModule_1 = class DynamicApiModule {
     static forFeature({ entity, controllerOptions, routes = [], }) {
         const schema = (0, helpers_1.buildSchemaFromEntity)(entity);
         const databaseModule = mongoose_1.MongooseModule.forFeature([{ name: entity.name, schema }], this.state.get('connectionName'));
-        services_1.DynamicApiGlobalStateService.addEntitySchema(entity.name, schema);
+        services_1.DynamicApiGlobalStateService.addEntitySchema(entity, schema);
         return new Promise((resolve, reject) => {
             const waitInitializedStateInterval = setInterval(async () => {
                 const stateInitialized = await (0, rxjs_1.firstValueFrom)(services_1.DynamicApiGlobalStateService.onInitialized());
@@ -116,17 +116,18 @@ let DynamicApiModule = DynamicApiModule_1 = class DynamicApiModule {
             }, 5000);
         });
     }
-    static buildStateFromOptions(useGlobalCache, cacheOptions, useAuth, routesConfig) {
+    static buildStateFromOptions(uri, useGlobalCache, cacheOptions, useAuth, routesConfig) {
         const routesConfigState = this.state.get('routesConfig');
         return {
+            uri,
             initialized: true,
             isGlobalCacheEnabled: useGlobalCache,
             ...(cacheOptions?.excludePaths ? { cacheExcludedPaths: cacheOptions?.excludePaths } : {}),
-            ...(useAuth?.user ? {
+            ...(useAuth?.userEntity ? {
                 isAuthEnabled: true,
                 credentials: {
-                    loginField: !useAuth.user.loginField ? 'email' : String(useAuth.user.loginField),
-                    passwordField: !useAuth.user.passwordField ? 'password' : String(useAuth.user.passwordField),
+                    loginField: !useAuth.login?.loginField ? 'email' : String(useAuth.login.loginField),
+                    passwordField: !useAuth.login?.passwordField ? 'password' : String(useAuth.login.passwordField),
                 },
                 jwtSecret: useAuth.jwt?.secret ?? 'dynamic-api-jwt-secret',
             } : {}),
@@ -138,29 +139,6 @@ let DynamicApiModule = DynamicApiModule_1 = class DynamicApiModule {
             } : {}),
         };
     }
-    static initializeAuthOptions(useAuth) {
-        return {
-            user: {
-                entity: useAuth.user.entity,
-                loginField: useAuth.user.loginField ?? 'email',
-                passwordField: useAuth.user.passwordField ?? 'password',
-                requestAdditionalFields: useAuth.user.requestAdditionalFields ?? [],
-            },
-            jwt: {
-                secret: useAuth.jwt?.secret ?? 'dynamic-api-jwt-secret',
-                expiresIn: useAuth.jwt?.expiresIn ?? '1d',
-            },
-            register: useAuth.register ? {
-                ...useAuth.register,
-                protected: useAuth.register.protected ?? !!useAuth.register.abilityPredicate,
-            } : {
-                protected: false,
-                additionalFields: [],
-            },
-            login: useAuth.login ?? {},
-            resetPassword: useAuth.resetPassword ?? {},
-        };
-    }
     static setDefaultRoutes(stateRoutesConfig, controllerRoutesConfig = {}, routes = []) {
         const defaults = controllerRoutesConfig.defaults ?? stateRoutesConfig.defaults;
         const excluded = controllerRoutesConfig.excluded ?? stateRoutesConfig.excluded;

package/src/guards/base-policies.guard.d.ts

@@ -1,12 +1,37 @@
+/// <reference types="mongoose/types/aggregate" />
+/// <reference types="mongoose/types/callback" />
+/// <reference types="mongoose/types/collection" />
+/// <reference types="mongoose/types/connection" />
+/// <reference types="mongoose/types/cursor" />
+/// <reference types="mongoose/types/document" />
+/// <reference types="mongoose/types/error" />
+/// <reference types="mongoose/types/expressions" />
+/// <reference types="mongoose/types/helpers" />
+/// <reference types="mongoose/types/middlewares" />
+/// <reference types="mongoose/types/indexes" />
+/// <reference types="mongoose/types/models" />
+/// <reference types="mongoose/types/mongooseoptions" />
+/// <reference types="mongoose/types/pipelinestage" />
+/// <reference types="mongoose/types/populate" />
+/// <reference types="mongoose/types/query" />
+/// <reference types="mongoose/types/schemaoptions" />
+/// <reference types="mongoose/types/schematypes" />
+/// <reference types="mongoose/types/session" />
+/// <reference types="mongoose/types/types" />
+/// <reference types="mongoose/types/utility" />
+/// <reference types="mongoose/types/validation" />
+/// <reference types="mongoose/types/virtuals" />
+/// <reference types="mongoose/types/inferschematype" />
 import { CanActivate, ExecutionContext, Type } from '@nestjs/common';
+import { Model } from 'mongoose';
 import { AbilityPredicate, RouteType } from '../interfaces';
 import { BaseEntity } from '../models';
 import { BaseService } from '../services';
-export declare abstract class BasePoliciesGuard<Entity extends BaseEntity, Service extends BaseService<Entity>> implements CanActivate {
-    protected readonly service: Service;
+export declare abstract class BasePoliciesGuard<Entity extends BaseEntity> extends BaseService<Entity> implements CanActivate {
+    protected readonly model: Model<Entity>;
     protected routeType: RouteType;
     protected entity: Type<Entity>;
     protected abilityPredicate: AbilityPredicate<Entity> | undefined;
-    protected constructor(service: Service);
+    protected constructor(model: Model<Entity>);
     canActivate(context: ExecutionContext): Promise<boolean>;
 }

package/src/guards/base-policies.guard.js

@@ -2,9 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BasePoliciesGuard = void 0;
 const common_1 = require("@nestjs/common");
-class BasePoliciesGuard {
-    constructor(service) {
-        this.service = service;
+const services_1 = require("../services");
+class BasePoliciesGuard extends services_1.BaseService {
+    constructor(model) {
+        super(model);
+        this.model = model;
     }
     async canActivate(context) {
         let { user, query, params } = context.switchToHttp().getRequest();
@@ -12,13 +14,12 @@ class BasePoliciesGuard {
             if (!user) {
                 throw new common_1.ForbiddenException('Access Denied');
             }
-            this.service.abilityPredicate = this.abilityPredicate;
-            this.service.user = user;
+            this.user = user;
             if (params?.id) {
-                await this.service.findOneDocument(params.id, query);
+                await this.findOneDocumentWithAbilityPredicate(params.id, query);
             }
             else {
-                await this.service.findManyDocuments(query);
+                await this.findManyDocumentsWithAbilityPredicate(query);
             }
         }
         return true;

package/src/interfaces/dynamic-api-ability.interface.d.ts

@@ -1,9 +1,9 @@
 import { BaseEntity } from '../models';
 import { RouteType } from './dynamic-api-route-type.type';
 type AbilityPredicate<Entity extends BaseEntity, User = any> = (entity: Entity, user: User) => boolean;
-type RegisterAbilityPredicate<User = any> = (user: User) => boolean;
+type AuthAbilityPredicate<User = any> = (user: User) => boolean;
 type ControllerAbilityPredicate<Entity extends BaseEntity> = {
     targets: RouteType[];
     predicate: AbilityPredicate<Entity>;
 };
-export { ControllerAbilityPredicate, RegisterAbilityPredicate, AbilityPredicate, };
+export { ControllerAbilityPredicate, AuthAbilityPredicate, AbilityPredicate, };

package/src/interfaces/dynamic-api-global-state.interface.d.ts

@@ -37,6 +37,7 @@ type RoutesConfig = {
 };
 interface DynamicApiGlobalState {
     initialized: boolean;
+    uri: string;
     connectionName: string;
     isGlobalCacheEnabled: boolean;
     cacheExcludedPaths: string[];

package/src/interfaces/dynamic-api-policy-handler.interface.d.ts

@@ -1,8 +1,32 @@
+/// <reference types="mongoose/types/aggregate" />
+/// <reference types="mongoose/types/callback" />
+/// <reference types="mongoose/types/collection" />
+/// <reference types="mongoose/types/connection" />
+/// <reference types="mongoose/types/cursor" />
+/// <reference types="mongoose/types/document" />
+/// <reference types="mongoose/types/error" />
+/// <reference types="mongoose/types/expressions" />
+/// <reference types="mongoose/types/helpers" />
+/// <reference types="mongoose/types/middlewares" />
+/// <reference types="mongoose/types/indexes" />
+/// <reference types="mongoose/types/models" />
+/// <reference types="mongoose/types/mongooseoptions" />
+/// <reference types="mongoose/types/pipelinestage" />
+/// <reference types="mongoose/types/populate" />
+/// <reference types="mongoose/types/query" />
+/// <reference types="mongoose/types/schemaoptions" />
+/// <reference types="mongoose/types/schematypes" />
+/// <reference types="mongoose/types/session" />
+/// <reference types="mongoose/types/types" />
+/// <reference types="mongoose/types/utility" />
+/// <reference types="mongoose/types/validation" />
+/// <reference types="mongoose/types/virtuals" />
+/// <reference types="mongoose/types/inferschematype" />
 import { ExecutionContext } from '@nestjs/common';
+import { Model } from 'mongoose';
 import { BaseEntity } from '../models';
-import { BaseService } from '../services';
-interface PoliciesGuard<Entity extends BaseEntity> {
+interface PoliciesGuard {
     canActivate(context: ExecutionContext): boolean | Promise<boolean>;
 }
-type PoliciesGuardConstructor<Entity extends BaseEntity> = new (service: BaseService<Entity>) => PoliciesGuard<Entity>;
+type PoliciesGuardConstructor<Entity extends BaseEntity> = new (model: Model<Entity>) => PoliciesGuard;
 export { PoliciesGuardConstructor, PoliciesGuard };

package/src/interfaces/dynamic-api-route-response.type.d.ts

@@ -0,0 +1,7 @@
+type DeleteResult = {
+    deletedCount: number;
+};
+type UpdateResult = {
+    modifiedCount: number;
+};
+export { DeleteResult, UpdateResult };

package/src/interfaces/dynamic-api-route-response.type.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/src/interfaces/dynamic-api-service-callback.interface.d.ts

@@ -1,12 +1,45 @@
+/// <reference types="mongoose/types/aggregate" />
+/// <reference types="mongoose/types/callback" />
+/// <reference types="mongoose/types/collection" />
+/// <reference types="mongoose/types/connection" />
+/// <reference types="mongoose/types/cursor" />
+/// <reference types="mongoose/types/document" />
+/// <reference types="mongoose/types/error" />
+/// <reference types="mongoose/types/expressions" />
+/// <reference types="mongoose/types/helpers" />
+/// <reference types="mongoose/types/middlewares" />
+/// <reference types="mongoose/types/indexes" />
+/// <reference types="mongoose/types/models" />
+/// <reference types="mongoose/types/mongooseoptions" />
+/// <reference types="mongoose/types/pipelinestage" />
+/// <reference types="mongoose/types/populate" />
+/// <reference types="mongoose/types/query" />
+/// <reference types="mongoose/types/schemaoptions" />
+/// <reference types="mongoose/types/schematypes" />
+/// <reference types="mongoose/types/session" />
+/// <reference types="mongoose/types/types" />
+/// <reference types="mongoose/types/utility" />
+/// <reference types="mongoose/types/validation" />
+/// <reference types="mongoose/types/virtuals" />
+/// <reference types="mongoose/types/inferschematype" />
+import { Type } from '@nestjs/common';
+import { FilterQuery } from 'mongoose';
 import { BaseEntity } from '../models';
-type DynamicApiCallbackMethods<Entity extends BaseEntity> = {
-    findById: (id: string) => Promise<Entity | undefined>;
-    findAndUpdateById: (id: string, update: Partial<Entity>) => Promise<Entity>;
+import { DeleteResult, UpdateResult } from './dynamic-api-route-response.type';
+type DynamicApiCallbackMethods = {
+    findManyDocuments<T>(entity: Type<T>, query: FilterQuery<T>): Promise<T[]>;
+    findOneDocument<T>(entity: Type<T>, query: FilterQuery<T>): Promise<T | undefined>;
+    createManyDocuments<T>(entity: Type<T>, data: Partial<T>[]): Promise<T[]>;
+    createOneDocument<T>(entity: Type<T>, data: Partial<T>): Promise<T>;
+    updateManyDocuments<T>(entity: Type<T>, query: FilterQuery<T>, data: Partial<T>): Promise<UpdateResult>;
+    updateOneDocument<T>(entity: Type<T>, query: FilterQuery<T>, data: Partial<T>): Promise<UpdateResult>;
+    deleteManyDocuments<T>(entity: Type<T>, ids: string[]): Promise<DeleteResult>;
+    deleteOneDocument<T>(entity: Type<T>, id: string): Promise<DeleteResult>;
 };
-type DynamicApiServiceCallback<Entity extends BaseEntity> = (entity: Entity, methods: DynamicApiCallbackMethods<Entity>) => Promise<void>;
+type DynamicApiServiceCallback<Entity extends BaseEntity> = (entity: Entity, methods: DynamicApiCallbackMethods) => Promise<void>;
 type DynamicApiResetPasswordCallbackMethods<Entity extends BaseEntity, UpdateBy = 'userId'> = {
     findUserByEmail: (email: string) => Promise<Entity | undefined>;
-    updateUserByEmail: (email: string, update: Partial<Entity>) => Promise<Entity>;
+    updateUserByEmail: (email: string, update: Partial<Entity>) => Promise<Entity | undefined>;
 };
 type DynamicApiResetPasswordCallback<Entity extends BaseEntity> = (_: {
     resetPasswordToken: string;

package/src/interfaces/index.d.ts

@@ -9,6 +9,7 @@ export * from './dynamic-api-policy-handler.interface';
 export * from './dynamic-api-route-config.interface';
 export * from './dynamic-api-route-dtos-bundle.type';
 export * from './dynamic-api-route-module.type';
+export * from './dynamic-api-route-response.type';
 export * from './dynamic-api-route-type.type';
 export * from './dynamic-api-schema-options.interface';
 export * from './dynamic-api-service-callback.interface';

package/src/interfaces/index.js

@@ -25,6 +25,7 @@ __exportStar(require("./dynamic-api-policy-handler.interface"), exports);
 __exportStar(require("./dynamic-api-route-config.interface"), exports);
 __exportStar(require("./dynamic-api-route-dtos-bundle.type"), exports);
 __exportStar(require("./dynamic-api-route-module.type"), exports);
+__exportStar(require("./dynamic-api-route-response.type"), exports);
 __exportStar(require("./dynamic-api-route-type.type"), exports);
 __exportStar(require("./dynamic-api-schema-options.interface"), exports);
 __exportStar(require("./dynamic-api-service-callback.interface"), exports);

package/src/mixins/create-policies-guard.mixin.d.ts

@@ -1,6 +1,5 @@
 import { Type } from '@nestjs/common';
 import { AbilityPredicate, PoliciesGuardConstructor, RouteType } from '../interfaces';
 import { BaseEntity } from '../models';
-import { BaseService } from '../services';
-declare function CreatePoliciesGuardMixin<Entity extends BaseEntity, Service extends BaseService<Entity>>(entity: Type<Entity>, routeType: RouteType, version: string | undefined, abilityPredicate: AbilityPredicate<Entity> | undefined): PoliciesGuardConstructor<Entity>;
+declare function CreatePoliciesGuardMixin<Entity extends BaseEntity>(entity: Type<Entity>, routeType: RouteType, version: string | undefined, abilityPredicate: AbilityPredicate<Entity> | undefined): PoliciesGuardConstructor<Entity>;
 export { CreatePoliciesGuardMixin };

package/src/mixins/create-policies-guard.mixin.js

@@ -14,13 +14,16 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CreatePoliciesGuardMixin = void 0;
 const common_1 = require("@nestjs/common");
+const mongoose_1 = require("@nestjs/mongoose");
+const mongoose_2 = require("mongoose");
+const dynamic_api_module_1 = require("../dynamic-api.module");
 const guards_1 = require("../guards");
 const helpers_1 = require("../helpers");
 function CreatePoliciesGuardMixin(entity, routeType, version, abilityPredicate) {
     let RoutePoliciesGuard = class RoutePoliciesGuard extends guards_1.BasePoliciesGuard {
-        constructor(service) {
-            super(service);
-            this.service = service;
+        constructor(model) {
+            super(model);
+            this.model = model;
             this.routeType = routeType;
             this.entity = entity;
             this.abilityPredicate = abilityPredicate;
@@ -28,8 +31,8 @@ function CreatePoliciesGuardMixin(entity, routeType, version, abilityPredicate)
     };
     RoutePoliciesGuard = __decorate([
         (0, common_1.Injectable)(),
-        __param(0, (0, common_1.Inject)(`${(0, helpers_1.provideName)(routeType, entity.name, version, 'Service')}`)),
-        __metadata("design:paramtypes", [Object])
+        __param(0, (0, mongoose_1.InjectModel)(entity.name, dynamic_api_module_1.DynamicApiModule.state.get('connectionName'))),
+        __metadata("design:paramtypes", [mongoose_2.Model])
     ], RoutePoliciesGuard);
     Object.defineProperty(RoutePoliciesGuard, 'name', {
         value: `${(0, helpers_1.provideName)(routeType, entity.name, version, 'PoliciesGuard')}`,

package/src/modules/auth/auth.helper.d.ts

@@ -1,10 +1,10 @@
 import { Type, ValidationPipeOptions } from '@nestjs/common';
 import { DynamicApiServiceCallback, DynamicAPIServiceProvider } from '../../interfaces';
 import { BaseEntity } from '../../models';
-import { AuthControllerConstructor, DynamicApiRegisterOptions, DynamicApiResetPasswordOptions } from './interfaces';
+import { AuthControllerConstructor, DynamicApiLoginOptions, DynamicApiRegisterOptions, DynamicApiResetPasswordOptions } from './interfaces';
 declare const authServiceProviderName = "DynamicApiAuthService";
 declare const localStrategyProviderName = "DynamicApiLocalStrategy";
 declare function createLocalStrategyProvider<Entity extends BaseEntity>(loginField: keyof Entity, passwordField: keyof Entity): DynamicAPIServiceProvider;
-declare function createAuthServiceProvider<Entity extends BaseEntity>(userEntity: Type<Entity>, loginField: keyof Entity, passwordField: keyof Entity, additionalFields: (keyof Entity)[] | undefined, registerCallback: DynamicApiServiceCallback<Entity> | undefined, loginCallback: DynamicApiServiceCallback<Entity> | undefined, resetPasswordOptions: DynamicApiResetPasswordOptions<Entity> | undefined): DynamicAPIServiceProvider;
-declare function createAuthController<Entity extends BaseEntity>(userEntity: Type<Entity>, loginField: keyof Entity, passwordField: keyof Entity, additionalRequestFields: (keyof Entity)[] | undefined, registerOptions: DynamicApiRegisterOptions<Entity> | undefined, validationPipeOptions: ValidationPipeOptions | undefined, resetPasswordOptions: DynamicApiResetPasswordOptions<Entity> | undefined): AuthControllerConstructor<Entity>;
+declare function createAuthServiceProvider<Entity extends BaseEntity>(userEntity: Type<Entity>, { loginField, passwordField, additionalFields, callback: loginCallback }: DynamicApiLoginOptions<Entity>, registerCallback: DynamicApiServiceCallback<Entity> | undefined, resetPasswordOptions: DynamicApiResetPasswordOptions<Entity> | undefined): DynamicAPIServiceProvider;
+declare function createAuthController<Entity extends BaseEntity>(userEntity: Type<Entity>, { loginField, passwordField, additionalFields }: DynamicApiLoginOptions<Entity>, registerOptions: DynamicApiRegisterOptions<Entity> | undefined, validationPipeOptions: ValidationPipeOptions | undefined, resetPasswordOptions: DynamicApiResetPasswordOptions<Entity> | undefined): AuthControllerConstructor<Entity>;
 export { authServiceProviderName, createAuthController, createAuthServiceProvider, createLocalStrategyProvider, localStrategyProviderName, };

package/src/modules/auth/auth.helper.js

@@ -56,7 +56,7 @@ function createLocalStrategyProvider(loginField, passwordField) {
     };
 }
 exports.createLocalStrategyProvider = createLocalStrategyProvider;
-function createAuthServiceProvider(userEntity, loginField, passwordField, additionalFields, registerCallback, loginCallback, resetPasswordOptions) {
+function createAuthServiceProvider(userEntity, { loginField, passwordField, additionalFields, callback: loginCallback }, registerCallback, resetPasswordOptions) {
     let AuthService = class AuthService extends services_2.BaseAuthService {
         constructor(model, jwtService, bcryptService) {
             super(model, jwtService, bcryptService);
@@ -83,8 +83,8 @@ function createAuthServiceProvider(userEntity, loginField, passwordField, additi
     };
 }
 exports.createAuthServiceProvider = createAuthServiceProvider;
-function createAuthController(userEntity, loginField, passwordField, additionalRequestFields, registerOptions, validationPipeOptions, resetPasswordOptions) {
-    let AuthController = class AuthController extends (0, mixins_1.AuthControllerMixin)(userEntity, loginField, passwordField, additionalRequestFields, registerOptions ?? {}, resetPasswordOptions) {
+function createAuthController(userEntity, { loginField, passwordField, additionalFields }, registerOptions, validationPipeOptions, resetPasswordOptions) {
+    let AuthController = class AuthController extends (0, mixins_1.AuthControllerMixin)(userEntity, loginField, passwordField, additionalFields, registerOptions ?? {}, resetPasswordOptions) {
         constructor(service) {
             super(service);
             this.service = service;

package/src/modules/auth/auth.module.d.ts

@@ -3,10 +3,11 @@ import { BcryptService } from '../../services';
 import { DynamicApiAuthOptions } from './interfaces';
 import { JwtStrategy } from './strategies';
 export declare class AuthModule {
-    static forRoot<Entity extends BaseEntity>({ user: { entity: userEntity, loginField, passwordField, requestAdditionalFields, }, jwt: { secret, expiresIn }, register, login, resetPassword, validationPipeOptions, }: DynamicApiAuthOptions<Entity>, extraImports?: any[]): {
+    static forRoot<Entity extends BaseEntity>(options: DynamicApiAuthOptions<Entity>, extraImports?: any[]): {
         module: typeof AuthModule;
         imports: any[];
         providers: (typeof BcryptService | import("../../interfaces/dynamic-api-service-provider.interface").DynamicAPIServiceProvider | typeof JwtStrategy)[];
         controllers: import("./interfaces/auth-controller.interface").AuthControllerConstructor<Entity>[];
     };
+    private static initializeAuthOptions;
 }

package/src/modules/auth/auth.module.js

@@ -18,13 +18,14 @@ const services_1 = require("../../services");
 const auth_helper_1 = require("./auth.helper");
 const strategies_1 = require("./strategies");
 let AuthModule = AuthModule_1 = class AuthModule {
-    static forRoot({ user: { entity: userEntity, loginField, passwordField, requestAdditionalFields, }, jwt: { secret, expiresIn }, register, login, resetPassword, validationPipeOptions, }, extraImports = []) {
-        const { resetPasswordCallback, changePasswordCallback, emailField = 'email', expiresInMinutes = 10 } = resetPassword;
+    static forRoot(options, extraImports = []) {
+        const { userEntity, login: { loginField, passwordField, ...login }, register, resetPassword, jwt: { secret, expiresIn }, validationPipeOptions, } = this.initializeAuthOptions(options);
+        const { resetPasswordCallback, changePasswordCallback, emailField, expirationInMinutes, abilityPredicate, } = resetPassword;
         const resetPasswordOptions = resetPasswordCallback
-            ? { resetPasswordCallback, changePasswordCallback, emailField, expiresInMinutes }
+            ? { resetPasswordCallback, changePasswordCallback, emailField, expirationInMinutes, abilityPredicate }
             : undefined;
-        const AuthController = (0, auth_helper_1.createAuthController)(userEntity, loginField, passwordField, requestAdditionalFields, register, validationPipeOptions, resetPasswordOptions);
-        const AuthServiceProvider = (0, auth_helper_1.createAuthServiceProvider)(userEntity, loginField, passwordField, requestAdditionalFields, register.callback, login.callback, resetPasswordOptions);
+        const AuthController = (0, auth_helper_1.createAuthController)(userEntity, { loginField, passwordField, ...login }, register, validationPipeOptions, resetPasswordOptions);
+        const AuthServiceProvider = (0, auth_helper_1.createAuthServiceProvider)(userEntity, { loginField, passwordField, ...login }, register.callback, resetPasswordOptions);
         const LocalStrategyProvider = (0, auth_helper_1.createLocalStrategyProvider)(loginField, passwordField);
         return {
             module: AuthModule_1,
@@ -52,6 +53,32 @@ let AuthModule = AuthModule_1 = class AuthModule {
             controllers: [AuthController],
         };
     }
+    static initializeAuthOptions({ userEntity, login, register, resetPassword, jwt, validationPipeOptions, }) {
+        return {
+            userEntity: userEntity,
+            login: {
+                ...login,
+                loginField: (login?.loginField ?? 'email'),
+                passwordField: (login?.passwordField ?? 'password'),
+                additionalFields: login?.additionalFields ?? [],
+            },
+            register: {
+                ...register,
+                additionalFields: register?.additionalFields ?? [],
+                protected: register?.protected ?? !!register?.abilityPredicate,
+            },
+            resetPassword: {
+                ...resetPassword,
+                emailField: (!resetPassword?.emailField ? 'email' : String(resetPassword.emailField)),
+                expirationInMinutes: resetPassword?.expirationInMinutes ?? 10,
+            },
+            jwt: {
+                secret: jwt?.secret ?? 'dynamic-api-jwt-secret',
+                expiresIn: jwt?.expiresIn ?? '1d',
+            },
+            validationPipeOptions: validationPipeOptions,
+        };
+    }
 };
 exports.AuthModule = AuthModule;
 exports.AuthModule = AuthModule = AuthModule_1 = __decorate([

package/src/modules/auth/interfaces/auth-options.interface.d.ts

@@ -1,40 +1,39 @@
 import { Type, ValidationPipeOptions } from '@nestjs/common';
-import { DynamicApiResetPasswordCallback, DynamicApiServiceCallback, RegisterAbilityPredicate } from '../../../interfaces';
+import { DynamicApiResetPasswordCallback, DynamicApiServiceCallback, AuthAbilityPredicate } from '../../../interfaces';
 import { BaseEntity } from '../../../models';
 type DynamicApiJWTOptions = {
     secret: string;
     expiresIn?: string | number;
 };
 type DynamicApiLoginOptions<Entity extends BaseEntity = any> = {
+    loginField?: keyof Entity;
+    passwordField?: keyof Entity;
     callback?: DynamicApiServiceCallback<Entity>;
+    abilityPredicate?: AuthAbilityPredicate;
+    additionalFields?: (keyof Entity)[];
 };
 type DynamicApiRegisterOptions<Entity extends BaseEntity = any> = {
     callback?: DynamicApiServiceCallback<Entity>;
     protected?: boolean;
-    abilityPredicate?: RegisterAbilityPredicate;
+    abilityPredicate?: AuthAbilityPredicate;
     additionalFields?: (keyof Entity | {
         name: keyof Entity;
         required?: boolean;
     })[];
 };
-type DynamicApiUserOptions<Entity extends BaseEntity = any> = {
-    entity: Type<Entity>;
-    loginField?: keyof Entity;
-    passwordField?: keyof Entity;
-    requestAdditionalFields?: (keyof Entity)[];
-};
 type DynamicApiResetPasswordOptions<Entity extends BaseEntity = any> = {
+    emailField: keyof Entity | string;
+    expirationInMinutes: number;
     resetPasswordCallback: DynamicApiResetPasswordCallback<Entity>;
     changePasswordCallback: DynamicApiServiceCallback<Entity>;
-    emailField: keyof Entity | string;
-    expiresInMinutes: number;
+    abilityPredicate?: AuthAbilityPredicate;
 };
 type DynamicApiAuthOptions<Entity extends BaseEntity = any> = {
-    user: DynamicApiUserOptions<Entity>;
+    userEntity: Type<Entity>;
     login?: DynamicApiLoginOptions<Entity>;
     register?: DynamicApiRegisterOptions<Entity>;
     jwt?: DynamicApiJWTOptions;
     resetPassword?: Partial<DynamicApiResetPasswordOptions<Entity>>;
     validationPipeOptions?: ValidationPipeOptions;
 };
-export type { DynamicApiAuthOptions, DynamicApiRegisterOptions, DynamicApiUserOptions, DynamicApiJWTOptions, DynamicApiLoginOptions, DynamicApiResetPasswordOptions, };
+export type { DynamicApiAuthOptions, DynamicApiRegisterOptions, DynamicApiJWTOptions, DynamicApiLoginOptions, DynamicApiResetPasswordOptions, };

package/src/modules/auth/mixins/auth-register-policies-guard.mixin.d.ts

@@ -1,5 +1,5 @@
 import { Type } from '@nestjs/common';
-import { PoliciesGuardConstructor, RegisterAbilityPredicate } from '../../../interfaces';
+import { PoliciesGuardConstructor, AuthAbilityPredicate } from '../../../interfaces';
 import { BaseEntity } from '../../../models';
-declare function AuthRegisterPoliciesGuardMixin<Entity extends BaseEntity>(entity: Type<Entity>, abilityPredicate: RegisterAbilityPredicate | undefined): PoliciesGuardConstructor<Entity>;
+declare function AuthRegisterPoliciesGuardMixin<Entity extends BaseEntity>(entity: Type<Entity>, abilityPredicate: AuthAbilityPredicate | undefined): PoliciesGuardConstructor<Entity>;
 export { AuthRegisterPoliciesGuardMixin };

package/src/modules/auth/services/base-auth.service.js

@@ -42,10 +42,10 @@ class BaseAuthService extends services_1.BaseService {
         };
     }
     async register(userToCreate) {
-        const hashedPassword = await this.bcryptService.hashPassword(userToCreate[this.passwordField]);
         try {
+            const hashedPassword = await this.bcryptService.hashPassword(userToCreate[this.passwordField]);
             const { _id } = await this.model.create({ ...userToCreate, [this.passwordField]: hashedPassword });
-            const user = await this.findOneDocument(_id);
+            const user = await this.findOneDocumentWithAbilityPredicate(_id);
             if (this.registerCallback) {
                 await this.registerCallback(user, this.callbackMethods);
             }
@@ -56,7 +56,7 @@ class BaseAuthService extends services_1.BaseService {
         }
     }
     async getAccount({ id }) {
-        const user = await this.findOneDocument(id);
+        const user = await this.findOneDocumentWithAbilityPredicate(id);
         const fieldsToBuild = [
             '_id',
             this.loginField,
@@ -81,13 +81,13 @@ class BaseAuthService extends services_1.BaseService {
             updateUserByEmail: async (email, data) => {
                 const user = await this.model.findOneAndUpdate({ [this.resetPasswordOptions.emailField]: email }, data, { new: true }).lean().exec();
                 if (!user) {
-                    this.handleDocumentNotFound();
+                    return;
                 }
                 return this.buildInstance(user);
             },
         };
-        const { resetPasswordCallback, expiresInMinutes } = this.resetPasswordOptions;
-        const resetPasswordToken = this.jwtService.sign({ email }, { expiresIn: expiresInMinutes * 60 });
+        const { resetPasswordCallback, expirationInMinutes } = this.resetPasswordOptions;
+        const resetPasswordToken = this.jwtService.sign({ email }, { expiresIn: expirationInMinutes * 60 });
         await resetPasswordCallback({ resetPasswordToken, email }, this.resetPasswordCallbackMethods);
     }
     async changePassword(resetPasswordToken, newPassword) {
@@ -110,7 +110,7 @@ class BaseAuthService extends services_1.BaseService {
         }
         let userId;
         try {
-            const { _id } = await this.findOneDocument(undefined, { [this.resetPasswordOptions.emailField]: email });
+            const { _id } = await this.findOneDocumentWithAbilityPredicate(undefined, { [this.resetPasswordOptions.emailField]: email });
             userId = _id.toString();
         }
         catch (error) {
@@ -122,7 +122,7 @@ class BaseAuthService extends services_1.BaseService {
         const hashedPassword = await this.bcryptService.hashPassword(newPassword);
         await this.model.updateOne({ _id: userId }, { [this.passwordField]: hashedPassword });
         if (this.resetPasswordOptions?.changePasswordCallback) {
-            const user = await this.findOneDocument(userId);
+            const user = await this.findOneDocumentWithAbilityPredicate(userId);
             await this.resetPasswordOptions.changePasswordCallback(this.buildInstance(user), this.callbackMethods);
         }
     }

package/src/routes/delete-many/delete-many-controller.interface.d.ts

@@ -1,8 +1,8 @@
+import { DeleteResult } from '../../interfaces';
 import { BaseEntity } from '../../models';
-import { DeletedCount } from '../delete-one';
 import { DeleteManyService } from './delete-many-service.interface';
 interface DeleteManyController<Entity extends BaseEntity> {
-    deleteMany(ids: string[]): Promise<DeletedCount>;
+    deleteMany(ids: string[]): Promise<DeleteResult>;
 }
 type DeleteManyControllerConstructor<Entity extends BaseEntity> = new (service: DeleteManyService<Entity>) => DeleteManyController<Entity>;
 export type { DeleteManyController, DeleteManyControllerConstructor };