Merge pull request #7 from DerManoMann/default_roles

Allow to set default roles on authenticated user
DerManoMann · Jan 27, 2016 · 62c94d3 · 62c94d3
2 parents d160796 + 71acecd
commit 62c94d3
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/Security/Core/Authentication/Provider/LdapAuthenticationProvider.php b/src/Security/Core/Authentication/Provider/LdapAuthenticationProvider.php
@@ -45,7 +45,7 @@ public function __construct($providerKey, UserProviderInterface $userProvider, $
         $this->userProvider = $userProvider;
         $this->ldap = $ldap;
         $this->logger = $logger;
-        $this->options = $options;
+        $this->options = array_merge(array('roles' => array()), $options);
     }
 
     /**
@@ -55,7 +55,7 @@ public function authenticate(TokenInterface $token)
     {
         $user = $this->userProvider->loadUserByUsername($token->getUsername());
         if ($user && $this->ldapAuth($token->getUserName(), $token->getCredentials())) {
-            return new UsernamePasswordToken($user, null, $this->providerKey, array_unique(array_merge($token->getRoles(), $user->getRoles())));
+            return new UsernamePasswordToken($user, null, $this->providerKey, array_unique(array_merge($this->options['roles'], $token->getRoles(), $user->getRoles())));
         }
 
         throw new AuthenticationException('Ldap authentication failed.');