@flusys/nestjs-auth 0.1.0-beta.3 → 1.1.0-beta

package/fesm/services/branch.service.js

@@ -27,46 +27,20 @@ function _ts_param(paramIndex, decorator) {
 }
 import { RequestScopedApiService, HybridCache } from '@flusys/nestjs-shared/classes';
 import { UtilsService } from '@flusys/nestjs-shared/modules';
-import { Inject, Injectable, Logger, NotFoundException, Scope } from '@nestjs/common';
+import { Inject, Injectable, Scope } from '@nestjs/common';
 import { CompanyBranch } from '../entities/company-branch.entity';
 import { AuthConfigService } from './auth-config.service';
 import { AuthDataSourceProvider } from './auth-datasource.provider';
 export class BranchService extends RequestScopedApiService {
-    /**
-   * Resolve entity class for this service
-   * @returns CompanyBranch entity class
-   */ resolveEntity() {
+    resolveEntity() {
         return CompanyBranch;
     }
-    /**
-   * Get DataSource provider for this service
-   * @returns AuthDataSourceProvider instance
-   */ getDataSourceProvider() {
+    getDataSourceProvider() {
         return this.dataSourceProvider;
     }
-    // ==================== Entity Conversion ====================
-    async convertSingleDtoToEntity(dto, _user) {
-        // Repository initialization is handled automatically by RequestScopedApiService
-        let branch = new CompanyBranch();
-        if ('id' in dto && dto.id && typeof dto.id === 'string') {
-            const dbData = await this.repository.findOne({
-                where: {
-                    id: dto.id
-                }
-            });
-            if (!dbData) {
-                throw new NotFoundException('Branch not found');
-            }
-            branch = dbData;
-        }
-        return {
-            ...branch,
-            ...dto
-        };
-    }
+    // Query Customization
     async getSelectQuery(query, _user, select) {
-        // Repository initialization is handled automatically by RequestScopedApiService
-        if (!select || !select.length) {
+        if (!select?.length) {
             select = [
                 'id',
                 'name',
@@ -75,14 +49,13 @@ export class BranchService extends RequestScopedApiService {
                 'createdAt'
             ];
         }
-        const selectFields = select.map((field)=>`${this.entityName}.${field}`);
-        query.select(selectFields);
+        query.select(select.map((f)=>`${this.entityName}.${f}`));
         return {
             query,
             isRaw: false
         };
     }
-    async getGlobalSearchQuery(query, search, _user) {
+    async getGlobalSearchQuery(query, search) {
         query.andWhere('(company_branch.name LIKE :search OR company_branch.slug LIKE :search OR company_branch.email LIKE :search)', {
             search: `%${search}%`
         });
@@ -91,24 +64,17 @@ export class BranchService extends RequestScopedApiService {
             isRaw: false
         };
     }
-    /**
-   * Override: Filter branches by user's company
-   * Ensures users can only see branches belonging to their company
-   */ async getExtraManipulateQuery(query, _filterAndPaginationDto, user) {
-        const result = await super.getExtraManipulateQuery(query, _filterAndPaginationDto, user);
-        // Only apply company filtering if company feature is enabled and user has company context
-        const isCompanyFeatureEnabled = this.authConfig.isCompanyFeatureEnabled();
-        if (isCompanyFeatureEnabled && user?.companyId) {
+    async getExtraManipulateQuery(query, filterDto, user) {
+        const result = await super.getExtraManipulateQuery(query, filterDto, user);
+        if (this.authConfig.isCompanyFeatureEnabled() && user?.companyId) {
             query.andWhere('company_branch.company_id = :companyId', {
                 companyId: user.companyId
             });
         }
         return result;
     }
-    // NOTE: @Inject() required for bundled code - type metadata may be lost during esbuild
     constructor(cacheManager, utilsService, dataSourceProvider, authConfig){
-        // Repository will be set asynchronously by RequestScopedApiService
-        super('company_branch', null, cacheManager, utilsService, BranchService.name, true), _define_property(this, "cacheManager", void 0), _define_property(this, "utilsService", void 0), _define_property(this, "dataSourceProvider", void 0), _define_property(this, "authConfig", void 0), _define_property(this, "logger", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService, this.dataSourceProvider = dataSourceProvider, this.authConfig = authConfig, this.logger = new Logger(BranchService.name);
+        super('company_branch', null, cacheManager, utilsService, BranchService.name, true), _define_property(this, "cacheManager", void 0), _define_property(this, "utilsService", void 0), _define_property(this, "dataSourceProvider", void 0), _define_property(this, "authConfig", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService, this.dataSourceProvider = dataSourceProvider, this.authConfig = authConfig;
     }
 }
 BranchService = _ts_decorate([

package/fesm/services/company.service.js

@@ -27,45 +27,19 @@ function _ts_param(paramIndex, decorator) {
 }
 import { RequestScopedApiService, HybridCache } from '@flusys/nestjs-shared/classes';
 import { UtilsService } from '@flusys/nestjs-shared/modules';
-import { Inject, Injectable, Logger, NotFoundException, Scope } from '@nestjs/common';
+import { Inject, Injectable, Scope } from '@nestjs/common';
 import { Company } from '../entities/company.entity';
 import { AuthDataSourceProvider } from './auth-datasource.provider';
 export class CompanyService extends RequestScopedApiService {
-    /**
-   * Resolve entity class for this service
-   * @returns Company entity class
-   */ resolveEntity() {
+    resolveEntity() {
         return Company;
     }
-    /**
-   * Get DataSource provider for this service
-   * @returns AuthDataSourceProvider instance
-   */ getDataSourceProvider() {
+    getDataSourceProvider() {
         return this.dataSourceProvider;
     }
-    // ==================== Entity Conversion ====================
-    async convertSingleDtoToEntity(dto, _user) {
-        // Repository initialization is handled automatically by RequestScopedApiService
-        let company = new Company();
-        if ('id' in dto && dto.id && typeof dto.id === 'string') {
-            const dbData = await this.repository.findOne({
-                where: {
-                    id: dto.id
-                }
-            });
-            if (!dbData) {
-                throw new NotFoundException('Company not found');
-            }
-            company = dbData;
-        }
-        return {
-            ...company,
-            ...dto
-        };
-    }
+    // Query Customization
     async getSelectQuery(query, _user, select) {
-        // Repository initialization is handled automatically by RequestScopedApiService
-        if (!select || !select.length) {
+        if (!select?.length) {
             select = [
                 'id',
                 'name',
@@ -74,14 +48,13 @@ export class CompanyService extends RequestScopedApiService {
                 'createdAt'
             ];
         }
-        const selectFields = select.map((field)=>`${this.entityName}.${field}`);
-        query.select(selectFields);
+        query.select(select.map((f)=>`${this.entityName}.${f}`));
         return {
             query,
             isRaw: false
         };
     }
-    async getGlobalSearchQuery(query, search, _user) {
+    async getGlobalSearchQuery(query, search) {
         query.andWhere('(company.name LIKE :search OR company.slug LIKE :search OR company.email LIKE :search)', {
             search: `%${search}%`
         });
@@ -90,10 +63,8 @@ export class CompanyService extends RequestScopedApiService {
             isRaw: false
         };
     }
-    // NOTE: @Inject() required for bundled code - type metadata may be lost during esbuild
     constructor(cacheManager, utilsService, dataSourceProvider){
-        // Repository will be set asynchronously by RequestScopedApiService
-        super('company', null, cacheManager, utilsService, CompanyService.name, true), _define_property(this, "cacheManager", void 0), _define_property(this, "utilsService", void 0), _define_property(this, "dataSourceProvider", void 0), _define_property(this, "logger", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService, this.dataSourceProvider = dataSourceProvider, this.logger = new Logger(CompanyService.name);
+        super('company', null, cacheManager, utilsService, CompanyService.name, true), _define_property(this, "cacheManager", void 0), _define_property(this, "utilsService", void 0), _define_property(this, "dataSourceProvider", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService, this.dataSourceProvider = dataSourceProvider;
     }
 }
 CompanyService = _ts_decorate([

package/fesm/services/index.js

@@ -1,4 +1,5 @@
 export * from './authentication.service';
+export * from './auth-email.service';
 export * from './company-selection-session.service';
 export * from './user.service';
 export * from './company.service';

package/fesm/services/user-permission.service.js

@@ -29,20 +29,14 @@ import { BadRequestException, Inject, Injectable, Logger, NotFoundException, Sco
 import { PermissionType, UserCompanyPermission } from '../entities/user-company-permission.entity';
 import { AuthDataSourceProvider } from './auth-datasource.provider';
 export class UserPermissionService {
-    /**
-   * Get repository lazily - initialized on first access
-   */ async getRepository() {
+    /** Get repository lazily - initialized on first access */ async getRepository() {
         if (!this._repository) {
             this._repository = await this.dataSourceProvider.getRepository(UserCompanyPermission);
         }
         return this._repository;
     }
-    // ==========================================================================
-    // COMPANY PERMISSIONS
-    // ==========================================================================
-    /**
-   * Find all companies a user has access to
-   */ async findUserCompanies(userId) {
+    // Company Permissions
+    /** Find all companies a user has access to */ async findUserCompanies(userId) {
         const repository = await this.getRepository();
         return repository.find({
             where: {
@@ -57,9 +51,7 @@ export class UserPermissionService {
             }
         });
     }
-    /**
-   * Assign user to a company
-   */ async assignUserToCompany(dto) {
+    /** Assign user to a company */ async assignUserToCompany(dto) {
         const repository = await this.getRepository();
         // Check if already exists
         const existing = await repository.findOne({
@@ -80,9 +72,7 @@ export class UserPermissionService {
         });
         await repository.save(permission);
     }
-    /**
-   * Revoke user access to a company
-   */ async revokeCompanyAccess(userId, companyId) {
+    /** Revoke user access to a company */ async revokeCompanyAccess(userId, companyId) {
         const repository = await this.getRepository();
         const permission = await repository.findOne({
             where: {
@@ -96,12 +86,8 @@ export class UserPermissionService {
         }
         await repository.remove(permission);
     }
-    // ==========================================================================
-    // BRANCH PERMISSIONS
-    // ==========================================================================
-    /**
-   * Find all branches a user has access to
-   */ async findUserBranches(userId) {
+    // Branch Permissions
+    /** Find all branches a user has access to */ async findUserBranches(userId) {
         const repository = await this.getRepository();
         return repository.find({
             where: {
@@ -116,9 +102,7 @@ export class UserPermissionService {
             }
         });
     }
-    /**
-   * Assign user to a branch
-   */ async assignUserToBranch(dto) {
+    /** Assign user to a branch */ async assignUserToBranch(dto) {
         const repository = await this.getRepository();
         // Check if already exists
         const existing = await repository.findOne({
@@ -139,9 +123,7 @@ export class UserPermissionService {
         });
         await repository.save(permission);
     }
-    /**
-   * Revoke user access to a branch
-   */ async revokeBranchAccess(userId, branchId) {
+    /** Revoke user access to a branch */ async revokeBranchAccess(userId, branchId) {
         const repository = await this.getRepository();
         const permission = await repository.findOne({
             where: {

package/fesm/services/user.service.js

@@ -28,30 +28,23 @@ function _ts_param(paramIndex, decorator) {
 import { RequestScopedApiService, HybridCache } from '@flusys/nestjs-shared/classes';
 import { UtilsService } from '@flusys/nestjs-shared/modules';
 import { ErrorHandler } from '@flusys/nestjs-shared/utils';
-import { BadRequestException, Inject, Injectable, Logger, NotFoundException, Scope } from '@nestjs/common';
+import { BadRequestException, Inject, Injectable, NotFoundException, Optional, Scope } from '@nestjs/common';
 import * as bcrypt from 'bcrypt';
 import { AuthConfigService } from './auth-config.service';
 import { AuthDataSourceProvider } from './auth-datasource.provider';
+import { BCRYPT_SALT_ROUNDS, USER_ENRICHER } from '../config';
 import { PermissionType } from '../enums';
+import { IUserEnricher } from '../interfaces/user-enricher.interface';
 import { UserCompanyPermission } from '../entities/user-company-permission.entity';
 import { User } from '../entities/user.entity';
 export class UserService extends RequestScopedApiService {
-    /**
-   * Resolve entity class for this service
-   * @returns User entity class
-   */ resolveEntity() {
+    resolveEntity() {
         return User;
     }
-    /**
-   * Get DataSource provider for this service
-   * @returns AuthDataSourceProvider instance
-   */ getDataSourceProvider() {
+    getDataSourceProvider() {
         return this.dataSourceProvider;
     }
-    /**
-   * Override ensureRepositoryInitialized to also initialize permission repository and dataSource
-   * CRITICAL: Also initializes permissionRepository and dataSource for company feature support
-   */ async ensureRepositoryInitialized() {
+    async ensureRepositoryInitialized() {
         await super.ensureRepositoryInitialized();
         // Initialize permission repository if company feature is enabled
         const isCompanyFeatureEnabled = this.authConfig.isCompanyFeatureEnabled();
@@ -65,26 +58,8 @@ export class UserService extends RequestScopedApiService {
             this.dataSource = await this.getDataSourceForService();
         }
     }
-    // ==========================================================================
-    // CUSTOM METHODS (Beyond RequestScopedApiService)
-    // ==========================================================================
-    /**
-   * Update last login timestamp
-   */ async updateLastLogin(id) {
-        // Ensure repository is initialized for custom method
-        await this.ensureRepositoryInitialized();
-        await this.repository.update(id, {
-            lastLoginAt: new Date()
-        });
-        await this.clearCacheForId([
-            {
-                id
-            }
-        ]);
-    }
-    /**
-   * Verify email
-   */ async verifyEmail(id) {
+    // Custom Methods
+    /** Verify email */ async verifyEmail(id) {
         // Ensure repository is initialized for custom method
         await this.ensureRepositoryInitialized();
         await this.repository.update(id, {
@@ -97,9 +72,7 @@ export class UserService extends RequestScopedApiService {
             }
         ]);
     }
-    /**
-   * Verify phone
-   */ async verifyPhone(id) {
+    /** Verify phone */ async verifyPhone(id) {
         // Ensure repository is initialized for custom method
         await this.ensureRepositoryInitialized();
         await this.repository.update(id, {
@@ -112,12 +85,7 @@ export class UserService extends RequestScopedApiService {
             }
         ]);
     }
-    /**
-   * Update user status
-   *
-   * When company feature is disabled: Updates User.isActive directly
-   * When company feature is enabled: Updates UserCompanyPermission.isActive for the logged user's company
-   */ async updateStatus(id, isActive, user) {
+    /** 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
         await this.ensureRepositoryInitialized();
         const isCompanyFeatureEnabled = this.authConfig.isCompanyFeatureEnabled();
@@ -148,50 +116,43 @@ export class UserService extends RequestScopedApiService {
             }
         ]);
     }
-    // ==========================================================================
-    // APISERVICE OVERRIDES (Customize behavior)
-    // ==========================================================================
-    /**
-   * Override: Convert DTO to entity (hash password before saving)
-   */ async convertSingleDtoToEntity(dto, user) {
+    // ApiService Overrides
+    /** Convert DTO to entity (hash password before saving) */ async convertSingleDtoToEntity(dto, user) {
         // Repository initialization is handled automatically by RequestScopedApiService
         const entity = await super.convertSingleDtoToEntity(dto, user);
-        // Hash password if provided
-        if (dto.password) {
-            entity.password = await bcrypt.hash(dto.password, 10);
+        // 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;
     }
-    /**
-   * Override: Convert entity to response DTO (remove password!)
-   *
-   * When company feature is enabled and raw mode is used, isActive comes from
-   * the permission table (user_companyIsActive). Otherwise, it comes from User entity.
-   */ convertEntityToResponseDto(entity, isRaw) {
+    /** Convert entity to response DTO (removes password). In raw mode with company feature, isActive comes from permission table. */ convertEntityToResponseDto(entity, isRaw) {
         // When raw mode is used with company feature, isActive comes from computed field
-        const isActive = isRaw && entity.user_companyIsActive !== undefined ? Boolean(entity.user_companyIsActive) : entity.isActive;
+        // Raw mode uses snake_case column names (due to SnakeNamingStrategy)
+        const isActive = isRaw && entity.user_companyIsActive !== undefined ? Boolean(entity.user_companyIsActive) : isRaw ? entity.user_is_active : entity.isActive;
         return {
             id: isRaw ? entity.user_id : entity.id,
             name: isRaw ? entity.user_name : entity.name,
             phone: isRaw ? entity.user_phone : entity.phone,
             email: isRaw ? entity.user_email : entity.email,
-            profilePictureId: isRaw ? entity.user_profilePictureId : entity.profilePictureId,
+            profilePictureId: isRaw ? entity.user_profile_picture_id : entity.profilePictureId,
             isActive,
-            emailVerified: isRaw ? entity.user_emailVerified : entity.emailVerified,
-            phoneVerified: isRaw ? entity.user_phoneVerified : entity.phoneVerified,
-            lastLoginAt: isRaw ? entity.user_lastLoginAt : entity.lastLoginAt,
-            additionalFields: isRaw ? entity.user_additionalFields : entity.additionalFields,
-            createdAt: isRaw ? entity.user_createdAt : entity.createdAt,
-            updatedAt: isRaw ? entity.user_updatedAt : entity.updatedAt,
-            deletedAt: isRaw ? entity.user_deletedAt : entity.deletedAt,
-            createdById: isRaw ? entity.user_createdById : entity.createdById,
-            updatedById: isRaw ? entity.user_updatedById : entity.updatedById,
-            deletedById: isRaw ? entity.user_deletedById : entity.deletedById
+            emailVerified: isRaw ? entity.user_email_verified : entity.emailVerified,
+            phoneVerified: isRaw ? entity.user_phone_verified : entity.phoneVerified,
+            lastLoginAt: isRaw ? entity.user_last_login_at : entity.lastLoginAt,
+            additionalFields: isRaw ? entity.user_additional_fields : entity.additionalFields,
+            createdAt: isRaw ? entity.user_created_at : entity.createdAt,
+            updatedAt: isRaw ? entity.user_updated_at : entity.updatedAt,
+            deletedAt: isRaw ? entity.user_deleted_at : entity.deletedAt,
+            createdById: isRaw ? entity.user_created_by_id : entity.createdById,
+            updatedById: isRaw ? entity.user_updated_by_id : entity.updatedById,
+            deletedById: isRaw ? entity.user_deleted_by_id : entity.deletedById
         };
     }
-    /**
-   * Override: Global search - search by name, email, or phone
-   */ async getGlobalSearchQuery(query, search, _user) {
+    /** Convert entity list to response DTO list */ convertEntityListToResponseListDto(entities, isRaw) {
+        return entities.map((entity)=>this.convertEntityToResponseDto(entity, isRaw));
+    }
+    /** Global search - search by name, email, or phone */ async getGlobalSearchQuery(query, search, _user) {
         query.andWhere('(user.name LIKE :search OR user.email LIKE :search OR user.phone LIKE :search)', {
             search: `%${search}%`
         });
@@ -200,18 +161,13 @@ export class UserService extends RequestScopedApiService {
             isRaw: false
         };
     }
-    /**
-   * Override: getExtraManipulateQuery - Add company permission-based isActive check when company feature enabled
-   *
-   * Note: When company feature is disabled at bootstrap, this method returns without modifications.
-   * All company-related filtering is skipped, and users are returned normally with isActive from User entity.
-   *
-   * When company feature is enabled:
-   * - isActive is computed from UserCompanyPermission table
-   * - Returns isRaw: true to use raw query results
-   */ async getExtraManipulateQuery(query, filterAndPaginationDto, user) {
+    /** 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
-        const result = await super.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
@@ -264,12 +220,7 @@ export class UserService extends RequestScopedApiService {
         }
         return result;
     }
-    /**
-   * Override: insert - Create company permission when company feature is enabled
-   *
-   * Note: When company feature is disabled at bootstrap, this method falls back to parent implementation.
-   * No company permissions are created, and user is inserted normally.
-   */ async insert(dto, user) {
+    /** 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
         const isCompanyFeatureEnabled = this.authConfig.isCompanyFeatureEnabled();
@@ -337,17 +288,139 @@ export class UserService extends RequestScopedApiService {
         }
     }
     /**
-   * Update user profile with password handling
-   */ async profile(dto, user) {
-        // Repository initialization is handled automatically by RequestScopedApiService
+   * 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) {
+        await this.ensureRepositoryInitialized();
+        const userEntity = await this.repository.findOne({
+            where: {
+                id: userId
+            }
+        });
+        if (!userEntity) {
+            throw new NotFoundException('User not found');
+        }
+        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);
+        }
+        return {
+            user: userData,
+            extras
+        };
+    }
+    /**
+   * Get enriched user list
+   * Applies enricher transformations after query execution
+   */ 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() {
+        if (this.userEnricher?.getProfileSections) {
+            return this.userEnricher.getProfileSections();
+        }
+        return [];
+    }
+    /**
+   * Get specific profile section data
+   */ async getProfileSectionData(userId, sectionId, user) {
+        await this.ensureRepositoryInitialized();
+        // Verify user exists
+        const userEntity = await this.repository.findOne({
+            where: {
+                id: userId
+            }
+        });
+        if (!userEntity) {
+            throw new NotFoundException('User not found');
+        }
+        if (this.userEnricher?.getProfileSectionData) {
+            return this.userEnricher.getProfileSectionData(userId, sectionId, user);
+        }
+        return null;
+    }
+    /**
+   * Update specific profile section
+   */ async updateProfileSection(userId, sectionId, data, user) {
+        await this.ensureRepositoryInitialized();
+        if (!this.dataSource) {
+            throw new BadRequestException('DataSource not available');
+        }
+        // Verify user exists
+        const userEntity = await this.repository.findOne({
+            where: {
+                id: userId
+            }
+        });
+        if (!userEntity) {
+            throw new NotFoundException('User not found');
+        }
+        if (!this.userEnricher?.updateProfileSection) {
+            throw new BadRequestException('Profile sections not supported');
+        }
+        const queryRunner = this.dataSource.createQueryRunner();
+        await queryRunner.connect();
+        await queryRunner.startTransaction();
+        try {
+            await this.userEnricher.updateProfileSection(userId, sectionId, data, queryRunner);
+            await queryRunner.commitTransaction();
+            await this.clearCacheForId([
+                userEntity
+            ]);
+        } catch (error) {
+            await queryRunner.rollbackTransaction();
+            ErrorHandler.logError(this.logger, error, 'updateProfileSection', {
+                entity: this.entityName,
+                sectionId
+            });
+            ErrorHandler.rethrowError(error);
+        } finally{
+            await queryRunner.release();
+        }
+    }
+    /**
+   * Get profile completion percentage
+   */ async getProfileCompletion(userId, user) {
+        await this.ensureRepositoryInitialized();
+        // Verify user exists
+        const userEntity = await this.repository.findOne({
+            where: {
+                id: userId
+            }
+        });
+        if (!userEntity) {
+            throw new NotFoundException('User not found');
+        }
+        if (this.userEnricher?.calculateProfileCompletion) {
+            return this.userEnricher.calculateProfileCompletion(userId, user);
+        }
+        return 100; // Default to 100% if no enricher
+    }
+    /** Update user profile with password handling and extras */ async profile(dto, user) {
+        // Ensure repository and dataSource are initialized
+        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);
+        }
         const queryRunner = this.dataSource.createQueryRunner();
         await queryRunner.connect();
         await queryRunner.startTransaction();
         try {
-            const userId = dto.id ?? user.id;
             const findUser = await queryRunner.manager.findOne(this.repository.target, {
                 where: {
                     id: userId
@@ -366,10 +439,14 @@ export class UserService extends RequestScopedApiService {
                 const salt = await bcrypt.genSalt();
                 findUser.password = await bcrypt.hash(dto.password, salt);
             }
-            // Merge other fields (excluding password)
-            const { password, ...restDto } = dto;
+            // Merge other fields (excluding password and extras)
+            const { password, extras, ...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);
+            }
             await queryRunner.commitTransaction();
             await this.clearCacheForId([
                 findUser
@@ -385,10 +462,8 @@ export class UserService extends RequestScopedApiService {
             await queryRunner.release();
         }
     }
-    // NOTE: @Inject() required for bundled code - type metadata may be lost during esbuild
-    constructor(cacheManager, utilsService, dataSourceProvider, authConfig){
-        // Repository will be set asynchronously by RequestScopedApiService
-        super('user', null, cacheManager, utilsService, UserService.name, true), _define_property(this, "cacheManager", void 0), _define_property(this, "utilsService", void 0), _define_property(this, "dataSourceProvider", void 0), _define_property(this, "authConfig", void 0), _define_property(this, "logger", void 0), _define_property(this, "permissionRepository", void 0), _define_property(this, "dataSource", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService, this.dataSourceProvider = dataSourceProvider, this.authConfig = authConfig, this.logger = new Logger(UserService.name);
+    constructor(cacheManager, utilsService, dataSourceProvider, authConfig, userEnricher){
+        super('user', null, cacheManager, utilsService, UserService.name, true), _define_property(this, "cacheManager", void 0), _define_property(this, "utilsService", void 0), _define_property(this, "dataSourceProvider", void 0), _define_property(this, "authConfig", void 0), _define_property(this, "userEnricher", void 0), _define_property(this, "permissionRepository", void 0), _define_property(this, "dataSource", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService, this.dataSourceProvider = dataSourceProvider, this.authConfig = authConfig, this.userEnricher = userEnricher;
     }
 }
 UserService = _ts_decorate([
@@ -399,11 +474,14 @@ UserService = _ts_decorate([
     _ts_param(1, Inject(UtilsService)),
     _ts_param(2, Inject(AuthDataSourceProvider)),
     _ts_param(3, Inject(AuthConfigService)),
+    _ts_param(4, Optional()),
+    _ts_param(4, Inject(USER_ENRICHER)),
     _ts_metadata("design:type", Function),
     _ts_metadata("design:paramtypes", [
         typeof HybridCache === "undefined" ? Object : HybridCache,
         typeof UtilsService === "undefined" ? Object : UtilsService,
         typeof AuthDataSourceProvider === "undefined" ? Object : AuthDataSourceProvider,
-        typeof AuthConfigService === "undefined" ? Object : AuthConfigService
+        typeof AuthConfigService === "undefined" ? Object : AuthConfigService,
+        typeof IUserEnricher === "undefined" ? Object : IUserEnricher
     ])
 ], UserService);