Logout: fix redirect

XhmikosR · XhmikosR · commit 6c29d5dab8c2 · 2025-03-24T08:29:40.000+02:00
Without this, we were getting into a loop with keep alive enabled
when using Firefox.

Signed-off-by: XhmikosR &lt;xhmikosr@gmail.com&gt;
diff --git a/scripts/js/logout.js b/scripts/js/logout.js
@@ -9,8 +9,10 @@
 
 document.addEventListener("DOMContentLoaded", () => {
   const logoutButton = document.getElementById("logout-button");
+  const logoutUrl = document.body.dataset.logoutUrl;
+
   logoutButton.addEventListener("click", event => {
     event.preventDefault();
-    utils.doLogout();
+    utils.doLogout(logoutUrl);
   });
 });
diff --git a/scripts/js/utils.js b/scripts/js/utils.js
@@ -463,12 +463,12 @@ function changeBulkDeleteStates(table) {
   }
 }
 
-function doLogout() {
+function doLogout(url) {
   $.ajax({
     url: apiUrl + "/auth",
     method: "DELETE",
   }).always(function () {
-    location.reload();
+    globalThis.location = url;
   });
 }
 
diff --git a/scripts/lua/header_authenticated.lp b/scripts/lua/header_authenticated.lp
@@ -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('scripts/js/logout.js')?>"></script>
 </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>
     <!-- JS Warning -->
     <div>

Original file line number	Diff line number	Diff line change
`@@ -463,12 +463,12 @@ function changeBulkDeleteStates(table) {`
`463`	`463`	`}`
`464`	`464`	`}`
`465`	`465`
`466`		`-function doLogout() {`
	`466`	`+function doLogout(url) {`
`467`	`467`	`$.ajax({`
`468`	`468`	`url: apiUrl + "/auth",`
`469`	`469`	`method: "DELETE",`
`470`	`470`	`}).always(function () {`
`471`		`- location.reload();`
	`471`	`+ globalThis.location = url;`
`472`	`472`	`});`
`473`	`473`	`}`
`474`	`474`