Modificaciones para funcionamiento de seguridad

parent 0d0a5381
......@@ -75,11 +75,6 @@
<version>3.10.8</version>
</dependency>
<dependency>
<groupId>org.hibernate.javax.persistence</groupId>
<artifactId>hibernate-jpa-2.0-api</artifactId>
<version>1.0.1.Final</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
......
......@@ -127,6 +127,20 @@ public class ServicioCarPooling {
}
@Transactional
public Optional<Usuario> login(@NotBlank String dni,@NotBlank String password) {
Optional<Usuario> usuarioLogin = repositorioUsuario.buscar(dni);
if (usuarioLogin.isPresent()) {
Usuario usuario = usuarioLogin.get();
BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder();
// Verificar la contraseña
if (passwordEncoder.matches(password, usuario.getClaveAcceso())) {
return usuarioLogin; // La contraseña es correcta
}
}
return usuarioLogin;
}
@Transactional
public Optional<Viaje> verViaje(@NotBlank int id) {
Optional<Viaje> viaje = repositorioViajes.buscar(id);
return viaje;
......
......@@ -23,8 +23,6 @@ import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.ActiveProfiles;
import java.util.*;
@SpringBootTest(classes = com.carpooling.carpoolingaoraha.CarPoolingAorAhaApplication.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
@ActiveProfiles(profiles = {"test"})
public class ControladorRESTTEST {
......@@ -39,7 +37,7 @@ public class ControladorRESTTEST {
void crearRestTemplate() {
RestTemplateBuilder restTemplateBuilder = new RestTemplateBuilder()
.rootUri("http://localhost:" + localPort + "/carpooling")
.additionalMessageConverters(List.of(springBoot));
.additionalMessageConverters(List.of(springBootJacksonConverter));
restTemplate = new TestRestTemplate(restTemplateBuilder);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment