[cleanup] code cleanup

Leantime · May 25, 2024 · 8afdce2 · 8afdce2
1 parent b29c801
commit 8afdce2
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 2 deletions.
diff --git a/app/Core/ConsoleKernel.php b/app/Core/ConsoleKernel.php
@@ -108,6 +108,11 @@ public static function artisanBinary()
         });
     }
 
+    /**
+     * Load and register the commands for the application.
+     *
+     * @return void
+     */
     protected function commands()
     {
         static $commandsLoaded;
@@ -181,6 +186,11 @@ protected function commands()
         $commandsLoaded = true;
     }
 
+    /**
+     * Schedule tasks to be executed.
+     *
+     * @return void
+     */
     private function schedule()
     {
         // Set default timezone

diff --git a/app/Core/Middleware/Installed.php b/app/Core/Middleware/Installed.php
@@ -52,6 +52,12 @@ public function handle(IncomingRequest $request, Closure $next): Response
 
         \Illuminate\Support\Facades\Cache::set('installed', true);
 
+        $route = Frontcontroller::getCurrentRoute();
+
+        if($session_says && $route == "install") {
+            return Frontcontroller::redirect(BASE_URL . "/auth/logout");
+        }
+
         return $next($request);
     }
 

diff --git a/app/Domain/Auth/Controllers/Login.php b/app/Domain/Auth/Controllers/Login.php
@@ -56,7 +56,10 @@ public function get(array $params): Response
             $url = urldecode($_GET['redirect']);
 
             //Check for open redirects, don't allow redirects to external sites.
-            if (filter_var($url, FILTER_VALIDATE_URL) === false) {
+            if (
+                filter_var($url, FILTER_VALIDATE_URL) === false &&
+                !in_array($url, ["/auth/logout"])
+            ) {
                 $redirectUrl = BASE_URL ."/" . $url;
             }
         }

diff --git a/app/Domain/Install/Controllers/Index.php b/app/Domain/Install/Controllers/Index.php
@@ -26,7 +26,7 @@ public function init(InstallRepository $installRepo)
             $this->installRepo = $installRepo;
 
             if ($this->installRepo->checkIfInstalled()) {
-                return FrontcontrollerCore::redirect(BASE_URL);
+                return FrontcontrollerCore::redirect(BASE_URL . "/");
             }
         }