FOUR-15298: [37189] Session Inactivity Option#7890

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
ryancooley merged 2 commits into from
Jan 23, 2025
Merged

FOUR-15298: [37189] Session Inactivity Option #7890

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
c80d97e
FOUR-15298: [37189] Session Inactivity Option
hjonathan Jan 13, 2025
63c543a
FOUR-15298: [37189] Session Inactivity Option
hjonathan Jan 14, 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
32 changes: 24 additions & 8 deletions resources/js/bootstrap.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -32,7 +32,7 @@ import DataTreeToggle from "./components/common/data-tree-toggle.vue";
import TreeView from "./components/TreeView.vue";
import FilterTable from "./components/shared/FilterTable.vue";
import PaginationTable from "./components/shared/PaginationTable.vue";
import PMDropdownSuggest from './components/PMDropdownSuggest';
import PMDropdownSuggest from "./components/PMDropdownSuggest";
import "@processmaker/screen-builder/dist/vue-form-builder.css";

window.__ = translator;
Expand DownExpand Up@@ -345,7 +345,14 @@ if (userID) {
window.ProcessMaker.AccountTimeoutWarnSeconds = parseInt(document.head.querySelector("meta[name=\"timeout-warn-seconds\"]")?.content);
window.ProcessMaker.AccountTimeoutEnabled = document.head.querySelector("meta[name=\"timeout-enabled\"]") ? parseInt(document.head.querySelector("meta[name=\"timeout-enabled\"]")?.content) : 1;
window.ProcessMaker.AccountTimeoutWorker = new Worker(timeoutScript);
window.ProcessMaker.AccountTimeoutWorker.addEventListener("message", (e) => {

const payloadAccountTimeoutWorker = {
timeout: window.ProcessMaker.AccountTimeoutLength,
warnSeconds: window.ProcessMaker.AccountTimeoutWarnSeconds,
enabled: window.ProcessMaker.AccountTimeoutEnabled,
};

window.ProcessMaker.AccountTimeoutWorker.onmessage = (e) => {
if (e.data.method === "countdown") {
window.ProcessMaker.sessionModal(
"Session Warning",
Expand All@@ -357,18 +364,27 @@ if (userID) {
if (e.data.method === "timedOut") {
window.location = "/logout?timeout=true";
}
});
};

// in some cases it's necessary to start manually
window.ProcessMaker.AccountTimeoutWorker.postMessage({
method: "start",
data: {
timeout: window.ProcessMaker.AccountTimeoutLength,
warnSeconds: window.ProcessMaker.AccountTimeoutWarnSeconds,
enabled: window.ProcessMaker.AccountTimeoutEnabled,
},
data: payloadAccountTimeoutWorker,
});

// Restart the timeout worker (when the user interacts with the page)
const eventsTimeoutWorker = ["click", "keypress"];

eventsTimeoutWorker.forEach((event) => {
document.addEventListener(event, () => {
window.ProcessMaker.AccountTimeoutWorker.postMessage({
method: "restart",
});
});
});

// End -> Restart the timeout worker (when the user interacts with the page)

const isSameDevice = (e) => {
const localDeviceId = Vue.$cookies.get(e.device_variable);
const remoteDeviceId = e.device_id;
Expand Down
158 changes: 90 additions & 68 deletions resources/js/components/Session.vue
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,75 +1,98 @@
<template>
<b-modal
id="sessionModal"
ref="sessionModal"
:title="title"
footer-class="pm-modal-footer"
no-close-on-backdrop
centered
>
<span v-html="message"></span>
<div class="progress">
<div class="progress-bar progress-bar-striped" role="progressbar" :style="{width: percentage + '%'}">
<span align="left" class="pl-2">{{moment().startOf('day').seconds(time).format('mm:ss')}}</span>
</div>
</div>
<template #modal-footer>
<a role="button" class="btn btn-outline-secondary ml-2" href="/logout" :disabled="disabled">{{('LogOut')}}</a>
<button type="button" class="btn btn-secondary ml-2" @click="keepAlive" :disabled="disabled">{{('Stay Connected')}}</button>
</template>
</b-modal>
<b-modal
id="sessionModal"
ref="sessionModal"
:title="title"
footer-class="pm-modal-footer"
no-close-on-backdrop
centered
no-close-button
>
<template #modal-header="{ close }">
<h5>{{ title }}</h5>
</template>
<span v-html="message" />
<div class="progress">
<div
class="progress-bar progress-bar-striped"
role="progressbar"
:style="{width: percentage + '%'}"
>
<span
align="left"
class="pl-2"
>{{ moment().startOf('day').seconds(time).format('mm:ss') }}</span>
</div>
</div>
<template #modal-footer>
<a
role="button"
class="btn btn-outline-secondary ml-2"
href="/logout"
:disabled="disabled"
>{{ ('LogOut') }}</a>
<button
type="button"
class="btn btn-secondary ml-2"
:disabled="disabled"
@click="keepAlive"
>
{{ ('Stay Connected') }}
</button>
</template>
</b-modal>
</template>


<script>

export default {
props: ["title", "message", "time", "warnSeconds", "shown"],
data() {
return {
errors: {},
disabled: false
}
},
watch: {
shown(value) {
if (value) {
this.$refs.sessionModal.show();
} else {
this.$refs.sessionModal.hide();
}
}
},
computed: {
percentage() {
if (this.time === "" || this.warnSeconds === "") {
return 0;
}
return Math.round((this.time / this.warnSeconds) * 100);
}
},
methods: {
onClose() {
this.$emit('close');
},
keepAlive() {
this.disabled = true;
ProcessMaker.apiClient
.post("/keep-alive", {}, {baseURL: ''})
.then(() => {
this.disabled = false;
this.onClose();
})
.catch(error => {
this.disabled = false;
this.errors = error.response.data.errors;
});
}
},
mounted() {
this.$emit("show");
}
}
export default {
props: ["title", "message", "time", "warnSeconds", "shown"],
data() {
return {
errors: {},
disabled: false,
};
},
computed: {
percentage() {
if (this.time === "" || this.warnSeconds === "") {
return 0;
}
return Math.round((this.time / this.warnSeconds) * 100);
},
},
watch: {
shown(value) {
if (value) {
this.$refs.sessionModal.show();
} else {
this.$refs.sessionModal.hide();
}
},
},
mounted() {
this.$emit("show");
},
methods: {
onClose() {
this.$emit("close");
},
keepAlive() {
this.disabled = true;

ProcessMaker.apiClient
.post("/keep-alive", {}, { baseURL: "" })
.then(() => {
this.disabled = false;
this.onClose();
})
.catch((error) => {
this.disabled = false;
this.errors = error.response.data.errors;
});
},
},
};
</script>

<style scoped>
Expand All@@ -81,5 +104,4 @@
display: flex;
}


</style>
17 changes: 16 additions & 1 deletion resources/js/timeout.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
self.time = 0;
self.interval = null;
self.restartWorker = false;

self.addEventListener("message", (e) => {
if (self.hasOwnProperty(e.data.method)) {
Expand All@@ -18,15 +19,24 @@ self.start = function (data) {
const timestampAtStart = Math.floor(Date.now() / 1000);
const timeoutAt = timestampAtStart + (data.timeout * 60);

self.restartWorker = false;

clearInterval(self.interval);
self.interval = setInterval(function () {
self.interval = setInterval(() => {
const currentTimestamp = Math.floor(Date.now() / 1000);
const timeRemaining = timeoutAt - currentTimestamp;

if (timeRemaining < data.warnSeconds && timeRemaining > 0) {
self.postMessage({ method: "countdown", data: { time: timeRemaining } });
}

if (timeRemaining > data.warnSeconds && self.restartWorker) {
clearInterval(self.interval);
self.start(data);
self.restartWorker = false;
return;
}

if (timeRemaining < 1) {
clearInterval(self.interval);
self.postMessage({ method: "timedOut", data: { time: timeRemaining } });
Expand All@@ -35,5 +45,10 @@ self.start = function (data) {
};

self.stop = function () {
self.restartWorker = false;
clearInterval(self.interval);
};

self.restart = function (data) {
self.restartWorker = true;
};
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
FOUR-15298: [37189] Session Inactivity Option#7890

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

ryancooley
merged 2 commits into

from

Jan 23, 2025
 Merged


FOUR-15298: [37189] Session Inactivity Option
#7890
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
c80d97e

FOUR-15298: [37189] Session Inactivity Option


hjonathan Jan 13, 2025
63c543a

FOUR-15298: [37189] Session Inactivity Option


hjonathan Jan 14, 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


32 changes: 24 additions & 8 deletions
resources/js/bootstrap.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,7 +32,7 @@ import DataTreeToggle from "./components/common/data-tree-toggle.vue";
import TreeView from "./components/TreeView.vue";
import FilterTable from "./components/shared/FilterTable.vue";
import PaginationTable from "./components/shared/PaginationTable.vue";
import PMDropdownSuggest from './components/PMDropdownSuggest';
import PMDropdownSuggest from "./components/PMDropdownSuggest";
import "@processmaker/screen-builder/dist/vue-form-builder.css";

window.__ = translator;
Expand DownExpand Up@@ -345,7 +345,14 @@ if (userID) {
 window.ProcessMaker.AccountTimeoutWarnSeconds = parseInt(document.head.querySelector("meta[name=\"timeout-warn-seconds\"]")?.content);
 window.ProcessMaker.AccountTimeoutEnabled = document.head.querySelector("meta[name=\"timeout-enabled\"]") ? parseInt(document.head.querySelector("meta[name=\"timeout-enabled\"]")?.content) : 1;
 window.ProcessMaker.AccountTimeoutWorker = new Worker(timeoutScript);
 window.ProcessMaker.AccountTimeoutWorker.addEventListener("message", (e) => {

 const payloadAccountTimeoutWorker = {
 timeout: window.ProcessMaker.AccountTimeoutLength,
 warnSeconds: window.ProcessMaker.AccountTimeoutWarnSeconds,
 enabled: window.ProcessMaker.AccountTimeoutEnabled,
 };

 window.ProcessMaker.AccountTimeoutWorker.onmessage = (e) => {
 if (e.data.method === "countdown") {
 window.ProcessMaker.sessionModal(
 "Session Warning",
Expand All@@ -357,18 +364,27 @@ if (userID) {
 if (e.data.method === "timedOut") {
 window.location = "/logout?timeout=true";
 }
 });
 };

 // in some cases it's necessary to start manually
 window.ProcessMaker.AccountTimeoutWorker.postMessage({
 method: "start",
 data: {
 timeout: window.ProcessMaker.AccountTimeoutLength,
 warnSeconds: window.ProcessMaker.AccountTimeoutWarnSeconds,
 enabled: window.ProcessMaker.AccountTimeoutEnabled,
 },
 data: payloadAccountTimeoutWorker,
 });

 // Restart the timeout worker (when the user interacts with the page)
 const eventsTimeoutWorker = ["click", "keypress"];

 eventsTimeoutWorker.forEach((event) => {
 document.addEventListener(event, () => {
 window.ProcessMaker.AccountTimeoutWorker.postMessage({
 method: "restart",
 });
 });
 });

 // End -> Restart the timeout worker (when the user interacts with the page)

 const isSameDevice = (e) => {
 const localDeviceId = Vue.$cookies.get(e.device_variable);
 const remoteDeviceId = e.device_id;
Expand Down

158 changes: 90 additions & 68 deletions
resources/js/components/Session.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,75 +1,98 @@
<template>
 <b-modal
 id="sessionModal"
 ref="sessionModal"
 :title="title"
 footer-class="pm-modal-footer"
 no-close-on-backdrop
 centered
 >
 <span v-html="message"></span>
 <div class="progress">
 <div class="progress-bar progress-bar-striped" role="progressbar" :style="{width: percentage + '%'}">
 <span align="left" class="pl-2">{{moment().startOf('day').seconds(time).format('mm:ss')}}</span>
 </div>
 </div>
 <template #modal-footer>
 <a role="button" class="btn btn-outline-secondary ml-2" href="/logout" :disabled="disabled">{{('LogOut')}}</a>
 <button type="button" class="btn btn-secondary ml-2" @click="keepAlive" :disabled="disabled">{{('Stay Connected')}}</button>
 </template>
 </b-modal>
 <b-modal
 id="sessionModal"
 ref="sessionModal"
 :title="title"
 footer-class="pm-modal-footer"
 no-close-on-backdrop
 centered
 no-close-button
 >
 <template #modal-header="{ close }">
 <h5>{{ title }}</h5>
 </template>
 <span v-html="message" />
 <div class="progress">
 <div
 class="progress-bar progress-bar-striped"
 role="progressbar"
 :style="{width: percentage + '%'}"
 >
 <span
 align="left"
 class="pl-2"
 >{{ moment().startOf('day').seconds(time).format('mm:ss') }}</span>
 </div>
 </div>
 <template #modal-footer>
 <a
 role="button"
 class="btn btn-outline-secondary ml-2"
 href="/logout"
 :disabled="disabled"
 >{{ ('LogOut') }}</a>
 <button
 type="button"
 class="btn btn-secondary ml-2"
 :disabled="disabled"
 @click="keepAlive"
 >
 {{ ('Stay Connected') }}
 </button>
 </template>
 </b-modal>
</template>


<script>

 export default {
 props: ["title", "message", "time", "warnSeconds", "shown"],
 data() {
 return {
 errors: {},
 disabled: false
 }
 },
 watch: {
 shown(value) {
 if (value) {
 this.$refs.sessionModal.show();
 } else {
 this.$refs.sessionModal.hide();
 }
 }
 },
 computed: {
 percentage() {
 if (this.time === "" || this.warnSeconds === "") {
 return 0;
 }
 return Math.round((this.time / this.warnSeconds) * 100);
 }
 },
 methods: {
 onClose() {
 this.$emit('close');
 },
 keepAlive() {
 this.disabled = true;
 ProcessMaker.apiClient
 .post("/keep-alive", {}, {baseURL: ''})
 .then(() => {
 this.disabled = false;
 this.onClose();
 })
 .catch(error => {
 this.disabled = false;
 this.errors = error.response.data.errors;
 });
 }
 },
 mounted() {
 this.$emit("show");
 }
 }
export default {
 props: ["title", "message", "time", "warnSeconds", "shown"],
 data() {
 return {
 errors: {},
 disabled: false,
 };
 },
 computed: {
 percentage() {
 if (this.time === "" || this.warnSeconds === "") {
 return 0;
 }
 return Math.round((this.time / this.warnSeconds) * 100);
 },
 },
 watch: {
 shown(value) {
 if (value) {
 this.$refs.sessionModal.show();
 } else {
 this.$refs.sessionModal.hide();
 }
 },
 },
 mounted() {
 this.$emit("show");
 },
 methods: {
 onClose() {
 this.$emit("close");
 },
 keepAlive() {
 this.disabled = true;

 ProcessMaker.apiClient
 .post("/keep-alive", {}, { baseURL: "" })
 .then(() => {
 this.disabled = false;
 this.onClose();
 })
 .catch((error) => {
 this.disabled = false;
 this.errors = error.response.data.errors;
 });
 },
 },
};
</script>

<style scoped>
Expand All@@ -81,5 +104,4 @@
 display: flex;
 }


</style>

17 changes: 16 additions & 1 deletion
resources/js/timeout.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
self.time = 0;
self.interval = null;
self.restartWorker = false;

self.addEventListener("message", (e) => {
 if (self.hasOwnProperty(e.data.method)) {
Expand All@@ -18,15 +19,24 @@ self.start = function (data) {
 const timestampAtStart = Math.floor(Date.now() / 1000);
 const timeoutAt = timestampAtStart + (data.timeout * 60);

 self.restartWorker = false;

 clearInterval(self.interval);
 self.interval = setInterval(function () {
 self.interval = setInterval(() => {
 const currentTimestamp = Math.floor(Date.now() / 1000);
 const timeRemaining = timeoutAt - currentTimestamp;

 if (timeRemaining < data.warnSeconds && timeRemaining > 0) {
 self.postMessage({ method: "countdown", data: { time: timeRemaining } });
 }

 if (timeRemaining > data.warnSeconds && self.restartWorker) {
 clearInterval(self.interval);
 self.start(data);
 self.restartWorker = false;
 return;
 }

 if (timeRemaining < 1) {
 clearInterval(self.interval);
 self.postMessage({ method: "timedOut", data: { time: timeRemaining } });
Expand All@@ -35,5 +45,10 @@ self.start = function (data) {
};

self.stop = function () {
 self.restartWorker = false;
 clearInterval(self.interval);
};

self.restart = function (data) {
 self.restartWorker = true;
};

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
FOUR-15298: [37189] Session Inactivity Option#7890

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

ryancooley
merged 2 commits into

from

Jan 23, 2025
 Merged


FOUR-15298: [37189] Session Inactivity Option
#7890
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
c80d97e

FOUR-15298: [37189] Session Inactivity Option


hjonathan Jan 13, 2025
63c543a

FOUR-15298: [37189] Session Inactivity Option


hjonathan Jan 14, 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


32 changes: 24 additions & 8 deletions
resources/js/bootstrap.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,7 +32,7 @@ import DataTreeToggle from "./components/common/data-tree-toggle.vue";
import TreeView from "./components/TreeView.vue";
import FilterTable from "./components/shared/FilterTable.vue";
import PaginationTable from "./components/shared/PaginationTable.vue";
import PMDropdownSuggest from './components/PMDropdownSuggest';
import PMDropdownSuggest from "./components/PMDropdownSuggest";
import "@processmaker/screen-builder/dist/vue-form-builder.css";

window.__ = translator;
Expand DownExpand Up@@ -345,7 +345,14 @@ if (userID) {
 window.ProcessMaker.AccountTimeoutWarnSeconds = parseInt(document.head.querySelector("meta[name=\"timeout-warn-seconds\"]")?.content);
 window.ProcessMaker.AccountTimeoutEnabled = document.head.querySelector("meta[name=\"timeout-enabled\"]") ? parseInt(document.head.querySelector("meta[name=\"timeout-enabled\"]")?.content) : 1;
 window.ProcessMaker.AccountTimeoutWorker = new Worker(timeoutScript);
 window.ProcessMaker.AccountTimeoutWorker.addEventListener("message", (e) => {

 const payloadAccountTimeoutWorker = {
 timeout: window.ProcessMaker.AccountTimeoutLength,
 warnSeconds: window.ProcessMaker.AccountTimeoutWarnSeconds,
 enabled: window.ProcessMaker.AccountTimeoutEnabled,
 };

 window.ProcessMaker.AccountTimeoutWorker.onmessage = (e) => {
 if (e.data.method === "countdown") {
 window.ProcessMaker.sessionModal(
 "Session Warning",
Expand All@@ -357,18 +364,27 @@ if (userID) {
 if (e.data.method === "timedOut") {
 window.location = "/logout?timeout=true";
 }
 });
 };

 // in some cases it's necessary to start manually
 window.ProcessMaker.AccountTimeoutWorker.postMessage({
 method: "start",
 data: {
 timeout: window.ProcessMaker.AccountTimeoutLength,
 warnSeconds: window.ProcessMaker.AccountTimeoutWarnSeconds,
 enabled: window.ProcessMaker.AccountTimeoutEnabled,
 },
 data: payloadAccountTimeoutWorker,
 });

 // Restart the timeout worker (when the user interacts with the page)
 const eventsTimeoutWorker = ["click", "keypress"];

 eventsTimeoutWorker.forEach((event) => {
 document.addEventListener(event, () => {
 window.ProcessMaker.AccountTimeoutWorker.postMessage({
 method: "restart",
 });
 });
 });

 // End -> Restart the timeout worker (when the user interacts with the page)

 const isSameDevice = (e) => {
 const localDeviceId = Vue.$cookies.get(e.device_variable);
 const remoteDeviceId = e.device_id;
Expand Down

158 changes: 90 additions & 68 deletions
resources/js/components/Session.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,75 +1,98 @@
<template>
 <b-modal
 id="sessionModal"
 ref="sessionModal"
 :title="title"
 footer-class="pm-modal-footer"
 no-close-on-backdrop
 centered
 >
 <span v-html="message"></span>
 <div class="progress">
 <div class="progress-bar progress-bar-striped" role="progressbar" :style="{width: percentage + '%'}">
 <span align="left" class="pl-2">{{moment().startOf('day').seconds(time).format('mm:ss')}}</span>
 </div>
 </div>
 <template #modal-footer>
 <a role="button" class="btn btn-outline-secondary ml-2" href="/logout" :disabled="disabled">{{('LogOut')}}</a>
 <button type="button" class="btn btn-secondary ml-2" @click="keepAlive" :disabled="disabled">{{('Stay Connected')}}</button>
 </template>
 </b-modal>
 <b-modal
 id="sessionModal"
 ref="sessionModal"
 :title="title"
 footer-class="pm-modal-footer"
 no-close-on-backdrop
 centered
 no-close-button
 >
 <template #modal-header="{ close }">
 <h5>{{ title }}</h5>
 </template>
 <span v-html="message" />
 <div class="progress">
 <div
 class="progress-bar progress-bar-striped"
 role="progressbar"
 :style="{width: percentage + '%'}"
 >
 <span
 align="left"
 class="pl-2"
 >{{ moment().startOf('day').seconds(time).format('mm:ss') }}</span>
 </div>
 </div>
 <template #modal-footer>
 <a
 role="button"
 class="btn btn-outline-secondary ml-2"
 href="/logout"
 :disabled="disabled"
 >{{ ('LogOut') }}</a>
 <button
 type="button"
 class="btn btn-secondary ml-2"
 :disabled="disabled"
 @click="keepAlive"
 >
 {{ ('Stay Connected') }}
 </button>
 </template>
 </b-modal>
</template>


<script>

 export default {
 props: ["title", "message", "time", "warnSeconds", "shown"],
 data() {
 return {
 errors: {},
 disabled: false
 }
 },
 watch: {
 shown(value) {
 if (value) {
 this.$refs.sessionModal.show();
 } else {
 this.$refs.sessionModal.hide();
 }
 }
 },
 computed: {
 percentage() {
 if (this.time === "" || this.warnSeconds === "") {
 return 0;
 }
 return Math.round((this.time / this.warnSeconds) * 100);
 }
 },
 methods: {
 onClose() {
 this.$emit('close');
 },
 keepAlive() {
 this.disabled = true;
 ProcessMaker.apiClient
 .post("/keep-alive", {}, {baseURL: ''})
 .then(() => {
 this.disabled = false;
 this.onClose();
 })
 .catch(error => {
 this.disabled = false;
 this.errors = error.response.data.errors;
 });
 }
 },
 mounted() {
 this.$emit("show");
 }
 }
export default {
 props: ["title", "message", "time", "warnSeconds", "shown"],
 data() {
 return {
 errors: {},
 disabled: false,
 };
 },
 computed: {
 percentage() {
 if (this.time === "" || this.warnSeconds === "") {
 return 0;
 }
 return Math.round((this.time / this.warnSeconds) * 100);
 },
 },
 watch: {
 shown(value) {
 if (value) {
 this.$refs.sessionModal.show();
 } else {
 this.$refs.sessionModal.hide();
 }
 },
 },
 mounted() {
 this.$emit("show");
 },
 methods: {
 onClose() {
 this.$emit("close");
 },
 keepAlive() {
 this.disabled = true;

 ProcessMaker.apiClient
 .post("/keep-alive", {}, { baseURL: "" })
 .then(() => {
 this.disabled = false;
 this.onClose();
 })
 .catch((error) => {
 this.disabled = false;
 this.errors = error.response.data.errors;
 });
 },
 },
};
</script>

<style scoped>
Expand All@@ -81,5 +104,4 @@
 display: flex;
 }


</style>

17 changes: 16 additions & 1 deletion
resources/js/timeout.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
self.time = 0;
self.interval = null;
self.restartWorker = false;

self.addEventListener("message", (e) => {
 if (self.hasOwnProperty(e.data.method)) {
Expand All@@ -18,15 +19,24 @@ self.start = function (data) {
 const timestampAtStart = Math.floor(Date.now() / 1000);
 const timeoutAt = timestampAtStart + (data.timeout * 60);

 self.restartWorker = false;

 clearInterval(self.interval);
 self.interval = setInterval(function () {
 self.interval = setInterval(() => {
 const currentTimestamp = Math.floor(Date.now() / 1000);
 const timeRemaining = timeoutAt - currentTimestamp;

 if (timeRemaining < data.warnSeconds && timeRemaining > 0) {
 self.postMessage({ method: "countdown", data: { time: timeRemaining } });
 }

 if (timeRemaining > data.warnSeconds && self.restartWorker) {
 clearInterval(self.interval);
 self.start(data);
 self.restartWorker = false;
 return;
 }

 if (timeRemaining < 1) {
 clearInterval(self.interval);
 self.postMessage({ method: "timedOut", data: { time: timeRemaining } });
Expand All@@ -35,5 +45,10 @@ self.start = function (data) {
};

self.stop = function () {
 self.restartWorker = false;
 clearInterval(self.interval);
};

self.restart = function (data) {
 self.restartWorker = true;
};

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
FOUR-15298: [37189] Session Inactivity Option#7890

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

ryancooley
merged 2 commits into

from

Jan 23, 2025
 Merged


FOUR-15298: [37189] Session Inactivity Option
#7890
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
c80d97e

FOUR-15298: [37189] Session Inactivity Option


hjonathan Jan 13, 2025
63c543a

FOUR-15298: [37189] Session Inactivity Option


hjonathan Jan 14, 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


32 changes: 24 additions & 8 deletions
resources/js/bootstrap.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,7 +32,7 @@ import DataTreeToggle from "./components/common/data-tree-toggle.vue";
import TreeView from "./components/TreeView.vue";
import FilterTable from "./components/shared/FilterTable.vue";
import PaginationTable from "./components/shared/PaginationTable.vue";
import PMDropdownSuggest from './components/PMDropdownSuggest';
import PMDropdownSuggest from "./components/PMDropdownSuggest";
import "@processmaker/screen-builder/dist/vue-form-builder.css";

window.__ = translator;
Expand DownExpand Up@@ -345,7 +345,14 @@ if (userID) {
 window.ProcessMaker.AccountTimeoutWarnSeconds = parseInt(document.head.querySelector("meta[name=\"timeout-warn-seconds\"]")?.content);
 window.ProcessMaker.AccountTimeoutEnabled = document.head.querySelector("meta[name=\"timeout-enabled\"]") ? parseInt(document.head.querySelector("meta[name=\"timeout-enabled\"]")?.content) : 1;
 window.ProcessMaker.AccountTimeoutWorker = new Worker(timeoutScript);
 window.ProcessMaker.AccountTimeoutWorker.addEventListener("message", (e) => {

 const payloadAccountTimeoutWorker = {
 timeout: window.ProcessMaker.AccountTimeoutLength,
 warnSeconds: window.ProcessMaker.AccountTimeoutWarnSeconds,
 enabled: window.ProcessMaker.AccountTimeoutEnabled,
 };

 window.ProcessMaker.AccountTimeoutWorker.onmessage = (e) => {
 if (e.data.method === "countdown") {
 window.ProcessMaker.sessionModal(
 "Session Warning",
Expand All@@ -357,18 +364,27 @@ if (userID) {
 if (e.data.method === "timedOut") {
 window.location = "/logout?timeout=true";
 }
 });
 };

 // in some cases it's necessary to start manually
 window.ProcessMaker.AccountTimeoutWorker.postMessage({
 method: "start",
 data: {
 timeout: window.ProcessMaker.AccountTimeoutLength,
 warnSeconds: window.ProcessMaker.AccountTimeoutWarnSeconds,
 enabled: window.ProcessMaker.AccountTimeoutEnabled,
 },
 data: payloadAccountTimeoutWorker,
 });

 // Restart the timeout worker (when the user interacts with the page)
 const eventsTimeoutWorker = ["click", "keypress"];

 eventsTimeoutWorker.forEach((event) => {
 document.addEventListener(event, () => {
 window.ProcessMaker.AccountTimeoutWorker.postMessage({
 method: "restart",
 });
 });
 });

 // End -> Restart the timeout worker (when the user interacts with the page)

 const isSameDevice = (e) => {
 const localDeviceId = Vue.$cookies.get(e.device_variable);
 const remoteDeviceId = e.device_id;
Expand Down

158 changes: 90 additions & 68 deletions
resources/js/components/Session.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,75 +1,98 @@
<template>
 <b-modal
 id="sessionModal"
 ref="sessionModal"
 :title="title"
 footer-class="pm-modal-footer"
 no-close-on-backdrop
 centered
 >
 <span v-html="message"></span>
 <div class="progress">
 <div class="progress-bar progress-bar-striped" role="progressbar" :style="{width: percentage + '%'}">
 <span align="left" class="pl-2">{{moment().startOf('day').seconds(time).format('mm:ss')}}</span>
 </div>
 </div>
 <template #modal-footer>
 <a role="button" class="btn btn-outline-secondary ml-2" href="/logout" :disabled="disabled">{{('LogOut')}}</a>
 <button type="button" class="btn btn-secondary ml-2" @click="keepAlive" :disabled="disabled">{{('Stay Connected')}}</button>
 </template>
 </b-modal>
 <b-modal
 id="sessionModal"
 ref="sessionModal"
 :title="title"
 footer-class="pm-modal-footer"
 no-close-on-backdrop
 centered
 no-close-button
 >
 <template #modal-header="{ close }">
 <h5>{{ title }}</h5>
 </template>
 <span v-html="message" />
 <div class="progress">
 <div
 class="progress-bar progress-bar-striped"
 role="progressbar"
 :style="{width: percentage + '%'}"
 >
 <span
 align="left"
 class="pl-2"
 >{{ moment().startOf('day').seconds(time).format('mm:ss') }}</span>
 </div>
 </div>
 <template #modal-footer>
 <a
 role="button"
 class="btn btn-outline-secondary ml-2"
 href="/logout"
 :disabled="disabled"
 >{{ ('LogOut') }}</a>
 <button
 type="button"
 class="btn btn-secondary ml-2"
 :disabled="disabled"
 @click="keepAlive"
 >
 {{ ('Stay Connected') }}
 </button>
 </template>
 </b-modal>
</template>


<script>

 export default {
 props: ["title", "message", "time", "warnSeconds", "shown"],
 data() {
 return {
 errors: {},
 disabled: false
 }
 },
 watch: {
 shown(value) {
 if (value) {
 this.$refs.sessionModal.show();
 } else {
 this.$refs.sessionModal.hide();
 }
 }
 },
 computed: {
 percentage() {
 if (this.time === "" || this.warnSeconds === "") {
 return 0;
 }
 return Math.round((this.time / this.warnSeconds) * 100);
 }
 },
 methods: {
 onClose() {
 this.$emit('close');
 },
 keepAlive() {
 this.disabled = true;
 ProcessMaker.apiClient
 .post("/keep-alive", {}, {baseURL: ''})
 .then(() => {
 this.disabled = false;
 this.onClose();
 })
 .catch(error => {
 this.disabled = false;
 this.errors = error.response.data.errors;
 });
 }
 },
 mounted() {
 this.$emit("show");
 }
 }
export default {
 props: ["title", "message", "time", "warnSeconds", "shown"],
 data() {
 return {
 errors: {},
 disabled: false,
 };
 },
 computed: {
 percentage() {
 if (this.time === "" || this.warnSeconds === "") {
 return 0;
 }
 return Math.round((this.time / this.warnSeconds) * 100);
 },
 },
 watch: {
 shown(value) {
 if (value) {
 this.$refs.sessionModal.show();
 } else {
 this.$refs.sessionModal.hide();
 }
 },
 },
 mounted() {
 this.$emit("show");
 },
 methods: {
 onClose() {
 this.$emit("close");
 },
 keepAlive() {
 this.disabled = true;

 ProcessMaker.apiClient
 .post("/keep-alive", {}, { baseURL: "" })
 .then(() => {
 this.disabled = false;
 this.onClose();
 })
 .catch((error) => {
 this.disabled = false;
 this.errors = error.response.data.errors;
 });
 },
 },
};
</script>

<style scoped>
Expand All@@ -81,5 +104,4 @@
 display: flex;
 }


</style>

17 changes: 16 additions & 1 deletion
resources/js/timeout.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
self.time = 0;
self.interval = null;
self.restartWorker = false;

self.addEventListener("message", (e) => {
 if (self.hasOwnProperty(e.data.method)) {
Expand All@@ -18,15 +19,24 @@ self.start = function (data) {
 const timestampAtStart = Math.floor(Date.now() / 1000);
 const timeoutAt = timestampAtStart + (data.timeout * 60);

 self.restartWorker = false;

 clearInterval(self.interval);
 self.interval = setInterval(function () {
 self.interval = setInterval(() => {
 const currentTimestamp = Math.floor(Date.now() / 1000);
 const timeRemaining = timeoutAt - currentTimestamp;

 if (timeRemaining < data.warnSeconds && timeRemaining > 0) {
 self.postMessage({ method: "countdown", data: { time: timeRemaining } });
 }

 if (timeRemaining > data.warnSeconds && self.restartWorker) {
 clearInterval(self.interval);
 self.start(data);
 self.restartWorker = false;
 return;
 }

 if (timeRemaining < 1) {
 clearInterval(self.interval);
 self.postMessage({ method: "timedOut", data: { time: timeRemaining } });
Expand All@@ -35,5 +45,10 @@ self.start = function (data) {
};

self.stop = function () {
 self.restartWorker = false;
 clearInterval(self.interval);
};

self.restart = function (data) {
 self.restartWorker = true;
};

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
FOUR-15298: [37189] Session Inactivity Option#7890

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

ryancooley
merged 2 commits into

from

Jan 23, 2025
 Merged


FOUR-15298: [37189] Session Inactivity Option
#7890
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
c80d97e

FOUR-15298: [37189] Session Inactivity Option


hjonathan Jan 13, 2025
63c543a

FOUR-15298: [37189] Session Inactivity Option


hjonathan Jan 14, 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


32 changes: 24 additions & 8 deletions
resources/js/bootstrap.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,7 +32,7 @@ import DataTreeToggle from "./components/common/data-tree-toggle.vue";
import TreeView from "./components/TreeView.vue";
import FilterTable from "./components/shared/FilterTable.vue";
import PaginationTable from "./components/shared/PaginationTable.vue";
import PMDropdownSuggest from './components/PMDropdownSuggest';
import PMDropdownSuggest from "./components/PMDropdownSuggest";
import "@processmaker/screen-builder/dist/vue-form-builder.css";

window.__ = translator;
Expand DownExpand Up@@ -345,7 +345,14 @@ if (userID) {
 window.ProcessMaker.AccountTimeoutWarnSeconds = parseInt(document.head.querySelector("meta[name=\"timeout-warn-seconds\"]")?.content);
 window.ProcessMaker.AccountTimeoutEnabled = document.head.querySelector("meta[name=\"timeout-enabled\"]") ? parseInt(document.head.querySelector("meta[name=\"timeout-enabled\"]")?.content) : 1;
 window.ProcessMaker.AccountTimeoutWorker = new Worker(timeoutScript);
 window.ProcessMaker.AccountTimeoutWorker.addEventListener("message", (e) => {

 const payloadAccountTimeoutWorker = {
 timeout: window.ProcessMaker.AccountTimeoutLength,
 warnSeconds: window.ProcessMaker.AccountTimeoutWarnSeconds,
 enabled: window.ProcessMaker.AccountTimeoutEnabled,
 };

 window.ProcessMaker.AccountTimeoutWorker.onmessage = (e) => {
 if (e.data.method === "countdown") {
 window.ProcessMaker.sessionModal(
 "Session Warning",
Expand All@@ -357,18 +364,27 @@ if (userID) {
 if (e.data.method === "timedOut") {
 window.location = "/logout?timeout=true";
 }
 });
 };

 // in some cases it's necessary to start manually
 window.ProcessMaker.AccountTimeoutWorker.postMessage({
 method: "start",
 data: {
 timeout: window.ProcessMaker.AccountTimeoutLength,
 warnSeconds: window.ProcessMaker.AccountTimeoutWarnSeconds,
 enabled: window.ProcessMaker.AccountTimeoutEnabled,
 },
 data: payloadAccountTimeoutWorker,
 });

 // Restart the timeout worker (when the user interacts with the page)
 const eventsTimeoutWorker = ["click", "keypress"];

 eventsTimeoutWorker.forEach((event) => {
 document.addEventListener(event, () => {
 window.ProcessMaker.AccountTimeoutWorker.postMessage({
 method: "restart",
 });
 });
 });

 // End -> Restart the timeout worker (when the user interacts with the page)

 const isSameDevice = (e) => {
 const localDeviceId = Vue.$cookies.get(e.device_variable);
 const remoteDeviceId = e.device_id;
Expand Down

158 changes: 90 additions & 68 deletions
resources/js/components/Session.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,75 +1,98 @@
<template>
 <b-modal
 id="sessionModal"
 ref="sessionModal"
 :title="title"
 footer-class="pm-modal-footer"
 no-close-on-backdrop
 centered
 >
 <span v-html="message"></span>
 <div class="progress">
 <div class="progress-bar progress-bar-striped" role="progressbar" :style="{width: percentage + '%'}">
 <span align="left" class="pl-2">{{moment().startOf('day').seconds(time).format('mm:ss')}}</span>
 </div>
 </div>
 <template #modal-footer>
 <a role="button" class="btn btn-outline-secondary ml-2" href="/logout" :disabled="disabled">{{('LogOut')}}</a>
 <button type="button" class="btn btn-secondary ml-2" @click="keepAlive" :disabled="disabled">{{('Stay Connected')}}</button>
 </template>
 </b-modal>
 <b-modal
 id="sessionModal"
 ref="sessionModal"
 :title="title"
 footer-class="pm-modal-footer"
 no-close-on-backdrop
 centered
 no-close-button
 >
 <template #modal-header="{ close }">
 <h5>{{ title }}</h5>
 </template>
 <span v-html="message" />
 <div class="progress">
 <div
 class="progress-bar progress-bar-striped"
 role="progressbar"
 :style="{width: percentage + '%'}"
 >
 <span
 align="left"
 class="pl-2"
 >{{ moment().startOf('day').seconds(time).format('mm:ss') }}</span>
 </div>
 </div>
 <template #modal-footer>
 <a
 role="button"
 class="btn btn-outline-secondary ml-2"
 href="/logout"
 :disabled="disabled"
 >{{ ('LogOut') }}</a>
 <button
 type="button"
 class="btn btn-secondary ml-2"
 :disabled="disabled"
 @click="keepAlive"
 >
 {{ ('Stay Connected') }}
 </button>
 </template>
 </b-modal>
</template>


<script>

 export default {
 props: ["title", "message", "time", "warnSeconds", "shown"],
 data() {
 return {
 errors: {},
 disabled: false
 }
 },
 watch: {
 shown(value) {
 if (value) {
 this.$refs.sessionModal.show();
 } else {
 this.$refs.sessionModal.hide();
 }
 }
 },
 computed: {
 percentage() {
 if (this.time === "" || this.warnSeconds === "") {
 return 0;
 }
 return Math.round((this.time / this.warnSeconds) * 100);
 }
 },
 methods: {
 onClose() {
 this.$emit('close');
 },
 keepAlive() {
 this.disabled = true;
 ProcessMaker.apiClient
 .post("/keep-alive", {}, {baseURL: ''})
 .then(() => {
 this.disabled = false;
 this.onClose();
 })
 .catch(error => {
 this.disabled = false;
 this.errors = error.response.data.errors;
 });
 }
 },
 mounted() {
 this.$emit("show");
 }
 }
export default {
 props: ["title", "message", "time", "warnSeconds", "shown"],
 data() {
 return {
 errors: {},
 disabled: false,
 };
 },
 computed: {
 percentage() {
 if (this.time === "" || this.warnSeconds === "") {
 return 0;
 }
 return Math.round((this.time / this.warnSeconds) * 100);
 },
 },
 watch: {
 shown(value) {
 if (value) {
 this.$refs.sessionModal.show();
 } else {
 this.$refs.sessionModal.hide();
 }
 },
 },
 mounted() {
 this.$emit("show");
 },
 methods: {
 onClose() {
 this.$emit("close");
 },
 keepAlive() {
 this.disabled = true;

 ProcessMaker.apiClient
 .post("/keep-alive", {}, { baseURL: "" })
 .then(() => {
 this.disabled = false;
 this.onClose();
 })
 .catch((error) => {
 this.disabled = false;
 this.errors = error.response.data.errors;
 });
 },
 },
};
</script>

<style scoped>
Expand All@@ -81,5 +104,4 @@
 display: flex;
 }


</style>

17 changes: 16 additions & 1 deletion
resources/js/timeout.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
self.time = 0;
self.interval = null;
self.restartWorker = false;

self.addEventListener("message", (e) => {
 if (self.hasOwnProperty(e.data.method)) {
Expand All@@ -18,15 +19,24 @@ self.start = function (data) {
 const timestampAtStart = Math.floor(Date.now() / 1000);
 const timeoutAt = timestampAtStart + (data.timeout * 60);

 self.restartWorker = false;

 clearInterval(self.interval);
 self.interval = setInterval(function () {
 self.interval = setInterval(() => {
 const currentTimestamp = Math.floor(Date.now() / 1000);
 const timeRemaining = timeoutAt - currentTimestamp;

 if (timeRemaining < data.warnSeconds && timeRemaining > 0) {
 self.postMessage({ method: "countdown", data: { time: timeRemaining } });
 }

 if (timeRemaining > data.warnSeconds && self.restartWorker) {
 clearInterval(self.interval);
 self.start(data);
 self.restartWorker = false;
 return;
 }

 if (timeRemaining < 1) {
 clearInterval(self.interval);
 self.postMessage({ method: "timedOut", data: { time: timeRemaining } });
Expand All@@ -35,5 +45,10 @@ self.start = function (data) {
};

self.stop = function () {
 self.restartWorker = false;
 clearInterval(self.interval);
};

self.restart = function (data) {
 self.restartWorker = true;
};

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
FOUR-15298: [37189] Session Inactivity Option#7890

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

ryancooley
merged 2 commits into

from

Jan 23, 2025
 Merged


FOUR-15298: [37189] Session Inactivity Option
#7890
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
c80d97e

FOUR-15298: [37189] Session Inactivity Option


hjonathan Jan 13, 2025
63c543a

FOUR-15298: [37189] Session Inactivity Option


hjonathan Jan 14, 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


32 changes: 24 additions & 8 deletions
resources/js/bootstrap.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,7 +32,7 @@ import DataTreeToggle from "./components/common/data-tree-toggle.vue";
import TreeView from "./components/TreeView.vue";
import FilterTable from "./components/shared/FilterTable.vue";
import PaginationTable from "./components/shared/PaginationTable.vue";
import PMDropdownSuggest from './components/PMDropdownSuggest';
import PMDropdownSuggest from "./components/PMDropdownSuggest";
import "@processmaker/screen-builder/dist/vue-form-builder.css";

window.__ = translator;
Expand DownExpand Up@@ -345,7 +345,14 @@ if (userID) {
 window.ProcessMaker.AccountTimeoutWarnSeconds = parseInt(document.head.querySelector("meta[name=\"timeout-warn-seconds\"]")?.content);
 window.ProcessMaker.AccountTimeoutEnabled = document.head.querySelector("meta[name=\"timeout-enabled\"]") ? parseInt(document.head.querySelector("meta[name=\"timeout-enabled\"]")?.content) : 1;
 window.ProcessMaker.AccountTimeoutWorker = new Worker(timeoutScript);
 window.ProcessMaker.AccountTimeoutWorker.addEventListener("message", (e) => {

 const payloadAccountTimeoutWorker = {
 timeout: window.ProcessMaker.AccountTimeoutLength,
 warnSeconds: window.ProcessMaker.AccountTimeoutWarnSeconds,
 enabled: window.ProcessMaker.AccountTimeoutEnabled,
 };

 window.ProcessMaker.AccountTimeoutWorker.onmessage = (e) => {
 if (e.data.method === "countdown") {
 window.ProcessMaker.sessionModal(
 "Session Warning",
Expand All@@ -357,18 +364,27 @@ if (userID) {
 if (e.data.method === "timedOut") {
 window.location = "/logout?timeout=true";
 }
 });
 };

 // in some cases it's necessary to start manually
 window.ProcessMaker.AccountTimeoutWorker.postMessage({
 method: "start",
 data: {
 timeout: window.ProcessMaker.AccountTimeoutLength,
 warnSeconds: window.ProcessMaker.AccountTimeoutWarnSeconds,
 enabled: window.ProcessMaker.AccountTimeoutEnabled,
 },
 data: payloadAccountTimeoutWorker,
 });

 // Restart the timeout worker (when the user interacts with the page)
 const eventsTimeoutWorker = ["click", "keypress"];

 eventsTimeoutWorker.forEach((event) => {
 document.addEventListener(event, () => {
 window.ProcessMaker.AccountTimeoutWorker.postMessage({
 method: "restart",
 });
 });
 });

 // End -> Restart the timeout worker (when the user interacts with the page)

 const isSameDevice = (e) => {
 const localDeviceId = Vue.$cookies.get(e.device_variable);
 const remoteDeviceId = e.device_id;
Expand Down

158 changes: 90 additions & 68 deletions
resources/js/components/Session.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,75 +1,98 @@
<template>
 <b-modal
 id="sessionModal"
 ref="sessionModal"
 :title="title"
 footer-class="pm-modal-footer"
 no-close-on-backdrop
 centered
 >
 <span v-html="message"></span>
 <div class="progress">
 <div class="progress-bar progress-bar-striped" role="progressbar" :style="{width: percentage + '%'}">
 <span align="left" class="pl-2">{{moment().startOf('day').seconds(time).format('mm:ss')}}</span>
 </div>
 </div>
 <template #modal-footer>
 <a role="button" class="btn btn-outline-secondary ml-2" href="/logout" :disabled="disabled">{{('LogOut')}}</a>
 <button type="button" class="btn btn-secondary ml-2" @click="keepAlive" :disabled="disabled">{{('Stay Connected')}}</button>
 </template>
 </b-modal>
 <b-modal
 id="sessionModal"
 ref="sessionModal"
 :title="title"
 footer-class="pm-modal-footer"
 no-close-on-backdrop
 centered
 no-close-button
 >
 <template #modal-header="{ close }">
 <h5>{{ title }}</h5>
 </template>
 <span v-html="message" />
 <div class="progress">
 <div
 class="progress-bar progress-bar-striped"
 role="progressbar"
 :style="{width: percentage + '%'}"
 >
 <span
 align="left"
 class="pl-2"
 >{{ moment().startOf('day').seconds(time).format('mm:ss') }}</span>
 </div>
 </div>
 <template #modal-footer>
 <a
 role="button"
 class="btn btn-outline-secondary ml-2"
 href="/logout"
 :disabled="disabled"
 >{{ ('LogOut') }}</a>
 <button
 type="button"
 class="btn btn-secondary ml-2"
 :disabled="disabled"
 @click="keepAlive"
 >
 {{ ('Stay Connected') }}
 </button>
 </template>
 </b-modal>
</template>


<script>

 export default {
 props: ["title", "message", "time", "warnSeconds", "shown"],
 data() {
 return {
 errors: {},
 disabled: false
 }
 },
 watch: {
 shown(value) {
 if (value) {
 this.$refs.sessionModal.show();
 } else {
 this.$refs.sessionModal.hide();
 }
 }
 },
 computed: {
 percentage() {
 if (this.time === "" || this.warnSeconds === "") {
 return 0;
 }
 return Math.round((this.time / this.warnSeconds) * 100);
 }
 },
 methods: {
 onClose() {
 this.$emit('close');
 },
 keepAlive() {
 this.disabled = true;
 ProcessMaker.apiClient
 .post("/keep-alive", {}, {baseURL: ''})
 .then(() => {
 this.disabled = false;
 this.onClose();
 })
 .catch(error => {
 this.disabled = false;
 this.errors = error.response.data.errors;
 });
 }
 },
 mounted() {
 this.$emit("show");
 }
 }
export default {
 props: ["title", "message", "time", "warnSeconds", "shown"],
 data() {
 return {
 errors: {},
 disabled: false,
 };
 },
 computed: {
 percentage() {
 if (this.time === "" || this.warnSeconds === "") {
 return 0;
 }
 return Math.round((this.time / this.warnSeconds) * 100);
 },
 },
 watch: {
 shown(value) {
 if (value) {
 this.$refs.sessionModal.show();
 } else {
 this.$refs.sessionModal.hide();
 }
 },
 },
 mounted() {
 this.$emit("show");
 },
 methods: {
 onClose() {
 this.$emit("close");
 },
 keepAlive() {
 this.disabled = true;

 ProcessMaker.apiClient
 .post("/keep-alive", {}, { baseURL: "" })
 .then(() => {
 this.disabled = false;
 this.onClose();
 })
 .catch((error) => {
 this.disabled = false;
 this.errors = error.response.data.errors;
 });
 },
 },
};
</script>

<style scoped>
Expand All@@ -81,5 +104,4 @@
 display: flex;
 }


</style>

17 changes: 16 additions & 1 deletion
resources/js/timeout.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
self.time = 0;
self.interval = null;
self.restartWorker = false;

self.addEventListener("message", (e) => {
 if (self.hasOwnProperty(e.data.method)) {
Expand All@@ -18,15 +19,24 @@ self.start = function (data) {
 const timestampAtStart = Math.floor(Date.now() / 1000);
 const timeoutAt = timestampAtStart + (data.timeout * 60);

 self.restartWorker = false;

 clearInterval(self.interval);
 self.interval = setInterval(function () {
 self.interval = setInterval(() => {
 const currentTimestamp = Math.floor(Date.now() / 1000);
 const timeRemaining = timeoutAt - currentTimestamp;

 if (timeRemaining < data.warnSeconds && timeRemaining > 0) {
 self.postMessage({ method: "countdown", data: { time: timeRemaining } });
 }

 if (timeRemaining > data.warnSeconds && self.restartWorker) {
 clearInterval(self.interval);
 self.start(data);
 self.restartWorker = false;
 return;
 }

 if (timeRemaining < 1) {
 clearInterval(self.interval);
 self.postMessage({ method: "timedOut", data: { time: timeRemaining } });
Expand All@@ -35,5 +45,10 @@ self.start = function (data) {
};

self.stop = function () {
 self.restartWorker = false;
 clearInterval(self.interval);
};

self.restart = function (data) {
 self.restartWorker = true;
};

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
FOUR-15298: [37189] Session Inactivity Option#7890

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

ryancooley
merged 2 commits into

from

Jan 23, 2025
 Merged


FOUR-15298: [37189] Session Inactivity Option
#7890
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
c80d97e

FOUR-15298: [37189] Session Inactivity Option


hjonathan Jan 13, 2025
63c543a

FOUR-15298: [37189] Session Inactivity Option


hjonathan Jan 14, 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


32 changes: 24 additions & 8 deletions
resources/js/bootstrap.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,7 +32,7 @@ import DataTreeToggle from "./components/common/data-tree-toggle.vue";
import TreeView from "./components/TreeView.vue";
import FilterTable from "./components/shared/FilterTable.vue";
import PaginationTable from "./components/shared/PaginationTable.vue";
import PMDropdownSuggest from './components/PMDropdownSuggest';
import PMDropdownSuggest from "./components/PMDropdownSuggest";
import "@processmaker/screen-builder/dist/vue-form-builder.css";

window.__ = translator;
Expand DownExpand Up@@ -345,7 +345,14 @@ if (userID) {
 window.ProcessMaker.AccountTimeoutWarnSeconds = parseInt(document.head.querySelector("meta[name=\"timeout-warn-seconds\"]")?.content);
 window.ProcessMaker.AccountTimeoutEnabled = document.head.querySelector("meta[name=\"timeout-enabled\"]") ? parseInt(document.head.querySelector("meta[name=\"timeout-enabled\"]")?.content) : 1;
 window.ProcessMaker.AccountTimeoutWorker = new Worker(timeoutScript);
 window.ProcessMaker.AccountTimeoutWorker.addEventListener("message", (e) => {

 const payloadAccountTimeoutWorker = {
 timeout: window.ProcessMaker.AccountTimeoutLength,
 warnSeconds: window.ProcessMaker.AccountTimeoutWarnSeconds,
 enabled: window.ProcessMaker.AccountTimeoutEnabled,
 };

 window.ProcessMaker.AccountTimeoutWorker.onmessage = (e) => {
 if (e.data.method === "countdown") {
 window.ProcessMaker.sessionModal(
 "Session Warning",
Expand All@@ -357,18 +364,27 @@ if (userID) {
 if (e.data.method === "timedOut") {
 window.location = "/logout?timeout=true";
 }
 });
 };

 // in some cases it's necessary to start manually
 window.ProcessMaker.AccountTimeoutWorker.postMessage({
 method: "start",
 data: {
 timeout: window.ProcessMaker.AccountTimeoutLength,
 warnSeconds: window.ProcessMaker.AccountTimeoutWarnSeconds,
 enabled: window.ProcessMaker.AccountTimeoutEnabled,
 },
 data: payloadAccountTimeoutWorker,
 });

 // Restart the timeout worker (when the user interacts with the page)
 const eventsTimeoutWorker = ["click", "keypress"];

 eventsTimeoutWorker.forEach((event) => {
 document.addEventListener(event, () => {
 window.ProcessMaker.AccountTimeoutWorker.postMessage({
 method: "restart",
 });
 });
 });

 // End -> Restart the timeout worker (when the user interacts with the page)

 const isSameDevice = (e) => {
 const localDeviceId = Vue.$cookies.get(e.device_variable);
 const remoteDeviceId = e.device_id;
Expand Down

158 changes: 90 additions & 68 deletions
resources/js/components/Session.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,75 +1,98 @@
<template>
 <b-modal
 id="sessionModal"
 ref="sessionModal"
 :title="title"
 footer-class="pm-modal-footer"
 no-close-on-backdrop
 centered
 >
 <span v-html="message"></span>
 <div class="progress">
 <div class="progress-bar progress-bar-striped" role="progressbar" :style="{width: percentage + '%'}">
 <span align="left" class="pl-2">{{moment().startOf('day').seconds(time).format('mm:ss')}}</span>
 </div>
 </div>
 <template #modal-footer>
 <a role="button" class="btn btn-outline-secondary ml-2" href="/logout" :disabled="disabled">{{('LogOut')}}</a>
 <button type="button" class="btn btn-secondary ml-2" @click="keepAlive" :disabled="disabled">{{('Stay Connected')}}</button>
 </template>
 </b-modal>
 <b-modal
 id="sessionModal"
 ref="sessionModal"
 :title="title"
 footer-class="pm-modal-footer"
 no-close-on-backdrop
 centered
 no-close-button
 >
 <template #modal-header="{ close }">
 <h5>{{ title }}</h5>
 </template>
 <span v-html="message" />
 <div class="progress">
 <div
 class="progress-bar progress-bar-striped"
 role="progressbar"
 :style="{width: percentage + '%'}"
 >
 <span
 align="left"
 class="pl-2"
 >{{ moment().startOf('day').seconds(time).format('mm:ss') }}</span>
 </div>
 </div>
 <template #modal-footer>
 <a
 role="button"
 class="btn btn-outline-secondary ml-2"
 href="/logout"
 :disabled="disabled"
 >{{ ('LogOut') }}</a>
 <button
 type="button"
 class="btn btn-secondary ml-2"
 :disabled="disabled"
 @click="keepAlive"
 >
 {{ ('Stay Connected') }}
 </button>
 </template>
 </b-modal>
</template>


<script>

 export default {
 props: ["title", "message", "time", "warnSeconds", "shown"],
 data() {
 return {
 errors: {},
 disabled: false
 }
 },
 watch: {
 shown(value) {
 if (value) {
 this.$refs.sessionModal.show();
 } else {
 this.$refs.sessionModal.hide();
 }
 }
 },
 computed: {
 percentage() {
 if (this.time === "" || this.warnSeconds === "") {
 return 0;
 }
 return Math.round((this.time / this.warnSeconds) * 100);
 }
 },
 methods: {
 onClose() {
 this.$emit('close');
 },
 keepAlive() {
 this.disabled = true;
 ProcessMaker.apiClient
 .post("/keep-alive", {}, {baseURL: ''})
 .then(() => {
 this.disabled = false;
 this.onClose();
 })
 .catch(error => {
 this.disabled = false;
 this.errors = error.response.data.errors;
 });
 }
 },
 mounted() {
 this.$emit("show");
 }
 }
export default {
 props: ["title", "message", "time", "warnSeconds", "shown"],
 data() {
 return {
 errors: {},
 disabled: false,
 };
 },
 computed: {
 percentage() {
 if (this.time === "" || this.warnSeconds === "") {
 return 0;
 }
 return Math.round((this.time / this.warnSeconds) * 100);
 },
 },
 watch: {
 shown(value) {
 if (value) {
 this.$refs.sessionModal.show();
 } else {
 this.$refs.sessionModal.hide();
 }
 },
 },
 mounted() {
 this.$emit("show");
 },
 methods: {
 onClose() {
 this.$emit("close");
 },
 keepAlive() {
 this.disabled = true;

 ProcessMaker.apiClient
 .post("/keep-alive", {}, { baseURL: "" })
 .then(() => {
 this.disabled = false;
 this.onClose();
 })
 .catch((error) => {
 this.disabled = false;
 this.errors = error.response.data.errors;
 });
 },
 },
};
</script>

<style scoped>
Expand All@@ -81,5 +104,4 @@
 display: flex;
 }


</style>

17 changes: 16 additions & 1 deletion
resources/js/timeout.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
self.time = 0;
self.interval = null;
self.restartWorker = false;

self.addEventListener("message", (e) => {
 if (self.hasOwnProperty(e.data.method)) {
Expand All@@ -18,15 +19,24 @@ self.start = function (data) {
 const timestampAtStart = Math.floor(Date.now() / 1000);
 const timeoutAt = timestampAtStart + (data.timeout * 60);

 self.restartWorker = false;

 clearInterval(self.interval);
 self.interval = setInterval(function () {
 self.interval = setInterval(() => {
 const currentTimestamp = Math.floor(Date.now() / 1000);
 const timeRemaining = timeoutAt - currentTimestamp;

 if (timeRemaining < data.warnSeconds && timeRemaining > 0) {
 self.postMessage({ method: "countdown", data: { time: timeRemaining } });
 }

 if (timeRemaining > data.warnSeconds && self.restartWorker) {
 clearInterval(self.interval);
 self.start(data);
 self.restartWorker = false;
 return;
 }

 if (timeRemaining < 1) {
 clearInterval(self.interval);
 self.postMessage({ method: "timedOut", data: { time: timeRemaining } });
Expand All@@ -35,5 +45,10 @@ self.start = function (data) {
};

self.stop = function () {
 self.restartWorker = false;
 clearInterval(self.interval);
};

self.restart = function (data) {
 self.restartWorker = true;
};

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
FOUR-15298: [37189] Session Inactivity Option#7890

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

ryancooley
merged 2 commits into

from

Jan 23, 2025
 Merged


FOUR-15298: [37189] Session Inactivity Option
#7890
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
c80d97e

FOUR-15298: [37189] Session Inactivity Option


hjonathan Jan 13, 2025
63c543a

FOUR-15298: [37189] Session Inactivity Option


hjonathan Jan 14, 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


32 changes: 24 additions & 8 deletions
resources/js/bootstrap.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,7 +32,7 @@ import DataTreeToggle from "./components/common/data-tree-toggle.vue";
import TreeView from "./components/TreeView.vue";
import FilterTable from "./components/shared/FilterTable.vue";
import PaginationTable from "./components/shared/PaginationTable.vue";
import PMDropdownSuggest from './components/PMDropdownSuggest';
import PMDropdownSuggest from "./components/PMDropdownSuggest";
import "@processmaker/screen-builder/dist/vue-form-builder.css";

window.__ = translator;
Expand DownExpand Up@@ -345,7 +345,14 @@ if (userID) {
 window.ProcessMaker.AccountTimeoutWarnSeconds = parseInt(document.head.querySelector("meta[name=\"timeout-warn-seconds\"]")?.content);
 window.ProcessMaker.AccountTimeoutEnabled = document.head.querySelector("meta[name=\"timeout-enabled\"]") ? parseInt(document.head.querySelector("meta[name=\"timeout-enabled\"]")?.content) : 1;
 window.ProcessMaker.AccountTimeoutWorker = new Worker(timeoutScript);
 window.ProcessMaker.AccountTimeoutWorker.addEventListener("message", (e) => {

 const payloadAccountTimeoutWorker = {
 timeout: window.ProcessMaker.AccountTimeoutLength,
 warnSeconds: window.ProcessMaker.AccountTimeoutWarnSeconds,
 enabled: window.ProcessMaker.AccountTimeoutEnabled,
 };

 window.ProcessMaker.AccountTimeoutWorker.onmessage = (e) => {
 if (e.data.method === "countdown") {
 window.ProcessMaker.sessionModal(
 "Session Warning",
Expand All@@ -357,18 +364,27 @@ if (userID) {
 if (e.data.method === "timedOut") {
 window.location = "/logout?timeout=true";
 }
 });
 };

 // in some cases it's necessary to start manually
 window.ProcessMaker.AccountTimeoutWorker.postMessage({
 method: "start",
 data: {
 timeout: window.ProcessMaker.AccountTimeoutLength,
 warnSeconds: window.ProcessMaker.AccountTimeoutWarnSeconds,
 enabled: window.ProcessMaker.AccountTimeoutEnabled,
 },
 data: payloadAccountTimeoutWorker,
 });

 // Restart the timeout worker (when the user interacts with the page)
 const eventsTimeoutWorker = ["click", "keypress"];

 eventsTimeoutWorker.forEach((event) => {
 document.addEventListener(event, () => {
 window.ProcessMaker.AccountTimeoutWorker.postMessage({
 method: "restart",
 });
 });
 });

 // End -> Restart the timeout worker (when the user interacts with the page)

 const isSameDevice = (e) => {
 const localDeviceId = Vue.$cookies.get(e.device_variable);
 const remoteDeviceId = e.device_id;
Expand Down

158 changes: 90 additions & 68 deletions
resources/js/components/Session.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,75 +1,98 @@
<template>
 <b-modal
 id="sessionModal"
 ref="sessionModal"
 :title="title"
 footer-class="pm-modal-footer"
 no-close-on-backdrop
 centered
 >
 <span v-html="message"></span>
 <div class="progress">
 <div class="progress-bar progress-bar-striped" role="progressbar" :style="{width: percentage + '%'}">
 <span align="left" class="pl-2">{{moment().startOf('day').seconds(time).format('mm:ss')}}</span>
 </div>
 </div>
 <template #modal-footer>
 <a role="button" class="btn btn-outline-secondary ml-2" href="/logout" :disabled="disabled">{{('LogOut')}}</a>
 <button type="button" class="btn btn-secondary ml-2" @click="keepAlive" :disabled="disabled">{{('Stay Connected')}}</button>
 </template>
 </b-modal>
 <b-modal
 id="sessionModal"
 ref="sessionModal"
 :title="title"
 footer-class="pm-modal-footer"
 no-close-on-backdrop
 centered
 no-close-button
 >
 <template #modal-header="{ close }">
 <h5>{{ title }}</h5>
 </template>
 <span v-html="message" />
 <div class="progress">
 <div
 class="progress-bar progress-bar-striped"
 role="progressbar"
 :style="{width: percentage + '%'}"
 >
 <span
 align="left"
 class="pl-2"
 >{{ moment().startOf('day').seconds(time).format('mm:ss') }}</span>
 </div>
 </div>
 <template #modal-footer>
 <a
 role="button"
 class="btn btn-outline-secondary ml-2"
 href="/logout"
 :disabled="disabled"
 >{{ ('LogOut') }}</a>
 <button
 type="button"
 class="btn btn-secondary ml-2"
 :disabled="disabled"
 @click="keepAlive"
 >
 {{ ('Stay Connected') }}
 </button>
 </template>
 </b-modal>
</template>


<script>

 export default {
 props: ["title", "message", "time", "warnSeconds", "shown"],
 data() {
 return {
 errors: {},
 disabled: false
 }
 },
 watch: {
 shown(value) {
 if (value) {
 this.$refs.sessionModal.show();
 } else {
 this.$refs.sessionModal.hide();
 }
 }
 },
 computed: {
 percentage() {
 if (this.time === "" || this.warnSeconds === "") {
 return 0;
 }
 return Math.round((this.time / this.warnSeconds) * 100);
 }
 },
 methods: {
 onClose() {
 this.$emit('close');
 },
 keepAlive() {
 this.disabled = true;
 ProcessMaker.apiClient
 .post("/keep-alive", {}, {baseURL: ''})
 .then(() => {
 this.disabled = false;
 this.onClose();
 })
 .catch(error => {
 this.disabled = false;
 this.errors = error.response.data.errors;
 });
 }
 },
 mounted() {
 this.$emit("show");
 }
 }
export default {
 props: ["title", "message", "time", "warnSeconds", "shown"],
 data() {
 return {
 errors: {},
 disabled: false,
 };
 },
 computed: {
 percentage() {
 if (this.time === "" || this.warnSeconds === "") {
 return 0;
 }
 return Math.round((this.time / this.warnSeconds) * 100);
 },
 },
 watch: {
 shown(value) {
 if (value) {
 this.$refs.sessionModal.show();
 } else {
 this.$refs.sessionModal.hide();
 }
 },
 },
 mounted() {
 this.$emit("show");
 },
 methods: {
 onClose() {
 this.$emit("close");
 },
 keepAlive() {
 this.disabled = true;

 ProcessMaker.apiClient
 .post("/keep-alive", {}, { baseURL: "" })
 .then(() => {
 this.disabled = false;
 this.onClose();
 })
 .catch((error) => {
 this.disabled = false;
 this.errors = error.response.data.errors;
 });
 },
 },
};
</script>

<style scoped>
Expand All@@ -81,5 +104,4 @@
 display: flex;
 }


</style>

17 changes: 16 additions & 1 deletion
resources/js/timeout.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
self.time = 0;
self.interval = null;
self.restartWorker = false;

self.addEventListener("message", (e) => {
 if (self.hasOwnProperty(e.data.method)) {
Expand All@@ -18,15 +19,24 @@ self.start = function (data) {
 const timestampAtStart = Math.floor(Date.now() / 1000);
 const timeoutAt = timestampAtStart + (data.timeout * 60);

 self.restartWorker = false;

 clearInterval(self.interval);
 self.interval = setInterval(function () {
 self.interval = setInterval(() => {
 const currentTimestamp = Math.floor(Date.now() / 1000);
 const timeRemaining = timeoutAt - currentTimestamp;

 if (timeRemaining < data.warnSeconds && timeRemaining > 0) {
 self.postMessage({ method: "countdown", data: { time: timeRemaining } });
 }

 if (timeRemaining > data.warnSeconds && self.restartWorker) {
 clearInterval(self.interval);
 self.start(data);
 self.restartWorker = false;
 return;
 }

 if (timeRemaining < 1) {
 clearInterval(self.interval);
 self.postMessage({ method: "timedOut", data: { time: timeRemaining } });
Expand All@@ -35,5 +45,10 @@ self.start = function (data) {
};

self.stop = function () {
 self.restartWorker = false;
 clearInterval(self.interval);
};

self.restart = function (data) {
 self.restartWorker = true;
};