From c43c3533507854740006e2cc4589a16b5d6b9c95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?=
 <barisusakli@gmail.com>
Date: Mon, 21 Jul 2025 21:22:40 -0400
Subject: [PATCH] fix: change the client side reloginTimer to match setting

when setting is changed restart timer
closes #13561
---
 public/src/admin/admin.js                 | 36 ++---------------------
 public/src/admin/modules/relogin-timer.js | 36 +++++++++++++++++++++++
 public/src/admin/settings.js              |  7 +++--
 3 files changed, 44 insertions(+), 35 deletions(-)
 create mode 100644 public/src/admin/modules/relogin-timer.js

diff --git a/public/src/admin/admin.js b/public/src/admin/admin.js
index e0d4e49b7f..7e68c65b8c 100644
--- a/public/src/admin/admin.js
+++ b/public/src/admin/admin.js
@@ -9,43 +9,12 @@ require('../../scripts-admin');
 app.onDomReady();
 
 (function () {
-	let logoutTimer = 0;
-	let logoutMessage;
-	function startLogoutTimer() {
-		if (app.config.adminReloginDuration <= 0) {
-			return;
-		}
-		if (logoutTimer) {
-			clearTimeout(logoutTimer);
-		}
-		// pre-translate language string gh#9046
-		if (!logoutMessage) {
-			require(['translator'], function (translator) {
-				translator.translate('[[login:logged-out-due-to-inactivity]]', function (translated) {
-					logoutMessage = translated;
-				});
-			});
-		}
-
-		logoutTimer = setTimeout(function () {
-			require(['bootbox'], function (bootbox) {
-				bootbox.alert({
-					closeButton: false,
-					message: logoutMessage,
-					callback: function () {
-						window.location.reload();
-					},
-				});
-			});
-		}, 3600000);
-	}
-
-	require(['hooks', 'admin/settings'], (hooks, Settings) => {
+	require(['hooks', 'admin/settings', 'admin/modules/relogin-timer'], (hooks, Settings, reloginTimer) => {
 		hooks.on('action:ajaxify.end', (data) => {
 			updatePageTitle(data.url);
 			setupRestartLinks();
 			showCorrectNavTab();
-			startLogoutTimer();
+			reloginTimer.start(app.config.adminReloginDuration);
 
 			$('[data-bs-toggle="tooltip"]').tooltip({
 				animation: false,
@@ -59,6 +28,7 @@ app.onDomReady();
 				Settings.populateTOC();
 			}
 		});
+
 		hooks.on('action:ajaxify.start', function () {
 			require(['bootstrap'], function (boostrap) {
 				const offcanvas = boostrap.Offcanvas.getInstance('#offcanvas');
diff --git a/public/src/admin/modules/relogin-timer.js b/public/src/admin/modules/relogin-timer.js
new file mode 100644
index 0000000000..f8504b51a2
--- /dev/null
+++ b/public/src/admin/modules/relogin-timer.js
@@ -0,0 +1,36 @@
+import { translate } from 'translator';
+import { alert as bootboxAlert } from 'bootbox';
+
+let logoutTimer = 0;
+let logoutMessage;
+
+export function start(adminReloginDuration) {
+	clearTimer();
+	if (adminReloginDuration <= 0) {
+		return;
+	}
+
+	// pre-translate language string gh#9046
+	if (!logoutMessage) {
+		translate('[[login:logged-out-due-to-inactivity]]', function (translated) {
+			logoutMessage = translated;
+		});
+	}
+
+	const timeoutMs = adminReloginDuration * 60000;
+	logoutTimer = setTimeout(function () {
+		bootboxAlert({
+			closeButton: false,
+			message: logoutMessage,
+			callback: function () {
+				window.location.reload();
+			},
+		});
+	}, timeoutMs);
+}
+
+function clearTimer() {
+	if (logoutTimer) {
+		clearTimeout(logoutTimer);
+	}
+}
\ No newline at end of file
diff --git a/public/src/admin/settings.js b/public/src/admin/settings.js
index 247f9646b2..f189718426 100644
--- a/public/src/admin/settings.js
+++ b/public/src/admin/settings.js
@@ -2,8 +2,8 @@
 
 
 define('admin/settings', [
-	'uploader', 'mousetrap', 'hooks', 'alerts', 'settings', 'bootstrap',
-], function (uploader, mousetrap, hooks, alerts, settings, bootstrap) {
+	'uploader', 'mousetrap', 'hooks', 'alerts', 'settings', 'bootstrap', 'admin/modules/relogin-timer',
+], function (uploader, mousetrap, hooks, alerts, settings, bootstrap, reloginTimer) {
 	const Settings = {};
 
 	Settings.populateTOC = function () {
@@ -217,6 +217,9 @@ define('admin/settings', [
 
 			for (const [field, value] of Object.entries(data)) {
 				app.config[field] = value;
+				if (field === 'adminReloginDuration') {
+					reloginTimer.start(parseInt(value, 10));
+				}
 			}
 
 			callback();