login endpoint refactored
This commit is contained in:
@@ -1,6 +1,5 @@
|
||||
package _11.asktpk.artisanconnectbackend.service;
|
||||
|
||||
import _11.asktpk.artisanconnectbackend.dto.AuthRequestDTO;
|
||||
import _11.asktpk.artisanconnectbackend.dto.ClientDTO;
|
||||
import _11.asktpk.artisanconnectbackend.dto.ClientRegistrationDTO;
|
||||
import _11.asktpk.artisanconnectbackend.entities.Client;
|
||||
@@ -86,6 +85,14 @@ public class ClientService {
|
||||
return toDto(clientRepository.findById(id).orElse(null));
|
||||
}
|
||||
|
||||
public Client getClientByEmail(String email) {
|
||||
return clientRepository.findByEmail(email);
|
||||
}
|
||||
|
||||
public Role getUserRole() {
|
||||
return rolesRepository.findRoleByRole("USER");
|
||||
}
|
||||
|
||||
public boolean clientExists(Long id) {
|
||||
return clientRepository.existsById(id);
|
||||
}
|
||||
@@ -117,29 +124,10 @@ public class ClientService {
|
||||
clientRepository.deleteById(id);
|
||||
}
|
||||
|
||||
// И замените метод checkClientCredentials на:
|
||||
public boolean checkClientCredentials(AuthRequestDTO dto) {
|
||||
Client cl = clientRepository.findByEmail(dto.getEmail());
|
||||
if (cl == null) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return passwordEncoder.matches(dto.getPassword(), cl.getPassword());
|
||||
}
|
||||
|
||||
// При создании нового пользователя не забудьте шифровать пароль:
|
||||
public ClientDTO registerClient(ClientRegistrationDTO clientDTO) {
|
||||
Client client = fromDto(clientDTO);
|
||||
client.setRole(rolesRepository.findRoleById(1L));
|
||||
client.setPassword(passwordEncoder.encode(client.getPassword()));
|
||||
return toDto(clientRepository.save(client));
|
||||
}
|
||||
|
||||
public Client getClientByEmail(String email) {
|
||||
return clientRepository.findByEmail(email);
|
||||
}
|
||||
|
||||
public Role getUserRole() {
|
||||
return rolesRepository.findRoleByRole("USER");
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user