NCP-3 add exception,add change password logic, fix checkauthtoken
This commit is contained in:
@@ -16,6 +16,7 @@ import ru.soune.no_copy.repository.AuthTokenRepository;
|
||||
import ru.soune.no_copy.repository.UserRepository;
|
||||
|
||||
import java.security.SecureRandom;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.Base64;
|
||||
import java.util.Locale;
|
||||
import java.util.Optional;
|
||||
@@ -42,12 +43,18 @@ public class AuthService {
|
||||
}
|
||||
|
||||
User user = new User();
|
||||
user.setFirstName(registerRequest.firstName());
|
||||
user.setSecondName(registerRequest.secondName());
|
||||
user.setLastName(registerRequest.lastName());
|
||||
user.setFullName(registerRequest.fullName());
|
||||
user.setEmail(registerRequest.email());
|
||||
user.setPassword(passwordEncoder.encode(registerRequest.password()));
|
||||
|
||||
if (registerRequest.companyName() != null) {
|
||||
user.setCompany(registerRequest.companyName());
|
||||
}
|
||||
|
||||
if (registerRequest.phone() != null) {
|
||||
user.setPhone(registerRequest.phone());
|
||||
}
|
||||
|
||||
User savedUser = userRepository.save(user);
|
||||
|
||||
AuthToken authToken = new AuthToken();
|
||||
@@ -71,13 +78,17 @@ public class AuthService {
|
||||
throw new NotValidationPasswordException("Invalid password");
|
||||
}
|
||||
|
||||
user.setLastLoginAt(LocalDateTime.now());
|
||||
User savedUser = userRepository.save(user);
|
||||
|
||||
AuthToken authToken = new AuthToken();
|
||||
authToken.setToken(generateAuthToken());
|
||||
authToken.setUser(user);
|
||||
authToken.setUser(savedUser);
|
||||
|
||||
return authTokenRepository.save(authToken);
|
||||
}
|
||||
|
||||
@Transactional
|
||||
public void logout(String token) {
|
||||
authTokenRepository.findByToken(token)
|
||||
.ifPresent(authTokenRepository::delete);
|
||||
|
||||
Reference in New Issue
Block a user