This commit is contained in:
@@ -6,6 +6,7 @@ import org.springframework.security.crypto.password.PasswordEncoder;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
import ru.soune.no_copy.dto.LoginRequest;
|
||||
import ru.soune.no_copy.dto.RegRequest;
|
||||
import ru.soune.no_copy.dto.RegisterRequest;
|
||||
import ru.soune.no_copy.entity.AuthToken;
|
||||
import ru.soune.no_copy.entity.User;
|
||||
@@ -35,23 +36,43 @@ public class AuthService {
|
||||
|
||||
private final SecureRandom secureRandom = new SecureRandom();
|
||||
|
||||
// @Transactional
|
||||
// public AuthToken register(RegisterRequest registerRequest) {
|
||||
// User user = new User();
|
||||
// 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();
|
||||
// authToken.setToken(generateAuthToken());
|
||||
// authToken.setUser(savedUser);
|
||||
//
|
||||
// return authTokenRepository.save(authToken);
|
||||
// }
|
||||
|
||||
@Transactional
|
||||
public AuthToken register(RegisterRequest registerRequest) {
|
||||
if (userRepository.existsByEmail(registerRequest.email())) {
|
||||
throw new UserAlreadyExistsException("User already exists with email: " + registerRequest.email());
|
||||
}
|
||||
|
||||
public AuthToken register(RegRequest registerRequest) {
|
||||
User user = new User();
|
||||
user.setFullName(registerRequest.fullName());
|
||||
user.setEmail(registerRequest.email());
|
||||
user.setPassword(passwordEncoder.encode(registerRequest.password()));
|
||||
user.setFullName(registerRequest.getFullName());
|
||||
user.setEmail(registerRequest.getEmail());
|
||||
user.setPassword(passwordEncoder.encode(registerRequest.getPassword()));
|
||||
|
||||
if (registerRequest.companyName() != null) {
|
||||
user.setCompany(registerRequest.companyName());
|
||||
if (registerRequest.getCompanyName() != null) {
|
||||
user.setCompany(registerRequest.getCompanyName());
|
||||
}
|
||||
|
||||
if (registerRequest.phone() != null) {
|
||||
user.setPhone(registerRequest.phone());
|
||||
if (registerRequest.getPhone() != null) {
|
||||
user.setPhone(registerRequest.getPhone());
|
||||
}
|
||||
|
||||
User savedUser = userRepository.save(user);
|
||||
|
||||
Reference in New Issue
Block a user