@flusys/nestjs-auth 1.0.0-beta → 1.0.0-rc

package/fesm/services/authentication.service.js

@@ -27,15 +27,14 @@ function _ts_param(paramIndex, decorator) {
 }
 import { BadRequestException, Inject, Injectable, Logger, NotFoundException, Optional, Scope, UnauthorizedException } from '@nestjs/common';
 import { JwtService } from '@nestjs/jwt';
-import { InjectRepository } from '@nestjs/typeorm';
 import * as bcrypt from 'bcrypt';
-import { Repository } from 'typeorm';
 import { ErrorHandler } from '@flusys/nestjs-shared/utils';
 import { AuthConfigService } from './auth-config.service';
 import { AuthDataSourceProvider } from './auth-datasource.provider';
 import { PermissionType } from '../enums';
 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';
@@ -44,34 +43,22 @@ import { CompanySelectionSessionService } from './company-selection-session.serv
 export class AuthenticationService {
     // Repository Getters
     async getUserRepository() {
-        if (this.dataSourceProvider) {
-            return this.dataSourceProvider.getRepository(User);
+        if (!this.dataSourceProvider) {
+            throw new Error('User repository not available');
         }
-        if (this.injectedUserRepository) {
-            return this.injectedUserRepository;
-        }
-        throw new Error('User repository not available');
+        return this.dataSourceProvider.getRepository(User);
     }
     async getPermissionRepository() {
-        if (!this.authConfig.isCompanyFeatureEnabled()) return null;
-        if (this.dataSourceProvider) {
-            return this.dataSourceProvider.getRepository(UserCompanyPermission);
-        }
-        return this.injectedPermissionRepository ?? null;
+        if (!this.authConfig.isCompanyFeatureEnabled() || !this.dataSourceProvider) return null;
+        return this.dataSourceProvider.getRepository(UserCompanyPermission);
     }
     async getCompanyRepository() {
-        if (!this.authConfig.isCompanyFeatureEnabled()) return null;
-        if (this.dataSourceProvider) {
-            return this.dataSourceProvider.getRepository(Company);
-        }
-        return this.injectedCompanyRepository ?? null;
+        if (!this.authConfig.isCompanyFeatureEnabled() || !this.dataSourceProvider) return null;
+        return this.dataSourceProvider.getRepository(Company);
     }
     async getBranchRepository() {
-        if (!this.authConfig.isCompanyFeatureEnabled()) return null;
-        if (this.dataSourceProvider) {
-            return this.dataSourceProvider.getRepository(CompanyBranch);
-        }
-        return this.injectedBranchRepository ?? null;
+        if (!this.authConfig.isCompanyFeatureEnabled() || !this.dataSourceProvider) return null;
+        return this.dataSourceProvider.getRepository(CompanyBranch);
     }
     // Login
     /** Login with email and password. Returns tokens or requires company/branch selection. */ async login(email, password) {
@@ -79,7 +66,14 @@ export class AuthenticationService {
         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);
         }
@@ -136,10 +130,8 @@ export class AuthenticationService {
         return await this.generateCompanySelectionResponse(user, companies, branches);
     }
     // Registration
-    /** Register a new user. If company feature enabled, optionally join/create company. */ async register(dto) {
+    /** 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
@@ -148,7 +140,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,
@@ -160,38 +178,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);
         }
-        // Handle company feature
-        return this.handleCompanyRegistration(user, dto);
+        return this.handleCompanyRegistration(user, dto, false);
     }
-    /** Handle company-related registration logic */ async handleCompanyRegistration(user, dto) {
+    /** 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.');
+        }
+        // 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);
+    }
+    /** 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
                     }
@@ -200,7 +248,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,
@@ -212,9 +259,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
@@ -223,16 +269,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',
@@ -241,16 +285,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,
@@ -259,10 +300,9 @@ 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) {
         return name.toLowerCase().replace(/[^a-z0-9]+/g, '-').replace(/^-+|-+$/g, '').substring(0, 100);
@@ -400,6 +440,11 @@ export class AuthenticationService {
             const payload = this.jwtService.verify(refreshToken, {
                 secret: this.authConfig.getRefreshTokenSecret()
             });
+            // Check if token has been revoked (user logged out after token was issued)
+            const isRevoked = await this.isTokenRevoked(payload.id, payload.iat);
+            if (isRevoked) {
+                throw new UnauthorizedException('Token has been revoked');
+            }
             const userRepository = await this.getUserRepository();
             const user = await userRepository.findOne({
                 where: {
@@ -480,8 +525,9 @@ export class AuthenticationService {
     }
     /** 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;
+            // 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 cacheKey = `${TOKEN_REVOKED_PREFIX}:${userId}`;
@@ -489,6 +535,7 @@ export class AuthenticationService {
         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) {
         if (!this.cacheManager || !tokenIssuedAt) {
@@ -615,6 +662,7 @@ export class AuthenticationService {
                 id: user.id,
                 email: user.email,
                 name: user.name ?? undefined,
+                phone: user.phone ?? undefined,
                 profilePictureId: user.profilePictureId ?? undefined
             }
         };
@@ -701,6 +749,7 @@ export class AuthenticationService {
                 id: user.id,
                 email: user.email,
                 name: user.name ?? undefined,
+                phone: user.phone ?? null,
                 profilePictureId: user.profilePictureId ?? null
             },
             companyFeatureEnabled
@@ -736,6 +785,7 @@ export class AuthenticationService {
                 id: user.id,
                 email: user.email,
                 name: user.name ?? undefined,
+                phone: user.phone ?? null,
                 profilePictureId: user.profilePictureId ?? null
             },
             company: {
@@ -781,32 +831,83 @@ 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, cacheManager, dataSourceProvider, sessionService, injectedUserRepository, injectedPermissionRepository, injectedCompanyRepository, injectedBranchRepository){
+    constructor(jwtService, authConfig, cacheManager, dataSourceProvider, sessionService, authEmailService){
         _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, "injectedUserRepository", void 0);
-        _define_property(this, "injectedPermissionRepository", void 0);
-        _define_property(this, "injectedCompanyRepository", void 0);
-        _define_property(this, "injectedBranchRepository", void 0);
+        _define_property(this, "authEmailService", void 0);
         _define_property(this, "logger", void 0);
         this.jwtService = jwtService;
         this.authConfig = authConfig;
         this.cacheManager = cacheManager;
         this.dataSourceProvider = dataSourceProvider;
         this.sessionService = sessionService;
-        this.injectedUserRepository = injectedUserRepository;
-        this.injectedPermissionRepository = injectedPermissionRepository;
-        this.injectedCompanyRepository = injectedCompanyRepository;
-        this.injectedBranchRepository = injectedBranchRepository;
+        this.authEmailService = authEmailService;
         this.logger = new Logger(AuthenticationService.name);
     }
 }
@@ -823,13 +924,7 @@ AuthenticationService = _ts_decorate([
     _ts_param(4, Optional()),
     _ts_param(4, Inject(CompanySelectionSessionService)),
     _ts_param(5, Optional()),
-    _ts_param(5, InjectRepository(User)),
-    _ts_param(6, Optional()),
-    _ts_param(6, InjectRepository(UserCompanyPermission)),
-    _ts_param(7, Optional()),
-    _ts_param(7, InjectRepository(Company)),
-    _ts_param(8, Optional()),
-    _ts_param(8, InjectRepository(CompanyBranch)),
+    _ts_param(5, Inject(AuthEmailService)),
     _ts_metadata("design:type", Function),
     _ts_metadata("design:paramtypes", [
         typeof JwtService === "undefined" ? Object : JwtService,
@@ -837,9 +932,6 @@ AuthenticationService = _ts_decorate([
         typeof HybridCache === "undefined" ? Object : HybridCache,
         typeof AuthDataSourceProvider === "undefined" ? Object : AuthDataSourceProvider,
         typeof CompanySelectionSessionService === "undefined" ? Object : CompanySelectionSessionService,
-        typeof Repository === "undefined" ? Object : Repository,
-        typeof Repository === "undefined" ? Object : Repository,
-        typeof Repository === "undefined" ? Object : Repository,
-        typeof Repository === "undefined" ? Object : Repository
+        typeof AuthEmailService === "undefined" ? Object : AuthEmailService
     ])
 ], AuthenticationService);

package/fesm/services/branch.service.js

@@ -27,6 +27,7 @@ function _ts_param(paramIndex, decorator) {
 }
 import { RequestScopedApiService, HybridCache } from '@flusys/nestjs-shared/classes';
 import { UtilsService } from '@flusys/nestjs-shared/modules';
+import { applyCompanyFilter } from '@flusys/nestjs-shared/utils';
 import { Inject, Injectable, Scope } from '@nestjs/common';
 import { CompanyBranch } from '../entities/company-branch.entity';
 import { AuthConfigService } from './auth-config.service';
@@ -66,11 +67,11 @@ export class BranchService extends RequestScopedApiService {
     }
     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
-            });
-        }
+        applyCompanyFilter(query, {
+            isCompanyFeatureEnabled: this.authConfig.isCompanyFeatureEnabled(),
+            entityAlias: 'company_branch',
+            columnName: 'company_id'
+        }, user);
         return result;
     }
     constructor(cacheManager, utilsService, dataSourceProvider, authConfig){

package/fesm/services/company-selection-session.service.js

@@ -33,7 +33,7 @@ const SESSION_TTL_MS = 5 * 60 * 1000; // 5 minutes
 export class CompanySelectionSessionService {
     /**
    * Create a new session for company/branch selection
-   */ async createSession(userId, companyId) {
+   */ async createSession(userId) {
         const sessionId = randomUUID();
         const now = new Date();
         const expiresAt = new Date(now.getTime() + SESSION_TTL_MS);

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

@@ -25,7 +25,7 @@ function _ts_param(paramIndex, decorator) {
         decorator(target, key, paramIndex);
     };
 }
-import { BadRequestException, Inject, Injectable, Logger, NotFoundException, Scope } from '@nestjs/common';
+import { BadRequestException, Inject, Injectable, NotFoundException, Scope } from '@nestjs/common';
 import { PermissionType, UserCompanyPermission } from '../entities/user-company-permission.entity';
 import { AuthDataSourceProvider } from './auth-datasource.provider';
 export class UserPermissionService {
@@ -140,10 +140,8 @@ export class UserPermissionService {
     // NOTE: @Inject() required for bundled code - type metadata may be lost during esbuild
     constructor(dataSourceProvider){
         _define_property(this, "dataSourceProvider", void 0);
-        _define_property(this, "logger", void 0);
         _define_property(this, "_repository", void 0);
         this.dataSourceProvider = dataSourceProvider;
-        this.logger = new Logger(UserPermissionService.name);
         this._repository = null;
     }
 }