Logout from custom firewall always deletes complete session (pimcore#…

…13825) * register logoutlistener only on pimcore_admin firewall * clear only admin session * set response to logout event object
michalananapps · Dec 20, 2022 · 9de7216 · 9de7216
1 parent 1dccd93
commit 9de7216
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/bundles/AdminBundle/config/security_services.yaml b/bundles/AdminBundle/config/security_services.yaml
@@ -54,7 +54,9 @@ services:
             $firewallName: !abstract defined by the factory
 
 
-    Pimcore\Bundle\AdminBundle\Security\Event\LogoutListener: ~
+    Pimcore\Bundle\AdminBundle\Security\Event\LogoutListener:
+        tags:
+            - { name: 'kernel.event_subscriber', dispatcher: 'security.event_dispatcher.pimcore_admin'}
 
     Pimcore\Bundle\AdminBundle\Security\User\TokenStorageUserResolver:
         public: true

diff --git a/bundles/AdminBundle/src/Security/Event/LogoutListener.php b/bundles/AdminBundle/src/Security/Event/LogoutListener.php
@@ -60,11 +60,14 @@ public function __construct(
     ) {
     }
 
-    public function onLogout(LogoutEvent $event): RedirectResponse|Response
+    /**
+     * @param LogoutEvent $event
+     */
+    public function onLogout(LogoutEvent $event): void
     {
         $request = $event->getRequest();
 
-        return $this->onLogoutSuccess($request);
+        $event->setResponse($this->onLogoutSuccess($request));
     }
 
     public function onLogoutSuccess(Request $request): RedirectResponse|Response
@@ -88,7 +91,7 @@ public function onLogoutSuccess(Request $request): RedirectResponse|Response
                 $adminSession->remove('user');
             }
 
-            Session::invalidate();
+            $adminSession->clear();
 
             return $event;
         });