From 10ebcd54794075563c396612eecbb37d6b770ace Mon Sep 17 00:00:00 2001
From: ThisBirchWood <dylanseandefaoite@gmail.com>
Date: Wed, 13 Aug 2025 23:39:08 +0200
Subject: [PATCH] ADD configurable JWT expiration time in UserController

---
 frontend/src/components/Topbar.tsx                          | 2 +-
 .../java/com/ddf/vodsystem/controllers/UserController.java  | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/frontend/src/components/Topbar.tsx b/frontend/src/components/Topbar.tsx
index 6a56a20..9026186 100644
--- a/frontend/src/components/Topbar.tsx
+++ b/frontend/src/components/Topbar.tsx
@@ -48,7 +48,7 @@ const Topbar = ({
         logout()
             .then(() => {
                 fetchUser();
-                navigate(0);
+                navigate("/");
             })
             .catch((error) => {
                 console.error("Logout failed:", error);
diff --git a/src/main/java/com/ddf/vodsystem/controllers/UserController.java b/src/main/java/com/ddf/vodsystem/controllers/UserController.java
index b01ed53..401ca21 100644
--- a/src/main/java/com/ddf/vodsystem/controllers/UserController.java
+++ b/src/main/java/com/ddf/vodsystem/controllers/UserController.java
@@ -6,6 +6,7 @@ import com.ddf.vodsystem.entities.User;
 import com.ddf.vodsystem.exceptions.NotAuthenticated;
 import com.ddf.vodsystem.services.UserService;
 import jakarta.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.ResponseCookie;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
@@ -17,6 +18,9 @@ import java.util.Optional;
 public class UserController {
     private final UserService userService;
 
+    @Value("${jwt.expiration}")
+    private long jwtExpiration;
+
     public UserController(UserService userService) {
         this.userService = userService;
     }
@@ -41,7 +45,7 @@ public class UserController {
 
         ResponseCookie cookie = ResponseCookie.from("token", jwt)
                 .httpOnly(true)
-                .maxAge(60 * 60 * 24)
+                .maxAge(jwtExpiration / 1000)
                 .sameSite("None")
                 .secure(true)
                 .path("/")