From cee62397fc37f2129c7ea08ee4180acd2204fd1c Mon Sep 17 00:00:00 2001
From: Nils-Johan Gynther <nils-johan.gynther@neoleaf.se>
Date: Thu, 30 Apr 2026 13:34:29 +0200
Subject: [PATCH] fix: jwt-auth.guard handleRequest wrong signature causing
 null.switchToHttp crash

---
 backend/src/auth/jwt-auth.guard.ts | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/backend/src/auth/jwt-auth.guard.ts b/backend/src/auth/jwt-auth.guard.ts
index b01c5415..492b69ef 100644
--- a/backend/src/auth/jwt-auth.guard.ts
+++ b/backend/src/auth/jwt-auth.guard.ts
@@ -1,4 +1,4 @@
-import { Injectable, CanActivate, ExecutionContext, Logger } from '@nestjs/common';
+import { Injectable, CanActivate, ExecutionContext, Logger, UnauthorizedException } from '@nestjs/common';
 import { Observable } from 'rxjs';
 import { Reflector } from '@nestjs/core';
 import { AuthGuard } from '@nestjs/passport';
@@ -21,15 +21,14 @@ export class JwtAuthGuard extends AuthGuard('jwt') {
     return super.canActivate(context);
   }
 
-  // Add logging for user ID in the JWT authentication guard
-  handleRequest(context: ExecutionContext, next: Function) {
-    const request = context.switchToHttp().getRequest();
-    const user = request.user;
-
-    if (user) {
-      this.logger.log(`User ID: ${user.userId}, Username: ${user.username}`);
+  // Log authenticated user ID for diagnostics
+  handleRequest<TUser = any>(err: any, user: TUser, info: any): TUser {
+    if (err || !user) {
+      throw err || new UnauthorizedException();
     }
-
-    return next();
+    if (user) {
+      this.logger.log(`Authenticated user ID: ${(user as any).userId}`);
+    }
+    return user;
   }
 }