frodovdr/raspap-webgui
1
0
Fork 0
mirror of https://github.com/billz/raspap-webgui.git synced 2025-03-01 10:31:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Pass redirectUrl as action to login

Browse Source
This commit is contained in:
billz 2025-01-21 00:38:03 -08:00
parent effcb5e48e
commit 9042ee8c01
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/js/custom.js
View File

@ -674,6 +674,10 @@ window.addEventListener('load', function() {
let sessionCheckInterval = setInterval(checkSession, 5000); let sessionCheckInterval = setInterval(checkSession, 5000);
function checkSession() { function checkSession() {
// skip session check if on login page
if (window.location.pathname === '/login') {
return;
}
$.get('ajax/session/do_check_session.php', function (data) { $.get('ajax/session/do_check_session.php', function (data) {
if (data.status === 'session_expired') { if (data.status === 'session_expired') {
clearInterval(sessionCheckInterval); clearInterval(sessionCheckInterval);
@ -689,8 +693,19 @@ function showSessionExpiredModal() {
} }
$(document).on("click", "#js-session-expired-login", function(e) { $(document).on("click", "#js-session-expired-login", function(e) {
console.log('clicked!'); const loginModal = $('#modal-admin-login');
window.location.href = '/login'; const redirectUrl = window.location.pathname;
window.location.href = `/login?action=${encodeURIComponent(redirectUrl)}`;
});
// show modal login on page load
$(document).ready(function () {
const params = new URLSearchParams(window.location.search);
const redirectUrl = $('#redirect-url').val() || params.get('action') || '/';
$('#modal-admin-login').modal('show');
$('#redirect-url').val(redirectUrl);
$('#username').focus();
$('#username').addClass("focusedInput");
}); });
// DHCP or Static IP option group // DHCP or Static IP option group