fix: conflict solve
This commit is contained in:
parent
b4ec889080
commit
d9adb66800
@ -142,13 +142,6 @@ public class UserServiceImpl implements UserService {
|
|||||||
userRepository.deleteRefreshToken(id);
|
userRepository.deleteRefreshToken(id);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isEmailExist(String email) {
|
|
||||||
Optional<User> user = userRepository.findByEmail(email);
|
|
||||||
|
|
||||||
return user.isPresent();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void changeForgottenPassword(Long id, String newPassword) {
|
public void changeForgottenPassword(Long id, String newPassword) {
|
||||||
User user = userRepository.findById(id).orElse(null);
|
User user = userRepository.findById(id).orElse(null);
|
||||||
|
Loading…
Reference in New Issue
Block a user