Fix for storing language

Leantime · Aug 15, 2024 · 83a06bf · 83a06bf
1 parent b4bfcd3
commit 83a06bf
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 19 deletions.
diff --git a/app/Core/HttpKernel.php b/app/Core/HttpKernel.php
@@ -156,9 +156,9 @@ public function getMiddleware(): array
         return self::dispatch_filter('http_middleware', [
             Middleware\TrustProxies::class,
             Middleware\InitialHeaders::class,
+            Middleware\StartSession::class,
             Middleware\Installed::class,
             Middleware\Updated::class,
-            Middleware\StartSession::class,
             Middleware\RequestRateLimiter::class,
             $this->app->make(IncomingRequest::class) instanceof ApiRequest
                 ? Middleware\ApiAuth::class

diff --git a/app/Core/IncomingRequest.php b/app/Core/IncomingRequest.php
@@ -161,5 +161,9 @@ public function fullUrl()
         return $this->getFullUrl();
     }
 
+    public function isApiOrCronRequest(): bool
+    {
+        return str_starts_with($_SERVER['REQUEST_URI'], "/api") || str_starts_with($_SERVER['REQUEST_URI'], "/cron");
+    }
 
 }
diff --git a/app/Core/Language.php b/app/Core/Language.php
@@ -95,15 +95,12 @@ public function __construct(
         //Get list of available languages
         $this->langlist = $this->getLanguageList();
 
-        //Get language that was set in middleware
-        $language =  session("usersettings.language") ?? $this->config->language;
+        $lang = $this->getCurrentLanguage();
+        $this->readIni();
 
-        //Start checking if the user has a language set
-        if (!$this->setLanguage($language)) {
-            $this->setLanguage("en-US");
-        }
     }
 
+
     /**
      * Set the language for the application.
      *
@@ -120,15 +117,18 @@ public function setLanguage(string $lang): bool
 
         session(["usersettings.language" => $lang]);
 
-        if (! isset($_COOKIE['language']) || $_COOKIE['language'] !== $lang) {
+        if ((!isset($_COOKIE['language']) || $_COOKIE['language'] !== $lang) && !request()->isApiOrCronRequest()) {
+
+            $isAPIRequest = request()->isApiOrCronRequest();
+
             Events::add_filter_listener(
                 'leantime.core.httpkernel.handle.beforeSendResponse',
                 fn ($response) => tap($response, fn (Response $response) => $response->headers->setCookie(
                     Cookie::create('language')
                     ->withValue($lang)
                     ->withExpires(time() + 60 * 60 * 24 * 30)
                     ->withPath(Str::finish($this->config->appDir, '/'))
-                    ->withSameSite('Strict')
+                    ->withSameSite('Lax')
                 ))
             );
         }
@@ -145,6 +145,23 @@ public function setLanguage(string $lang): bool
      */
     public function getCurrentLanguage(): string
     {
+
+        if (session()->has("usersettings.language")) {
+            $this->language = session("usersettings.language");
+            return  $this->language;
+        }
+
+        if (isset($_COOKIE['language'])) {
+            $this->language = $_COOKIE['language'];
+            return  $this->language;
+        }
+
+        if(session("companysettings.language")){
+            $this->language = session("companysettings.language");
+            return  $this->language;
+        }
+
+        $this->language = $this->config->language;
         return $this->language;
     }
 
@@ -169,7 +186,7 @@ public function isValidLanguage(string $langCode): bool
     public function readIni(): array
     {
         if (Cache::store('installation')->has('cache.language_resources_' . $this->language) && $this->config->debug == 0) {
-            
+
             $this->ini_array =  self::dispatch_filter(
                 'language_resources',
                 Cache::store('installation')->get('cache.language_resources_' . $this->language),

diff --git a/app/Domain/Setting/Repositories/Setting.php b/app/Domain/Setting/Repositories/Setting.php
@@ -28,10 +28,6 @@ public function __construct(DbCore $db)
             $this->db = $db;
         }
 
-        /**
-         * @param $type
-         * @return false|mixed
-         */
         /**
          * @param $type
          * @return false|mixed
@@ -67,11 +63,6 @@ public function getSetting($type): mixed
                 return false;
         }
 
-        /**
-         * @param $type
-         * @param $value
-         * @return bool
-         */
         /**
          * @param $type
          * @param $value

diff --git a/logs/.gitignore b/logs/.gitignore
@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore