fixed logout warning, closes #413

Author: Erwin Dondorp

saltgui/static/scripts/pages/Logout.js

@@ -17,11 +17,7 @@ export class LogoutPage extends Page {
     }, 60000);
 
     // verify often for an expired session that we expect
-    this.sessionTimeoutInterval = window.setInterval(() => {
-      if (Utils.getStorageItem("session", "token", null) === null) {
-        window.clearInterval(this.sessionTimeoutInterval);
-        return;
-      }
+    window.setInterval(() => {
       this._updateSessionTimeoutWarning();
     }, 1000);
   }
@@ -57,6 +53,13 @@ export class LogoutPage extends Page {
   _updateSessionTimeoutWarning () {
     const warning = document.getElementById("warning");
 
+    if (Utils.getStorageItem("session", "token", null) === null) {
+      // cannot force logout without session
+      warning.style.display = "";
+      warning.innerText = "No session";
+      return;
+    }
+
     const loginResponseStr = Utils.getStorageItem("session", "login-response", "{}");
     const loginResponse = JSON.parse(loginResponseStr);
 

saltgui/static/scripts/panels/Options.js

@@ -168,8 +168,11 @@ export class OptionsPanel extends Panel {
       durationStr = "\nduration is " + str1.substr(11, 8);
     }
     let expiresInStr = "";
-    const str2 = new Date(pSessionExpire * 1000 - Date.now()).toISOString();
-    if (str2.startsWith("1970-01-01T")) {
+    const leftMillis = pSessionExpire * 1000 - Date.now();
+    if (leftMillis < 0) {
+      expiresInStr = "\nexpired";
+    } else if (leftMillis < 86400000) {
+      const str2 = new Date(leftMillis).toISOString();
       // remove the date prefix and the millisecond suffix
       expiresInStr = "\nexpires in " + str2.substr(11, 8);
     }