diff --git a/src/main/java/_11/asktpk/artisanconnectbackend/service/AuthService.java b/src/main/java/_11/asktpk/artisanconnectbackend/service/AuthService.java index 0457596..ce4891f 100644 --- a/src/main/java/_11/asktpk/artisanconnectbackend/service/AuthService.java +++ b/src/main/java/_11/asktpk/artisanconnectbackend/service/AuthService.java @@ -7,7 +7,6 @@ import _11.asktpk.artisanconnectbackend.dto.ClientDTO; import _11.asktpk.artisanconnectbackend.entities.Client; import _11.asktpk.artisanconnectbackend.security.JwtUtil; import org.springframework.http.*; -import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.stereotype.Service; import lombok.extern.slf4j.Slf4j; @@ -23,10 +22,10 @@ public class AuthService { private final PasswordEncoder passwordEncoder; private final JwtUtil jwtUtil; - public AuthService(ClientService clientService, JwtUtil jwtUtil) { + public AuthService(ClientService clientService, JwtUtil jwtUtil, PasswordEncoder passwordEncoder) { this.clientService = clientService; this.jwtUtil = jwtUtil; - this.passwordEncoder = new BCryptPasswordEncoder(); + this.passwordEncoder = passwordEncoder; } public AuthResponseDTO login(String email, String password) throws Exception { diff --git a/src/main/java/_11/asktpk/artisanconnectbackend/service/ClientService.java b/src/main/java/_11/asktpk/artisanconnectbackend/service/ClientService.java index 467ec4c..722ec6b 100644 --- a/src/main/java/_11/asktpk/artisanconnectbackend/service/ClientService.java +++ b/src/main/java/_11/asktpk/artisanconnectbackend/service/ClientService.java @@ -7,7 +7,6 @@ import _11.asktpk.artisanconnectbackend.entities.Role; import _11.asktpk.artisanconnectbackend.repository.ClientRepository; import _11.asktpk.artisanconnectbackend.repository.RolesRepository; import jakarta.persistence.EntityNotFoundException; -import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.stereotype.Service; import java.util.List; @@ -15,12 +14,10 @@ import java.util.List; @Service public class ClientService { private final ClientRepository clientRepository; - private final PasswordEncoder passwordEncoder; private final RolesRepository rolesRepository; - public ClientService(ClientRepository clientRepository, PasswordEncoder passwordEncoder, RolesRepository rolesRepository) { + public ClientService(ClientRepository clientRepository, RolesRepository rolesRepository) { this.clientRepository = clientRepository; - this.passwordEncoder = passwordEncoder; this.rolesRepository = rolesRepository; } @@ -126,7 +123,6 @@ public class ClientService { public ClientDTO registerClient(Client client) { client.setRole(getUserRole()); // ID 1 - USER role - client.setPassword(passwordEncoder.encode(client.getPassword())); return toDto(clientRepository.save(client)); } }