Code refactoring

Author: SamuelTallet

.htaccess

@@ -3,11 +3,6 @@ RewriteCond %{REQUEST_FILENAME} !-d
 RewriteCond %{REQUEST_FILENAME} !-f
 RewriteRule ^(.*)$ index.php/$1 [QSA,L]
 
-# For JavaScript modules.
-<IfModule mod_mime.c>
-  AddType text/javascript mjs
-</IfModule>
-
 <IfModule php_module>
   php_value upload_max_filesize 25M
   php_value post_max_size 25M

index.php

@@ -1,87 +1,42 @@
 <?php
 
+namespace MPG;
+
 use Limber\Application;
 use Capsule\Factory\ServerRequestFactory;
 use Limber\Exceptions\NotFoundHttpException;
 
-session_start();
+const APP_NAME = 'MongoDB PHP GUI';
+const VERSION = '1.2.6';
 
 /**
- * Application name.
- * 
- * @var string
- */
-define('MPG_APP_NAME', 'MongoDB PHP GUI');
-
-/**
- * Application version.
- * 
- * @var string
+ * Absolute path, without trailing slash.
+ * Example: /opt/mongodb-php-gui
  */
-define('MPG_APP_VERSION', '1.2.6');
+const ABS_PATH = __DIR__;
 
-/**
- * Development mode?
- * 
- * @var boolean
- * @deprecated
- */
-define('MPG_DEV_MODE', false);
-
-/**
- * Absolute path. XXX Without trailing slash.
- * 
- * @var string
- * @example /opt/mongodb-php-gui
- */
-define('MPG_ABS_PATH', __DIR__);
-
-$baseUrl = '//' . $_SERVER['HTTP_HOST'];
-
-// If request matches a folder. For example: /mongo/
-if ( preg_match('#/$#', $_SERVER['REQUEST_URI']) ) {
-
-    $serverPath = $_SERVER['REQUEST_URI'];
-
-} else {
-
-    $serverPath = dirname($_SERVER['REQUEST_URI']);
-
-    // Normalize directory separator in server path.
-    if ( DIRECTORY_SEPARATOR !== '/' ) {
-        $serverPath = str_replace(DIRECTORY_SEPARATOR, '/', $serverPath);
-    }
+session_start();
 
+if ( !file_exists($autoload_file = ABS_PATH . '/vendor/autoload.php') ) {
+    die('Run `composer install` to complete ' . APP_NAME . ' installation.');
 }
 
-$serverPath = rtrim($serverPath, '/');
+$loader = require_once $autoload_file;
+$loader->add('MPG', ABS_PATH . '/source/php');
 
-$baseUrl .= $serverPath;
+Request::initialize();
 
-/**
- * Server path. XXX Without trailing slash.
- * 
- * @var string
- * @example /mongo
- */
-define('MPG_SERVER_PATH', $serverPath);
+$baseUrl = '//' . $_SERVER['HTTP_HOST'] . Request::getPath();
 
 /**
- * Base URL. XXX Without trailing slash.
+ * Base URL, without trailing slash.
  * 
  * @var string
- * @example //127.0.0.1:5000/mongo
+ * Example: //127.0.0.1:5000/mongo
  */
 define('MPG_BASE_URL', $baseUrl);
 
-if ( !file_exists($autoload_file = MPG_ABS_PATH . '/vendor/autoload.php') ) {
-    die('Run `composer install` to complete ' . MPG_APP_NAME . ' installation.');
-}
-
-$loader = require_once $autoload_file;
-$loader->add('MPG', MPG_ABS_PATH . '/source/php');
-
-$router = require MPG_ABS_PATH . '/routes.php';
+$router = require ABS_PATH . '/routes.php';
 
 $application = new Application($router);
 $serverRequest = ServerRequestFactory::createFromGlobals();
@@ -91,6 +46,6 @@
     $response = $application->dispatch($serverRequest);
     $application->send($response);
 
-} catch (NotFoundHttpException $e) {
+} catch (NotFoundHttpException $_error) {
     die('Route not found. Try to append a slash to URL.');
 }

routes.php

@@ -6,150 +6,150 @@
 
 $router = new Router();
 
