From c9490cf1495df338737361def33a83afe42b9d71 Mon Sep 17 00:00:00 2001
From: Yasen Pramatarov <yasen@lindeas.com>
Date: Fri, 13 Jun 2025 12:20:37 +0300
Subject: [PATCH] Troubleshoots router class

---
 app/core/Router.php | 57 ++++++++++++++++++++++++++++-----------------
 1 file changed, 36 insertions(+), 21 deletions(-)

diff --git a/app/core/Router.php b/app/core/Router.php
index e7ca7ed..8a51011 100644
--- a/app/core/Router.php
+++ b/app/core/Router.php
@@ -11,32 +11,47 @@ class Router {
      * Returns current username if session is valid, null otherwise.
      */
     public static function checkAuth(array $config, string $app_root, array $public_pages, string $page): ?string {
-        $validSession = Session::isValidSession();
+        // Always allow login page to be accessed
+        if ($page === 'login') {
+            return null;
+        }
+
+        // Check if this is a public page
+        $isPublicPage = in_array($page, $public_pages, true);
+
+        // For public pages, don't validate session
+        if ($isPublicPage) {
+            return null;
+        }
+
+        // For protected pages, check if we have a valid session
+        $validSession = Session::isValidSession(true);
+
+        // If session is valid, return the username
         if ($validSession) {
             return Session::getUsername();
         }
 
-        if (!in_array($page, $public_pages, true)) {
-            // flash session timeout if needed
-            if (isset($_SESSION['LAST_ACTIVITY']) && !isset($_SESSION['session_timeout_shown'])) {
-                Feedback::flash('LOGIN', 'SESSION_TIMEOUT');
-                $_SESSION['session_timeout_shown'] = true;
-            }
-            // preserve flash messages
-            $flash_messages = $_SESSION['flash_messages'] ?? [];
-            Session::cleanup($config);
-            $_SESSION['flash_messages'] = $flash_messages;
-
-            // build login URL
-            $loginUrl = $app_root . '?page=login';
-            $trimmed = trim($page, '/?');
-            if (!in_array($trimmed, INVALID_REDIRECT_PAGES, true)) {
-                $loginUrl .= '&redirect=' . urlencode($_SERVER['REQUEST_URI']);
-            }
-            header('Location: ' . $loginUrl);
-            exit();
+        // If we get here, we need to redirect to login
+        // Only show timeout message if we had an active session before
+        if (isset($_SESSION['LAST_ACTIVITY']) && !isset($_SESSION['session_timeout_shown'])) {
+            Feedback::flash('LOGIN', 'SESSION_TIMEOUT');
+            $_SESSION['session_timeout_shown'] = true;
         }
 
-        return null;
+        // Preserve flash messages
+        $flash_messages = $_SESSION['flash_messages'] ?? [];
+        Session::cleanup($config);
+        $_SESSION['flash_messages'] = $flash_messages;
+
+        // Build login URL with redirect if appropriate
+        $loginUrl = $app_root . '?page=login';
+        $trimmed = trim($page, '/?');
+        if (!empty($trimmed) && !in_array($trimmed, INVALID_REDIRECT_PAGES, true)) {
+            $loginUrl .= '&redirect=' . urlencode($_SERVER['REQUEST_URI']);
+        }
+
+        header('Location: ' . $loginUrl);
+        exit();
     }
 }