fix: ci lint error and resolve merge conflicts

Author: Fayvor22

src/app.module.ts

@@ -12,6 +12,7 @@ import { IndexOptimizationModule } from './database/index-optimization/index-opt
 import { RateLimitingModule } from './rate-limiting/rate-limiting.module';
 import { QuotaGuard } from './rate-limiting/guards/quota.guard';
 import { getDatabaseConfig } from './config/database.config';
+import { GlobalAuthGuard } from './auth/guards/global-auth.guard';
 import { loadFeatureFlags } from './config/feature-flags.config';
 import { SessionModule } from './session/session.module';
 import { DebuggingModule } from './debugging/debugging.module';
@@ -76,7 +77,7 @@ const featureFlags = loadFeatureFlags();
       ? [
           {
             provide: APP_GUARD,
-            useClass: require('./auth/guards/global-auth.guard').GlobalAuthGuard,
+            useClass: GlobalAuthGuard,
           },
         ]
       : []),

src/auth/auth.module.ts

@@ -39,7 +39,14 @@ import { SocialAuthController } from './controllers/social-auth.controller';
     ServiceAuthGuard,
     GlobalAuthGuard,
   ],
-  exports: [PassportModule, JwtModule, AuthService, JwtAuthGuard, ServiceAuthGuard, GlobalAuthGuard],
+  exports: [
+    PassportModule,
+    JwtModule,
+    AuthService,
+    JwtAuthGuard,
+    ServiceAuthGuard,
+    GlobalAuthGuard,
+  ],
     GoogleStrategy,
     GitHubStrategy,
     SocialAuthService,

src/auth/auth.service.ts

@@ -40,6 +40,7 @@ export class AuthService {
       decoded = this.jwtService.verify(refreshToken, {
         secret: process.env.JWT_REFRESH_SECRET || 'default-refresh-secret',
       });
+    } catch {
     } catch (_e) {
       throw new UnauthorizedException('Invalid or expired refresh token');
     }
@@ -109,21 +110,23 @@ export class AuthService {
     const payload = { sub: user.id, email: user.email, role: user.role };
     const refreshJti = uuidv4();
 
-    const [accessToken, refreshToken] = await Promise.all([
-      this.jwtService.signAsync(payload as any, {
+    const accessToken = await this.jwtService.signAsync(
+      payload as any,
+      {
         secret: process.env.JWT_SECRET || 'default-jwt-secret',
         expiresIn: (process.env.JWT_EXPIRES_IN || '15m') as any,
-      } as any),
+      } as any,
       }),
-      this.jwtService.signAsync(
-        { ...payload, jti: refreshJti } as any,
-        {
-          secret: process.env.JWT_REFRESH_SECRET || 'default-refresh-secret',
-          expiresIn: (process.env.JWT_REFRESH_EXPIRES_IN || '7d') as any,
-        } as any,
+    );
+
+    const refreshToken = await this.jwtService.signAsync(
+      { ...payload, jti: refreshJti } as any,
+      {
+        secret: process.env.JWT_REFRESH_SECRET || 'default-refresh-secret',
+        expiresIn: (process.env.JWT_REFRESH_EXPIRES_IN || '7d') as any,
+      } as any,
         },
-      ),
-    ]);
+    );
 
     return {
       accessToken,

src/auth/guards/global-auth.guard.ts

@@ -1,4 +1,4 @@
-import { Injectable, ExecutionContext, Inject, UnauthorizedException } from '@nestjs/common';
+import { Injectable, ExecutionContext, UnauthorizedException } from '@nestjs/common';
 import { CanActivate } from '@nestjs/common/interfaces';
 import { Reflector } from '@nestjs/core';
 import { JwtAuthGuard } from './jwt-auth.guard';
@@ -29,15 +29,15 @@ export class GlobalAuthGuard implements CanActivate {
     try {
       const result = (await this.jwtGuard.canActivate(context)) as boolean;
       if (result) return true;
-    } catch (e) {
+    } catch {
       // continue to try service guard
     }
 
     // Try service token
     try {
       const result = (await this.serviceGuard.canActivate(context)) as boolean;
       if (result) return true;
-    } catch (e) {
+    } catch {
       // both failed
     }
 

src/auth/guards/service-auth.guard.ts

@@ -27,7 +27,10 @@ export class ServiceAuthGuard implements CanActivate {
 
       // Basic validation: service claim and allowed list
       const serviceName = (payload as any).service as string | undefined;
-      const allowed = (process.env.SERVICE_ALLOW_LIST || '').split(',').map((s) => s.trim()).filter(Boolean);
+      const allowed = (process.env.SERVICE_ALLOW_LIST || '')
+        .split(',')
+        .map((s) => s.trim())
+        .filter(Boolean);
 
       if (!serviceName) throw new UnauthorizedException('Invalid service token');
       if (allowed.length > 0 && !allowed.includes(serviceName)) {
@@ -37,7 +40,7 @@ export class ServiceAuthGuard implements CanActivate {
       // attach service identity for downstream usage
       (req as any).serviceIdentity = { name: serviceName, claims: payload };
       return true;
-    } catch (e) {
+    } catch {
       throw new UnauthorizedException('Invalid service token');
     }
   }