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