From 58d82c0c1ec59b61652f5a0d4b1459901be77737 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gustavo=20Bascop=C3=A9?= <gustavo.bascope@processmaker.com>
Date: Tue, 26 Aug 2025 17:13:09 -0400
Subject: [PATCH 1/2] removed session.lifetime from cache and fix session modal
 on layoutnext.blade

---
 ProcessMaker/Providers/ProcessMakerServiceProvider.php | 5 ++++-
 resources/js/next/config/session.js                    | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/ProcessMaker/Providers/ProcessMakerServiceProvider.php b/ProcessMaker/Providers/ProcessMakerServiceProvider.php
index 1c18838a0d..280a55f8ad 100644
--- a/ProcessMaker/Providers/ProcessMakerServiceProvider.php
+++ b/ProcessMaker/Providers/ProcessMakerServiceProvider.php
@@ -284,7 +284,10 @@ public function register(): void
         });
 
         $this->app->extend('config', function ($originalConfig) {
-            return new SettingsConfigRepository($originalConfig->all());
+            $config = $originalConfig->all();
+            unset($config['session']['lifetime']);
+
+            return new SettingsConfigRepository($config);
         });
 
         $this->app->singleton('currentTenant', function () {
diff --git a/resources/js/next/config/session.js b/resources/js/next/config/session.js
index 6390c538e8..86d35bba19 100644
--- a/resources/js/next/config/session.js
+++ b/resources/js/next/config/session.js
@@ -10,7 +10,6 @@ export default () => {
   const closeSessionModal = getGlobalPMVariable("closeSessionModal");
   const alert = getGlobalPMVariable("alert");
   const user = getGlobalPMVariable("user");
-  const sessionModal = getGlobalPMVariable("sessionModal");
 
   const isSameDevice = (e) => {
     const localDeviceId = Vue.$cookies.get(e.device_variable);
@@ -26,6 +25,7 @@ export default () => {
     const AccountTimeoutWorker = new Worker(timeoutScript);
 
     AccountTimeoutWorker.addEventListener("message", (e) => {
+      const sessionModal = getGlobalPMVariable("sessionModal");
       if (e.data.method === "countdown") {
         sessionModal(
           "Session Warning",

From f99488c8aa96bb7776dad7da1846a2383d55fed4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gustavo=20Bascop=C3=A9?= <gustavo.bascope@processmaker.com>
Date: Tue, 26 Aug 2025 18:57:54 -0400
Subject: [PATCH 2/2] fix php unit tests

---
 ProcessMaker/Providers/ProcessMakerServiceProvider.php | 5 +----
 ProcessMaker/Repositories/SettingsConfigRepository.php | 6 ++++++
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/ProcessMaker/Providers/ProcessMakerServiceProvider.php b/ProcessMaker/Providers/ProcessMakerServiceProvider.php
index 280a55f8ad..1c18838a0d 100644
--- a/ProcessMaker/Providers/ProcessMakerServiceProvider.php
+++ b/ProcessMaker/Providers/ProcessMakerServiceProvider.php
@@ -284,10 +284,7 @@ public function register(): void
         });
 
         $this->app->extend('config', function ($originalConfig) {
-            $config = $originalConfig->all();
-            unset($config['session']['lifetime']);
-
-            return new SettingsConfigRepository($config);
+            return new SettingsConfigRepository($originalConfig->all());
         });
 
         $this->app->singleton('currentTenant', function () {
diff --git a/ProcessMaker/Repositories/SettingsConfigRepository.php b/ProcessMaker/Repositories/SettingsConfigRepository.php
index b04623e35a..d392504c54 100644
--- a/ProcessMaker/Repositories/SettingsConfigRepository.php
+++ b/ProcessMaker/Repositories/SettingsConfigRepository.php
@@ -45,6 +45,12 @@ public function get($key, $default = null)
             return $this->getMany($key);
         }
 
+        if ($key === 'session.lifetime') {
+            $settingValue = $this->getFromSettings($key);
+
+            return $settingValue ?? $default;
+        }
+
         if (Arr::has($this->items, $key)) {
             return Arr::get($this->items, $key);
         }