Pi-Hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2025-12-20 02:38:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Logout: fix redirect

Browse Source 
Without this, we were getting into a loop with keep alive enabled
when using Firefox.

Signed-off-by: XhmikosR <xhmikosr@gmail.com>
This commit is contained in:
XhmikosR
2025-03-09 08:52:59 +02:00
parent e3ead702ce
commit 6c29d5dab8
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/js/logout.js
View File

@@ -9,8 +9,10 @@
document.addEventListener("DOMContentLoaded", () => { document.addEventListener("DOMContentLoaded", () => {
const logoutButton = document.getElementById("logout-button"); const logoutButton = document.getElementById("logout-button");
const logoutUrl = document.body.dataset.logoutUrl;
logoutButton.addEventListener("click", event => { logoutButton.addEventListener("click", event => {
event.preventDefault(); event.preventDefault();
utils.doLogout(); utils.doLogout(logoutUrl);
}); });
}); });

4
scripts/js/utils.js
View File

@@ -463,12 +463,12 @@ function changeBulkDeleteStates(table) {
} }
} }
function doLogout() { function doLogout(url) {
$.ajax({ $.ajax({
url: apiUrl + "/auth", url: apiUrl + "/auth",
method: "DELETE", method: "DELETE",
}).always(function () { }).always(function () {
location.reload(); globalThis.location = url;
}); });
} }

2
scripts/lua/header_authenticated.lp
View File

@@ -22,7 +22,7 @@ mg.include('header.lp','r')
<script defer src="<?=pihole.fileversion('vendor/bstreeview/bstreeview.min.js')?>"></script> <script defer src="<?=pihole.fileversion('vendor/bstreeview/bstreeview.min.js')?>"></script>
<script defer src="<?=pihole.fileversion('scripts/js/logout.js')?>"></script> <script defer src="<?=pihole.fileversion('scripts/js/logout.js')?>"></script>
</head> </head>
<body class="<?=theme.name?> hold-transition sidebar-mini <? if pihole.boxedlayout() then ?>layout-boxed<? end ?> logged-in" data-apiurl="<?=pihole.api_url()?>"> <body class="<?=theme.name?> hold-transition sidebar-mini <? if pihole.boxedlayout() then ?>layout-boxed<? end ?> logged-in" data-apiurl="<?=pihole.api_url()?>" data-logout-url="<?=webhome .. 'login'?>">
<noscript> <noscript>
<!-- JS Warning --> <!-- JS Warning -->
<div> <div>