From 8593af0ccc32e1ea57878f99505c912c793e96a7 Mon Sep 17 00:00:00 2001 From: Don Strawsburg Date: Fri, 30 Jan 2026 15:55:11 -0500 Subject: [PATCH] fix to users controller and added logging --- .gitignore | 3 +++ .../battlbuilder/config/SecurityConfig.java | 1 + .../api/v1/admin/AdminUsersController.java | 2 +- .../admin/controller/AdminUserController.java | 3 +++ src/main/resources/application.properties | 17 ++++++++++++++++- 5 files changed, 24 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 7bc4bf7..cb8ecad 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,6 @@ build/ ### VS Code ### .vscode/ + +### +/logs/ diff --git a/src/main/java/group/goforward/battlbuilder/config/SecurityConfig.java b/src/main/java/group/goforward/battlbuilder/config/SecurityConfig.java index 9e47b7c..de6ef0a 100644 --- a/src/main/java/group/goforward/battlbuilder/config/SecurityConfig.java +++ b/src/main/java/group/goforward/battlbuilder/config/SecurityConfig.java @@ -46,6 +46,7 @@ public class SecurityConfig { .requestMatchers("/swagger-ui/**", "/v3/api-docs/**").permitAll() .requestMatchers("/actuator/health", "/actuator/info").permitAll() .requestMatchers("/api/products/gunbuilder/**", "/api/v1/products/gunbuilder/**").permitAll() + .requestMatchers("/api/admin/users/**").permitAll() // Short links (public redirect) .requestMatchers(HttpMethod.GET, "/go/**").permitAll() diff --git a/src/main/java/group/goforward/battlbuilder/controllers/api/v1/admin/AdminUsersController.java b/src/main/java/group/goforward/battlbuilder/controllers/api/v1/admin/AdminUsersController.java index aa4bb47..3eb1aee 100644 --- a/src/main/java/group/goforward/battlbuilder/controllers/api/v1/admin/AdminUsersController.java +++ b/src/main/java/group/goforward/battlbuilder/controllers/api/v1/admin/AdminUsersController.java @@ -18,7 +18,7 @@ import java.time.OffsetDateTime; import java.util.List; @RestController -@RequestMapping({"/api/v1/admin/users"}) +@RequestMapping({"/api/v1/save/admin/users"}) @CrossOrigin public class AdminUsersController { diff --git a/src/main/java/group/goforward/battlbuilder/web/admin/controller/AdminUserController.java b/src/main/java/group/goforward/battlbuilder/web/admin/controller/AdminUserController.java index 2cd2999..11d519e 100644 --- a/src/main/java/group/goforward/battlbuilder/web/admin/controller/AdminUserController.java +++ b/src/main/java/group/goforward/battlbuilder/web/admin/controller/AdminUserController.java @@ -11,6 +11,8 @@ import org.springframework.web.bind.annotation.*; import java.util.List; import java.util.UUID; +import static org.testng.Reporter.log; + @RestController @RequestMapping({"/admin/users", "/api/v1/admin/users"}) @PreAuthorize("hasRole(" + Constants.ROLE_ADMIN + ")") @@ -24,6 +26,7 @@ public class AdminUserController { @GetMapping public List listUsers() { + log("AdminUserController: listUsers called"); return adminUserService.getAllUsersForAdmin(); } diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index ec4444b..d347b27 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -86,4 +86,19 @@ spring.jackson.serialization.fail-on-empty-beans=false # looking for a fix to the http & https CORS issue server.forward-headers-strategy=framework -org.springframework.security=DEBUG \ No newline at end of file + +#Logging +logging.file.name=logs/spring.log + +# General logging +logging.level.root=INFO + +# Web + Controller requests +logging.level.org.springframework.web=DEBUG + +# Spring Security (403 / 401 / auth issues) +logging.level.org.springframework.security=DEBUG + +# Tomcat + proxy headers +logging.level.org.apache.catalina=DEBUG +logging.level.org.springframework.boot.web.embedded.tomcat=DEBUG \ No newline at end of file