Admin page refactoring (first steps)

cyklokoalicia · Nov 16, 2024 · 00b244a · 00b244a
1 parent 43ee525
commit 00b244a
Show file tree

Hide file tree

Showing 14 changed files with 586 additions and 526 deletions.
diff --git a/admin.php b/admin.php
diff --git a/config/packages/security.php b/config/packages/security.php
@@ -45,6 +45,13 @@
             ]
         );
 
+    $security->roleHierarchy('ROLE_ADMIN', ['ROLE_USER']);
+    $security->roleHierarchy('ROLE_SUPER_ADMIN', ['ROLE_ADMIN']);
+
+    $security->accessControl()
+        ->path('^/admin')
+        ->roles(['ROLE_ADMIN']);
+
     $security
         ->accessControl()
         ->path('^/login$')

diff --git a/config/routes.php b/config/routes.php
@@ -9,7 +9,9 @@
         ->controller([\BikeShare\Controller\CommandController::class, 'index']);
     $routes->add('scan', '/scan.php/{action}/{id}')
         ->controller([\BikeShare\Controller\ScanController::class, 'index']);
-    $routes->add('admin', '/admin.php')
+    $routes->add('admin_old', '/admin.php')
+        ->controller([\BikeShare\Controller\AdminController::class, 'index']);
+    $routes->add('admin', '/admin')
         ->controller([\BikeShare\Controller\AdminController::class, 'index']);
     $routes->add('register', '/register.php')
         ->controller([\BikeShare\Controller\RegisterController::class, 'index']);

diff --git a/cron.php b/cron.php
diff --git a/docker-data/mysql/create-database.sql b/docker-data/mysql/create-database.sql
@@ -102,13 +102,14 @@ CREATE TABLE `sent` (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 
-DROP TABLE IF EXISTS `sessions`;
-CREATE TABLE `sessions` (
-  `userId` int(10) unsigned NOT NULL,
-  `sessionId` varchar(256) CHARACTER SET latin1 NOT NULL,
-  `timeStamp` varchar(256) CHARACTER SET latin1 NOT NULL,
-  UNIQUE KEY `userId` (`userId`),
-  KEY `sessionId` (`sessionId`)
+DROP TABLE IF EXISTS `remember_me_token`;
+CREATE TABLE `remember_me_token` (
+  `series` varchar(88) NOT NULL,
+  `value` varchar(88) NOT NULL,
+  `class` varchar(255) NOT NULL,
+  `username` varchar(255) NOT NULL,
+  `lastUsed` TIMESTAMP NOT NULL,
+  PRIMARY KEY (`series`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 

diff --git a/index.php b/index.php
@@ -90,7 +90,7 @@
       <li><a href="<?= $configuration->get('systemrules'); ?>" target="_blank"><span class="glyphicon glyphicon-question-sign"></span><?= _('Help'); ?></a></li>
 <?php
 if ($auth->isLoggedIn() && $user->findPrivileges($userid) > 0) {
-    echo '<li><a href="admin.php"><span class="glyphicon glyphicon-cog"></span> ', _('Admin'), '</a></li>';
+    echo '<li><a href="/admin"><span class="glyphicon glyphicon-cog"></span> ', _('Admin'), '</a></li>';
 }
 
 if ($auth->isLoggedIn()) {