Merge branch 'master' into snyk-upgrade-3634cbb274508a9eb5670f028703f673

Leantime · Jun 24, 2024 · dcc7dfe · dcc7dfe
2 parents 197a282 + 9c8eea3
commit dcc7dfe
Show file tree

Hide file tree

Showing 239 changed files with 3,778 additions and 2,951 deletions.
diff --git a/.dev/test.env b/.dev/test.env
@@ -122,3 +122,8 @@ LEAN_OIDC_CLIEND_SECRET =
 #LEAN_OIDC_USERINFO_URL_OVERRIDE = https://api.github.com/user,https://api.github.com/user/emails
 #LEAN_OIDC_SCOPES = user:email
 #LEAN_OIDC_FIELD_EMAIL = 0.email
+
+LEAN_RATELIMIT_GENERAL = 50000
+LEAN_RATELIMIT_AUTH = 50000
+LEAN_RATELIMIT_API = 50000
+
diff --git a/.idea/leantime-oss.iml b/.idea/leantime-oss.iml
diff --git a/.idea/php.xml b/.idea/php.xml
diff --git a/.idea/phpspec.xml b/.idea/phpspec.xml
diff --git a/app/Core/ApiSession.php b/app/Core/ApiSession.php
@@ -120,13 +120,16 @@ public static function oAuth2Grants(
             } else {
                 $middleware_params[] = new ClientCredentials($client, $creds);
             }
+
+            if ($usesRefresh) {
+                $middleware_params[] = new RefreshToken($client, $creds);
+            }
+
         } else {
             $middleware_params[] = $customGrantType;
         }
 
-        if ($usesRefresh) {
-            $middleware_params[] = new RefreshToken($client, $creds);
-        }
+
 
         $stack = HandlerStack::create();
         $oauth = new OAuth2Middleware(...$middleware_params);

diff --git a/app/Core/AppSettings.php b/app/Core/AppSettings.php
@@ -11,7 +11,7 @@
 class AppSettings
 {
 
-    public string $appVersion = "3.1.4";
+    public string $appVersion = "3.2.0-beta";
 
 
     public string $dbVersion = "3.0.2";
@@ -40,21 +40,6 @@ public function loadSettings(Environment $config = null): void
             ini_set('display_errors', 0);
         }
 
-        if (session_status() !== PHP_SESSION_ACTIVE) {
-            if (filter_var($config->useRedis, FILTER_VALIDATE_BOOL) && (!defined("LEAN_CLI") || !LEAN_CLI)) {
-                ini_set('session.save_handler', 'redis');
-                ini_set('session.save_path', $config->redisUrl);
-            }
-
-            ini_set('session.use_cookies', 1);
-            ini_set('session.use_only_cookies', 1);
-            ini_set('session.cookie_httponly', 1);
-            ini_set('session.use_trans_sid', 0);
-
-        }
-
-        ini_set('session.cache_limiter', '');
-
         ini_set("log_errors", 1);
 
         if ($config->logPath != '' && $config->logPath != 'null') {