@flusys/nestjs-auth 2.0.0 → 3.0.0

package/fesm/services/user.service.js

@@ -46,23 +46,17 @@ export class UserService extends RequestScopedApiService {
     }
     async ensureRepositoryInitialized() {
         await super.ensureRepositoryInitialized();
-        // Initialize permission repository if company feature is enabled
         const isCompanyFeatureEnabled = this.authConfig.isCompanyFeatureEnabled();
         if (isCompanyFeatureEnabled && !this.permissionRepository) {
             [this.permissionRepository] = await this.initializeAdditionalRepositories([
                 UserCompanyPermission
             ]);
         }
-        // Initialize DataSource for transaction support
         if (!this.dataSource) {
             this.dataSource = await this.getDataSourceForService();
         }
     }
-    // Custom Methods
-    /**
-   * Validate profile ownership, ensure repository initialized, and fetch user.
-   * Throws ForbiddenException if not owner, NotFoundException if user not found.
-   */ async getUserForProfile(userId, user) {
+    async getUserForProfile(userId, user) {
         if (userId !== user.id) {
             throw new ForbiddenException('Cannot access another user\'s profile');
         }
@@ -77,38 +71,32 @@ export class UserService extends RequestScopedApiService {
         }
         return userEntity;
     }
-    /** Verify email */ async verifyEmail(id) {
-        // Ensure repository is initialized for custom method
+    async verifyEmail(id) {
         await this.ensureRepositoryInitialized();
         await this.repository.update(id, {
             emailVerified: true
         });
-        // Clear cache for this user
         await this.clearCacheForId([
             {
                 id
             }
         ]);
     }
-    /** Verify phone */ async verifyPhone(id) {
-        // Ensure repository is initialized for custom method
+    async verifyPhone(id) {
         await this.ensureRepositoryInitialized();
         await this.repository.update(id, {
             phoneVerified: true
         });
-        // Clear cache for this user
         await this.clearCacheForId([
             {
                 id
             }
         ]);
     }
-    /** Update user status. When company feature enabled, updates permission isActive for logged user's company. */ async updateStatus(id, isActive, user) {
-        // Ensure repository is initialized for custom method
+    async updateStatus(id, isActive, user) {
         await this.ensureRepositoryInitialized();
         const isCompanyFeatureEnabled = this.authConfig.isCompanyFeatureEnabled();
         if (isCompanyFeatureEnabled && user?.companyId && this.permissionRepository) {
-            // Company feature enabled - update permission isActive
             const permission = await this.permissionRepository.findOne({
                 where: {
                     userId: id,
@@ -122,36 +110,30 @@ export class UserService extends RequestScopedApiService {
             permission.isActive = isActive;
             await this.permissionRepository.save(permission);
         } else {
-            // Company feature disabled - update User.isActive directly
             await this.repository.update(id, {
                 isActive
             });
         }
-        // Clear cache for this user
         await this.clearCacheForId([
             {
                 id
             }
         ]);
     }
-    // ApiService Overrides
-    /** Convert DTO to entity (hash password before saving) */ async convertSingleDtoToEntity(dto, user) {
-        // Repository initialization is handled automatically by RequestScopedApiService
+    async convertSingleDtoToEntity(dto, user) {
         const entity = await super.convertSingleDtoToEntity(dto, user);
-        // Hash password if provided (CreateUserDto has password field)
         if ('password' in dto && dto.password) {
             entity.password = await bcrypt.hash(dto.password, BCRYPT_SALT_ROUNDS);
         }
         return entity;
     }
-    /** Convert entity to response DTO (removes password). In raw mode with company feature, isActive comes from permission table. */ convertEntityToResponseDto(entity, isRaw) {
+    convertEntityToResponseDto(entity, isRaw) {
         if (isRaw) {
             return this.convertRawToResponseDto(entity);
         }
         return this.convertEntityToDto(entity);
     }
-    /** Convert raw query result to response DTO */ convertRawToResponseDto(raw) {
-        // When raw mode is used with company feature, isActive comes from computed field
+    convertRawToResponseDto(raw) {
         const isActive = raw.user_companyIsActive !== undefined ? Boolean(raw.user_companyIsActive) : raw.user_is_active;
         return {
             id: raw.user_id,
@@ -172,7 +154,7 @@ export class UserService extends RequestScopedApiService {
             deletedById: raw.user_deleted_by_id
         };
     }
-    /** Convert entity to response DTO */ convertEntityToDto(entity) {
+    convertEntityToDto(entity) {
         return {
             id: entity.id,
             name: entity.name,
@@ -192,10 +174,10 @@ export class UserService extends RequestScopedApiService {
             deletedById: entity.deletedById
         };
     }
-    /** Convert entity list to response DTO list */ convertEntityListToResponseListDto(entities, isRaw) {
+    convertEntityListToResponseListDto(entities, isRaw) {
         return entities.map((entity)=>this.convertEntityToResponseDto(entity, isRaw));
     }
-    /** Global search - search by name, email, or phone */ async getGlobalSearchQuery(query, search, _user) {
+    async getGlobalSearchQuery(query, search, _user) {
         query.andWhere('(user.name LIKE :search OR user.email LIKE :search OR user.phone LIKE :search)', {
             search: `%${search}%`
         });
@@ -204,26 +186,16 @@ export class UserService extends RequestScopedApiService {
             isRaw: false
         };
     }
-    /** Add company permission-based isActive check when company feature enabled. Returns isRaw: true for computed fields. */ async getExtraManipulateQuery(query, filterAndPaginationDto, user) {
-        // Repository initialization is handled automatically by RequestScopedApiService
+    async getExtraManipulateQuery(query, filterAndPaginationDto, user) {
         let result = await super.getExtraManipulateQuery(query, filterAndPaginationDto, user);
-        // Apply user enricher query modifications if available
         if (this.userEnricher?.enrichListQuery) {
             await this.userEnricher.enrichListQuery(query, user);
         }
-        // Only apply company filtering if:
-        // 1. Company feature is enabled at bootstrap
-        // 2. User has company context
-        // 3. Permission repository is available
         const isCompanyFeatureEnabled = this.authConfig.isCompanyFeatureEnabled();
         if (!isCompanyFeatureEnabled) {
-            // Company feature disabled - return without any company-related modifications
-            // isActive will come from User entity directly
             return result;
         }
-        // Company feature is enabled - apply company-based filtering
         if (user?.companyId && this.permissionRepository) {
-            // Add computed isActive field from permission table
             query.addSelect(`(SELECT perm.is_active FROM user_company_permissions perm
           WHERE perm.user_id = user.id
           AND perm.permission_type = :permissionType
@@ -231,7 +203,6 @@ export class UserService extends RequestScopedApiService {
           LIMIT 1)`, 'user_companyIsActive');
             query.setParameter('permissionType', PermissionType.COMPANY);
             query.setParameter('companyId', user.companyId);
-            // Add filter for isActive if provided (filters by permission isActive)
             if (filterAndPaginationDto.filter?.isActive !== undefined) {
                 query.andWhere(`EXISTS (
             SELECT 1 FROM user_company_permissions perm
@@ -245,7 +216,6 @@ export class UserService extends RequestScopedApiService {
                     isActiveValue: filterAndPaginationDto.filter.isActive
                 });
             }
-            // Filter users to only show those with company permission
             query.andWhere(`EXISTS (
           SELECT 1 FROM user_company_permissions perm
           WHERE perm.user_id = user.id
@@ -255,7 +225,6 @@ export class UserService extends RequestScopedApiService {
                 permissionType: PermissionType.COMPANY,
                 companyId: user.companyId
             });
-            // Return with isRaw: true to get the computed field
             return {
                 query,
                 isRaw: true
@@ -263,11 +232,8 @@ export class UserService extends RequestScopedApiService {
         }
         return result;
     }
-    /** Insert user. Creates company permission when company feature is enabled. */ async insert(dto, user) {
-        // Repository initialization is handled automatically by RequestScopedApiService
-        // Check if company feature is enabled
+    async insert(dto, user) {
         const isCompanyFeatureEnabled = this.authConfig.isCompanyFeatureEnabled();
-        // If company feature is disabled OR missing dependencies, use parent implementation
         if (!isCompanyFeatureEnabled || !this.dataSource || !user?.companyId || !this.permissionRepository) {
             return super.insert(dto, user);
         }
@@ -275,11 +241,8 @@ export class UserService extends RequestScopedApiService {
         await queryRunner.connect();
         await queryRunner.startTransaction();
         try {
-            // First, insert the user using parent method logic
             const userEntity = await this.convertSingleDtoToEntity(dto, user);
             const savedUser = await queryRunner.manager.save(this.repository.target, userEntity);
-            // Create company permission (repository is guaranteed to exist due to check above)
-            // Check if permission already exists
             const existingPermission = await queryRunner.manager.findOne(this.permissionRepository.target, {
                 where: {
                     userId: savedUser.id,
@@ -296,7 +259,6 @@ export class UserService extends RequestScopedApiService {
                 });
                 await queryRunner.manager.save(this.permissionRepository.target, permission);
             }
-            // Also create branch permission if user has branch context
             if (user.branchId) {
                 const existingBranchPermission = await queryRunner.manager.findOne(this.permissionRepository.target, {
                     where: {
@@ -330,13 +292,9 @@ export class UserService extends RequestScopedApiService {
             await queryRunner.release();
         }
     }
-    /**
-   * Get user profile with extras from enricher
-   * Returns base user data plus any extra data provided by enricher (roles, permissions, etc.)
-   */ async getProfileWithExtras(userId, user) {
+    async getProfileWithExtras(userId, user) {
         const userEntity = await this.getUserForProfile(userId, user);
         const userData = this.convertEntityToResponseDto(userEntity, false);
-        // Get extras from enricher if available
         let extras;
         if (this.userEnricher?.getProfileExtras) {
             extras = await this.userEnricher.getProfileExtras(userId, user);
@@ -346,38 +304,34 @@ export class UserService extends RequestScopedApiService {
             extras
         };
     }
-    /**
-   * Get enriched user list
-   * Applies enricher transformations after query execution
-   */ async getEnrichedList(users, user) {
+    async getAll(search, filterAndPaginationDto, user) {
+        const result = await super.getAll(search, filterAndPaginationDto, user);
+        const enrichedData = await this.getEnrichedList(result.data, user);
+        return {
+            data: enrichedData,
+            total: result.total
+        };
+    }
+    async getEnrichedList(users, user) {
         if (this.userEnricher?.enrichListItems) {
             return this.userEnricher.enrichListItems(users, user);
         }
         return users;
     }
-    // ============================================
-    // Multi-Step Profile Methods (via Enricher)
-    // ============================================
-    /**
-   * Get profile section definitions from enricher
-   */ async getProfileSections() {
+    async getProfileSections() {
         if (this.userEnricher?.getProfileSections) {
             return this.userEnricher.getProfileSections();
         }
         return [];
     }
-    /**
-   * Get specific profile section data
-   */ async getProfileSectionData(userId, sectionId, user) {
+    async getProfileSectionData(userId, sectionId, user) {
         await this.getUserForProfile(userId, user);
         if (this.userEnricher?.getProfileSectionData) {
             return this.userEnricher.getProfileSectionData(userId, sectionId, user);
         }
         return null;
     }
-    /**
-   * Update specific profile section
-   */ async updateProfileSection(userId, sectionId, data, user) {
+    async updateProfileSection(userId, sectionId, data, user) {
         const userEntity = await this.getUserForProfile(userId, user);
         if (!this.dataSource) {
             throw new BadRequestException('DataSource not available');
@@ -405,23 +359,19 @@ export class UserService extends RequestScopedApiService {
             await queryRunner.release();
         }
     }
-    /**
-   * Get profile completion percentage
-   */ async getProfileCompletion(userId, user) {
+    async getProfileCompletion(userId, user) {
         await this.getUserForProfile(userId, user);
         if (this.userEnricher?.calculateProfileCompletion) {
             return this.userEnricher.calculateProfileCompletion(userId, user);
         }
-        return 100; // Default to 100% if no enricher
+        return 100;
     }
-    /** Update user profile with password handling and extras */ async profile(dto, user) {
-        // Ensure repository and dataSource are initialized
+    async profile(dto, user) {
         await this.ensureRepositoryInitialized();
         if (!this.dataSource) {
             throw new BadRequestException('DataSource not available');
         }
         const userId = dto.id ?? user.id;
-        // Validate extras if enricher provides validation
         if (dto.extras && this.userEnricher?.validateProfileExtras) {
             await this.userEnricher.validateProfileExtras(userId, dto.extras, user);
         }
@@ -437,9 +387,7 @@ export class UserService extends RequestScopedApiService {
             if (!findUser) {
                 throw new NotFoundException('User not found');
             }
-            // Handle password update
             if (dto.password) {
-                // If updating own profile, require old password verification
                 const isOwnProfile = !dto.id || dto.id === user.id;
                 if (isOwnProfile) {
                     if (!dto.oldPassword) {
@@ -452,12 +400,9 @@ export class UserService extends RequestScopedApiService {
                 }
                 findUser.password = await bcrypt.hash(dto.password, BCRYPT_SALT_ROUNDS);
             }
-            // Merge other fields (excluding password, oldPassword, extras, and sensitive flags)
-            // Users cannot self-modify emailVerified, phoneVerified, or isActive via profile update
             const { password, oldPassword, extras, emailVerified, phoneVerified, isActive, ...restDto } = dto;
             Object.assign(findUser, restDto);
             await queryRunner.manager.save(this.repository.target, findUser);
-            // Handle extras update via enricher
             if (extras && this.userEnricher?.updateProfileExtras) {
                 await this.userEnricher.updateProfileExtras(userId, extras, queryRunner);
             }

package/interfaces/user-enricher.interface.d.ts

@@ -1,4 +1,4 @@
-import { ILoggedUserInfo } from '@flusys/nestjs-shared/interfaces';
+import { ILoggedUserInfo, IPermissionLogic } from '@flusys/nestjs-shared/interfaces';
 import { QueryRunner, SelectQueryBuilder } from 'typeorm';
 import { User } from '../entities/user.entity';
 import { IUser } from './user.interface';
@@ -9,7 +9,7 @@ export interface IProfileSection {
     icon?: string;
     required?: boolean;
     hasFileUpload?: boolean;
-    editPermission?: string;
+    editPermission?: IPermissionLogic;
 }
 export interface IProfileSectionData {
     sectionId: string;
@@ -61,4 +61,5 @@ export interface IUserEnricher {
     }, queryRunner: QueryRunner): Promise<IProfileFile>;
     handleSectionFileDelete?(userId: string, sectionId: string, field: string, fileId: string, queryRunner: QueryRunner): Promise<void>;
     calculateProfileCompletion?(userId: string, user: ILoggedUserInfo): Promise<number>;
+    onUserCreated?(userId: string, additionalFields: Record<string, any> | null, queryRunner: QueryRunner): Promise<void>;
 }

package/modules/auth.module.d.ts

@@ -1,13 +1,15 @@
+import { IBootstrapAppConfig } from '@flusys/nestjs-core';
 import { DynamicModule } from '@nestjs/common';
 import { AuthModuleAsyncOptions, AuthModuleOptions } from '../interfaces/auth-module-options.interface';
 export declare class AuthModule {
     static forRoot(options: AuthModuleOptions): DynamicModule;
     static forRootAsync(options: AuthModuleAsyncOptions): DynamicModule;
     private static buildModule;
+    private static getFeatureFlags;
     private static buildImports;
     private static buildControllers;
     private static buildProviders;
     private static buildExports;
     private static createAsyncProviders;
-    static getEntities(enableCompanyFeature?: boolean): any[];
+    static getEntities(config: IBootstrapAppConfig): any[];
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flusys/nestjs-auth",
-  "version": "2.0.0",
+  "version": "3.0.0",
   "description": "Authentication and authorization infrastructure for NestJS applications",
   "main": "cjs/index.js",
   "module": "fesm/index.js",
@@ -91,7 +91,7 @@
     "typeorm": "^0.3.0"
   },
   "dependencies": {
-    "@flusys/nestjs-core": "2.0.0",
-    "@flusys/nestjs-shared": "2.0.0"
+    "@flusys/nestjs-core": "3.0.0",
+    "@flusys/nestjs-shared": "3.0.0"
   }
 }

package/services/auth-config.service.d.ts

@@ -10,6 +10,7 @@ export declare class AuthConfigService implements IModuleConfigService {
     getDatabaseMode(): DatabaseMode;
     isMultiTenant(): boolean;
     isCompanyFeatureEnabled(): boolean;
+    isEmailVerificationEnabled(): boolean;
     getJwtSecret(): string;
     getJwtExpiration(): string;
     getRefreshTokenSecret(): string;

package/services/auth-datasource.provider.d.ts

@@ -18,6 +18,7 @@ export declare class AuthDataSourceProvider extends MultiTenantDataSourceService
     protected getOrCreateTenantConnection(tenant: ITenantDatabaseConfig): Promise<DataSource>;
     private static buildParentOptions;
     isCompanyFeatureEnabled(tenant?: ITenantDatabaseConfig): boolean;
+    isEmailVerificationEnabled(tenant?: ITenantDatabaseConfig): boolean;
     getAuthEntities(): Promise<any[]>;
     protected createDataSourceFromConfig(config: IDatabaseConfig): Promise<DataSource>;
 }

package/services/auth-email.service.d.ts

@@ -23,6 +23,7 @@ export declare class AuthEmailService {
         phone?: string;
         password: string;
         companyData?: PendingRegistration['companyData'];
+        additionalFields?: Record<string, any>;
         verifyUrlBase: string;
     }): Promise<{
         success: boolean;

package/services/authentication.service.d.ts

@@ -1,5 +1,6 @@
 import { HybridCache } from '@flusys/nestjs-shared/classes';
 import { JwtService } from '@nestjs/jwt';
+import { IUserEnricher } from '../interfaces/user-enricher.interface';
 import { RegistrationDto } from '../dtos/authentication.dto';
 import { CompanyBranch } from '../entities/company-branch.entity';
 import { Company } from '../entities/company.entity';
@@ -16,9 +17,11 @@ export declare class AuthenticationService {
     private readonly dataSourceProvider?;
     private readonly sessionService?;
     private readonly authEmailService?;
+    private readonly userEnricher?;
     private readonly logger;
-    constructor(jwtService: JwtService, authConfig: AuthConfigService, cacheManager?: HybridCache, dataSourceProvider?: AuthDataSourceProvider, sessionService?: CompanySelectionSessionService, authEmailService?: AuthEmailService);
+    constructor(jwtService: JwtService, authConfig: AuthConfigService, cacheManager?: HybridCache, dataSourceProvider?: AuthDataSourceProvider, sessionService?: CompanySelectionSessionService, authEmailService?: AuthEmailService, userEnricher?: IUserEnricher);
     private isCompanyFeatureEnabled;
+    private isEmailVerificationEnabled;
     private getUserRepository;
     private getPermissionRepository;
     private getCompanyRepository;

package/services/user.service.d.ts

@@ -1,4 +1,5 @@
 import { RequestScopedApiService, HybridCache } from '@flusys/nestjs-shared/classes';
+import { FilterAndPaginationDto } from '@flusys/nestjs-shared/dtos';
 import { ILoggedUserInfo } from '@flusys/nestjs-shared/interfaces';
 import { UtilsService } from '@flusys/nestjs-shared/modules';
 import { EntityTarget, Repository } from 'typeorm';
@@ -42,6 +43,10 @@ export declare class UserService extends RequestScopedApiService<CreateUserDto,
         user: IUser;
         extras?: IProfileExtras;
     }>;
+    getAll(search: string, filterAndPaginationDto: FilterAndPaginationDto, user: ILoggedUserInfo | null): Promise<{
+        data: Array<IUser>;
+        total: number;
+    }>;
     getEnrichedList(users: IUser[], user: ILoggedUserInfo | null): Promise<IEnrichedUser[]>;
     getProfileSections(): Promise<IProfileSection[]>;
     getProfileSectionData(userId: string, sectionId: string, user: ILoggedUserInfo): Promise<IProfileSectionData | null>;