diff --git a/src/User/Framework/Security/LdapUserProvider.php b/src/User/Framework/Security/LdapUserProvider.php index a7937e5..ce435fa 100644 --- a/src/User/Framework/Security/LdapUserProvider.php +++ b/src/User/Framework/Security/LdapUserProvider.php @@ -43,7 +43,6 @@ class LdapUserProvider implements UserProviderInterface, PasswordUpgraderInterfa private string $usernameAttribute; private string $emailAttribute; private string $displayNameAttribute; - private RoleFetcherInterface $roleFetcher; public function __construct( private UserRepository $userRepository, @@ -65,7 +64,6 @@ class LdapUserProvider implements UserProviderInterface, PasswordUpgraderInterfa $this->uidKey = $uidKey; $this->defaultSearch = str_replace('{uid_key}', $uidKey, $filter); -// $this->roleFetcher = $defaultRoles; $this->usernameAttribute = $usernameAttribute; $this->emailAttribute = $emailAttribute; $this->displayNameAttribute = $displayNameAttribute; @@ -158,12 +156,6 @@ class LdapUserProvider implements UserProviderInterface, PasswordUpgraderInterfa $extraFields[$field] = $this->getAttributeValue($entry, $field); } - if (null !== $this->passwordAttribute) { - $password = $this->getAttributeValue($entry, $this->passwordAttribute); - } - -// $roles = $this->roleFetcher->fetchRoles($entry); - $dbUser = $this->getDbUser($identifier); if (null === $dbUser) { @@ -182,22 +174,6 @@ class LdapUserProvider implements UserProviderInterface, PasswordUpgraderInterfa return $dbUser; } -// protected function loadUser(string $identifier, Entry $entry): UserInterface -// { -// $password = null; -// $extraFields = []; -// -// if (null !== $this->passwordAttribute) { -// $password = $this->getAttributeValue($entry, $this->passwordAttribute); -// } -// -// foreach ($this->extraFields as $field) { -// $extraFields[$field] = $this->getAttributeValue($entry, $field); -// } -// -// return new LdapUser($entry, $identifier, $password, $this->defaultRoles, $extraFields); -// } - private function getDbUser(string $identifier): ?UserInterface { if (in_array($this->uidKey, ['mail', 'email'])) {