Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
G
Gestion des stages Backend
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Fatima Ezzahra Majidi
Gestion des stages Backend
Merge requests
!9
recuperation des id des utilisateurs connecté
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
recuperation des id des utilisateurs connecté
master
into
main
Overview
0
Commits
1
Pipelines
0
Changes
8
Merged
Fatima Ezzahra Majidi
requested to merge
master
into
main
2 months ago
Overview
0
Commits
1
Pipelines
0
Changes
8
Expand
0
0
Merge request reports
Compare
main
main (base)
and
latest version
latest version
d8dab518
1 commit,
2 months ago
8 files
+
97
−
64
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
8
Search (e.g. *.vue) (Ctrl+P)
src/main/java/com/example/gestionstagesbackend/controllers/AuthController.java
+
13
−
24
Options
@@ -13,6 +13,7 @@ import org.springframework.security.core.context.SecurityContextHolder;
import
org.springframework.web.bind.annotation.*
;
import
java.util.Collections
;
import
java.util.HashMap
;
import
java.util.Map
;
import
java.util.Optional
;
@@ -54,41 +55,29 @@ public class AuthController {
String
username
=
loginRequest
.
get
(
"username"
);
String
password
=
loginRequest
.
get
(
"password"
);
System
.
out
.
println
(
"🔍 Attempting login for: "
+
username
);
if
(
username
==
null
||
password
==
null
)
{
System
.
out
.
println
(
"❌ Username or password is missing in the request."
);
return
ResponseEntity
.
status
(
400
).
body
(
Map
.
of
(
"error"
,
"Username and password are required"
));
}
Optional
<
User
>
userOptional
=
userService
.
findByUsername
(
username
);
if
(
userOptional
.
isEmpty
())
{
System
.
out
.
println
(
"❌ User not found!"
);
return
ResponseEntity
.
status
(
401
).
body
(
Map
.
of
(
"error"
,
"Invalid credentials"
));
Optional
<
User
>
user
=
userService
.
findByUsername
(
username
);
if
(
user
.
isEmpty
())
{
return
ResponseEntity
.
status
(
401
).
body
(
"Invalid credentials"
);
}
User
user
=
userOptional
.
get
();
System
.
out
.
println
(
"✅ User found: "
+
username
);
try
{
Authentication
authentication
=
authenticationManager
.
authenticate
(
new
UsernamePasswordAuthenticationToken
(
username
,
password
)
);
// Update security context on successful authentication
SecurityContextHolder
.
getContext
().
setAuthentication
(
authentication
);
System
.
out
.
println
(
"✅ Login successful for user: "
+
username
);
// ✅ 🔥 Renvoie les rôles de l'utilisateur dans la réponse
return
ResponseEntity
.
ok
(
Map
.
of
(
"message"
,
"Login successful"
,
"username"
,
user
.
getUsername
(),
"roles"
,
user
.
getRoles
()
// Retourne les rôles ici
));
// ✅ Send username & familyname in the response
Map
<
String
,
Object
>
responseBody
=
new
HashMap
<>();
responseBody
.
put
(
"id"
,
user
.
get
().
getId
());
// 🔥 Ajoute l'ID ici
responseBody
.
put
(
"username"
,
user
.
get
().
getUsername
());
responseBody
.
put
(
"familyname"
,
user
.
get
().
getFamilyname
());
// Assure-toi que ce champ existe bien
responseBody
.
put
(
"roles"
,
user
.
get
().
getRoles
());
responseBody
.
put
(
"message"
,
"Login successful"
);
return
ResponseEntity
.
ok
(
responseBody
);
}
catch
(
Exception
e
)
{
System
.
out
.
println
(
"❌ Authentication failed for user "
+
username
+
": "
+
e
.
getMessage
());
return
ResponseEntity
.
status
(
401
).
body
(
Map
.
of
(
"error"
,
"Invalid username or password"
));
return
ResponseEntity
.
status
(
401
).
body
(
"Invalid username or password"
);
}
}
Loading