Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

nom et prénom depuis le LDAP à la connexion #228

Open
wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

nom et prénom depuis le LDAP à la connexion #228

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions ...main/java/org/esup_portail/esup_stage/security/userdetails/CasUserDetailsServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
import org.esup_portail.esup_stage.service.AppConfigService;
import org.esup_portail.esup_stage.service.ldap.LdapService;
import org.esup_portail.esup_stage.service.ldap.model.LdapUser;
import org.jasig.cas.client.authentication.AttributePrincipal;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.cas.authentication.CasAssertionAuthenticationToken;
import org.springframework.security.core.GrantedAuthority;
Expand All @@ -18,7 +17,10 @@
import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.security.core.userdetails.UsernameNotFoundException;

import java.util.*;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;

public class CasUserDetailsServiceImpl implements AuthenticationUserDetailsService<CasAssertionAuthenticationToken> {

Expand All @@ -45,11 +47,7 @@ public class CasUserDetailsServiceImpl implements AuthenticationUserDetailsServi

@Override
public UserDetails loadUserDetails(CasAssertionAuthenticationToken authentication) throws UsernameNotFoundException {
AttributePrincipal principal = authentication.getAssertion().getPrincipal();
String username = authentication.getName();
Map<String, Object> attributes = principal.getAttributes();
String nom = getStringValue(attributes.get("sn"));
String prenom = getStringValue(attributes.get("givenName"));

// Recherche de l'utilisateur
Utilisateur utilisateur = utilisateurJpaRepository.findOneByLogin(username);
Expand Down Expand Up @@ -78,8 +76,8 @@ public UserDetails loadUserDetails(CasAssertionAuthenticationToken authenticatio
}
utilisateur = new Utilisateur();
utilisateur.setLogin(username);
utilisateur.setNom(nom);
utilisateur.setPrenom(prenom);
utilisateur.setNom(String.join(" ", users.get(0).getSn()));
utilisateur.setPrenom(String.join(" ", users.get(0).getGivenName()));
utilisateur.setActif(true);
utilisateur.setRoles(roles);
utilisateur.setUid(users.get(0).getUid());
Expand All @@ -93,6 +91,8 @@ public UserDetails loadUserDetails(CasAssertionAuthenticationToken authenticatio
if (ldapUser == null) {
throw new UsernameNotFoundException("Utilisateur LDAP non trouvé à partir du login " + utilisateur.getLogin());
}
String nom = String.join(" ", ldapUser.getSn());
String prenom = String.join(" ", ldapUser.getGivenName());
// Si c'est un étudiant on lui créé une ligne dans la table Etudiant s'il n'existe pas
if (UtilisateurHelper.isRole(utilisateur, Role.ETU)) {
Etudiant etudiant = etudiantRepository.findByNumEtudiant(ldapUser.getCodEtu());
Expand Down