small change

Real-Dev-Squad · Mar 3, 2024 · 5acb634 · 5acb634
1 parent 222919c
commit 5acb634
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/skill-tree/src/main/java/com/RDS/skilltree/Config/SecurityConfig.java b/skill-tree/src/main/java/com/RDS/skilltree/Config/SecurityConfig.java
@@ -29,7 +29,6 @@ public class SecurityConfig {
 
     private final AuthEntryPoint authEntryPoint;
     private final CustomAccessDeniedHandler accessDeniedHandler;
-    private final String[] roles = Arrays.stream(UserRole.values()).map(role -> role.label).toArray(String[]::new);
 
 
     public SecurityConfig(AuthEntryPoint authEntryPoint, CustomAccessDeniedHandler accessDeniedHandler) {
@@ -43,11 +42,11 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
                 .cors(httpSecurityCorsConfigurer -> httpSecurityCorsConfigurer.configurationSource(corsConfigurationSource()))
                 .authorizeHttpRequests(auth -> auth
                         .requestMatchers("/v1/endorsements/status").hasAuthority(UserRole.SUPERUSER.label)
-                        .requestMatchers("/v1/endorsements/**").hasAnyAuthority(roles)
+                        .requestMatchers("/v1/**").hasAnyAuthority(UserRole.getAllRoles())
                         .anyRequest().authenticated())
                 .exceptionHandling(ex -> ex.accessDeniedHandler(this.accessDeniedHandler).authenticationEntryPoint(this.authEntryPoint))
                 .sessionManagement(session -> session.sessionCreationPolicy(SessionCreationPolicy.STATELESS));
-//        http.oauth2ResourceServer(OAuth2ResourceServerConfigurer::jwt)
+
         http.addFilterBefore(jwtAuthenticationFilter(), UsernamePasswordAuthenticationFilter.class);
         return http.build();
     }

diff --git a/skill-tree/src/main/java/com/RDS/skilltree/User/UserRole.java b/skill-tree/src/main/java/com/RDS/skilltree/User/UserRole.java
@@ -2,6 +2,7 @@
 
 import org.springframework.security.core.GrantedAuthority;
 
+import java.util.Arrays;
 import java.util.Collection;
 
 public enum UserRole  {
@@ -22,5 +23,8 @@ public static UserRole fromString(String text) {
         }
         return null;
     }
+    public static String[] getAllRoles(){
+        return  Arrays.stream(UserRole.values()).map(role -> role.label).toArray(String[]::new);
+    }
 
 }