Skip to content

Added uid field #155

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

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

Added uid field #155

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions DependencyInjection/Configuration.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,8 @@ private function addRoleNode()
->scalarNode('user_attribute')->defaultValue('member')->end()
->scalarNode('user_id')->defaultValue('dn')
->validate()
->ifNotInArray(array('dn', 'username'))
->thenInvalid('Only dn or username')
->ifNotInArray(array('dn', 'username', 'uid'))
->thenInvalid('Only dn, username or uid')
->end()
->end()
->end()
Expand Down
8 changes: 6 additions & 2 deletions Manager/LdapManagerUser.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,14 @@ public function auth()
if (strlen($this->password) === 0) {
throw new ConnectionException('Password can\'t be empty');
}

if (null === $this->ldapUser) {
$this->bindByUsername();
$this->doPass();
} else {
$this->doPass();
$this->bindByDn();
}
}
}

/**
Expand Down Expand Up @@ -276,6 +276,10 @@ private function getUserId()
return $this->username;
break;

case 'uid':
return $this->username;
break;

default:
throw new \Exception(sprintf("The value can't be retrieved for this user_id : %s",$this->params['role']['user_id']));
}
Expand Down