fix: change the client side reloginTimer to match setting

when setting is changed restart timer
closes #13561

public/src/admin/admin.js

@@ -9,43 +9,12 @@ require('../../scripts-admin');
 app.onDomReady();
 
 (function () {
-	let logoutTimer = 0;
+	require(['hooks', 'admin/settings', 'admin/modules/relogin-timer'], (hooks, Settings, reloginTimer) => {
-	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) => {
 		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');

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);
+	}
+}

public/src/admin/settings.js

@@ -2,8 +2,8 @@
 
 
 define('admin/settings', [
-	'uploader', 'mousetrap', 'hooks', 'alerts', 'settings', 'bootstrap',
+	'uploader', 'mousetrap', 'hooks', 'alerts', 'settings', 'bootstrap', 'admin/modules/relogin-timer',
-], function (uploader, mousetrap, hooks, alerts, settings, bootstrap) {
+], 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();