From 0940fc5110f9919605fd736ad2cd62984234c3a6 Mon Sep 17 00:00:00 2001
From: Lukas Malte Monnerjahn <lukasmalte.monnerjahn@dataport.de>
Date: Tue, 27 Feb 2024 11:42:54 +0100
Subject: [PATCH] OZG-4717 OZG-5110 Rename environment endpoint
---
.../admin/environment/FrontendEnvironmentController.java | 4 ++--
.../de/ozgcloud/admin/security/SecurityConfiguration.java | 2 +-
.../ozgcloud/admin/security/SecurityConfigurationITCase.java | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/java/de/ozgcloud/admin/environment/FrontendEnvironmentController.java b/src/main/java/de/ozgcloud/admin/environment/FrontendEnvironmentController.java
index 7f58244e..41d9e4db 100644
--- a/src/main/java/de/ozgcloud/admin/environment/FrontendEnvironmentController.java
+++ b/src/main/java/de/ozgcloud/admin/environment/FrontendEnvironmentController.java
@@ -9,12 +9,12 @@ import org.springframework.web.bind.annotation.RestController;
import de.ozgcloud.admin.RootController;
import lombok.RequiredArgsConstructor;
-@RestController
+@RestController("ozgCloudEnvironmentController")
@RequiredArgsConstructor
@RequestMapping(FrontendEnvironmentController.PATH)
public class FrontendEnvironmentController {
- static final String PATH = "/api/frontendEnvironment"; // NOSONAR
+ static final String PATH = "/api/environment"; // NOSONAR
private final ProductionProperties environmentProperties;
diff --git a/src/main/java/de/ozgcloud/admin/security/SecurityConfiguration.java b/src/main/java/de/ozgcloud/admin/security/SecurityConfiguration.java
index 03de09a7..568d79a7 100644
--- a/src/main/java/de/ozgcloud/admin/security/SecurityConfiguration.java
+++ b/src/main/java/de/ozgcloud/admin/security/SecurityConfiguration.java
@@ -53,7 +53,7 @@ public class SecurityConfiguration {
http.exceptionHandling(eh -> eh.authenticationEntryPoint(authenticationEntryPoint));
http.authorizeHttpRequests(requests -> requests
- .requestMatchers(HttpMethod.GET, "/api/frontendEnvironment").permitAll()
+ .requestMatchers(HttpMethod.GET, "/api/environment").permitAll()
.requestMatchers("/api").authenticated()
.requestMatchers("/api/**").authenticated()
.requestMatchers("/actuator").permitAll()
diff --git a/src/test/java/de/ozgcloud/admin/security/SecurityConfigurationITCase.java b/src/test/java/de/ozgcloud/admin/security/SecurityConfigurationITCase.java
index d4f087b4..653c7b68 100644
--- a/src/test/java/de/ozgcloud/admin/security/SecurityConfigurationITCase.java
+++ b/src/test/java/de/ozgcloud/admin/security/SecurityConfigurationITCase.java
@@ -67,7 +67,7 @@ class SecurityConfigurationITCase {
@SneakyThrows
@ParameterizedTest
@ValueSource(strings = {
- "/api/frontendEnvironment",
+ "/api/environment",
"/configserver/name/profile"
})
void shouldAllow(String path) {
@@ -145,7 +145,7 @@ class SecurityConfigurationITCase {
@SneakyThrows
@ParameterizedTest
@ValueSource(strings = {
- "/api/frontendEnvironment",
+ "/api/environment",
"/configserver/name/profile",
"/api", "/api/configuration", "/api/configuration/param",
})
--
GitLab