Skip to content

bugfix/FOUR-24333 Inconsistencies with Session Timeout before Alloted time #8476

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nolanpro merged 2 commits into from
Sep 2, 2025
Merged

bugfix/FOUR-24333 Inconsistencies with Session Timeout before Alloted time #8476

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
58d82c0
removed session.lifetime from cache and fix session modal on layoutne…
gustavobascope Aug 26, 2025
f99488c
fix php unit tests
gustavobascope Aug 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions ProcessMaker/Repositories/SettingsConfigRepository.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
2 changes: 1 addition & 1 deletion resources/js/next/config/session.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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",
Expand Down