diff options
Diffstat (limited to 'src/main/java/com/blog/web/security')
3 files changed, 7 insertions, 12 deletions
diff --git a/src/main/java/com/blog/web/security/CustomUserDetailsService.java b/src/main/java/com/blog/web/security/CustomUserDetailsService.java index a7516f3..76c0ed8 100644 --- a/src/main/java/com/blog/web/security/CustomUserDetailsService.java +++ b/src/main/java/com/blog/web/security/CustomUserDetailsService.java @@ -21,12 +21,12 @@ public class CustomUserDetailsService implements UserDetailsService { @Override public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException { - UserEntity user = userRepository.findFirstByUsername(username); - if(user != null) { - User authUser = new User( - user.getEmail(), - user.getPassword(), - user.getRoles().stream().map((role) -> new SimpleGrantedAuthority(role.getName())) + UserEntity userEntity = userRepository.findFirstByUsername(username); + if(userEntity != null) { + final User authUser = new User( + userEntity.getEmail(), + userEntity.getPassword(), + userEntity.getRoles().stream().map((role) -> new SimpleGrantedAuthority(role.getName())) .collect(Collectors.toList()) ); return authUser; diff --git a/src/main/java/com/blog/web/security/SecurityConfig.java b/src/main/java/com/blog/web/security/SecurityConfig.java index 6b85bb3..b459224 100644 --- a/src/main/java/com/blog/web/security/SecurityConfig.java +++ b/src/main/java/com/blog/web/security/SecurityConfig.java @@ -9,7 +9,6 @@ import org.springframework.security.config.annotation.web.configuration.EnableWe import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.security.web.SecurityFilterChain; -import org.springframework.security.web.util.matcher.AntPathRequestMatcher; @Configuration @EnableWebSecurity diff --git a/src/main/java/com/blog/web/security/SecurityUtil.java b/src/main/java/com/blog/web/security/SecurityUtil.java index 6e8a5b0..ef0b3d9 100644 --- a/src/main/java/com/blog/web/security/SecurityUtil.java +++ b/src/main/java/com/blog/web/security/SecurityUtil.java @@ -7,10 +7,6 @@ import org.springframework.security.core.context.SecurityContextHolder; public class SecurityUtil { public static String getSessionUser() { Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); - if(!(authentication instanceof AnonymousAuthenticationToken)) { - String currentUsername = authentication.getName(); - return currentUsername; - } - return null; + return !(authentication instanceof AnonymousAuthenticationToken) ? authentication.getName() : null; } } |