diff --git a/src/main/java/group/goforward/battlbuilder/config/SecurityConfig.java b/src/main/java/group/goforward/battlbuilder/config/SecurityConfig.java index cb1a31f..9e47b7c 100644 --- a/src/main/java/group/goforward/battlbuilder/config/SecurityConfig.java +++ b/src/main/java/group/goforward/battlbuilder/config/SecurityConfig.java @@ -45,7 +45,7 @@ public class SecurityConfig { .requestMatchers("/api/auth/**").permitAll() .requestMatchers("/swagger-ui/**", "/v3/api-docs/**").permitAll() .requestMatchers("/actuator/health", "/actuator/info").permitAll() - .requestMatchers("/api/products/gunbuilder/**").permitAll() + .requestMatchers("/api/products/gunbuilder/**", "/api/v1/products/gunbuilder/**").permitAll() // Short links (public redirect) .requestMatchers(HttpMethod.GET, "/go/**").permitAll() @@ -85,7 +85,10 @@ public class SecurityConfig { "https://battl.builders", "http://bb-web-app:3001", "http://bb-web-app:3000", - "http://bb-web-app" + "http://bb-web-app", + "https//bb-web-app:3001", + "https//bb-web-app:3000", + "https//bb-web-app" )); // production frontend)); cfg.setAllowedMethods(List.of("GET", "POST", "PUT", "PATCH", "DELETE", "OPTIONS")); cfg.setAllowedHeaders(List.of("Authorization", "Content-Type")); diff --git a/src/main/java/group/goforward/battlbuilder/controllers/api/v1/admin/AdminPlatformController.java b/src/main/java/group/goforward/battlbuilder/controllers/api/v1/admin/AdminPlatformController.java index 7563900..b0de50b 100644 --- a/src/main/java/group/goforward/battlbuilder/controllers/api/v1/admin/AdminPlatformController.java +++ b/src/main/java/group/goforward/battlbuilder/controllers/api/v1/admin/AdminPlatformController.java @@ -12,7 +12,7 @@ import java.util.List; import org.springframework.web.server.ResponseStatusException; @RestController -@RequestMapping({"/api/platforms", "/api/v1/platforms"}) +@RequestMapping({"/api/platforms", "/api/v1/admin/platforms"}) @CrossOrigin public class AdminPlatformController { 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 new file mode 100644 index 0000000..aa4bb47 --- /dev/null +++ b/src/main/java/group/goforward/battlbuilder/controllers/api/v1/admin/AdminUsersController.java @@ -0,0 +1,38 @@ +package group.goforward.battlbuilder.controllers.api.v1.admin; + +import group.goforward.battlbuilder.mapper.BrandMapper; +import group.goforward.battlbuilder.model.Brand; +import group.goforward.battlbuilder.model.Platform; +import group.goforward.battlbuilder.model.User; +import group.goforward.battlbuilder.repos.PlatformRepository; +import group.goforward.battlbuilder.repos.UserRepository; +import group.goforward.battlbuilder.web.dto.admin.AdminUserDto; +import group.goforward.battlbuilder.web.dto.admin.PlatformDto; +import group.goforward.battlbuilder.web.dto.brand.BrandDto; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.server.ResponseStatusException; + +import java.time.OffsetDateTime; +import java.util.List; + +@RestController +@RequestMapping({"/api/v1/admin/users"}) +@CrossOrigin +public class AdminUsersController { + + private final UserRepository userRepository; + + public AdminUsersController(UserRepository userRepository) { + this.userRepository = userRepository; + } + + @GetMapping + public ResponseEntity> getAllUsers() { + List users = userRepository.findAll(); + return ResponseEntity.ok(users); + } + + +} \ No newline at end of file diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index af568ca..ec4444b 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -85,3 +85,5 @@ 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