smarthut/backend
2
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch '18-username-not-enable-can-login' into 'dev'

Browse source 
Resolve "Username not enable can login"

Closes #18

See merge request sa4-2020/the-sanmarinoes/backend!23
This commit is contained in:
Matteo Omenetti 2020-03-04 15:40:36 +01:00
commit bff433e954
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/AuthenticationController.java
View file

@ -55,9 +55,6 @@ public class AuthenticationController {
throw new UserNotFoundException();
}
System.out.println(user);
System.out.println(authenticationRequest);
authenticate(user.getUsername(), authenticationRequest.getPassword());
userDetails = userDetailsService.loadUserByUsername(user.getUsername());
} else {
@ -65,7 +62,9 @@ public class AuthenticationController {
authenticate(
authenticationRequest.getUsernameOrEmail(),
authenticationRequest.getPassword());
userDetails = userDetailsService.loadUserByUsername(authenticationRequest.getUsernameOrEmail());
userDetails =
userDetailsService.loadUserByUsername(
authenticationRequest.getUsernameOrEmail());
}
final String token = jwtTokenUtil.generateToken(userDetails);

2
src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/JWTUserDetailsService.java
View file

@ -15,7 +15,7 @@ public class JWTUserDetailsService implements UserDetailsService {
@Override
public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
User toReturn = repository.findByUsername(username);
if (toReturn != null) {
if (toReturn != null && toReturn.getEnabled()) {
return new org.springframework.security.core.userdetails.User(
toReturn.getUsername(), toReturn.getPassword(), Set.of());
} else {