Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
Rubén Ramírez
/
MangAffinity
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
6a267025
authored
Feb 22, 2025
by
Rubén Ramírez
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
fix: [ServicioUsuario]:
Corregidas erratas
parent
d5bf03e2
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
15 deletions
src/main/java/com/ujaen/tfg/mangaffinity/servicios/ServicioUsuarios.java
src/main/java/com/ujaen/tfg/mangaffinity/servicios/ServicioUsuarios.java
View file @
6a267025
...
...
@@ -6,7 +6,6 @@ import com.ujaen.tfg.mangaffinity.repositorios.RepositorioUsuario;
import
com.ujaen.tfg.mangaffinity.rest.DTO.DTOLoginRespuesta
;
import
com.ujaen.tfg.mangaffinity.rest.DTO.DTOUsuario
;
import
com.ujaen.tfg.mangaffinity.seguridad.JwtUtil
;
import
jakarta.annotation.PostConstruct
;
import
jakarta.validation.Valid
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
...
...
@@ -35,10 +34,6 @@ public class ServicioUsuarios {
this
.
admin
.
setEmail
(
"admin@example.com"
);
this
.
admin
.
setNombreUsuario
(
"admin"
);
}
@PostConstruct
public
void
initAdmin
()
{
admin
.
setContrasenia
(
passwordEncoder
.
encode
(
"adminpassword"
));
}
/**
* Función para crear un Socio en la estructura
...
...
@@ -46,14 +41,6 @@ public class ServicioUsuarios {
*/
public
void
crearUsuario
(
@Valid
Usuario
usuario
)
{
usuario
.
setContrasenia
(
passwordEncoder
.
encode
(
usuario
.
getContrasenia
()));
// Si el email es del admin, asignarle el rol ADMIN
if
(
usuario
.
getEmail
().
equalsIgnoreCase
(
"admin@example.com"
))
{
usuario
.
setRol
(
"ADMIN"
);
}
else
{
usuario
.
setRol
(
"USUARIO_REGISTRADO"
);
}
repositorioUsuario
.
guardar
(
usuario
);
}
...
...
@@ -72,9 +59,14 @@ public class ServicioUsuarios {
if
(!
passwordEncoder
.
matches
(
contrasenia
,
usuario
.
get
().
getContrasenia
()))
{
return
null
;
}
String
rol
=
"USUARIO_REGISTRADO"
;
// Recuperamos el rol del usuario desde la base de datos
String
rol
=
usuario
.
get
().
getRol
();
if
(
email
.
equals
(
admin
.
getEmail
()))
{
if
(!
passwordEncoder
.
matches
(
contrasenia
,
passwordEncoder
.
encode
(
"adminpassword"
)))
{
return
null
;
}
rol
=
"ADMIN"
;
}
// Datos adicionales en el token (claims)
Map
<
String
,
Object
>
claims
=
new
HashMap
<>();
...
...
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