Avoid calling onAuthenticationFailure() from start()

lexik · Aug 28, 2016 · 4070e57 · 4070e57
1 parent e5f5149
commit 4070e57
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 13 deletions.
diff --git a/Security/Guard/JWTTokenAuthenticator.php b/Security/Guard/JWTTokenAuthenticator.php
@@ -3,7 +3,6 @@
 namespace Lexik\Bundle\JWTAuthenticationBundle\Security\Guard;
 
 use Lexik\Bundle\JWTAuthenticationBundle\Event\JWTAuthenticatedEvent;
-use Lexik\Bundle\JWTAuthenticationBundle\Event\JWTFailureEventInterface;
 use Lexik\Bundle\JWTAuthenticationBundle\Event\JWTInvalidEvent;
 use Lexik\Bundle\JWTAuthenticationBundle\Event\JWTNotFoundEvent;
 use Lexik\Bundle\JWTAuthenticationBundle\Events;
@@ -138,15 +137,11 @@ public function getUser($preAuthToken, UserProviderInterface $userProvider)
 
     /**
      * {@inheritdoc}
-     *
-     * @param JWTFailureEventInterface $event An event to be dispatched (default JWTInvalidEvent)
      */
-    public function onAuthenticationFailure(Request $request, AuthenticationException $authException, JWTFailureEventInterface $event = null)
+    public function onAuthenticationFailure(Request $request, AuthenticationException $authException)
     {
-        if (null === $event) {
-            $event = new JWTInvalidEvent($authException, new JWTAuthenticationFailureResponse($authException->getMessage()));
-            $this->dispatcher->dispatch(Events::JWT_INVALID, $event);
-        }
+        $event = new JWTInvalidEvent($authException, new JWTAuthenticationFailureResponse($authException->getMessage()));
+        $this->dispatcher->dispatch(Events::JWT_INVALID, $event);
 
         return $event->getResponse();
     }
@@ -171,7 +166,7 @@ public function start(Request $request, AuthenticationException $authException =
 
         $this->dispatcher->dispatch(Events::JWT_NOT_FOUND, $event);
 
-        return $this->onAuthenticationFailure($request, $authException, $event);
+        return $event->getResponse();
     }
 
     /**

diff --git a/Tests/Functional/SubscribedTokenAuthenticationTest.php b/Tests/Functional/SubscribedTokenAuthenticationTest.php
@@ -2,8 +2,8 @@
 
 namespace Lexik\Bundle\JWTAuthenticationBundle\Tests\Functional;
 
-use Lexik\Bundle\JWTAuthenticationBundle\Event\JWTInvalidEvent;
 use Lexik\Bundle\JWTAuthenticationBundle\Event\JWTDecodedEvent;
+use Lexik\Bundle\JWTAuthenticationBundle\Event\JWTInvalidEvent;
 use Lexik\Bundle\JWTAuthenticationBundle\Event\JWTNotFoundEvent;
 use Lexik\Bundle\JWTAuthenticationBundle\Events;
 

diff --git a/Tests/Functional/Utils/CallableEventSubscriber.php b/Tests/Functional/Utils/CallableEventSubscriber.php
@@ -2,19 +2,19 @@
 
 namespace Lexik\Bundle\JWTAuthenticationBundle\Tests\Functional\Utils;
 
+use Lexik\Bundle\JWTAuthenticationBundle\Event\JWTAuthenticatedEvent;
 use Lexik\Bundle\JWTAuthenticationBundle\Event\JWTCreatedEvent;
 use Lexik\Bundle\JWTAuthenticationBundle\Event\JWTDecodedEvent;
-use Lexik\Bundle\JWTAuthenticationBundle\Event\JWTInvalidEvent;
 use Lexik\Bundle\JWTAuthenticationBundle\Event\JWTEncodedEvent;
+use Lexik\Bundle\JWTAuthenticationBundle\Event\JWTInvalidEvent;
 use Lexik\Bundle\JWTAuthenticationBundle\Event\JWTNotFoundEvent;
-use Lexik\Bundle\JWTAuthenticationBundle\Event\JWTAuthenticatedEvent;
 use Lexik\Bundle\JWTAuthenticationBundle\Events;
 use Symfony\Component\EventDispatcher\Event;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
 class CallableEventSubscriber implements EventSubscriberInterface
 {
-    private static $listeners = [];
+    private static $listeners     = [];
     private static $eventClassMap = [
         Events::JWT_CREATED       => JWTCreatedEvent::class,
         Events::JWT_DECODED       => JWTDecodedEvent::class,