Merge pull request 'develop' (#255) from develop into main
All checks were successful
CD - Deploy on main / deploy (push) Successful in 58s
All checks were successful
CD - Deploy on main / deploy (push) Successful in 58s
Reviewed-on: #255
This commit was merged in pull request #255.
This commit is contained in:
@@ -89,7 +89,7 @@ public class UserServiceImpl implements UserService {
|
||||
user.setTokenDate(LocalDateTime.now());
|
||||
String token= stringService.getUniqueString();
|
||||
user.setToken(token);
|
||||
userRepository.save(user);
|
||||
user=userRepository.save(user);
|
||||
|
||||
|
||||
|
||||
@@ -98,7 +98,7 @@ public class UserServiceImpl implements UserService {
|
||||
user.getUsername(),
|
||||
reseturl + token);
|
||||
|
||||
return userRepository.findUserToDtoById(userPaylaodWeb.getId()).orElse(null);
|
||||
return userRepository.findUserToDtoById(user.getId()).orElse(null);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
Reference in New Issue
Block a user