@flusys/nestjs-auth 3.0.0-rc → 3.0.0

package/fesm/services/authentication.service.js

@@ -30,7 +30,8 @@ import { ErrorHandler, generateUniqueSlug } from '@flusys/nestjs-shared/utils';
 import { BadRequestException, Inject, Injectable, Logger, NotFoundException, Optional, Scope, UnauthorizedException } from '@nestjs/common';
 import { JwtService } from '@nestjs/jwt';
 import * as bcrypt from 'bcrypt';
-import { BCRYPT_SALT_ROUNDS, TOKEN_REVOKED_PREFIX } from '../config';
+import { BCRYPT_SALT_ROUNDS, TOKEN_REVOKED_PREFIX, USER_ENRICHER } from '../config';
+import { IUserEnricher } from '../interfaces/user-enricher.interface';
 import { CompanyBranch } from '../entities/company-branch.entity';
 import { Company } from '../entities/company.entity';
 import { UserCompanyPermission } from '../entities/user-company-permission.entity';
@@ -41,11 +42,14 @@ import { AuthDataSourceProvider } from './auth-datasource.provider';
 import { AuthEmailService } from './auth-email.service';
 import { CompanySelectionSessionService } from './company-selection-session.service';
 export class AuthenticationService {
-    // Feature Flags
-    /** Check if company feature is enabled (tenant-aware with global fallback) */ isCompanyFeatureEnabled() {
+    isCompanyFeatureEnabled() {
         return this.dataSourceProvider?.isCompanyFeatureEnabled() ?? this.authConfig.isCompanyFeatureEnabled();
     }
-    // Repository Getters
+    isEmailVerificationEnabled() {
+        const featureEnabled = this.dataSourceProvider?.isEmailVerificationEnabled() ?? this.authConfig.isEmailVerificationEnabled();
+        const providerAvailable = this.authEmailService?.isEmailEnabled() ?? false;
+        return featureEnabled && providerAvailable;
+    }
     async getUserRepository() {
         if (!this.dataSourceProvider) {
             throw new Error('User repository not available');
@@ -64,10 +68,8 @@ export class AuthenticationService {
         if (!this.isCompanyFeatureEnabled() || !this.dataSourceProvider) return null;
         return this.dataSourceProvider.getRepository(CompanyBranch);
     }
-    // Login
     async login(email, password) {
-        // Check for pending registration first (user registered but hasn't verified email yet)
-        if (await this.authEmailService?.hasPendingRegistration(email)) {
+        if (this.isEmailVerificationEnabled() && await this.authEmailService.hasPendingRegistration(email)) {
             return {
                 requiresEmailVerification: true,
                 email,
@@ -78,7 +80,7 @@ export class AuthenticationService {
         if (!user.isActive) {
             throw new UnauthorizedException('User account is deactivated');
         }
-        if (this.authEmailService?.isEmailEnabled() && !user.emailVerified) {
+        if (this.isEmailVerificationEnabled() && !user.emailVerified) {
             return {
                 requiresEmailVerification: true,
                 email: user.email,
@@ -90,20 +92,18 @@ export class AuthenticationService {
         }
         return this.handleCompanyBasedLogin(user);
     }
-    /** Handle login when company feature is enabled */ async handleCompanyBasedLogin(user) {
+    async handleCompanyBasedLogin(user) {
         const permissionRepository = await this.getPermissionRepository();
         const branchRepository = await this.getBranchRepository();
         if (!permissionRepository || !branchRepository) {
             return this.generateLoginResponse(user);
         }
-        // Get company permissions
         const companyPermissions = await permissionRepository.find({
             where: {
                 userId: user.id,
                 permissionType: PermissionType.COMPANY
             }
         });
-        // Load companies
         const companyRepository = await this.getCompanyRepository();
         if (!companyRepository) {
             return this.generateLoginResponse(user);
@@ -114,12 +114,9 @@ export class AuthenticationService {
         }).andWhere('c.is_active = :active', {
             active: true
         }).getMany() : [];
-        // If user has no company assignments yet, return simple login response
-        // This allows users to login and be assigned to companies later
         if (companies.length === 0) {
             return this.generateLoginResponse(user);
         }
-        // Get branch permissions
         const branchPermissions = await permissionRepository.find({
             where: {
                 userId: user.id,
@@ -132,32 +129,25 @@ export class AuthenticationService {
         }).andWhere('b.is_active = :active', {
             active: true
         }).getMany() : [];
-        // Case 1: Single company, single branch → Direct login
         if (companies.length === 1 && branches.length === 1) {
             return this.generateLoginResponseWithCompany(user, companies[0], branches[0]);
         }
-        // Case 2: Multiple options → Selection required (frontend handles UI)
-        // Returns all companies with their branches for frontend to display
         return await this.generateCompanySelectionResponse(user, companies, branches);
     }
-    // Registration
-    /** Register a new user. If email enabled, creates pending registration. Otherwise creates user directly. */ async register(dto, verifyUrlBase) {
+    async register(dto, verifyUrlBase) {
         const userRepository = await this.getUserRepository();
         const existingUser = await userRepository.findOne({
             where: {
                 email: dto.email
             }
         });
-        // When company feature is enabled and user exists, allow joining/creating company
         if (existingUser && this.isCompanyFeatureEnabled()) {
             return this.handleExistingUserCompanyRegistration(existingUser, dto);
         }
-        // User exists but company feature is off - email must be unique
         if (existingUser) {
             throw new BadRequestException('Registration failed due to email exists. Please try again or contact support.');
         }
-        // If email verification is enabled, create pending registration instead of user
-        if (this.authEmailService?.isEmailEnabled() && verifyUrlBase) {
+        if (this.isEmailVerificationEnabled() && verifyUrlBase) {
             const companyData = this.isCompanyFeatureEnabled() ? {
                 companySlug: dto.companySlug,
                 branchSlug: dto.branchSlug,
@@ -171,6 +161,7 @@ export class AuthenticationService {
                 phone: dto.phone,
                 password: dto.password,
                 companyData,
+                additionalFields: dto.additionalFields,
                 verifyUrlBase
             });
             return {
@@ -178,10 +169,9 @@ export class AuthenticationService {
                 message: result.message
             };
         }
-        // No email verification - create user directly
         return this.createUserDirectly(dto);
     }
-    /** Handle registration for existing user when company feature is enabled */ async handleExistingUserCompanyRegistration(existingUser, dto) {
+    async handleExistingUserCompanyRegistration(existingUser, dto) {
         if (!dto.companySlug && !dto.newCompanyName) {
             throw new BadRequestException('Email already registered. Please login or provide a company to join/create.');
         }
@@ -190,7 +180,6 @@ export class AuthenticationService {
         if (!permissionRepository || !companyRepository) {
             throw new BadRequestException('Company feature repositories not available');
         }
-        // For existing users joining a company, check if already assigned
         if (dto.companySlug) {
             const company = await companyRepository.findOne({
                 where: {
@@ -213,50 +202,92 @@ export class AuthenticationService {
         }
         return this.processCompanyRegistration(existingUser, dto, true);
     }
-    /** Create user directly (no email verification) */ async createUserDirectly(dto) {
-        const userRepository = await this.getUserRepository();
-        const hashedPassword = await bcrypt.hash(dto.password, BCRYPT_SALT_ROUNDS);
-        const user = userRepository.create({
-            name: dto.name,
-            email: dto.email,
-            phone: dto.phone,
-            password: hashedPassword,
-            isActive: true,
-            emailVerified: false,
-            phoneVerified: false
-        });
-        await userRepository.save(user);
-        if (!this.isCompanyFeatureEnabled()) {
-            return this.generateRegistrationResponse(user);
+    async createUserDirectly(dto) {
+        if (!this.dataSourceProvider) {
+            throw new BadRequestException('Data source not available');
+        }
+        const dataSource = await this.dataSourceProvider.getDataSource();
+        const queryRunner = dataSource.createQueryRunner();
+        await queryRunner.connect();
+        await queryRunner.startTransaction();
+        try {
+            const hashedPassword = await bcrypt.hash(dto.password, BCRYPT_SALT_ROUNDS);
+            const user = queryRunner.manager.create(User, {
+                name: dto.name,
+                email: dto.email,
+                phone: dto.phone,
+                password: hashedPassword,
+                isActive: true,
+                emailVerified: false,
+                phoneVerified: false
+            });
+            await queryRunner.manager.save(User, user);
+            if (this.userEnricher?.onUserCreated) {
+                await this.userEnricher.onUserCreated(user.id, dto.additionalFields ?? null, queryRunner);
+            }
+            await queryRunner.commitTransaction();
+            if (!this.isCompanyFeatureEnabled()) {
+                return this.generateRegistrationResponse(user);
+            }
+            return this.processCompanyRegistration(user, dto);
+        } catch (error) {
+            await queryRunner.rollbackTransaction();
+            if (error instanceof BadRequestException) {
+                throw error;
+            }
+            ErrorHandler.logError(this.logger, error, 'createUserDirectly');
+            throw new BadRequestException('Registration failed. Please try again.');
+        } finally{
+            await queryRunner.release();
         }
-        return this.processCompanyRegistration(user, dto);
     }
-    /** Create user from pending registration (after email verification) */ async createUserFromPendingRegistration(pending) {
-        const userRepository = await this.getUserRepository();
-        const existingUser = await userRepository.findOne({
-            where: {
-                email: pending.email
+    async createUserFromPendingRegistration(pending) {
+        if (!this.dataSourceProvider) {
+            throw new BadRequestException('Data source not available');
+        }
+        const dataSource = await this.dataSourceProvider.getDataSource();
+        const queryRunner = dataSource.createQueryRunner();
+        await queryRunner.connect();
+        await queryRunner.startTransaction();
+        try {
+            const existingUser = await queryRunner.manager.findOne(User, {
+                where: {
+                    email: pending.email
+                }
+            });
+            if (existingUser) {
+                throw new BadRequestException('This email has already been registered.');
             }
-        });
-        if (existingUser) {
-            throw new BadRequestException('This email has already been registered.');
-        }
-        const user = userRepository.create({
-            name: pending.name,
-            email: pending.email,
-            phone: pending.phone,
-            password: pending.passwordHash,
-            isActive: true,
-            emailVerified: true,
-            phoneVerified: false
-        });
-        await userRepository.save(user);
-        if (this.isCompanyFeatureEnabled() && pending.companyData) {
-            return this.processCompanyRegistration(user, pending.companyData);
+            const user = queryRunner.manager.create(User, {
+                name: pending.name,
+                email: pending.email,
+                phone: pending.phone,
+                password: pending.passwordHash,
+                isActive: true,
+                emailVerified: true,
+                phoneVerified: false
+            });
+            await queryRunner.manager.save(User, user);
+            if (this.userEnricher?.onUserCreated) {
+                await this.userEnricher.onUserCreated(user.id, pending.additionalFields ?? null, queryRunner);
+            }
+            await queryRunner.commitTransaction();
+            if (this.isCompanyFeatureEnabled() && pending.companyData) {
+                return this.processCompanyRegistration(user, pending.companyData);
+            }
+            return this.generateRegistrationResponse(user);
+        } catch (error) {
+            await queryRunner.rollbackTransaction();
+            if (error instanceof BadRequestException) {
+                throw error;
+            }
+            ErrorHandler.logError(this.logger, error, 'createUserFromPendingRegistration');
+            throw new BadRequestException('Registration failed. Please try again.');
+        } finally{
+            await queryRunner.release();
         }
-        return this.generateRegistrationResponse(user);
     }
-    /** Process company registration (join existing or create new) */ async processCompanyRegistration(user, data, throwOnUnavailable = false) {
+    async processCompanyRegistration(user, data, throwOnUnavailable = false) {
         const companyRepository = await this.getCompanyRepository();
         const branchRepository = await this.getBranchRepository();
         const permissionRepository = await this.getPermissionRepository();
@@ -271,7 +302,7 @@ export class AuthenticationService {
         }
         return this.generateRegistrationResponse(user);
     }
-    /** Find existing company/branch or create new ones */ async findOrCreateCompanyAndBranch(data, companyRepo, branchRepo) {
+    async findOrCreateCompanyAndBranch(data, companyRepo, branchRepo) {
         if (data.companySlug) {
             const company = await companyRepo.findOne({
                 where: {
@@ -335,7 +366,7 @@ export class AuthenticationService {
             branch: null
         };
     }
-    /** Assign user to company and optionally branch */ async assignUserPermissions(userId, companyId, branchId, permissionRepo) {
+    async assignUserPermissions(userId, companyId, branchId, permissionRepo) {
         await permissionRepo.save(permissionRepo.create({
             userId,
             permissionType: PermissionType.COMPANY,
@@ -349,8 +380,7 @@ export class AuthenticationService {
             }));
         }
     }
-    // Company/Branch Selection
-    /** Select company and branch (step 2 of login). Frontend receives all options and user selects both. */ async select(sessionId, companyId, branchId) {
+    async select(sessionId, companyId, branchId) {
         this.ensureCompanyFeatureEnabled();
         if (!this.sessionService) {
             throw new BadRequestException('Session service not available');
@@ -361,11 +391,11 @@ export class AuthenticationService {
         }
         return this.validateAndLoginWithCompany(session.userId, companyId, branchId);
     }
-    /** Switch company/branch after login */ async switchCompany(userId, companyId, branchId) {
+    async switchCompany(userId, companyId, branchId) {
         this.ensureCompanyFeatureEnabled();
         return this.validateAndLoginWithCompany(userId, companyId, branchId);
     }
-    /** Shared: Validate user access to company/branch and generate login response */ async validateAndLoginWithCompany(userId, companyId, branchId) {
+    async validateAndLoginWithCompany(userId, companyId, branchId) {
         const userRepository = await this.getUserRepository();
         const user = await userRepository.findOne({
             where: {
@@ -381,7 +411,6 @@ export class AuthenticationService {
         if (!permissionRepository || !companyRepository || !branchRepository) {
             throw new BadRequestException('Repositories not available');
         }
-        // Validate company access
         const hasCompanyAccess = await permissionRepository.findOne({
             where: {
                 userId,
@@ -401,7 +430,6 @@ export class AuthenticationService {
         if (!company) {
             throw new UnauthorizedException('Company not found or inactive');
         }
-        // Validate branch access
         const hasBranchAccess = await permissionRepository.findOne({
             where: {
                 userId,
@@ -424,8 +452,7 @@ export class AuthenticationService {
         }
         return this.generateLoginResponseWithCompany(user, company, branch);
     }
-    // Token Management
-    /** Refresh access token (with token rotation). Returns new access token and new refresh token. */ async refreshToken(refreshToken) {
+    async refreshToken(refreshToken) {
         try {
             const payload = this.jwtService.verify(refreshToken, {
                 secret: this.authConfig.getRefreshTokenSecret()
@@ -459,7 +486,7 @@ export class AuthenticationService {
             throw new UnauthorizedException('Invalid or expired refresh token');
         }
     }
-    /** Change password */ async changePassword(userId, currentPassword, newPassword) {
+    async changePassword(userId, currentPassword, newPassword) {
         const userRepository = await this.getUserRepository();
         const user = await userRepository.findOne({
             where: {
@@ -473,21 +500,19 @@ export class AuthenticationService {
         user.password = await bcrypt.hash(newPassword, BCRYPT_SALT_ROUNDS);
         await userRepository.save(user);
     }
-    /** Logout - Revokes all tokens. Stores revocation timestamp in cache. */ async logout(userId) {
+    async logout(userId) {
         if (!this.cacheManager) {
-            // Cache is required for secure logout - tokens cannot be revoked without it
             this.logger.error(`SECURITY: Cache not available for logout (userId: ${userId}). ` + 'Token revocation failed - tokens will remain valid until expiry. ' + 'Configure cache (Redis) to enable proper token revocation.');
             throw new BadRequestException('Logout service temporarily unavailable. Please try again later.');
         }
-        const revokedAt = Math.floor(Date.now() / 1000); // Unix timestamp in seconds
+        const revokedAt = Math.floor(Date.now() / 1000);
         const cacheKey = `${TOKEN_REVOKED_PREFIX}:${userId}`;
-        // TTL matches refresh token expiry (tokens older than this are already expired)
         const refreshTokenExpiry = this.authConfig.getRefreshTokenExpiration();
         const ttlMs = this.parseExpiryToMs(refreshTokenExpiry);
         await this.cacheManager.set(cacheKey, revokedAt, ttlMs);
         this.logger.log(`User ${userId} logged out - all tokens revoked`);
     }
-    /** Check if a token is revoked (issued before user's revocation timestamp) */ async isTokenRevoked(userId, tokenIssuedAt) {
+    async isTokenRevoked(userId, tokenIssuedAt) {
         if (!this.cacheManager || !tokenIssuedAt) {
             return false;
         }
@@ -496,12 +521,11 @@ export class AuthenticationService {
         if (!revokedAt) {
             return false;
         }
-        // Token is revoked if it was issued before the revocation timestamp
         return tokenIssuedAt < revokedAt;
     }
-    /** Parse JWT expiry string to milliseconds */ parseExpiryToMs(expiry) {
+    parseExpiryToMs(expiry) {
         const match = expiry.match(/^(\d+)([smhd])$/);
-        if (!match) return 7 * 24 * 60 * 60 * 1000; // Default 7 days
+        if (!match) return 7 * 24 * 60 * 60 * 1000;
         const value = parseInt(match[1], 10);
         const unit = match[2];
         switch(unit){
@@ -517,8 +541,7 @@ export class AuthenticationService {
                 return 7 * 24 * 60 * 60 * 1000;
         }
     }
-    // Query Methods
-    /** Get user's companies */ async getUserCompanies(userId) {
+    async getUserCompanies(userId) {
         this.ensureCompanyFeatureEnabled();
         const permissionRepository = await this.getPermissionRepository();
         const companyRepository = await this.getCompanyRepository();
@@ -539,14 +562,13 @@ export class AuthenticationService {
             active: true
         }).orderBy('c.name', 'ASC').getMany();
     }
-    /** Get branches for a company that user has access to */ async getUserBranches(userId, companyId) {
+    async getUserBranches(userId, companyId) {
         this.ensureCompanyFeatureEnabled();
         const permissionRepository = await this.getPermissionRepository();
         const branchRepository = await this.getBranchRepository();
         if (!permissionRepository || !branchRepository) {
             throw new BadRequestException('Repositories not available');
         }
-        // Verify company access
         const companyPermission = await permissionRepository.findOne({
             where: {
                 userId,
@@ -557,7 +579,6 @@ export class AuthenticationService {
         if (!companyPermission) {
             throw new UnauthorizedException('No access to this company');
         }
-        // Get branch permissions
         const branchPermissions = await permissionRepository.find({
             where: {
                 userId,
@@ -574,7 +595,7 @@ export class AuthenticationService {
             active: true
         }).orderBy('b.serial', 'ASC').addOrderBy('b.name', 'ASC').getMany();
     }
-    /** Get company by ID */ async getCompanyById(companyId) {
+    async getCompanyById(companyId) {
         const companyRepository = await this.getCompanyRepository();
         if (!companyRepository) {
             return null;
@@ -585,7 +606,7 @@ export class AuthenticationService {
             }
         });
     }
-    /** Get branch by ID */ async getBranchById(branchId) {
+    async getBranchById(branchId) {
         const branchRepository = await this.getBranchRepository();
         if (!branchRepository) {
             return null;
@@ -596,7 +617,7 @@ export class AuthenticationService {
             }
         });
     }
-    /** Get user info for /auth/me endpoint. Returns user, company, and branch info (no tokens). */ async getUserInfo(userId, companyId, branchId) {
+    async getUserInfo(userId, companyId, branchId) {
         const userRepository = await this.getUserRepository();
         const user = await userRepository.findOne({
             where: {
@@ -622,7 +643,6 @@ export class AuthenticationService {
         }
         return response;
     }
-    // Helper Methods
     ensureCompanyFeatureEnabled() {
         if (!this.isCompanyFeatureEnabled()) {
             throw new BadRequestException('Company feature is not enabled');
@@ -642,8 +662,7 @@ export class AuthenticationService {
         await userRepository.save(user);
         return user;
     }
-    // Response Generators
-    /** Create user info object */ toUserInfo(user) {
+    toUserInfo(user) {
         return {
             id: user.id,
             email: user.email,
@@ -652,7 +671,7 @@ export class AuthenticationService {
             profilePictureId: user.profilePictureId ?? null
         };
     }
-    /** Create company info object */ toCompanyInfo(company) {
+    toCompanyInfo(company) {
         return {
             id: company.id,
             name: company.name,
@@ -660,7 +679,7 @@ export class AuthenticationService {
             logoId: company.logoId ?? null
         };
     }
-    /** Create branch info object */ toBranchInfo(branch) {
+    toBranchInfo(branch) {
         return {
             id: branch.id,
             name: branch.name,
@@ -668,7 +687,7 @@ export class AuthenticationService {
             logoId: branch.logoId ?? null
         };
     }
-    /** Generate JWT tokens */ generateTokens(payload) {
+    generateTokens(payload) {
         const accessToken = this.jwtService.sign({
             ...payload,
             type: 'access'
@@ -750,13 +769,14 @@ export class AuthenticationService {
         };
     }
     // NOTE: @Inject() required for bundled code - type metadata may be lost during esbuild
-    constructor(jwtService, authConfig, cacheManager, dataSourceProvider, sessionService, authEmailService){
+    constructor(jwtService, authConfig, cacheManager, dataSourceProvider, sessionService, authEmailService, userEnricher){
         _define_property(this, "jwtService", void 0);
         _define_property(this, "authConfig", void 0);
         _define_property(this, "cacheManager", void 0);
         _define_property(this, "dataSourceProvider", void 0);
         _define_property(this, "sessionService", void 0);
         _define_property(this, "authEmailService", void 0);
+        _define_property(this, "userEnricher", void 0);
         _define_property(this, "logger", void 0);
         this.jwtService = jwtService;
         this.authConfig = authConfig;
@@ -764,6 +784,7 @@ export class AuthenticationService {
         this.dataSourceProvider = dataSourceProvider;
         this.sessionService = sessionService;
         this.authEmailService = authEmailService;
+        this.userEnricher = userEnricher;
         this.logger = new Logger(AuthenticationService.name);
     }
 }
@@ -781,6 +802,8 @@ AuthenticationService = _ts_decorate([
     _ts_param(4, Inject(CompanySelectionSessionService)),
     _ts_param(5, Optional()),
     _ts_param(5, Inject(AuthEmailService)),
+    _ts_param(6, Optional()),
+    _ts_param(6, Inject(USER_ENRICHER)),
     _ts_metadata("design:type", Function),
     _ts_metadata("design:paramtypes", [
         typeof JwtService === "undefined" ? Object : JwtService,
@@ -788,6 +811,7 @@ AuthenticationService = _ts_decorate([
         typeof HybridCache === "undefined" ? Object : HybridCache,
         typeof AuthDataSourceProvider === "undefined" ? Object : AuthDataSourceProvider,
         typeof CompanySelectionSessionService === "undefined" ? Object : CompanySelectionSessionService,
-        typeof AuthEmailService === "undefined" ? Object : AuthEmailService
+        typeof AuthEmailService === "undefined" ? Object : AuthEmailService,
+        typeof IUserEnricher === "undefined" ? Object : IUserEnricher
     ])
 ], AuthenticationService);