@flusys/nestjs-auth 6.0.2 → 6.1.0

package/fesm/services/authentication.service.js

@@ -42,6 +42,7 @@ import { Company } from '../entities/company.entity';
 import { PendingRegistration } from '../entities/pending-registration.entity';
 import { UserCompanyPermission } from '../entities/user-company-permission.entity';
 import { PermissionType } from '../enums';
+import { generateTokens, parseExpiryToMs, toBranchInfo, toCompanyInfo, toUserInfo } from '../helpers';
 import { IUserEnricher } from '../interfaces/user-enricher.interface';
 import { AuthConfigService } from './auth-config.service';
 import { AuthDataSourceProvider } from './auth-datasource.provider';
@@ -68,17 +69,9 @@ export class AuthenticationService {
         }
         return this.dataSourceProvider.getRepository(AppUser);
     }
-    async getPermissionRepository() {
+    async getCompanyScopedRepository(entity) {
         if (!this.isCompanyFeatureEnabled() || !this.dataSourceProvider) return null;
-        return this.dataSourceProvider.getRepository(UserCompanyPermission);
-    }
-    async getCompanyRepository() {
-        if (!this.isCompanyFeatureEnabled() || !this.dataSourceProvider) return null;
-        return this.dataSourceProvider.getRepository(Company);
-    }
-    async getBranchRepository() {
-        if (!this.isCompanyFeatureEnabled() || !this.dataSourceProvider) return null;
-        return this.dataSourceProvider.getRepository(CompanyBranch);
+        return this.dataSourceProvider.getRepository(entity);
     }
     async login(email, password) {
         if (this.isEmailVerificationEnabled() && await this.authEmailService.hasPendingRegistration(email)) {
@@ -110,8 +103,8 @@ export class AuthenticationService {
         return await this.handleCompanyBasedLogin(user);
     }
     async handleCompanyBasedLogin(user) {
-        const permissionRepository = await this.getPermissionRepository();
-        const branchRepository = await this.getBranchRepository();
+        const permissionRepository = await this.getCompanyScopedRepository(UserCompanyPermission);
+        const branchRepository = await this.getCompanyScopedRepository(CompanyBranch);
         if (!permissionRepository || !branchRepository) {
             return this.generateLoginResponse(user);
         }
@@ -121,7 +114,7 @@ export class AuthenticationService {
                 permissionType: PermissionType.COMPANY
             }
         });
-        const companyRepository = await this.getCompanyRepository();
+        const companyRepository = await this.getCompanyScopedRepository(Company);
         if (!companyRepository) {
             return this.generateLoginResponse(user);
         }
@@ -199,8 +192,8 @@ export class AuthenticationService {
                 messageKey: AUTH_MESSAGES.REGISTER_EMAIL_EXISTS
             });
         }
