From 3efb9c83dfa888e0e8a7af5bae654876ab5ba16a Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Thu, 21 Mar 2024 14:52:36 +0100
Subject: [PATCH] OZG-5176 Use static variable instead of "ADMIN_ADMIN" litaral
---
.../de/ozgcloud/admin/security/SecurityConfiguration.java | 5 +++--
.../ozgcloud/admin/security/SecurityConfigurationITCase.java | 3 ++-
src/test/java/de/ozgcloud/admin/settings/SettingsITCase.java | 3 ++-
.../de/ozgcloud/admin/settings/postfach/PostfachITCase.java | 3 ++-
4 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/main/java/de/ozgcloud/admin/security/SecurityConfiguration.java b/src/main/java/de/ozgcloud/admin/security/SecurityConfiguration.java
index 7f556832..cacf2095 100644
--- a/src/main/java/de/ozgcloud/admin/security/SecurityConfiguration.java
+++ b/src/main/java/de/ozgcloud/admin/security/SecurityConfiguration.java
@@ -33,6 +33,7 @@ import org.springframework.security.oauth2.core.oidc.StandardClaimNames;
import org.springframework.security.oauth2.server.resource.authentication.JwtAuthenticationConverter;
import org.springframework.security.web.SecurityFilterChain;
+import de.ozgcloud.admin.common.user.UserRole;
import lombok.RequiredArgsConstructor;
@Configuration
@@ -54,8 +55,8 @@ public class SecurityConfiguration {
http.authorizeHttpRequests(requests -> requests
.requestMatchers(HttpMethod.GET, "/api/environment").permitAll()
- .requestMatchers("/api/configuration/settings").hasRole("ADMIN_ADMIN")
- .requestMatchers("/api/configuration/settings/**").hasRole("ADMIN_ADMIN")
+ .requestMatchers("/api/configuration/settings").hasRole(UserRole.ADMIN_USER)
+ .requestMatchers("/api/configuration/settings/**").hasRole(UserRole.ADMIN_USER)
.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 e9fb3386..c20d573b 100644
--- a/src/test/java/de/ozgcloud/admin/security/SecurityConfigurationITCase.java
+++ b/src/test/java/de/ozgcloud/admin/security/SecurityConfigurationITCase.java
@@ -37,6 +37,7 @@ import org.springframework.security.test.context.support.WithMockUser;
import org.springframework.test.web.servlet.MockMvc;
import org.springframework.test.web.servlet.ResultActions;
+import de.ozgcloud.admin.common.user.UserRole;
import de.ozgcloud.common.test.DataITCase;
import lombok.SneakyThrows;
@@ -177,7 +178,7 @@ class SecurityConfigurationITCase {
class TestWithAdminRole {
@Test
@SneakyThrows
- @WithMockUser(roles = "ADMIN_ADMIN")
+ @WithMockUser(roles = UserRole.ADMIN_USER)
void shouldAllow() {
var result = mockMvc.perform(get("/api/configuration/settings"));
diff --git a/src/test/java/de/ozgcloud/admin/settings/SettingsITCase.java b/src/test/java/de/ozgcloud/admin/settings/SettingsITCase.java
index 8b21102c..b91713a8 100644
--- a/src/test/java/de/ozgcloud/admin/settings/SettingsITCase.java
+++ b/src/test/java/de/ozgcloud/admin/settings/SettingsITCase.java
@@ -36,12 +36,13 @@ import org.springframework.security.test.context.support.WithMockUser;
import org.springframework.test.web.servlet.MockMvc;
import org.springframework.test.web.servlet.ResultActions;
+import de.ozgcloud.admin.common.user.UserRole;
import de.ozgcloud.common.test.DataITCase;
import lombok.SneakyThrows;
@DataITCase
@AutoConfigureMockMvc
-@WithMockUser
+@WithMockUser(roles = UserRole.ADMIN_USER)
class SettingsITCase {
@Autowired
diff --git a/src/test/java/de/ozgcloud/admin/settings/postfach/PostfachITCase.java b/src/test/java/de/ozgcloud/admin/settings/postfach/PostfachITCase.java
index a00766ee..657c9c50 100644
--- a/src/test/java/de/ozgcloud/admin/settings/postfach/PostfachITCase.java
+++ b/src/test/java/de/ozgcloud/admin/settings/postfach/PostfachITCase.java
@@ -24,6 +24,7 @@ import org.springframework.test.web.servlet.ResultActions;
import com.fasterxml.jackson.databind.ObjectMapper;
+import de.ozgcloud.admin.common.user.UserRole;
import de.ozgcloud.admin.settings.Settings;
import de.ozgcloud.admin.settings.SettingsBody;
import de.ozgcloud.admin.settings.SettingsConstants;
@@ -33,7 +34,7 @@ import lombok.SneakyThrows;
@DataITCase
@AutoConfigureMockMvc
-@WithMockUser
+@WithMockUser(roles = UserRole.ADMIN_USER)
class PostfachITCase {
private static final String POSTFACH_NAME = "Postfach";
--
GitLab