Improve error handling on profile redirection

Author: AdrienClairembault

src/Glpi/Controller/Session/ChangeProfileController.php

@@ -73,8 +73,9 @@ public function __invoke(Request $request): Response
             $route = $go_to_create_ticket ? "/ServiceCatalog" : "/Helpdesk";
             $redirect = $request->getBasePath() . $route;
         } else {
-            $_SESSION['_redirected_from_profile_selector'] = true;
             $redirect = Html::getBackUrl();
+            $separator = str_contains($redirect, '?') ? "&" : "?";
+            $redirect = $redirect . $separator . '_redirected_from_profile_selector=true';
         }
 
         return new RedirectResponse($redirect);

src/Glpi/Kernel/Listener/ExceptionListener/AccessErrorListener.php

@@ -72,6 +72,13 @@ public function onKernelException(ExceptionEvent $event): void
 
         $response = null;
 
+        // On profile change, we will redirect the user to the home page in case
+        // of access errors for the current page.
+        $redirect_to_home_on_error = $event->getRequest()
+            ->query
+            ->getBoolean('_redirected_from_profile_selector')
+        ;
+
         if ($throwable instanceof SessionExpiredException) {
             Session::destroy(); // destroy the session to prevent pesistence of unexpected data
 
@@ -84,10 +91,8 @@ public function onKernelException(ExceptionEvent $event): void
             );
         } elseif (
             $throwable instanceof AccessDeniedHttpException
-            && ($_SESSION['_redirected_from_profile_selector'] ?? false)
+            && $redirect_to_home_on_error
         ) {
-            unset($_SESSION['_redirected_from_profile_selector']);
-
             $request = $event->getRequest();
             $response = new RedirectResponse(
                 sprintf(