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

package/cjs/services/authentication.service.js

@@ -10,15 +10,14 @@ Object.defineProperty(exports, "AuthenticationService", {
 });
 const _common = require("@nestjs/common");
 const _jwt = require("@nestjs/jwt");
-const _typeorm = require("@nestjs/typeorm");
 const _bcrypt = /*#__PURE__*/ _interop_require_wildcard(require("bcrypt"));
-const _typeorm1 = require("typeorm");
 const _utils = require("@flusys/nestjs-shared/utils");
 const _authconfigservice = require("./auth-config.service");
 const _authdatasourceprovider = require("./auth-datasource.provider");
 const _enums = require("../enums");
 const _config = require("../config");
 const _classes = require("@flusys/nestjs-shared/classes");
+const _authemailservice = require("./auth-email.service");
 const _companybranchentity = require("../entities/company-branch.entity");
 const _companyentity = require("../entities/company.entity");
 const _usercompanypermissionentity = require("../entities/user-company-permission.entity");
@@ -95,34 +94,22 @@ function _ts_param(paramIndex, decorator) {
 let AuthenticationService = class AuthenticationService {
     // Repository Getters
     async getUserRepository() {
-        if (this.dataSourceProvider) {
-            return this.dataSourceProvider.getRepository(_userentity.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(_userentity.User);
     }
     async getPermissionRepository() {
-        if (!this.authConfig.isCompanyFeatureEnabled()) return null;
-        if (this.dataSourceProvider) {
-            return this.dataSourceProvider.getRepository(_usercompanypermissionentity.UserCompanyPermission);
-        }
-        return this.injectedPermissionRepository ?? null;
+        if (!this.authConfig.isCompanyFeatureEnabled() || !this.dataSourceProvider) return null;
+        return this.dataSourceProvider.getRepository(_usercompanypermissionentity.UserCompanyPermission);
     }
     async getCompanyRepository() {
-        if (!this.authConfig.isCompanyFeatureEnabled()) return null;
-        if (this.dataSourceProvider) {
-            return this.dataSourceProvider.getRepository(_companyentity.Company);
-        }
-        return this.injectedCompanyRepository ?? null;
+        if (!this.authConfig.isCompanyFeatureEnabled() || !this.dataSourceProvider) return null;
+        return this.dataSourceProvider.getRepository(_companyentity.Company);
     }
     async getBranchRepository() {
-        if (!this.authConfig.isCompanyFeatureEnabled()) return null;
-        if (this.dataSourceProvider) {
-            return this.dataSourceProvider.getRepository(_companybranchentity.CompanyBranch);
-        }
-        return this.injectedBranchRepository ?? null;
+        if (!this.authConfig.isCompanyFeatureEnabled() || !this.dataSourceProvider) return null;
+        return this.dataSourceProvider.getRepository(_companybranchentity.CompanyBranch);
     }
     // Login
     /** Login with email and password. Returns tokens or requires company/branch selection. */ async login(email, password) {
@@ -130,7 +117,14 @@ let AuthenticationService = class AuthenticationService {
         if (!user.isActive) {
             throw new _common.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);
         }
@@ -187,10 +181,8 @@ let AuthenticationService = 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
@@ -199,7 +191,33 @@ let AuthenticationService = class AuthenticationService {
         if (existingUser) {
             throw new _common.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, _config.BCRYPT_SALT_ROUNDS);
         const user = userRepository.create({
             name: dto.name,
@@ -211,38 +229,68 @@ let AuthenticationService = 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 _common.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 _common.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
                     }
@@ -251,7 +299,6 @@ let AuthenticationService = class AuthenticationService {
                     throw new _common.BadRequestException('Branch not found or inactive');
                 }
             } else {
-                // Get first active branch
                 branch = await branchRepository.findOne({
                     where: {
                         companyId: company.id,
@@ -263,9 +310,8 @@ let AuthenticationService = 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
@@ -274,16 +320,14 @@ let AuthenticationService = class AuthenticationService {
             if (existingCompany) {
                 throw new _common.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',
@@ -292,16 +336,13 @@ let AuthenticationService = class AuthenticationService {
             });
             await branchRepository.save(branch);
         }
-        // Create permissions if company exists
         if (company) {
-            // Create company permission
             const companyPermission = permissionRepository.create({
                 userId: user.id,
                 permissionType: _enums.PermissionType.COMPANY,
                 targetId: company.id
             });
             await permissionRepository.save(companyPermission);
-            // Create branch permission if branch exists
             if (branch) {
                 const branchPermission = permissionRepository.create({
                     userId: user.id,
@@ -310,10 +351,9 @@ let AuthenticationService = 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);
@@ -451,6 +491,11 @@ let AuthenticationService = 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 _common.UnauthorizedException('Token has been revoked');
+            }
             const userRepository = await this.getUserRepository();
             const user = await userRepository.findOne({
                 where: {
@@ -531,8 +576,9 @@ let AuthenticationService = 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 _common.BadRequestException('Logout service temporarily unavailable. Please try again later.');
         }
         const revokedAt = Math.floor(Date.now() / 1000); // Unix timestamp in seconds
         const cacheKey = `${_config.TOKEN_REVOKED_PREFIX}:${userId}`;
@@ -540,6 +586,7 @@ let AuthenticationService = 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) {
@@ -666,6 +713,7 @@ let AuthenticationService = class AuthenticationService {
                 id: user.id,
                 email: user.email,
                 name: user.name ?? undefined,
+                phone: user.phone ?? undefined,
                 profilePictureId: user.profilePictureId ?? undefined
             }
         };
@@ -752,6 +800,7 @@ let AuthenticationService = class AuthenticationService {
                 id: user.id,
                 email: user.email,
                 name: user.name ?? undefined,
+                phone: user.phone ?? null,
                 profilePictureId: user.profilePictureId ?? null
             },
             companyFeatureEnabled
@@ -787,6 +836,7 @@ let AuthenticationService = class AuthenticationService {
                 id: user.id,
                 email: user.email,
                 name: user.name ?? undefined,
+                phone: user.phone ?? null,
                 profilePictureId: user.profilePictureId ?? null
             },
             company: {
@@ -832,32 +882,83 @@ let AuthenticationService = 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 _common.Logger(AuthenticationService.name);
     }
 };
@@ -874,13 +975,7 @@ AuthenticationService = _ts_decorate([
     _ts_param(4, (0, _common.Optional)()),
     _ts_param(4, (0, _common.Inject)(_companyselectionsessionservice.CompanySelectionSessionService)),
     _ts_param(5, (0, _common.Optional)()),
-    _ts_param(5, (0, _typeorm.InjectRepository)(_userentity.User)),
-    _ts_param(6, (0, _common.Optional)()),
-    _ts_param(6, (0, _typeorm.InjectRepository)(_usercompanypermissionentity.UserCompanyPermission)),
-    _ts_param(7, (0, _common.Optional)()),
-    _ts_param(7, (0, _typeorm.InjectRepository)(_companyentity.Company)),
-    _ts_param(8, (0, _common.Optional)()),
-    _ts_param(8, (0, _typeorm.InjectRepository)(_companybranchentity.CompanyBranch)),
+    _ts_param(5, (0, _common.Inject)(_authemailservice.AuthEmailService)),
     _ts_metadata("design:type", Function),
     _ts_metadata("design:paramtypes", [
         typeof _jwt.JwtService === "undefined" ? Object : _jwt.JwtService,
@@ -888,9 +983,6 @@ AuthenticationService = _ts_decorate([
         typeof _classes.HybridCache === "undefined" ? Object : _classes.HybridCache,
         typeof _authdatasourceprovider.AuthDataSourceProvider === "undefined" ? Object : _authdatasourceprovider.AuthDataSourceProvider,
         typeof _companyselectionsessionservice.CompanySelectionSessionService === "undefined" ? Object : _companyselectionsessionservice.CompanySelectionSessionService,
-        typeof _typeorm1.Repository === "undefined" ? Object : _typeorm1.Repository,
-        typeof _typeorm1.Repository === "undefined" ? Object : _typeorm1.Repository,
-        typeof _typeorm1.Repository === "undefined" ? Object : _typeorm1.Repository,
-        typeof _typeorm1.Repository === "undefined" ? Object : _typeorm1.Repository
+        typeof _authemailservice.AuthEmailService === "undefined" ? Object : _authemailservice.AuthEmailService
     ])
 ], AuthenticationService);

package/cjs/services/branch.service.js

@@ -10,6 +10,7 @@ Object.defineProperty(exports, "BranchService", {
 });
 const _classes = require("@flusys/nestjs-shared/classes");
 const _modules = require("@flusys/nestjs-shared/modules");
+const _utils = require("@flusys/nestjs-shared/utils");
 const _common = require("@nestjs/common");
 const _companybranchentity = require("../entities/company-branch.entity");
 const _authconfigservice = require("./auth-config.service");
@@ -76,11 +77,11 @@ let BranchService = class BranchService extends _classes.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
-            });
-        }
+        (0, _utils.applyCompanyFilter)(query, {
+            isCompanyFeatureEnabled: this.authConfig.isCompanyFeatureEnabled(),
+            entityAlias: 'company_branch',
+            columnName: 'company_id'
+        }, user);
         return result;
     }
     constructor(cacheManager, utilsService, dataSourceProvider, authConfig){

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

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

package/cjs/services/index.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", {
     value: true
 });
 _export_star(require("./authentication.service"), exports);
+_export_star(require("./auth-email.service"), exports);
 _export_star(require("./company-selection-session.service"), exports);
 _export_star(require("./user.service"), exports);
 _export_star(require("./company.service"), exports);

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

@@ -150,10 +150,8 @@ let UserPermissionService = 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 _common.Logger(UserPermissionService.name);
         this._repository = null;
     }
 };