fixed bug

fabpot · fabpot · commit faa8e9806361 · 2014-09-24T07:52:20.000+02:00
diff --git a/src/Symfony/Component/Security/Http/Firewall/SimplePreAuthenticationListener.php b/src/Symfony/Component/Security/Http/Firewall/SimplePreAuthenticationListener.php
@@ -21,7 +21,6 @@
 use Symfony\Component\Security\Core\Exception\AuthenticationException;
 use Symfony\Component\Security\Http\Authentication\AuthenticationFailureHandlerInterface;
 use Symfony\Component\Security\Http\Authentication\AuthenticationSuccessHandlerInterface;
-use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 
 /**
  * SimplePreAuthenticationListener implements simple proxying to an authenticator.
@@ -76,13 +75,15 @@ public function handle(GetResponseEvent $event)
         }
 
         try {
-            $this->securityContext->setToken(null);
             $token = $this->simpleAuthenticator->createToken($request, $this->providerKey);
 
-            if ($token instanceof TokenInterface) {
-                $token = $this->authenticationManager->authenticate($token);
-                $this->securityContext->setToken($token);
+            // allow null to be returned to skip authentication
+            if (null === $token) {
+                return;
             }
+
+            $token = $this->authenticationManager->authenticate($token);
+            $this->securityContext->setToken($token);
         } catch (AuthenticationException $e) {
             $this->securityContext->setToken(null);
 
