| @@ -108,16 +108,17 @@ public class JwtAuthenticationController { | |||||
| } | } | ||||
| private ResponseEntity<?> createAuthTokenResponse(JwtRequest authenticationRequest) { | private ResponseEntity<?> createAuthTokenResponse(JwtRequest authenticationRequest) { | ||||
| final UserDetails userDetails = userDetailsService.loadUserByUsername(authenticationRequest.getUsername()); | |||||
| if (userDetails == null) { | |||||
| // final UserDetails userDetails = userDetailsService.loadUserByUsername(authenticationRequest.getUsername()); | |||||
| final User user = userDetailsService.loadUserByUsername(authenticationRequest.getUsername()); | |||||
| if (user == null) { | |||||
| return ResponseEntity.status(HttpStatus.UNAUTHORIZED) | return ResponseEntity.status(HttpStatus.UNAUTHORIZED) | ||||
| .body(new ExceptionResponse(authenticationRequest.getUsername() + " not yet register in the system.", null)); | .body(new ExceptionResponse(authenticationRequest.getUsername() + " not yet register in the system.", null)); | ||||
| } | } | ||||
| final String accessToken = jwtTokenUtil.generateToken(userDetails); | |||||
| final String refreshToken = jwtTokenUtil.createRefreshToken(userDetails.getUsername()).getToken(); | |||||
| final String accessToken = jwtTokenUtil.generateToken(user); | |||||
| final String refreshToken = jwtTokenUtil.createRefreshToken(user.getUsername()).getToken(); | |||||
| User user = userRepository.findByName(authenticationRequest.getUsername()).get(0); | |||||
| // User user = userRepository.findByName(authenticationRequest.getUsername()).get(0); | |||||
| List<String> abilities = new ArrayList<>(); | List<String> abilities = new ArrayList<>(); | ||||
| final Set<SimpleGrantedAuthority> userAuthority = userAuthorityService.getUserAuthority(user); | final Set<SimpleGrantedAuthority> userAuthority = userAuthorityService.getUserAuthority(user); | ||||