-        const permissionRepository = await this.getPermissionRepository();
-        const companyRepository = await this.getCompanyRepository();
+        const permissionRepository = await this.getCompanyScopedRepository(UserCompanyPermission);
+        const companyRepository = await this.getCompanyScopedRepository(Company);
         if (!permissionRepository || !companyRepository) {
             throw new BadRequestException({
                 message: 'Company feature repositories not available',
@@ -334,9 +327,9 @@ export class AuthenticationService {
         }
     }
     async processCompanyRegistration(user, data, throwOnUnavailable = false) {
-        const companyRepository = await this.getCompanyRepository();
-        const branchRepository = await this.getBranchRepository();
-        const permissionRepository = await this.getPermissionRepository();
+        const companyRepository = await this.getCompanyScopedRepository(Company);
+        const branchRepository = await this.getCompanyScopedRepository(CompanyBranch);
+        const permissionRepository = await this.getCompanyScopedRepository(UserCompanyPermission);
         if (!companyRepository || !branchRepository || !permissionRepository) {
             if (throwOnUnavailable) throw new BadRequestException({
                 message: 'Company feature repositories not available',
@@ -472,9 +465,9 @@ export class AuthenticationService {
                 messageKey: USER_MESSAGES.NOT_FOUND
             });
         }
-        const permissionRepository = await this.getPermissionRepository();
-        const companyRepository = await this.getCompanyRepository();
-        const branchRepository = await this.getBranchRepository();
+        const permissionRepository = await this.getCompanyScopedRepository(UserCompanyPermission);
+        const companyRepository = await this.getCompanyScopedRepository(Company);
+        const branchRepository = await this.getCompanyScopedRepository(CompanyBranch);
         if (!permissionRepository || !companyRepository || !branchRepository) {
             throw new BadRequestException({
                 message: 'Repositories not available',
@@ -564,8 +557,8 @@ export class AuthenticationService {
                 });
             }
             if (payload.companyId) {
-                const companyRepository = await this.getCompanyRepository();
-                const permissionRepository = await this.getPermissionRepository();
+                const companyRepository = await this.getCompanyScopedRepository(Company);
+                const permissionRepository = await this.getCompanyScopedRepository(UserCompanyPermission);
                 if (companyRepository) {
                     const company = await companyRepository.findOne({
                         where: {
@@ -596,7 +589,7 @@ export class AuthenticationService {
                     }
                 }
                 if (payload.branchId) {
-                    const branchRepository = await this.getBranchRepository();
+                    const branchRepository = await this.getCompanyScopedRepository(CompanyBranch);
                     if (branchRepository) {
                         const branch = await branchRepository.findOne({
                             where: {
@@ -629,7 +622,7 @@ export class AuthenticationService {
                     }
                 }
             }
-            return this.generateTokens({
+            return generateTokens(this.jwtService, this.authConfig, {
                 id: user.id,
                 email: user.email,
                 type: 'access',
@@ -678,7 +671,7 @@ export class AuthenticationService {
         const revokedAt = Math.floor(Date.now() / 1000);
         const cacheKey = `${TOKEN_REVOKED_PREFIX}:${userId}`;
         const refreshTokenExpiry = this.authConfig.getRefreshTokenExpiration();
-        const ttlMs = this.parseExpiryToMs(refreshTokenExpiry);
+        const ttlMs = parseExpiryToMs(refreshTokenExpiry);
         await this.cacheManager.set(cacheKey, revokedAt, ttlMs);
     }
     async isTokenRevoked(userId, tokenIssuedAt) {
@@ -692,28 +685,10 @@ export class AuthenticationService {
         }
         return tokenIssuedAt < revokedAt;
     }
-    parseExpiryToMs(expiry) {
-        const match = expiry.match(/^(\d+)([smhd])$/);
-        if (!match) return 7 * 24 * 60 * 60 * 1000;
-        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;
-        }
-    }
     async getUserCompanies(userId) {
         this.ensureCompanyFeatureEnabled();
-        const permissionRepository = await this.getPermissionRepository();
-        const companyRepository = await this.getCompanyRepository();
+        const permissionRepository = await this.getCompanyScopedRepository(UserCompanyPermission);
+        const companyRepository = await this.getCompanyScopedRepository(Company);
         if (!permissionRepository || !companyRepository) {
             throw new BadRequestException({
                 message: 'Repositories not available',
@@ -739,8 +714,8 @@ export class AuthenticationService {
     }
     async getUserBranches(userId, companyId) {
         this.ensureCompanyFeatureEnabled();
-        const permissionRepository = await this.getPermissionRepository();
-        const branchRepository = await this.getBranchRepository();
+        const permissionRepository = await this.getCompanyScopedRepository(UserCompanyPermission);
+        const branchRepository = await this.getCompanyScopedRepository(CompanyBranch);
         if (!permissionRepository || !branchRepository) {
             throw new BadRequestException({
                 message: 'Repositories not available',
@@ -780,7 +755,7 @@ export class AuthenticationService {
         }).orderBy('b.serial', 'ASC').addOrderBy('b.name', 'ASC').getMany();
     }
     async getCompanyById(companyId) {
-        const companyRepository = await this.getCompanyRepository();
+        const companyRepository = await this.getCompanyScopedRepository(Company);
         if (!companyRepository) {
             return null;
         }
@@ -791,7 +766,7 @@ export class AuthenticationService {
         });
     }
     async getBranchById(branchId) {
-        const branchRepository = await this.getBranchRepository();
+        const branchRepository = await this.getCompanyScopedRepository(CompanyBranch);
         if (!branchRepository) {
             return null;
         }
@@ -813,7 +788,7 @@ export class AuthenticationService {
             messageKey: USER_MESSAGES.NOT_FOUND
         });
         const response = {
-            user: this.toUserInfo(user)
+            user: toUserInfo(user)
         };
         if (this.isCompanyFeatureEnabled()) {
             if (!companyId) {
@@ -827,14 +802,14 @@ export class AuthenticationService {
                 message: 'Company not found.',
                 messageKey: AUTH_MESSAGES.COMPANY_NOT_FOUND
             });
-            response.company = this.toCompanyInfo(company);
+            response.company = toCompanyInfo(company);
             if (branchId) {
                 const branch = await this.getBranchById(branchId);
                 if (!branch) throw new UnauthorizedException({
                     message: 'Branch not found.',
                     messageKey: AUTH_MESSAGES.BRANCH_NOT_FOUND
                 });
-                response.branch = this.toBranchInfo(branch);
+                response.branch = toBranchInfo(branch);
             }
         }
         return response;
@@ -864,55 +839,8 @@ export class AuthenticationService {
         await userRepository.save(user);
         return user;
     }
-    toUserInfo(user) {
-        return {
-            id: user.id,
-            email: user.email,
-            name: user.name ?? undefined,
-            phone: user.phone ?? null,
-            profilePictureId: user.profilePictureId ?? null
-        };
-    }
-    toCompanyInfo(company) {
-        return {
-            id: company.id,
-            name: company.name,
-            slug: company.slug,
-            logoId: company.logoId ?? null
-        };
-    }
-    toBranchInfo(branch) {
-        return {
-            id: branch.id,
-            name: branch.name,
-            slug: branch.slug,
-            logoId: branch.logoId ?? null
-        };
-    }
-    generateTokens(payload) {
-        const accessToken = this.jwtService.sign({
-            ...payload,
-            type: 'access'
-        }, {
-            secret: this.authConfig.getJwtSecret(),
-            expiresIn: this.authConfig.getJwtExpiration(),
-            algorithm: 'HS256'
-        });
-        const refreshToken = this.jwtService.sign({
-            ...payload,
-            type: 'refresh'
-        }, {
-            secret: this.authConfig.getRefreshTokenSecret(),
-            expiresIn: this.authConfig.getRefreshTokenExpiration(),
-            algorithm: 'HS256'
-        });
-        return {
-            accessToken,
-            refreshToken
-        };
-    }
     generateLoginResponse(user) {
-        const { accessToken, refreshToken } = this.generateTokens({
+        const { accessToken, refreshToken } = generateTokens(this.jwtService, this.authConfig, {
             id: user.id,
             email: user.email,
             type: 'access'
@@ -921,11 +849,11 @@ export class AuthenticationService {
         return {
             accessToken,
             refreshToken,
-            user: this.toUserInfo(user)
+            user: toUserInfo(user)
         };
     }
     generateLoginResponseWithCompany(user, company, branch) {
-        const { accessToken, refreshToken } = this.generateTokens({
+        const { accessToken, refreshToken } = generateTokens(this.jwtService, this.authConfig, {
             id: user.id,
             email: user.email,
             type: 'access',
@@ -936,9 +864,9 @@ export class AuthenticationService {
         return {
             accessToken,
             refreshToken,
-            user: this.toUserInfo(user),
-            company: this.toCompanyInfo(company),
-            branch: branch ? this.toBranchInfo(branch) : undefined
+            user: toUserInfo(user),
+            company: toCompanyInfo(company),
+            branch: branch ? toBranchInfo(branch) : undefined
         };
     }
     sendLoginNotification(userId, companyId) {
@@ -963,10 +891,10 @@ export class AuthenticationService {
         }
         const sessionId = await this.sessionService.createSession(user.id);
         const companiesWithBranches = companies.map((company)=>({
-                ...this.toCompanyInfo(company),
+                ...toCompanyInfo(company),
                 isActive: company.isActive,
                 branches: branches.filter((b)=>b.companyId === company.id).map((b)=>({
-                        ...this.toBranchInfo(b),
+                        ...toBranchInfo(b),
                         isActive: b.isActive
                     }))
             }));
@@ -974,7 +902,7 @@ export class AuthenticationService {
             requiresSelection: true,
             sessionId,
             expiresAt: new Date(Date.now() + 5 * 60 * 1000),
-            user: this.toUserInfo(user),
+            user: toUserInfo(user),
             companies: companiesWithBranches
         };
     }