From c2018c4c2195fc26f188e15ae56a0a30e385174f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= <mauricio@fauth.dev>
Date: Tue, 20 Sep 2022 21:55:28 -0300
Subject: Extract /console/bookmark/refresh action from ImportController
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>
---
 .../Controllers/Console/Bookmark/RefreshController.php  | 17 +++++++++++++++++
 .../classes/Controllers/Import/ImportController.php     | 11 -----------
 libraries/routes.php                                    |  2 ++
 libraries/services_controllers.php                      |  5 +++++
 4 files changed, 24 insertions(+), 11 deletions(-)
 create mode 100644 libraries/classes/Controllers/Console/Bookmark/RefreshController.php

(limited to 'libraries')

diff --git a/libraries/classes/Controllers/Console/Bookmark/RefreshController.php b/libraries/classes/Controllers/Console/Bookmark/RefreshController.php
new file mode 100644
index 0000000000..6b482a671b
--- /dev/null
+++ b/libraries/classes/Controllers/Console/Bookmark/RefreshController.php
@@ -0,0 +1,17 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PhpMyAdmin\Controllers\Console\Bookmark;
+
+use PhpMyAdmin\Console;
+use PhpMyAdmin\Controllers\AbstractController;
+use PhpMyAdmin\Http\ServerRequest;
+
+final class RefreshController extends AbstractController
+{
+    public function __invoke(ServerRequest $request): void
+    {
+        $this->response->addJSON('console_message_bookmark', Console::getBookmarkContent());
+    }
+}
diff --git a/libraries/classes/Controllers/Import/ImportController.php b/libraries/classes/Controllers/Import/ImportController.php
index b89e20a5e8..f4b1deaf03 100644
--- a/libraries/classes/Controllers/Import/ImportController.php
+++ b/libraries/classes/Controllers/Import/ImportController.php
@@ -6,7 +6,6 @@ namespace PhpMyAdmin\Controllers\Import;
 
 use PhpMyAdmin\Bookmark;
 use PhpMyAdmin\ConfigStorage\Relation;
-use PhpMyAdmin\Console;
 use PhpMyAdmin\Controllers\AbstractController;
 use PhpMyAdmin\Core;
 use PhpMyAdmin\DatabaseInterface;
@@ -119,16 +118,6 @@ final class ImportController extends AbstractController
         $GLOBALS['local_import_file'] = $_POST['local_import_file'] ?? null;
         $GLOBALS['show_as_php'] = $_POST['show_as_php'] ?? null;
 
-        // If it's a refresh console bookmarks request
-        if (isset($_GET['console_bookmark_refresh'])) {
-            $this->response->addJSON(
-                'console_message_bookmark',
-                Console::getBookmarkContent()
-            );
-
-            return;
-        }
-
         // If it's a console bookmark add request
         if (isset($_POST['console_bookmark_add'])) {
             if (! isset($_POST['label'], $_POST['db'], $_POST['bookmark_query'], $_POST['shared'])) {
diff --git a/libraries/routes.php b/libraries/routes.php
index 5e95d0a2ac..05d18944d4 100644
--- a/libraries/routes.php
+++ b/libraries/routes.php
@@ -9,6 +9,7 @@ use PhpMyAdmin\Controllers\CheckRelationsController;
 use PhpMyAdmin\Controllers\CollationConnectionController;
 use PhpMyAdmin\Controllers\ColumnController;
 use PhpMyAdmin\Controllers\Config;
+use PhpMyAdmin\Controllers\Console\Bookmark\RefreshController;
 use PhpMyAdmin\Controllers\Database;
 use PhpMyAdmin\Controllers\DatabaseController;
 use PhpMyAdmin\Controllers\ErrorReportController;
@@ -53,6 +54,7 @@ return static function (RouteCollector $routes): void {
         $routes->post('/get', Config\GetConfigController::class);
         $routes->post('/set', Config\SetConfigController::class);
     });
+    $routes->get('/console/bookmark/refresh', RefreshController::class);
     $routes->addGroup('/database', static function (RouteCollector $routes): void {
         $routes->addGroup('/central-columns', static function (RouteCollector $routes): void {
             $routes->addRoute(['GET', 'POST'], '', Database\CentralColumnsController::class);
diff --git a/libraries/services_controllers.php b/libraries/services_controllers.php
index 02725969a4..ffbb1f6772 100644
--- a/libraries/services_controllers.php
+++ b/libraries/services_controllers.php
@@ -8,6 +8,7 @@ use PhpMyAdmin\Controllers\CheckRelationsController;
 use PhpMyAdmin\Controllers\CollationConnectionController;
 use PhpMyAdmin\Controllers\ColumnController;
 use PhpMyAdmin\Controllers\Config;
+use PhpMyAdmin\Controllers\Console;
 use PhpMyAdmin\Controllers\Database;
 use PhpMyAdmin\Controllers\DatabaseController;
 use PhpMyAdmin\Controllers\ErrorReportController;
@@ -95,6 +96,10 @@ return [
                 '$config' => '@config',
             ],
         ],
+        Console\Bookmark\RefreshController::class => [
+            'class' => Console\Bookmark\RefreshController::class,
+            'arguments' => ['$response' => '@response', '$template' => '@template'],
+        ],
         Database\CentralColumns\PopulateColumnsController::class => [
             'class' => Database\CentralColumns\PopulateColumnsController::class,
             'arguments' => [
-- 
cgit v1.2.3