-$router->get(MPG_SERVER_PATH . '/', function() {
+$router->get(Request::getPath() . '/', function() {
 
     AuthController::ensureUserIsLogged();
-    Redirect::to('/queryDatabase');
+    Request::redirectTo('/queryDatabase');
 
 });
 
 $router->get(
-    MPG_SERVER_PATH . '/login',
+    Request::getPath() . '/login',
     AuthController::class . '@login'
 );
 
 $router->post(
-    MPG_SERVER_PATH . '/login',
+    Request::getPath() . '/login',
     AuthController::class . '@login'
 );
 
 $router->get(
-    MPG_SERVER_PATH . '/manageCollections',
+    Request::getPath() . '/manageCollections',
     CollectionsController::class . '@manage'
 );
 
 $router->post(
-    MPG_SERVER_PATH . '/listCollections',
+    Request::getPath() . '/listCollections',
     CollectionsController::class . '@list'
 );
 
 $router->post(
-    MPG_SERVER_PATH . '/createCollection',
+    Request::getPath() . '/createCollection',
     CollectionsController::class . '@create'
 );
 
 $router->post(
-    MPG_SERVER_PATH . '/renameCollection',
+    Request::getPath() . '/renameCollection',
     CollectionsController::class . '@rename'
 );
 
 $router->post(
-    MPG_SERVER_PATH . '/dropCollection',
+    Request::getPath() . '/dropCollection',
     CollectionsController::class . '@drop'
 );
 
 $router->get(
-    MPG_SERVER_PATH . '/importDocuments',
+    Request::getPath() . '/importDocuments',
     DocumentsController::class . '@import'
 );
 
 $router->post(
-    MPG_SERVER_PATH . '/importDocuments',
+    Request::getPath() . '/importDocuments',
     DocumentsController::class . '@import'
 );
 
 $router->get(
-    MPG_SERVER_PATH . '/visualizeDatabase',
+    Request::getPath() . '/visualizeDatabase',
     DatabasesController::class . '@visualize'
 );
 
 $router->get(
-    MPG_SERVER_PATH . '/getDatabaseNetworkGraph',
+    Request::getPath() . '/getDatabaseNetworkGraph',
     DatabasesController::class . '@getNetworkGraph'
 );
 
 $router->get(
-    MPG_SERVER_PATH . '/queryDatabase',
+    Request::getPath() . '/queryDatabase',
     DatabasesController::class . '@query'
 );
 
 $router->post(
-    MPG_SERVER_PATH . '/insertOneDocument',
+    Request::getPath() . '/insertOneDocument',
     DocumentsController::class . '@insertOne'
 );
 
 $router->post(
-    MPG_SERVER_PATH . '/countDocuments',
+    Request::getPath() . '/countDocuments',
     DocumentsController::class . '@count'
 );
 
 $router->post(
-    MPG_SERVER_PATH . '/deleteOneDocument',
+    Request::getPath() . '/deleteOneDocument',
     DocumentsController::class . '@deleteOne'
 );
 
 $router->post(
-    MPG_SERVER_PATH . '/convertSQLToMongoDBQuery',
+    Request::getPath() . '/convertSQLToMongoDBQuery',
     SQLController::class . '@convertToMongoDBQuery'
 );
 
 $router->post(
-    MPG_SERVER_PATH . '/findDocuments',
+    Request::getPath() . '/findDocuments',
     DocumentsController::class . '@find'
 );
 
 $router->post(
-    MPG_SERVER_PATH . '/updateOneDocument',
+    Request::getPath() . '/updateOneDocument',
     DocumentsController::class . '@updateOne'
 );
 
 $router->post(
-    MPG_SERVER_PATH . '/enumCollectionFields',
+    Request::getPath() . '/enumCollectionFields',
     CollectionsController::class . '@enumFields'
 );
 
 $router->get(
-    MPG_SERVER_PATH . '/manageIndexes',
+    Request::getPath() . '/manageIndexes',
     IndexesController::class . '@manage'
 );
 
 $router->post(
-    MPG_SERVER_PATH . '/createIndex',
+    Request::getPath() . '/createIndex',
     IndexesController::class . '@create'
 );
 
 $router->post(
-    MPG_SERVER_PATH . '/listIndexes',
+    Request::getPath() . '/listIndexes',
     IndexesController::class . '@list'
 );
 
 $router->post(
-    MPG_SERVER_PATH . '/dropIndex',
+    Request::getPath() . '/dropIndex',
     IndexesController::class . '@drop'
 );
 
 $router->get(
-    MPG_SERVER_PATH . '/manageUsers',
+    Request::getPath() . '/manageUsers',
     UsersController::class . '@manage'
 );
 
 $router->post(
-    MPG_SERVER_PATH . '/createUser',
+    Request::getPath() . '/createUser',
     UsersController::class . '@create'
 );
 
 $router->post(
-    MPG_SERVER_PATH . '/listUsers',
+    Request::getPath() . '/listUsers',
     UsersController::class . '@list'
 );
 
 $router->post(
-    MPG_SERVER_PATH . '/dropUser',
+    Request::getPath() . '/dropUser',
     UsersController::class . '@drop'
 );
 
 $router->get(
-    MPG_SERVER_PATH . '/logout',
+    Request::getPath() . '/logout',
     AuthController::class . '@logout'
 );
 

source/js/login.mjs source/js/login.esm.jssource/js/login.mjs renamed to source/js/login.esm.js

@@ -8,7 +8,7 @@ public static function ensureUserIsLogged() {
 
         if ( !isset($_SESSION['mpg']['user_is_logged']) ) {
 
-            Redirect::to('/login#');
+            Request::redirectTo('/login#');
 
         }
 
@@ -29,7 +29,7 @@ public function login() : ViewResponse {
             } else {
 
                 $_SESSION['mpg']['user_is_logged'] = true;
-                Redirect::to('/');
+                Request::redirectTo('/');
 
             }
 
@@ -88,7 +88,7 @@ public function logout() {
 
         $_SESSION['mpg'] = [];
 
-        Redirect::to('/login');
+        Request::redirectTo('/login');
 
     }
 

source/php/MPG/AuthController.php

@@ -23,10 +23,6 @@ public static function normalize(\Throwable $error, string $function = null) : a
             $normalizedError['error']['function'] = $function;
         }
 
-        if ( MPG_DEV_MODE === true ) {
-            $normalizedError['error']['trace'] = $error->getTrace();
-        }
-
         return $normalizedError;
 
     }