fix logout from backend when logging off in frontend

Author: marclindemann

Classes/Middleware/BackendUserSimulator.php

@@ -57,12 +57,6 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
             return $handler->handle($request);
         }
 
-        // if backend user is already simulated
-        // then do not try to simulate again
-        // otherwise the user cannot log off the backend anymore
-        if ($request->getCookieParams()[$this->configuration->getCookieName()]) {
-            return $handler->handle($request);
-        }
 
         $tempBackendUserAuthentication = GeneralUtility::makeInstance(BackendUserAuthentication::class);
         $backendCookieName = $tempBackendUserAuthentication->name;
@@ -80,18 +74,33 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
                 && $request->getCookieParams()[$backendCookieName] === $request->getCookieParams()[$simulateBeCookieName]
             ) {
                 $response = $handler->handle($request);
+
+                if (!$GLOBALS['BE_USER'] instanceof BackendUserAuthentication) {
+                    $GLOBALS['BE_USER'] = GeneralUtility::makeInstance(BackendUserAuthentication::class);
+                    $GLOBALS['BE_USER']->start();
+                }
+
                 $GLOBALS['BE_USER']->logoff();
 
-                return new RedirectResponse(
+                $response = new RedirectResponse(
                     $request->getUri(),
                     307,
                     $response->getHeaders()
                 );
+                $response = $this->withSessionCookie($response,$this->configuration->getCookieName(),'');
+                return $response;
             }
 
             return $handler->handle($request);
         }
 
+        // if backend user is already simulated
+        // then do not try to simulate again
+        // otherwise the user cannot log off the backend anymore
+        if ($request->getCookieParams()[$this->configuration->getCookieName()]) {
+            return $handler->handle($request);
+        }
+
         // at this point we know
         // 1. user is logged in as frontend user
         // 2. user is not logged in as backend user yet