From 74118f91ee1d9b6dd1ca55fd007dbee97dfca04b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= <mauricio@fauth.dev>
Date: Wed, 16 Aug 2023 19:09:27 -0300
Subject: [PATCH] Create the UserPreferencesLoading middleware
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
---
 libraries/classes/Application.php             |  9 ++----
 .../Middleware/UserPreferencesLoading.php     | 29 +++++++++++++++++++
 2 files changed, 31 insertions(+), 7 deletions(-)
 create mode 100644 libraries/classes/Middleware/UserPreferencesLoading.php

diff --git a/libraries/classes/Application.php b/libraries/classes/Application.php
index c80b03f9c8..1922087f4a 100644
--- a/libraries/classes/Application.php
+++ b/libraries/classes/Application.php
@@ -48,8 +48,8 @@ use PhpMyAdmin\Middleware\TokenRequestParamChecking;
 use PhpMyAdmin\Middleware\UriSchemeUpdating;
 use PhpMyAdmin\Middleware\UrlParamsSetting;
 use PhpMyAdmin\Middleware\UrlRedirection;
+use PhpMyAdmin\Middleware\UserPreferencesLoading;
 use PhpMyAdmin\Routing\Routing;
-use PhpMyAdmin\Theme\ThemeManager;
 use PhpMyAdmin\Tracking\Tracker;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
@@ -132,6 +132,7 @@ class Application
         $requestHandler->add(new ResponseRendererLoading($this->config));
         $requestHandler->add(new TokenMismatchChecking());
         $requestHandler->add(new ProfilingChecking());
+        $requestHandler->add(new UserPreferencesLoading($this->config));
 
         $runner = new RequestHandlerRunner(
             $requestHandler,
@@ -156,12 +157,6 @@ class Application
 
         $settings = $this->config->getSettings();
 
-        /** @var ThemeManager $themeManager */
-        $themeManager = $container->get(ThemeManager::class);
-
-        // load user preferences
-        $this->config->loadUserPreferences($themeManager);
-
         /* Tell tracker that it can actually work */
         Tracker::enable();
 
diff --git a/libraries/classes/Middleware/UserPreferencesLoading.php b/libraries/classes/Middleware/UserPreferencesLoading.php
new file mode 100644
index 0000000000..4c2178071d
--- /dev/null
+++ b/libraries/classes/Middleware/UserPreferencesLoading.php
@@ -0,0 +1,29 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PhpMyAdmin\Middleware;
+
+use PhpMyAdmin\Config;
+use PhpMyAdmin\Core;
+use PhpMyAdmin\Theme\ThemeManager;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Server\MiddlewareInterface;
+use Psr\Http\Server\RequestHandlerInterface;
+
+final class UserPreferencesLoading implements MiddlewareInterface
+{
+    public function __construct(private readonly Config $config)
+    {
+    }
+
+    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
+    {
+        /** @var ThemeManager $themeManager */
+        $themeManager = Core::getContainerBuilder()->get(ThemeManager::class);
+        $this->config->loadUserPreferences($themeManager);
+
+        return $handler->handle($request);
+    }
+}