Merge branch '18978-webshell-timeout-ux' into main. Closes #18978

[arvados-workbench2.git] / public / webshell / index.html

diff --git a/public/webshell/index.html b/public/webshell/index.html
index 028664c488f74b7f5dd8256d63e9a81390bdeab8..aae70a97afab13a30a553eb2a6196d2a074f9484 100644 (file)
--- a/public/webshell/index.html
+++ b/public/webshell/index.html
@@ -60,7 +60,7 @@
         if (currentTime - lastTime > idleTimeoutMs) {
           //logout
           sh.reset();
-          sh.sessionClosed();
+          sh.sessionClosed("Session timed out after " + timeout + " seconds.");
           document.body.onmousemove = undefined;
           document.body.onkeydown = undefined;
         } else {
@@ -88,10 +88,12 @@
              sh.keysPressed(token + "\n");
              sh.vt100('(sent authentication token)\n');
              token = null;
-             updateIdleTimer();
-             document.body.onmousemove = updateIdleTimer;
-             document.body.onkeydown = updateIdleTimer;
-             setTimeout(checkIdleTimer, 1000);
+             if (timeout > 0) {
+               updateIdleTimer();
+               document.body.onmousemove = updateIdleTimer;
+               document.body.onkeydown = updateIdleTimer;
+               setTimeout(checkIdleTimer, 1000);
+             }
           } else {
             setTimeout(trySendToken, 200);
           }