Skip to content
Snippets Groups Projects
Commit 3efb9c83 authored by OZGCloud's avatar OZGCloud
Browse files

OZG-5176 Use static variable instead of "ADMIN_ADMIN" litaral

parent be00ce10
Branches
Tags
No related merge requests found
...@@ -33,6 +33,7 @@ import org.springframework.security.oauth2.core.oidc.StandardClaimNames; ...@@ -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.oauth2.server.resource.authentication.JwtAuthenticationConverter;
import org.springframework.security.web.SecurityFilterChain; import org.springframework.security.web.SecurityFilterChain;
import de.ozgcloud.admin.common.user.UserRole;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
@Configuration @Configuration
...@@ -54,8 +55,8 @@ public class SecurityConfiguration { ...@@ -54,8 +55,8 @@ public class SecurityConfiguration {
http.authorizeHttpRequests(requests -> requests http.authorizeHttpRequests(requests -> requests
.requestMatchers(HttpMethod.GET, "/api/environment").permitAll() .requestMatchers(HttpMethod.GET, "/api/environment").permitAll()
.requestMatchers("/api/configuration/settings").hasRole("ADMIN_ADMIN") .requestMatchers("/api/configuration/settings").hasRole(UserRole.ADMIN_USER)
.requestMatchers("/api/configuration/settings/**").hasRole("ADMIN_ADMIN") .requestMatchers("/api/configuration/settings/**").hasRole(UserRole.ADMIN_USER)
.requestMatchers("/api").authenticated() .requestMatchers("/api").authenticated()
.requestMatchers("/api/**").authenticated() .requestMatchers("/api/**").authenticated()
.requestMatchers("/actuator").permitAll() .requestMatchers("/actuator").permitAll()
......
...@@ -37,6 +37,7 @@ import org.springframework.security.test.context.support.WithMockUser; ...@@ -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.MockMvc;
import org.springframework.test.web.servlet.ResultActions; import org.springframework.test.web.servlet.ResultActions;
import de.ozgcloud.admin.common.user.UserRole;
import de.ozgcloud.common.test.DataITCase; import de.ozgcloud.common.test.DataITCase;
import lombok.SneakyThrows; import lombok.SneakyThrows;
...@@ -177,7 +178,7 @@ class SecurityConfigurationITCase { ...@@ -177,7 +178,7 @@ class SecurityConfigurationITCase {
class TestWithAdminRole { class TestWithAdminRole {
@Test @Test
@SneakyThrows @SneakyThrows
@WithMockUser(roles = "ADMIN_ADMIN") @WithMockUser(roles = UserRole.ADMIN_USER)
void shouldAllow() { void shouldAllow() {
var result = mockMvc.perform(get("/api/configuration/settings")); var result = mockMvc.perform(get("/api/configuration/settings"));
......
...@@ -36,12 +36,13 @@ import org.springframework.security.test.context.support.WithMockUser; ...@@ -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.MockMvc;
import org.springframework.test.web.servlet.ResultActions; import org.springframework.test.web.servlet.ResultActions;
import de.ozgcloud.admin.common.user.UserRole;
import de.ozgcloud.common.test.DataITCase; import de.ozgcloud.common.test.DataITCase;
import lombok.SneakyThrows; import lombok.SneakyThrows;
@DataITCase @DataITCase
@AutoConfigureMockMvc @AutoConfigureMockMvc
@WithMockUser @WithMockUser(roles = UserRole.ADMIN_USER)
class SettingsITCase { class SettingsITCase {
@Autowired @Autowired
......
...@@ -24,6 +24,7 @@ import org.springframework.test.web.servlet.ResultActions; ...@@ -24,6 +24,7 @@ import org.springframework.test.web.servlet.ResultActions;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import de.ozgcloud.admin.common.user.UserRole;
import de.ozgcloud.admin.settings.Settings; import de.ozgcloud.admin.settings.Settings;
import de.ozgcloud.admin.settings.SettingsBody; import de.ozgcloud.admin.settings.SettingsBody;
import de.ozgcloud.admin.settings.SettingsConstants; import de.ozgcloud.admin.settings.SettingsConstants;
...@@ -33,7 +34,7 @@ import lombok.SneakyThrows; ...@@ -33,7 +34,7 @@ import lombok.SneakyThrows;
@DataITCase @DataITCase
@AutoConfigureMockMvc @AutoConfigureMockMvc
@WithMockUser @WithMockUser(roles = UserRole.ADMIN_USER)
class PostfachITCase { class PostfachITCase {
private static final String POSTFACH_NAME = "Postfach"; private static final String POSTFACH_NAME = "Postfach";
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment