11package org .baeldung .security ;
22
33import java .util .ArrayList ;
4- import java .util .Arrays ;
54import java .util .Collection ;
65import java .util .List ;
76
87import javax .servlet .http .HttpServletRequest ;
98
10- import org .baeldung .persistence .dao .RoleRepository ;
119import org .baeldung .persistence .dao .UserRepository ;
1210import org .baeldung .persistence .model .Privilege ;
1311import org .baeldung .persistence .model .Role ;
@@ -28,9 +26,6 @@ public class MyUserDetailsService implements UserDetailsService {
2826 @ Autowired
2927 private UserRepository userRepository ;
3028
31- @ Autowired
32- private RoleRepository roleRepository ;
33-
3429 @ Autowired
3530 private LoginAttemptService loginAttemptService ;
3631
@@ -53,7 +48,7 @@ public UserDetails loadUserByUsername(final String email) throws UsernameNotFoun
5348 try {
5449 final User user = userRepository .findByEmail (email );
5550 if (user == null ) {
56- return new org . springframework . security . core . userdetails . User ( " " , " " , true , true , true , true , getAuthorities ( Arrays . asList ( roleRepository . findByName ( "ROLE_USER" ))) );
51+ throw new UsernameNotFoundException ( "No user found with username: " + email );
5752 }
5853
5954 return new org .springframework .security .core .userdetails .User (user .getEmail (), user .getPassword (), user .isEnabled (), true , true , true , getAuthorities (user .getRoles ()));
@@ -90,8 +85,9 @@ private final List<GrantedAuthority> getGrantedAuthorities(final List<String> pr
9085
9186 private String getClientIP () {
9287 final String xfHeader = request .getHeader ("X-Forwarded-For" );
93- if (xfHeader == null )
88+ if (xfHeader == null ) {
9489 return request .getRemoteAddr ();
90+ }
9591 return xfHeader .split ("," )[0 ];
9692 }
9793}
0 commit comments