[Security\Http] Skip remember-me logout on empty token

chalasr · chalasr · commit e87be5718dc7 · 2020-07-06T12:01:01.000+02:00
diff --git a/src/Symfony/Component/Security/Http/EventListener/RememberMeLogoutListener.php b/src/Symfony/Component/Security/Http/EventListener/RememberMeLogoutListener.php
@@ -40,6 +40,10 @@ public function onLogout(LogoutEvent $event): void
             return;
         }
 
+        if (!$event->getToken()) {
+            return;
+        }
+
         if (null === $event->getResponse()) {
             throw new LogicException(sprintf('No response was set for this logout action. Make sure the DefaultLogoutListener or another listener has set the response before "%s" is called.', __CLASS__));
         }
diff --git a/src/Symfony/Component/Security/Http/Tests/EventListener/RememberMeLogoutListenerTest.php b/src/Symfony/Component/Security/Http/Tests/EventListener/RememberMeLogoutListenerTest.php
@@ -0,0 +1,30 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Security\Http\Tests\EventListener;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\Security\Http\Event\LogoutEvent;
+use Symfony\Component\Security\Http\EventListener\RememberMeLogoutListener;
+use Symfony\Component\Security\Http\RememberMe\AbstractRememberMeServices;
+
+class RememberMeLogoutListenerTest extends TestCase
+{
+    public function testOnLogoutDoesNothingIfNoToken()
+    {
+        $rememberMeServices = $this->createMock(AbstractRememberMeServices::class);
+        $rememberMeServices->expects($this->never())->method('logout');
+
+        $rememberMeLogoutListener = new RememberMeLogoutListener($rememberMeServices);
+        $rememberMeLogoutListener->onLogout(new LogoutEvent(new Request(),null));
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,10 @@ public function onLogout(LogoutEvent $event): void`
`40`	`40`	`return;`
`41`	`41`	`}`
`42`	`42`
	`43`	`+ if (!$event->getToken()) {`
	`44`	`+ return;`
	`45`	`+ }`
	`46`	`+`
`43`	`47`	`if (null === $event->getResponse()) {`
`44`	`48`	`throw new LogicException(sprintf('No response was set for this logout action. Make sure the DefaultLogoutListener or another listener has set the response before "%s" is called.', __CLASS__));`
`45`	`49`	`}`