Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
Alvaro Ordóñez Romero
/
DAE-aha00026-aor00039
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
960cfc8f
authored
Dec 19, 2023
by
Alvaro Ordóñez Romero
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
Modificaciones para funcionamiento de seguridad
parent
0d0a5381
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
8 deletions
pom.xml
src/main/java/com/carpooling/carpoolingaoraha/services/ServicioCarPooling.java
src/test/java/com/carpooling/carpoolingaoraha/ControladorRESTEST/ControladorRESTTEST.java
pom.xml
View file @
960cfc8f
...
@@ -75,11 +75,6 @@
...
@@ -75,11 +75,6 @@
<version>
3.10.8
</version>
<version>
3.10.8
</version>
</dependency>
</dependency>
<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>
<groupId>
org.springframework.boot
</groupId>
<artifactId>
spring-boot-starter-web
</artifactId>
<artifactId>
spring-boot-starter-web
</artifactId>
</dependency>
</dependency>
...
...
src/main/java/com/carpooling/carpoolingaoraha/services/ServicioCarPooling.java
View file @
960cfc8f
...
@@ -127,6 +127,20 @@ public class ServicioCarPooling {
...
@@ -127,6 +127,20 @@ public class ServicioCarPooling {
}
}
@Transactional
@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
)
{
public
Optional
<
Viaje
>
verViaje
(
@NotBlank
int
id
)
{
Optional
<
Viaje
>
viaje
=
repositorioViajes
.
buscar
(
id
);
Optional
<
Viaje
>
viaje
=
repositorioViajes
.
buscar
(
id
);
return
viaje
;
return
viaje
;
...
...
src/test/java/com/carpooling/carpoolingaoraha/ControladorRESTEST/ControladorRESTTEST.java
View file @
960cfc8f
...
@@ -23,8 +23,6 @@ import org.springframework.test.annotation.DirtiesContext;
...
@@ -23,8 +23,6 @@ import org.springframework.test.annotation.DirtiesContext;
import
org.springframework.test.context.ActiveProfiles
;
import
org.springframework.test.context.ActiveProfiles
;
import
java.util.*
;
import
java.util.*
;
@SpringBootTest
(
classes
=
com
.
carpooling
.
carpoolingaoraha
.
CarPoolingAorAhaApplication
.
class
,
webEnvironment
=
SpringBootTest
.
WebEnvironment
.
RANDOM_PORT
)
@SpringBootTest
(
classes
=
com
.
carpooling
.
carpoolingaoraha
.
CarPoolingAorAhaApplication
.
class
,
webEnvironment
=
SpringBootTest
.
WebEnvironment
.
RANDOM_PORT
)
@ActiveProfiles
(
profiles
=
{
"test"
})
@ActiveProfiles
(
profiles
=
{
"test"
})
public
class
ControladorRESTTEST
{
public
class
ControladorRESTTEST
{
...
@@ -39,7 +37,7 @@ public class ControladorRESTTEST {
...
@@ -39,7 +37,7 @@ public class ControladorRESTTEST {
void
crearRestTemplate
()
{
void
crearRestTemplate
()
{
RestTemplateBuilder
restTemplateBuilder
=
new
RestTemplateBuilder
()
RestTemplateBuilder
restTemplateBuilder
=
new
RestTemplateBuilder
()
.
rootUri
(
"http://localhost:"
+
localPort
+
"/carpooling"
)
.
rootUri
(
"http://localhost:"
+
localPort
+
"/carpooling"
)
.
additionalMessageConverters
(
List
.
of
(
springBoot
));
.
additionalMessageConverters
(
List
.
of
(
springBoot
JacksonConverter
));
restTemplate
=
new
TestRestTemplate
(
restTemplateBuilder
);
restTemplate
=
new
TestRestTemplate
(
restTemplateBuilder
);
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment