refactor(core): remove User functionality and update code base for new ACL

Author: Awilum

app/Controllers/UsersController.php

@@ -28,8 +28,7 @@
     "autoload": {
         "classmap": [
             "app",
-            "twig",
-            "middlewares"
+            "twig"
         ]
     }
 }

composer.json

@@ -23,9 +23,6 @@
 $flextype->registry->set('plugins.admin.settings.navigation.system.tools', ['title' => __('admin_tools'),'icon' => 'fas fa-toolbox', 'link' => $flextype->router->pathFor('admin.tools.index')]);
 $flextype->registry->set('plugins.admin.settings.navigation.system.api', ['title' => __('admin_api'),'icon' => 'fas fa-network-wired', 'link' => $flextype->router->pathFor('admin.api.index')]);
 
-// Add Global Vars Admin Twig Extension
-$flextype->twig->addExtension(new GlobalVarsAdminTwigExtension($flextype));
-
 /**
  * Add Assets
  */
@@ -57,10 +54,6 @@
     return new EntriesController($container);
 };
 
-$flextype['UsersController'] = static function ($container) {
-    return new UsersController($container);
-};
-
 $flextype['ToolsController'] = static function ($container) {
     return new ToolsController($container);
 };

dependencies.php

@@ -4,21 +4,10 @@
 
 namespace Flextype;
 
-// UsersController
-$app->group('/' . $admin_route, function () use ($app) : void {
-    $app->get('/installation', 'UsersController:installation')->setName('admin.users.installation');
-    $app->post('/installation', 'UsersController:installationProcess')->setName('admin.users.installationProcess');
-    $app->get('/login', 'UsersController:login')->setName('admin.users.login');
-    $app->post('/login', 'UsersController:loginProcess')->setName('admin.users.loginProcess');
-})->add('csrf');
-
-$app->group('/' . $admin_route, function () use ($app) : void {
+$app->group('/' . $admin_route, function () use ($app, $flextype) : void {
     // Dashboard
     $app->get('', 'DashboardController:index')->setName('admin.dashboard.index');
 
-    // UsersController
-    $app->post('/logout', 'UsersController:logoutProcess')->setName('admin.users.logoutProcess');
-
     // EntriesController
     $app->get('/entries', 'EntriesController:index')->setName('admin.entries.index');
     $app->get('/entries/edit', 'EntriesController:edit')->setName('admin.entries.edit');
@@ -38,7 +27,6 @@
     $app->post('/entries/upload-media-file', 'EntriesController:uploadMediaFileProcess')->setName('admin.entries.uploadMediaFileProcess');
     $app->post('/entries/display-view-process', 'EntriesController:displayViewProcess')->setName('admin.entries.displayViewProcess');
 
-
     // Settings Controller
     $app->get('/settings', 'SettingsController:index')->setName('admin.settings.index');
     $app->post('/settings', 'SettingsController:updateSettingsProcess')->setName('admin.settings.update');
@@ -98,4 +86,8 @@
     $app->post('/api/management/entries/edit', 'ApiManagementEntriesController:editProcess')->setName('admin.api_management_entries.editProcess');
     $app->post('/api/management/entries/delete', 'ApiManagementEntriesController:deleteProcess')->setName('admin.api_management_entries.deleteProcess');
 
-})->add(new AdminPanelAuthMiddleware($flextype))->add('csrf');
+})->add(new AclAccountIsUserLoggedInMiddleware(['container' => $flextype, 'redirect' => 'admin.accounts.login']))
+  ->add(new AclAccountsIsUserLoggedInRolesOneOfMiddleware(['container' => $flextype,
+                                                           'redirect' => 'admin.accounts.no-access',
+                                                           'roles' => 'admin']))
+  ->add('csrf');