From 4e6034134f93c1a8c379a95fa6de4e89bd19ce06 Mon Sep 17 00:00:00 2001 From: yoganandhank Date: Tue, 14 Jul 2026 11:58:37 +0530 Subject: [PATCH] login bugs resolved added session properly --- .../java/com/gcc_manpower/controller/HomeController.java | 4 ---- .../controller/GccServiceDocumentsController.java | 6 ++---- .../controller/GccServicePaymentTrackerController.java | 3 --- src/main/resources/application-local.properties | 5 ++++- src/main/resources/application-prod.properties | 4 ++++ .../resources/templates/gccservicedocuments/login.html | 1 + .../resources/templates/gccservicedocuments/upload.html | 8 ++++++++ .../resources/templates/gccservicedocuments/view.html | 8 ++++++++ .../templates/gccservicepaymenttracker/dashboard.html | 8 ++++++++ .../templates/gccservicepaymenttracker/login.html | 1 + src/main/resources/templates/home/home.html | 8 ++++++++ src/main/resources/templates/home/login.html | 1 + src/main/resources/templates/home/view-login-details.html | 8 ++++++++ 13 files changed, 53 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/gcc_manpower/controller/HomeController.java b/src/main/java/com/gcc_manpower/controller/HomeController.java index ef917c7..ad4e435 100644 --- a/src/main/java/com/gcc_manpower/controller/HomeController.java +++ b/src/main/java/com/gcc_manpower/controller/HomeController.java @@ -83,10 +83,6 @@ public class HomeController { @GetMapping("/login") public String login(HttpSession session) { - // If already logged in, redirect to the home page - if (session.getAttribute("usrName") != null) { - return "redirect:/"; - } return "home/login"; } diff --git a/src/main/java/com/gcc_manpower/gccservicedocuments/controller/GccServiceDocumentsController.java b/src/main/java/com/gcc_manpower/gccservicedocuments/controller/GccServiceDocumentsController.java index c051ec8..5ddd71f 100644 --- a/src/main/java/com/gcc_manpower/gccservicedocuments/controller/GccServiceDocumentsController.java +++ b/src/main/java/com/gcc_manpower/gccservicedocuments/controller/GccServiceDocumentsController.java @@ -71,9 +71,6 @@ public class GccServiceDocumentsController { @GetMapping("/login") public String login(HttpSession session) { - if (session.getAttribute("doc_usrName") != null) { - return "redirect:/gccservicedocuments/view"; - } return "gccservicedocuments/login"; } @@ -320,7 +317,8 @@ public class GccServiceDocumentsController { fileWebUrl = "/gccservicedocuments/files/" + cleanCategory + "/" + savedFilename; } - boolean updated = documentService.updateDocument(id, title.trim(), mainCategory.trim(), subCategory.trim(), fileType.trim(), + boolean updated = documentService.updateDocument(id, title.trim(), mainCategory.trim(), subCategory.trim(), + fileType.trim(), fileWebUrl, originalFilename); if (updated) { diff --git a/src/main/java/com/gcc_manpower/gccservicepaymenttracker/controller/GccServicePaymentTrackerController.java b/src/main/java/com/gcc_manpower/gccservicepaymenttracker/controller/GccServicePaymentTrackerController.java index 0b315bd..fb23830 100644 --- a/src/main/java/com/gcc_manpower/gccservicepaymenttracker/controller/GccServicePaymentTrackerController.java +++ b/src/main/java/com/gcc_manpower/gccservicepaymenttracker/controller/GccServicePaymentTrackerController.java @@ -52,9 +52,6 @@ public class GccServicePaymentTrackerController { @GetMapping("/login") public String login(HttpSession session) { - if (session.getAttribute("pay_usrName") != null) { - return "redirect:/gccservicepaymenttracker/dashboard"; - } return "gccservicepaymenttracker/login"; } diff --git a/src/main/resources/application-local.properties b/src/main/resources/application-local.properties index 4b4cb62..6c15434 100644 --- a/src/main/resources/application-local.properties +++ b/src/main/resources/application-local.properties @@ -35,4 +35,7 @@ spring.thymeleaf.cache=false # Multipart File Upload Limits (supports large video files) spring.servlet.multipart.max-file-size=300MB -spring.servlet.multipart.max-request-size=300MB \ No newline at end of file +spring.servlet.multipart.max-request-size=300MB + +# Session tracking configuration +server.servlet.session.tracking-modes=cookie diff --git a/src/main/resources/application-prod.properties b/src/main/resources/application-prod.properties index 3b26bd1..d055431 100644 --- a/src/main/resources/application-prod.properties +++ b/src/main/resources/application-prod.properties @@ -46,3 +46,7 @@ spring.thymeleaf.cache=false # Multipart File Upload Limits (supports large video files) spring.servlet.multipart.max-file-size=300MB spring.servlet.multipart.max-request-size=300MB + +# Session tracking configuration +server.servlet.session.tracking-modes=cookie + diff --git a/src/main/resources/templates/gccservicedocuments/login.html b/src/main/resources/templates/gccservicedocuments/login.html index 6e503ac..75fc155 100644 --- a/src/main/resources/templates/gccservicedocuments/login.html +++ b/src/main/resources/templates/gccservicedocuments/login.html @@ -93,6 +93,7 @@ .then(response => response.json()) .then(data => { if (data.result) { + sessionStorage.setItem("doc_usrName", data.usrName); window.location.href = contextPath + 'gccservicedocuments/view'; } else { submitBtn.disabled = false; diff --git a/src/main/resources/templates/gccservicedocuments/upload.html b/src/main/resources/templates/gccservicedocuments/upload.html index 291e35e..8e5c7a2 100644 --- a/src/main/resources/templates/gccservicedocuments/upload.html +++ b/src/main/resources/templates/gccservicedocuments/upload.html @@ -2,6 +2,14 @@ + GCC Documents Upload Portal diff --git a/src/main/resources/templates/gccservicedocuments/view.html b/src/main/resources/templates/gccservicedocuments/view.html index 85070f7..4e7f0f4 100644 --- a/src/main/resources/templates/gccservicedocuments/view.html +++ b/src/main/resources/templates/gccservicedocuments/view.html @@ -2,6 +2,14 @@ + GCC Service Documents & Videos diff --git a/src/main/resources/templates/gccservicepaymenttracker/dashboard.html b/src/main/resources/templates/gccservicepaymenttracker/dashboard.html index 43c13c8..a97122f 100644 --- a/src/main/resources/templates/gccservicepaymenttracker/dashboard.html +++ b/src/main/resources/templates/gccservicepaymenttracker/dashboard.html @@ -2,6 +2,14 @@ + GCC Payment Tracker - Dashboard diff --git a/src/main/resources/templates/gccservicepaymenttracker/login.html b/src/main/resources/templates/gccservicepaymenttracker/login.html index 6a64a07..23473e8 100644 --- a/src/main/resources/templates/gccservicepaymenttracker/login.html +++ b/src/main/resources/templates/gccservicepaymenttracker/login.html @@ -93,6 +93,7 @@ .then(response => response.json()) .then(data => { if (data.result) { + sessionStorage.setItem("pay_usrName", data.usrName); window.location.href = contextPath + 'gccservicepaymenttracker/dashboard'; } else { submitBtn.disabled = false; diff --git a/src/main/resources/templates/home/home.html b/src/main/resources/templates/home/home.html index 387276e..2ef3b44 100644 --- a/src/main/resources/templates/home/home.html +++ b/src/main/resources/templates/home/home.html @@ -2,6 +2,14 @@ + GCC IT Cell Outsourced Manpower Details diff --git a/src/main/resources/templates/home/login.html b/src/main/resources/templates/home/login.html index 1bd21d8..a51687c 100644 --- a/src/main/resources/templates/home/login.html +++ b/src/main/resources/templates/home/login.html @@ -67,6 +67,7 @@ if (data.result) { let usrName = data.usrName && data.usrName.length > 0 ? data.usrName : null; if (usrName) { + sessionStorage.setItem("usrName", usrName); console.log("Redirecting to:", contextPath + 'redirect'); alert("Login Success"); window.location.href = contextPath + 'redirect'; diff --git a/src/main/resources/templates/home/view-login-details.html b/src/main/resources/templates/home/view-login-details.html index 5592bcb..a494ebb 100644 --- a/src/main/resources/templates/home/view-login-details.html +++ b/src/main/resources/templates/home/view-login-details.html @@ -2,6 +2,14 @@ + GCC IT Cell Outsourced Manpower Details