Merge branch 'develop'

Author: Ahtisham992

apps/backend/src/auth/auth.service.ts

@@ -91,13 +91,15 @@ export class AuthService {
     const payload = { sub: userId, email };
 
     const accessToken = await this.jwtService.signAsync(payload, {
-      secret: this.config.get('JWT_SECRET'),
-      expiresIn: this.config.get('JWT_EXPIRES_IN'),
+      secret: this.config.get<string>('JWT_SECRET') || 'default_secret',
+      expiresIn: this.config.get<string>('JWT_EXPIRES_IN') || '15m',
     });
 
     const refreshToken = await this.jwtService.signAsync(payload, {
-      secret: this.config.get('JWT_REFRESH_SECRET'),
-      expiresIn: this.config.get('JWT_REFRESH_EXPIRES_IN'),
+      secret:
+        this.config.get<string>('JWT_REFRESH_SECRET') ||
+        'default_refresh_secret',
+      expiresIn: this.config.get<string>('JWT_REFRESH_EXPIRES_IN') || '7d',
     });
 
     return { accessToken, refreshToken };

apps/backend/src/auth/strategies/jwt-refresh.strategy.ts

@@ -12,7 +12,8 @@ export class JwtRefreshStrategy extends PassportStrategy(
   constructor(config: ConfigService) {
     super({
       jwtFromRequest: ExtractJwt.fromBodyField('refreshToken'),
-      secretOrKey: config.get<string>('JWT_REFRESH_SECRET')!,
+      secretOrKey:
+        config.get<string>('JWT_REFRESH_SECRET') || 'default_refresh_secret',
       passReqToCallback: true,
     });
   }

apps/backend/src/auth/strategies/jwt.strategy.ts

@@ -12,7 +12,7 @@ export class JwtStrategy extends PassportStrategy(Strategy, 'jwt') {
   ) {
     super({
       jwtFromRequest: ExtractJwt.fromAuthHeaderAsBearerToken(),
-      secretOrKey: config.get<string>('JWT_SECRET')!,
+      secretOrKey: config.get<string>('JWT_SECRET') || 'default_secret',
     });
   }