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

package/fesm/services/authentication.service.js

@@ -34,17 +34,16 @@ import { ErrorHandler } from '@flusys/nestjs-shared/utils';
 import { AuthConfigService } from './auth-config.service';
 import { AuthDataSourceProvider } from './auth-datasource.provider';
 import { PermissionType } from '../enums';
-// Password hashing configuration
-const BCRYPT_SALT_ROUNDS = 12; // Increased from 10 for better security
+import { BCRYPT_SALT_ROUNDS, TOKEN_REVOKED_PREFIX } from '../config';
+import { HybridCache } from '@flusys/nestjs-shared/classes';
+import { AuthEmailService } from './auth-email.service';
 import { CompanyBranch } from '../entities/company-branch.entity';
 import { Company } from '../entities/company.entity';
 import { UserCompanyPermission } from '../entities/user-company-permission.entity';
 import { User } from '../entities/user.entity';
 import { CompanySelectionSessionService } from './company-selection-session.service';
 export class AuthenticationService {
-    // ==========================================================================
-    // REPOSITORY GETTERS
-    // ==========================================================================
+    // Repository Getters
     async getUserRepository() {
         if (this.dataSourceProvider) {
             return this.dataSourceProvider.getRepository(User);
@@ -75,26 +74,26 @@ export class AuthenticationService {
         }
         return this.injectedBranchRepository ?? null;
     }
-    // ==========================================================================
-    // LOGIN
-    // ==========================================================================
-    /**
-   * Login with email and password
-   * Returns either tokens directly or requires company/branch selection
-   */ async login(email, password) {
+    // Login
+    /** Login with email and password. Returns tokens or requires company/branch selection. */ async login(email, password) {
         const user = await this.validateUser(email, password);
         if (!user.isActive) {
             throw new UnauthorizedException('User account is deactivated');
         }
-        // If company feature not enabled, return simple token
+        // Check email verification if email service is enabled
+        if (this.authEmailService?.isEmailEnabled() && !user.emailVerified) {
+            return {
+                requiresEmailVerification: true,
+                email: user.email,
+                message: 'Please verify your email address before logging in.'
+            };
+        }
         if (!this.authConfig.isCompanyFeatureEnabled()) {
             return this.generateLoginResponse(user);
         }
         return this.handleCompanyBasedLogin(user);
     }
-    /**
-   * Handle login when company feature is enabled
-   */ async handleCompanyBasedLogin(user) {
+    /** Handle login when company feature is enabled */ async handleCompanyBasedLogin(user) {
         const permissionRepository = await this.getPermissionRepository();
         const branchRepository = await this.getBranchRepository();
         if (!permissionRepository || !branchRepository) {
@@ -144,16 +143,9 @@ export class AuthenticationService {
         // Returns all companies with their branches for frontend to display
         return await this.generateCompanySelectionResponse(user, companies, branches);
     }
-    // ==========================================================================
-    // REGISTRATION
-    // ==========================================================================
-    /**
-   * Register a new user
-   * If company feature enabled, optionally join/create company
-   */ async register(dto) {
+    // Registration
+    /** Register a new user. If email enabled, creates pending registration. Otherwise creates user directly. */ async register(dto, verifyUrlBase) {
         const userRepository = await this.getUserRepository();
-        // Check if user exists
-        // Note: Generic error message to prevent email enumeration attacks
         const existingUser = await userRepository.findOne({
             where: {
                 email: dto.email
@@ -162,7 +154,33 @@ export class AuthenticationService {
         if (existingUser) {
             throw new BadRequestException('Registration failed. Please try again or contact support.');
         }
-        // Create user
+        // If email verification is enabled, create pending registration instead of user
+        if (this.authEmailService?.isEmailEnabled() && verifyUrlBase) {
+            const companyData = this.authConfig.isCompanyFeatureEnabled() ? {
+                companySlug: dto.companySlug,
+                branchSlug: dto.branchSlug,
+                newCompanyName: dto.newCompanyName,
+                newCompanyPhone: dto.newCompanyPhone,
+                newCompanyAddress: dto.newCompanyAddress
+            } : undefined;
+            const result = await this.authEmailService.createPendingRegistration({
+                email: dto.email,
+                name: dto.name,
+                phone: dto.phone,
+                password: dto.password,
+                companyData,
+                verifyUrlBase
+            });
+            return {
+                requiresEmailVerification: true,
+                message: result.message
+            };
+        }
+        // No email verification - create user directly
+        return this.createUserDirectly(dto);
+    }
+    /** 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,
@@ -174,40 +192,68 @@ export class AuthenticationService {
             phoneVerified: false
         });
         await userRepository.save(user);
-        // If company feature not enabled, return simple response
         if (!this.authConfig.isCompanyFeatureEnabled()) {
-            return this.generateLoginResponse(user, false);
+            return this.generateRegistrationResponse(user, false, false);
+        }
+        return this.handleCompanyRegistration(user, dto, false);
+    }
+    /** Create user from pending registration (after email verification) */ async createUserFromPendingRegistration(pending) {
+        const userRepository = await this.getUserRepository();
+        // Check if user already exists (race condition protection)
+        const existingUser = await userRepository.findOne({
+            where: {
+                email: pending.email
+            }
+        });
+        if (existingUser) {
+            throw new BadRequestException('This email has already been registered.');
         }
-        // Handle company feature
-        return this.handleCompanyRegistration(user, dto);
+        // Create user with verified email
+        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);
+        // Handle company feature if enabled
+        if (this.authConfig.isCompanyFeatureEnabled() && pending.companyData) {
+            return this.handleCompanyRegistrationFromPending(user, pending.companyData);
+        }
+        return this.generateRegistrationResponse(user, this.authConfig.isCompanyFeatureEnabled(), false);
+    }
+    /** Handle company registration from pending registration data */ async handleCompanyRegistrationFromPending(user, companyData) {
+        return this.processCompanyRegistration(user, companyData, false);
+    }
+    /** Handle company-related registration logic */ async handleCompanyRegistration(user, dto, requiresEmailVerification) {
+        return this.processCompanyRegistration(user, dto, requiresEmailVerification);
     }
-    /**
-   * Handle company-related registration logic
-   */ async handleCompanyRegistration(user, dto) {
+    /** Shared logic for company registration (join existing or create new) */ async processCompanyRegistration(user, data, requiresEmailVerification) {
         const companyRepository = await this.getCompanyRepository();
         const branchRepository = await this.getBranchRepository();
         const permissionRepository = await this.getPermissionRepository();
         if (!companyRepository || !branchRepository || !permissionRepository) {
-            return this.generateLoginResponse(user, true);
+            return this.generateRegistrationResponse(user, true, requiresEmailVerification);
         }
         let company = null;
         let branch = null;
-        // Case 1: Join existing company by slug
-        if (dto.companySlug) {
+        if (data.companySlug) {
             company = await companyRepository.findOne({
                 where: {
-                    slug: dto.companySlug,
+                    slug: data.companySlug,
                     isActive: true
                 }
             });
             if (!company) {
                 throw new BadRequestException('Company not found or inactive');
             }
-            // Find branch by slug or get default
-            if (dto.branchSlug) {
+            if (data.branchSlug) {
                 branch = await branchRepository.findOne({
                     where: {
-                        slug: dto.branchSlug,
+                        slug: data.branchSlug,
                         companyId: company.id,
                         isActive: true
                     }
@@ -216,7 +262,6 @@ export class AuthenticationService {
                     throw new BadRequestException('Branch not found or inactive');
                 }
             } else {
-                // Get first active branch
                 branch = await branchRepository.findOne({
                     where: {
                         companyId: company.id,
@@ -228,9 +273,8 @@ export class AuthenticationService {
                     }
                 });
             }
-        } else if (dto.newCompanyName) {
-            const slug = this.generateSlug(dto.newCompanyName);
-            // Check if slug exists
+        } else if (data.newCompanyName) {
+            const slug = this.generateSlug(data.newCompanyName);
             const existingCompany = await companyRepository.findOne({
                 where: {
                     slug
@@ -239,16 +283,14 @@ export class AuthenticationService {
             if (existingCompany) {
                 throw new BadRequestException('Company creation failed. Please try a different name.');
             }
-            // Create company
             company = companyRepository.create({
-                name: dto.newCompanyName,
+                name: data.newCompanyName,
                 slug,
-                phone: dto.newCompanyPhone,
-                address: dto.newCompanyAddress,
+                phone: data.newCompanyPhone,
+                address: data.newCompanyAddress,
                 isActive: true
             });
             await companyRepository.save(company);
-            // Create default branch
             branch = branchRepository.create({
                 name: 'Main Branch',
                 slug: 'main-branch',
@@ -257,16 +299,13 @@ export class AuthenticationService {
             });
             await branchRepository.save(branch);
         }
-        // Create permissions if company exists
         if (company) {
-            // Create company permission
             const companyPermission = permissionRepository.create({
                 userId: user.id,
                 permissionType: PermissionType.COMPANY,
                 targetId: company.id
             });
             await permissionRepository.save(companyPermission);
-            // Create branch permission if branch exists
             if (branch) {
                 const branchPermission = permissionRepository.create({
                     userId: user.id,
@@ -275,23 +314,15 @@ export class AuthenticationService {
                 });
                 await permissionRepository.save(branchPermission);
             }
-            return this.generateLoginResponseWithCompany(user, company, branch ?? undefined);
+            return this.generateRegistrationResponseWithCompany(user, company, branch ?? undefined, requiresEmailVerification);
         }
-        // No company assigned
-        return this.generateLoginResponse(user, true);
+        return this.generateRegistrationResponse(user, true, requiresEmailVerification);
     }
-    /**
-   * Generate URL-friendly slug from name
-   */ generateSlug(name) {
+    /** Generate URL-friendly slug from name */ generateSlug(name) {
         return name.toLowerCase().replace(/[^a-z0-9]+/g, '-').replace(/^-+|-+$/g, '').substring(0, 100);
     }
-    // ==========================================================================
-    // COMPANY/BRANCH SELECTION
-    // ==========================================================================
-    /**
-   * Select company and branch (step 2 of login)
-   * Frontend receives all options and user selects both together
-   */ async select(sessionId, companyId, branchId) {
+    // Company/Branch Selection
+    /** Select company and branch (step 2 of login). Frontend receives all options and user selects both. */ async select(sessionId, companyId, branchId) {
         this.ensureCompanyFeatureEnabled();
         if (!this.sessionService) {
             throw new BadRequestException('Session service not available');
@@ -358,9 +389,7 @@ export class AuthenticationService {
         }
         return this.generateLoginResponseWithCompany(user, company, branch);
     }
-    /**
-   * Switch company/branch after login
-   */ async switchCompany(userId, companyId, branchId) {
+    /** Switch company/branch after login */ async switchCompany(userId, companyId, branchId) {
         this.ensureCompanyFeatureEnabled();
         const userRepository = await this.getUserRepository();
         const user = await userRepository.findOne({
@@ -419,13 +448,8 @@ 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) {
+    // Token Management
+    /** Refresh access token (with token rotation). Returns new access token and new refresh token. */ async refreshToken(refreshToken) {
         try {
             const payload = this.jwtService.verify(refreshToken, {
                 secret: this.authConfig.getRefreshTokenSecret()
@@ -491,9 +515,7 @@ export class AuthenticationService {
             throw new UnauthorizedException('Invalid or expired refresh token');
         }
     }
-    /**
-   * Change password
-   */ async changePassword(userId, currentPassword, newPassword) {
+    /** Change password */ async changePassword(userId, currentPassword, newPassword) {
         const userRepository = await this.getUserRepository();
         const user = await userRepository.findOne({
             where: {
@@ -510,15 +532,50 @@ export class AuthenticationService {
         user.password = await bcrypt.hash(newPassword, BCRYPT_SALT_ROUNDS);
         await userRepository.save(user);
     }
-    /**
-   * Logout (placeholder for token blacklisting if needed)
-   */ async logout(_userId) {}
-    // ==========================================================================
-    // QUERY METHODS
-    // ==========================================================================
-    /**
-   * Get user's companies
-   */ async getUserCompanies(userId) {
+    /** Logout - Revokes all tokens. Stores revocation timestamp in cache. */ async logout(userId) {
+        if (!this.cacheManager) {
+            // Cache not available - graceful degradation (client-side logout only)
+            return;
+        }
+        const revokedAt = Math.floor(Date.now() / 1000); // Unix timestamp in seconds
+        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);
+    }
+    /** Check if a token is revoked (issued before user's revocation timestamp) */ async isTokenRevoked(userId, tokenIssuedAt) {
+        if (!this.cacheManager || !tokenIssuedAt) {
+            return false;
+        }
+        const cacheKey = `${TOKEN_REVOKED_PREFIX}:${userId}`;
+        const revokedAt = await this.cacheManager.get(cacheKey);
+        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) {
+        const match = expiry.match(/^(\d+)([smhd])$/);
+        if (!match) return 7 * 24 * 60 * 60 * 1000; // Default 7 days
+        const value = parseInt(match[1], 10);
+        const unit = match[2];
+        switch(unit){
+            case 's':
+                return value * 1000;
+            case 'm':
+                return value * 60 * 1000;
+            case 'h':
+                return value * 60 * 60 * 1000;
+            case 'd':
+                return value * 24 * 60 * 60 * 1000;
+            default:
+                return 7 * 24 * 60 * 60 * 1000;
+        }
+    }
+    // Query Methods
+    /** Get user's companies */ async getUserCompanies(userId) {
         this.ensureCompanyFeatureEnabled();
         const permissionRepository = await this.getPermissionRepository();
         const companyRepository = await this.getCompanyRepository();
@@ -539,9 +596,7 @@ export class AuthenticationService {
             active: true
         }).orderBy('c.name', 'ASC').getMany();
     }
-    /**
-   * Get branches for a company that user has access to
-   */ async getUserBranches(userId, companyId) {
+    /** Get branches for a company that user has access to */ async getUserBranches(userId, companyId) {
         this.ensureCompanyFeatureEnabled();
         const permissionRepository = await this.getPermissionRepository();
         const branchRepository = await this.getBranchRepository();
@@ -576,9 +631,7 @@ export class AuthenticationService {
             active: true
         }).orderBy('b.serial', 'ASC').addOrderBy('b.name', 'ASC').getMany();
     }
-    /**
-   * Get company by ID
-   */ async getCompanyById(companyId) {
+    /** Get company by ID */ async getCompanyById(companyId) {
         const companyRepository = await this.getCompanyRepository();
         if (!companyRepository) {
             return null;
@@ -589,9 +642,7 @@ export class AuthenticationService {
             }
         });
     }
-    /**
-   * Get branch by ID
-   */ async getBranchById(branchId) {
+    /** Get branch by ID */ async getBranchById(branchId) {
         const branchRepository = await this.getBranchRepository();
         if (!branchRepository) {
             return null;
@@ -602,10 +653,7 @@ export class AuthenticationService {
             }
         });
     }
-    /**
-   * Get user info for /auth/me endpoint
-   * Returns only user, company, and branch information (no tokens)
-   */ async getUserInfo(userId, companyId, branchId) {
+    /** Get user info for /auth/me endpoint. Returns user, company, and branch info (no tokens). */ async getUserInfo(userId, companyId, branchId) {
         const userRepository = await this.getUserRepository();
         const user = await userRepository.findOne({
             where: {
@@ -621,6 +669,7 @@ export class AuthenticationService {
                 id: user.id,
                 email: user.email,
                 name: user.name ?? undefined,
+                phone: user.phone ?? undefined,
                 profilePictureId: user.profilePictureId ?? undefined
             }
         };
@@ -656,9 +705,7 @@ export class AuthenticationService {
         }
         return response;
     }
-    // ==========================================================================
-    // HELPER METHODS
-    // ==========================================================================
+    // Helper Methods
     ensureCompanyFeatureEnabled() {
         if (!this.authConfig.isCompanyFeatureEnabled()) {
             throw new BadRequestException('Company feature is not enabled');
@@ -682,9 +729,7 @@ export class AuthenticationService {
         await userRepository.save(user);
         return user;
     }
-    // ==========================================================================
-    // RESPONSE GENERATORS
-    // ==========================================================================
+    // Response Generators
     generateLoginResponse(user, companyFeatureEnabled = false) {
         const payload = {
             id: user.id,
@@ -711,6 +756,7 @@ export class AuthenticationService {
                 id: user.id,
                 email: user.email,
                 name: user.name ?? undefined,
+                phone: user.phone ?? null,
                 profilePictureId: user.profilePictureId ?? null
             },
             companyFeatureEnabled
@@ -746,6 +792,7 @@ export class AuthenticationService {
                 id: user.id,
                 email: user.email,
                 name: user.name ?? undefined,
+                phone: user.phone ?? null,
                 profilePictureId: user.profilePictureId ?? null
             },
             company: {
@@ -791,17 +838,76 @@ export class AuthenticationService {
                 id: user.id,
                 email: user.email,
                 name: user.name ?? undefined,
+                phone: user.phone ?? null,
                 profilePictureId: user.profilePictureId ?? null
             },
             companies: companiesWithBranches
         };
     }
+    /** Generate registration response - tokens included only if email verification not required */ generateRegistrationResponse(user, companyFeatureEnabled, requiresEmailVerification) {
+        const userInfo = {
+            id: user.id,
+            email: user.email,
+            name: user.name ?? undefined,
+            phone: user.phone ?? null,
+            profilePictureId: user.profilePictureId ?? null
+        };
+        if (requiresEmailVerification) {
+            return {
+                user: userInfo,
+                companyFeatureEnabled,
+                requiresEmailVerification: true
+            };
+        }
+        const loginResponse = this.generateLoginResponse(user, companyFeatureEnabled);
+        return {
+            ...loginResponse,
+            requiresEmailVerification: false
+        };
+    }
+    /** Generate registration response with company - tokens included only if email verification not required */ generateRegistrationResponseWithCompany(user, company, branch, requiresEmailVerification = false) {
+        const userInfo = {
+            id: user.id,
+            email: user.email,
+            name: user.name ?? undefined,
+            phone: user.phone ?? null,
+            profilePictureId: user.profilePictureId ?? null
+        };
+        const companyInfo = {
+            id: company.id,
+            name: company.name,
+            slug: company.slug,
+            logoId: company.logoId ?? null
+        };
+        const branchInfo = branch ? {
+            id: branch.id,
+            name: branch.name,
+            slug: branch.slug,
+            logoId: branch.logoId ?? null
+        } : undefined;
+        if (requiresEmailVerification) {
+            return {
+                user: userInfo,
+                company: companyInfo,
+                branch: branchInfo,
+                companyFeatureEnabled: true,
+                requiresEmailVerification: true
+            };
+        }
+        const loginResponse = this.generateLoginResponseWithCompany(user, company, branch);
+        return {
+            ...loginResponse,
+            requiresEmailVerification: false
+        };
+    }
     // NOTE: @Inject() required for bundled code - type metadata may be lost during esbuild
-    constructor(jwtService, authConfig, dataSourceProvider, sessionService, injectedUserRepository, injectedPermissionRepository, injectedCompanyRepository, injectedBranchRepository){
+    constructor(jwtService, authConfig, cacheManager, dataSourceProvider, sessionService, authEmailService, injectedUserRepository, injectedPermissionRepository, injectedCompanyRepository, injectedBranchRepository){
         _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, "injectedUserRepository", void 0);
         _define_property(this, "injectedPermissionRepository", void 0);
         _define_property(this, "injectedCompanyRepository", void 0);
@@ -809,8 +915,10 @@ export class AuthenticationService {
         _define_property(this, "logger", void 0);
         this.jwtService = jwtService;
         this.authConfig = authConfig;
+        this.cacheManager = cacheManager;
         this.dataSourceProvider = dataSourceProvider;
         this.sessionService = sessionService;
+        this.authEmailService = authEmailService;
         this.injectedUserRepository = injectedUserRepository;
         this.injectedPermissionRepository = injectedPermissionRepository;
         this.injectedCompanyRepository = injectedCompanyRepository;
@@ -825,23 +933,29 @@ AuthenticationService = _ts_decorate([
     _ts_param(0, Inject(JwtService)),
     _ts_param(1, Inject(AuthConfigService)),
     _ts_param(2, Optional()),
-    _ts_param(2, Inject(AuthDataSourceProvider)),
+    _ts_param(2, Inject('CACHE_INSTANCE')),
     _ts_param(3, Optional()),
-    _ts_param(3, Inject(CompanySelectionSessionService)),
+    _ts_param(3, Inject(AuthDataSourceProvider)),
     _ts_param(4, Optional()),
-    _ts_param(4, InjectRepository(User)),
+    _ts_param(4, Inject(CompanySelectionSessionService)),
     _ts_param(5, Optional()),
-    _ts_param(5, InjectRepository(UserCompanyPermission)),
+    _ts_param(5, Inject(AuthEmailService)),
     _ts_param(6, Optional()),
-    _ts_param(6, InjectRepository(Company)),
+    _ts_param(6, InjectRepository(User)),
     _ts_param(7, Optional()),
-    _ts_param(7, InjectRepository(CompanyBranch)),
+    _ts_param(7, InjectRepository(UserCompanyPermission)),
+    _ts_param(8, Optional()),
+    _ts_param(8, InjectRepository(Company)),
+    _ts_param(9, Optional()),
+    _ts_param(9, InjectRepository(CompanyBranch)),
     _ts_metadata("design:type", Function),
     _ts_metadata("design:paramtypes", [
         typeof JwtService === "undefined" ? Object : JwtService,
         typeof AuthConfigService === "undefined" ? Object : AuthConfigService,
+        typeof HybridCache === "undefined" ? Object : HybridCache,
         typeof AuthDataSourceProvider === "undefined" ? Object : AuthDataSourceProvider,
         typeof CompanySelectionSessionService === "undefined" ? Object : CompanySelectionSessionService,
+        typeof AuthEmailService === "undefined" ? Object : AuthEmailService,
         typeof Repository === "undefined" ? Object : Repository,
         typeof Repository === "undefined" ? Object : Repository,
         typeof Repository === "undefined" ? Object : Repository,