From b10c44aa8af707a7a7b0f983f4b304474974d2c8 Mon Sep 17 00:00:00 2001 From: Sainan <63328889+Sainan@users.noreply.github.com> Date: Fri, 18 Apr 2025 03:54:14 +0200 Subject: [PATCH 1/3] fix(webui): handle config get request failing due to expired authz --- static/webui/script.js | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/static/webui/script.js b/static/webui/script.js index b56e2f6e..998a2438 100644 --- a/static/webui/script.js +++ b/static/webui/script.js @@ -1315,7 +1315,7 @@ single.getRoute("/webui/cheats").on("beforeload", function () { interval = setInterval(() => { if (window.authz) { clearInterval(interval); - fetch("/custom/config?" + window.authz).then(res => { + fetch("/custom/config?" + window.authz).then(async res => { if (res.status == 200) { $("#server-settings-no-perms").addClass("d-none"); $("#server-settings").removeClass("d-none"); @@ -1335,8 +1335,14 @@ single.getRoute("/webui/cheats").on("beforeload", function () { }) ); } else { - $("#server-settings-no-perms").removeClass("d-none"); - $("#server-settings").addClass("d-none"); + if (await res.text() == "Log-in expired") { + revalidateAuthz(() => { + single.loadRoute("/webui/cheats"); + }); + } else { + $("#server-settings-no-perms").removeClass("d-none"); + $("#server-settings").addClass("d-none"); + } } }); } -- 2.47.2 From c5c8a2f0cfb108d76ded817c4275a3c47e1a9221 Mon Sep 17 00:00:00 2001 From: Sainan <63328889+Sainan@users.noreply.github.com> Date: Fri, 18 Apr 2025 03:57:19 +0200 Subject: [PATCH 2/3] I thought we disabled prettier here smh --- static/webui/script.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/static/webui/script.js b/static/webui/script.js index 998a2438..f1960a01 100644 --- a/static/webui/script.js +++ b/static/webui/script.js @@ -1335,7 +1335,7 @@ single.getRoute("/webui/cheats").on("beforeload", function () { }) ); } else { - if (await res.text() == "Log-in expired") { + if ((await res.text()) == "Log-in expired") { revalidateAuthz(() => { single.loadRoute("/webui/cheats"); }); -- 2.47.2 From d95fbf204d926debd45fd104c5f3af4dc24770e0 Mon Sep 17 00:00:00 2001 From: Sainan <63328889+Sainan@users.noreply.github.com> Date: Fri, 18 Apr 2025 04:00:19 +0200 Subject: [PATCH 3/3] Ensure this is purely a reload --- static/webui/script.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/static/webui/script.js b/static/webui/script.js index f1960a01..e8e4821e 100644 --- a/static/webui/script.js +++ b/static/webui/script.js @@ -1337,7 +1337,9 @@ single.getRoute("/webui/cheats").on("beforeload", function () { } else { if ((await res.text()) == "Log-in expired") { revalidateAuthz(() => { - single.loadRoute("/webui/cheats"); + if (single.getCurrentPath() == "/webui/cheats") { + single.loadRoute("/webui/cheats"); + } }); } else { $("#server-settings-no-perms").removeClass("d-none"); -- 2.47.2