Merge pull request #2591 from Leantime/sessionFixes

Improve current project setting flow
Leantime · Jul 27, 2024 · 290b4da · 290b4da
2 parents 47a8ee6 + 3cf5c54
commit 290b4da
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 21 deletions.
diff --git a/app/Core/Middleware/CurrentProject.php b/app/Core/Middleware/CurrentProject.php
@@ -3,6 +3,8 @@
 namespace Leantime\Core\Middleware;
 
 use Closure;
+use Leantime\Core\Frontcontroller;
+use Leantime\Core\HtmxRequest;
 use Leantime\Core\IncomingRequest;
 use Leantime\Domain\Auth\Services\Auth as AuthService;
 use Leantime\Domain\Projects\Services\Projects as ProjectService;
@@ -18,8 +20,15 @@ class CurrentProject
      **/
     public function handle(IncomingRequest $request, Closure $next): Response
     {
+
         if (app()->make(AuthService::class)->loggedIn()) {
-            app()->make(ProjectService::class)->setCurrentProject();
+
+            $actionPath = Frontcontroller::getModuleName();
+
+            //Only change/set project if the request is not htmx, api or cron
+            if (!($request instanceof HtmxRequest) && $actionPath != 'api' && $actionPath != 'cron') {
+                app()->make(ProjectService::class)->setCurrentProject();
+            }
         }
 
         return $next($request);

diff --git a/app/Core/Middleware/StartSession.php b/app/Core/Middleware/StartSession.php
@@ -11,15 +11,16 @@
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Date;
 use Leantime\Core\Eventhelpers;
+use Leantime\Core\Frontcontroller;
 use Leantime\Core\IncomingRequest;
 use Symfony\Component\HttpFoundation\Cookie;
 use Symfony\Component\HttpFoundation\Response;
 use Illuminate\Encryption\Encrypter;
 
 class StartSession
 {
-
     use Eventhelpers;
+
     /**
      * The session manager.
      *
@@ -64,33 +65,29 @@ public function handle(IncomingRequest $request, Closure $next)
 
         self::dispatch_event('session_initialized');
 
-        //Enable session locking by default
-        //We have too many async requests with session write requests creating all sorts of odd behavior
-        //if session locking is not enabled
         return $this->handleRequestWhileBlocking($request, $session, $next);
     }
 
     /**
      * Handle the given request within session state.
      *
-     * @param  IncomingRequest  $request
-     * @param  \Illuminate\Contracts\Session\Session  $session
-     * @param  \Closure  $next
+     * @param  IncomingRequest                       $request
+     * @param  \Illuminate\Contracts\Session\Session $session
+     * @param  \Closure                              $next
      * @return mixed
      */
-    protected function handleRequestWhileBlocking(IncomingRequest $request, $session, Closure $next) {
-
+    protected function handleRequestWhileBlocking(IncomingRequest $request, $session, Closure $next)
+    {
 
         $lockFor = $this->manager->defaultRouteBlockLockSeconds();
 
-        $lock = Cache::store("installation")
-            ->lock('session:'.$session->getId(), $lockFor)
+        $lock = $this->cache("installation")
+            ->lock('session:' . $session->getId(), $lockFor)
             ->betweenBlockedAttemptsSleepFor(50);
 
         try {
-            $lock->block(
-                $this->manager->defaultRouteBlockWaitSeconds()
-            );
+            //Acquire lock every 50ms for 20 seconds
+            $lock->block(20);
 
             return $this->handleStatefulRequest($request, $session, $next);
         } finally {
@@ -303,6 +300,6 @@ protected function sessionIsPersistent(?array $config = null)
      */
     protected function cache($driver)
     {
-        return call_user_func($this->cacheFactoryResolver)->driver($driver);
+        return Cache::store($driver);
     }
 }
diff --git a/app/Domain/Comments/Templates/submodules/generalComment.sub.php b/app/Domain/Comments/Templates/submodules/generalComment.sub.php
@@ -71,7 +71,7 @@
                                                         <span class="fa fa-trash"></span> <?php echo $tpl->__('links.delete') ?>
                                                     </a></li>
                                                 <?php } ?>
-                                                <?php if (($row['userId'] == $_SESSION['userdata']['id']) || $login::userIsAtLeast($roles::$manager)) { ?>
+                                                <?php if (($row['userId'] == session('userdata.id')) || $login::userIsAtLeast($roles::$manager)) { ?>
                                                     <li>
                                                         <a href="javascript:void(0);" onclick="toggleCommentBoxes(<?php echo $row['id']; ?>, null, '<?=$formHash?>', true)">
                                                             <span class="fa fa-edit"></span> <?php echo $tpl->__('label.edit') ?>

diff --git a/app/Domain/Projects/Hxcontrollers/ProjectCardProgress.php b/app/Domain/Projects/Hxcontrollers/ProjectCardProgress.php
@@ -77,7 +77,7 @@ public function init(
 
     public function getProgress() {
 
-        $projectId = $_GET['projectId'];
+        $projectId = $_GET['pId'];
 
         $project = array("id" => $projectId);
 

diff --git a/app/Domain/Projects/Services/Projects.php b/app/Domain/Projects/Services/Projects.php
@@ -656,6 +656,13 @@ public function changeCurrentSessionProject($projectId): bool
 
             $projectId = (int)$projectId;
 
+            if (
+                session()->exists("currentProject") &&
+                session("currentProject") == $projectId
+            ) {
+                return true;
+            }
+
             session(["currentProjectName" => '']);
 
             if ($this->isUserAssignedToProject(session("userdata.id"), $projectId) === true) {

diff --git a/app/Domain/Projects/Templates/partials/projectCard.blade.php b/app/Domain/Projects/Templates/partials/projectCard.blade.php
@@ -3,8 +3,6 @@
     'type' => 'simple'
 ])
 
-
-
 <div class="projectBox" id="projectBox-{{ $project['id'] }}">
     <div class="row" >
         <div class="col-md-12 fixed">
@@ -42,7 +40,7 @@ class="favoriteClick favoriteStar pull-right margin-right {{ $project['isFavorit
 
             @if($type != "simple")
                 <div id="projectProgressBox-{{ $project['id'] }}"
-                    hx-get="{{ BASE_URL }}/hx/projects/projectCardProgress/getProgress?projectId={{ $project['id'] }}"
+                    hx-get="{{ BASE_URL }}/hx/projects/projectCardProgress/getProgress?pId={{ $project['id'] }}"
                     hx-trigger="load"
                     hx-swap="innerHTML"
                     hx-target="#projectProgressBox-{{ $project['id'] }}"