Skip to content
Snippets Groups Projects
Commit 9db07a71 authored by David Surville's avatar David Surville
Browse files

Arrêt de l'utilisation de la fonction deprecated ModuleOptions::getLdapUsername()

parent d88c4df1
No related branches found
No related tags found
No related merge requests found
Pipeline #38208 passed
...@@ -127,7 +127,7 @@ class Cas extends AbstractAdapter ...@@ -127,7 +127,7 @@ class Cas extends AbstractAdapter
->setMessages(['Authentication successful.']); ->setMessages(['Authentication successful.']);
// recherche de l'individu dans l'annuaire LDAP (il existe forcément puisque l'auth CAS a réussi) // recherche de l'individu dans l'annuaire LDAP (il existe forcément puisque l'auth CAS a réussi)
$usernameAttribute = $this->getModuleOptions()->getLdapUsername(); $usernameAttribute = $this->getModuleOptions()->getLdap()['username'];
switch ($usernameAttribute) { switch ($usernameAttribute) {
case 'uid': case 'uid':
$ldapPeople = $this->getLdapPeopleMapper()->findOneByUid($identity->getUsername()); $ldapPeople = $this->getLdapPeopleMapper()->findOneByUid($identity->getUsername());
......
...@@ -129,7 +129,7 @@ class Ldap extends AbstractAdapter implements EventManagerAwareInterface ...@@ -129,7 +129,7 @@ class Ldap extends AbstractAdapter implements EventManagerAwareInterface
} }
// recherche de l'individu dans l'annuaire LDAP // recherche de l'individu dans l'annuaire LDAP
$usernameAttribute = $this->getModuleOptions()->getLdapUsername(); $usernameAttribute = $this->getModuleOptions()->getLdap()['username'];
switch($usernameAttribute) { switch($usernameAttribute) {
case 'uid': case 'uid':
$ldapPeople = $this->getLdapPeopleMapper()->findOneByUid($this->usernameUsurpe ?: $username); $ldapPeople = $this->getLdapPeopleMapper()->findOneByUid($this->usernameUsurpe ?: $username);
......
...@@ -58,7 +58,7 @@ class Ldap extends AbstractStorage ...@@ -58,7 +58,7 @@ class Ldap extends AbstractStorage
$sessionIdentity = $this->storage->read(); $sessionIdentity = $this->storage->read();
$username = $sessionIdentity->getUsername(); $username = $sessionIdentity->getUsername();
$usernameAttribute = $this->getModuleOptions()->getLdapUsername(); $usernameAttribute = $this->getModuleOptions()->getLdap()['username'];
switch($usernameAttribute) { switch($usernameAttribute) {
case 'uid': case 'uid':
$identity = $this->getMapper()->findOneByUid($username); $identity = $this->getMapper()->findOneByUid($username);
......
...@@ -82,7 +82,7 @@ class CasService ...@@ -82,7 +82,7 @@ class CasService
error_reporting($oldErrorReporting); error_reporting($oldErrorReporting);
// recherche de l'individu dans l'annuaire LDAP (il existe forcément puisque l'auth CAS a réussi) // recherche de l'individu dans l'annuaire LDAP (il existe forcément puisque l'auth CAS a réussi)
$usernameAttribute = $this->getOptions()->getLdapUsername(); $usernameAttribute = $this->getOptions()->getLdap()['username'];
switch($usernameAttribute) { switch($usernameAttribute) {
case 'uid': case 'uid':
$ldapPeople = $this->getLdapPeopleMapper()->findOneByUid($identity); $ldapPeople = $this->getLdapPeopleMapper()->findOneByUid($identity);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment