Changeset 2274

Timestamp:

Mar 7, 2014, 2:27:06 PM (9 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #587: Improve session timeout handling

A really, really big red error message is used on the main page. When clicking the error message a login prompt is displayed. Once the user is logged in again, the error message is removed and navigation is restored.

Location:

extensions/net.sf.basedb.reggie/branches/2.15-stable/resources

Files:

• css/reggie.css (modified) (1 diff)
• keep_session_alive.jsp (modified) (1 diff)
• reggie.js (modified) (4 diffs)

extensions/net.sf.basedb.reggie/branches/2.15-stable/resources/css/reggie.css

@@ -1 +1 @@
 @charset "UTF-8";
+
+#timeoutMessage
+{
+  position: absolute;
+  display: table-cell;
+  top: 15%;
+  bottom: 15%;
+  left: 15%;
+  right: 15%;
+  font-weight: bold;
+  padding-top: 15%;
+  text-align: center;
+  font-size: 2em;
+}
+
 
 .error a

extensions/net.sf.basedb.reggie/branches/2.15-stable/resources/keep_session_alive.jsp

@@ -22 +22 @@
 function init()
 {
+  // Dispatch an event to the 'timeoutMessage' <div> asking it to restore navigation buttons
+  var timeoutMessage = window.opener.document.getElementById('timeoutMessage');
+  var customEvent = timeoutMessage.ownerDocument.createEvent('CustomEvent');
+  customEvent.initCustomEvent('logged-in', true, true, {});
+  timeoutMessage.dispatchEvent(customEvent);
+  // Close this window
   window.close();
 }

extensions/net.sf.basedb.reggie/branches/2.15-stable/resources/reggie.js

@@ -543 +543 @@
   var internal = {};
   internal.h1 = document.getElementsByTagName('h1')[0];
+  internal.navigation = document.getElementsByClassName('navigation')[0];
   internal.interval = debug ? 5000 : 30000;
   internal.root = reggieRoot ? reggieRoot : '';
@@ -580 +581 @@
     request.send(null);
     
-    setTimeout(internal.repeatAgain, 1000); 
+    internal.timerId = setTimeout(internal.repeatAgain, 1000);  
   }
   
@@ -586 +587 @@
   {
     Main.removeClass(internal.h1, 'working');
-    setTimeout(internal.sendKeepAlive, internal.interval);
+    internal.timerId = setTimeout(internal.sendKeepAlive, internal.interval);
   }
   
@@ -600 +601 @@
     if (!response.session)
     {
-      var keepAlive = Main.getPageValue('open.windows', 'KeepSessionAlive');
-      if (!keepAlive || keepAlive.closed)
+      // Session has timed out; no need to keep it running
+      clearTimeout(internal.timerId);
+
+      // Hide navigation buttons
+      internal.navigation.style.display = 'none';
+      
+      // Show message
+      var div = document.getElementById('timeoutMessage');
+      if (!div)
       {
-        Main.openPopup(internal.root+'keep_session_alive.jsp?ID='+ID, 'KeepSessionAlive', 800, 600);
+        div = document.createElement('div');
+        div.id = 'timeoutMessage';
+        div.className = 'messagecontainer error link';
+        div.innerHTML = 'You have been logged out due to inactivity or unstable internet connection. Click HERE to login again!';
+        div.addEventListener('click', internal.openLoginWindow, false);
+        div.addEventListener('logged-in', internal.loggedInAgain, false);
+        var frm = document.forms['reggie'];
+        frm.appendChild(div);
       }
-    }
+      else
+      {
+        Main.show('timeoutMessage');
+      }
+    }
+  }
+  
+  // Open popup window for logging in again
+  internal.openLoginWindow = function()
+  {
+    Main.openPopup(internal.root+'keep_session_alive.jsp?ID='+ID, 'KeepSessionAlive', 800, 600);
+  }
+  
+  // Callback when the user has been successfully logged in
+  internal.loggedInAgain = function()
+  {
+    Main.hide('timeoutMessage');
+    internal.navigation.style.display = 'block';
+    internal.repeatAgain();
   }