refactor: code

Author: ThisAster

src/main/java/com/thisaster/testtask/auth/config/SecurityConfiguration.java

@@ -2,6 +2,7 @@
 
 import com.thisaster.testtask.auth.service.SecurityUserDetailsService;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.authentication.AuthenticationManager;
@@ -14,16 +15,20 @@
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
 import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer;
 import org.springframework.security.config.http.SessionCreationPolicy;
+import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.security.oauth2.jwt.JwtDecoder;
 import org.springframework.security.oauth2.server.resource.authentication.JwtAuthenticationConverter;
 import org.springframework.security.oauth2.server.resource.authentication.JwtGrantedAuthoritiesConverter;
 import org.springframework.security.web.SecurityFilterChain;
 
+import java.util.Collection;
+
 @Configuration
 @EnableWebSecurity
 @EnableMethodSecurity
 @RequiredArgsConstructor
+@Slf4j
 public class SecurityConfiguration {
 
     private final SecurityUserDetailsService userDetailsService;
@@ -36,7 +41,7 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti
         http
                 .csrf(AbstractHttpConfigurer::disable)
                 .authorizeHttpRequests(request -> request
-                        .requestMatchers("/api/auth/register").access(AuthorityAuthorizationManager.hasRole("SUPERVISOR"))
+                        .requestMatchers("/api/auth/register").access(AuthorityAuthorizationManager.hasAuthority("SUPERVISOR"))
                         .requestMatchers("/api", "/swagger-ui/**", "/v1/api-docs/**").permitAll()
                         .requestMatchers("/api/auth/login").permitAll()
                         .anyRequest().authenticated())
@@ -59,6 +64,11 @@ public JwtAuthenticationConverter jwtAuthenticationConverter() {
 
         JwtAuthenticationConverter jwtConverter = new JwtAuthenticationConverter();
         jwtConverter.setJwtGrantedAuthoritiesConverter(converter);
+        jwtConverter.setJwtGrantedAuthoritiesConverter(jwt -> {
+            Collection<GrantedAuthority> authorities = converter.convert(jwt);
+            log.info("Extracted roles from token: {}", authorities);
+            return authorities;
+        });
         return jwtConverter;
     }
 

src/main/java/com/thisaster/testtask/auth/config/UserPrincipal.java

@@ -24,9 +24,8 @@ public class UserPrincipal implements UserDetails {
 
     @Override
     public Collection<? extends GrantedAuthority> getAuthorities() {
-        return List.of(new SimpleGrantedAuthority("ROLE_" + user.getRole().getName().toUpperCase()));
+        return List.of(new SimpleGrantedAuthority(user.getRole().getName().toUpperCase()));
     }
-
     @Override
     public String getPassword() {
         return user.getPassword();

src/main/java/com/thisaster/testtask/auth/utils/JWTUtils.java

@@ -15,8 +15,8 @@
 @Component
 @RequiredArgsConstructor
 public class JWTUtils {
-    private final JwtEncoder jwtEncoder;
 
+    private final JwtEncoder jwtEncoder;
 
     public String generateToken(UserDetails userDetails) {
         Instant now = Instant.now();