refactor: simplify user authentication

Improve usage of dependency injection container. Use UserAuth::authenticated() instead of checking session variable.
bacula-web · Dec 29, 2023 · df9a01c · df9a01c
1 parent f9e797e
commit df9a01c
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 12 deletions.
diff --git a/application/Controller/LoginController.php b/application/Controller/LoginController.php
@@ -107,10 +107,7 @@ public function login(Request $request, Response $response): Response
 
         $this->session->set('user_authenticated', $this->userAuth->authUser($form_data['username'], $form_data['password']));
 
-        // TODO: fix $userAuth->authenticated()
-        //if ($this->userAuth->authenticated()) {
-
-        if ($this->session->get('user_authenticated') === 'yes') {
+        if ($this->userAuth->authenticated()) {
 
             $username = Sanitizer::sanitize($form_data['username']);
 

diff --git a/application/Middleware/DbAuthMiddleware.php b/application/Middleware/DbAuthMiddleware.php
@@ -24,6 +24,7 @@
 use App\Libs\FileConfig;
 use Core\App\UserAuth;
 use Core\Exception\AppException;
+use Core\Exception\ConfigFileException;
 use GuzzleHttp\Psr7\Response;
 use Odan\Session\SessionInterface;
 use Psr\Http\Message\ResponseInterface;
@@ -43,11 +44,15 @@ class DbAuthMiddleware implements MiddlewareInterface
     private ?string $basePath;
 
     /**
+     * @param UserAuth $userAuth
+     * @param SessionInterface $session
+     * @param Twig $twig
      * @throws AppException
+     * @throws ConfigFileException
      */
     public function __construct(UserAuth $userAuth, SessionInterface $session, Twig $twig)
     {
-        $this->dbAuth = new $userAuth;
+        $this->dbAuth = $userAuth;
 
         // Check if database exists and is writable
         $this->dbAuth->check();

diff --git a/application/config/container-bindings.php b/application/config/container-bindings.php
@@ -10,6 +10,7 @@
 use App\Tables\JobTable;
 use App\Tables\LogTable;
 use App\Tables\PoolTable;
+use App\Tables\UserTable;
 use App\Tables\VolumeTable;
 use Core\Db\DatabaseFactory;
 use Odan\Session\PhpSession;
@@ -72,6 +73,9 @@
     CatalogTable::class => function (SessionInterface $session) {
         return new CatalogTable(DatabaseFactory::getDatabase($session->get('catalog_id', 0)));
     },
+    UserTable::class => function () {
+        return new UserTable(DatabaseFactory::getDatabase());
+    },
     LogTable::class => function (SessionInterface $session) {
         return new LogTable(DatabaseFactory::getDatabase($session->get('catalog_id', 0)));
     },

diff --git a/core/App/UserAuth.php b/core/App/UserAuth.php
@@ -46,15 +46,15 @@ class UserAuth
      * @var UserTable
      */
     private UserTable $userTable;
+    private SessionInterface $session;
 
     /**
      * @throws Exception
      */
-    public function __construct()
+    public function __construct(UserTable $userTable, SessionInterface $session)
     {
-        $this->userTable = new UserTable(
-            DatabaseFactory::getDatabase()
-        );
+        $this->userTable = $userTable;
+        $this->session = $session;
     }
 
     /**
@@ -145,9 +145,7 @@ public function destroySession(Session\SessionInterface $session): void
      */
     public function authenticated(): bool
     {
-        $session = new Session\PhpSession();
-
-        if ($session->get('user_authenticated') === 'yes') {
+        if ($this->session->get('user_authenticated') === 'yes') {
             return true;
         }