Merge pull request #935 from RunestoneInteractive/session_holes

plug session expiration holes

Author: bnmnetp

runestone/common/css/runestone-custom-sphinx-bootstrap.css

@@ -869,6 +869,10 @@ textarea#lp-result {
     background: green;
 }
 
+#subchapterprogress > div.loggedout {
+    background: lightgray;
+}
+
 .runestone_caption {
     text-align: center;
 }

runestone/common/js/bookfuncs.js

@@ -90,7 +90,7 @@ function addReadingList() {
 
 
 function timedRefresh() {
-    timeoutPeriod = 4500000;  // 75 minutes
+    timeoutPeriod =  900000;  // 75 minutes
     $(document).bind("idle.idleTimer", function () {
         // After timeout period send the user back to the index.  This will force a login
         // if needed when they want to go to a particular page.  This may not be perfect
@@ -109,7 +109,7 @@ class PageProgressBar {
     constructor(actDict) {
         this.possible = 0;
         this.total = 1;
-        if(actDict) {
+        if(actDict && Object.keys(actDict).length > 0) {
             this.activities = actDict;
         } else {
             let activities = {'page': 0};
@@ -149,6 +149,9 @@ class PageProgressBar {
         $( "#subchapterprogress" ).progressbar({
             value: value
         });
+        if (! eBookConfig.isLoggedIn) {
+            $("#subchapterprogress>div").addClass("loggedout");
+        }
     }
 
     updateProgress(div_id) {
@@ -185,10 +188,10 @@ function handlePageSetup() {
         }
         $(document).trigger("runestone:login")
         addReadingList();
-        // timedRefresh() ??
+        timedRefresh();
     } else {
         mess = 'Not logged in'
-        $(document).trigger("runestone:logout")
+        $(document).trigger("runestone:logout");
     }
     $(".loggedinuser").html(mess);
 

runestone/common/js/runestonebase.js

@@ -35,10 +35,16 @@ RunestoneBase.prototype.logBookEvent = function (eventInfo) {
         return;
     }
     eventInfo.course = eBookConfig.course;
+    eventInfo.clientLoginStatus = eBookConfig.isLoggedIn;
     eventInfo.timezoneoffset = (new Date()).getTimezoneOffset()/60
     if (eBookConfig.useRunestoneServices && eBookConfig.logLevel > 0) {
         var post_return = jQuery.post(eBookConfig.ajaxURL + 'hsblog', eventInfo,
-                                      null, 'json');
+            function(jsondata) {
+                if (jsondata.log == false) {
+                    alert(jsondata.message);
+                    location.href = eBookConfig.app + '/default/user/login?_next=' + location.pathname;
+                }
+            }, 'json');
     }
     console.log("logging event " + JSON.stringify(eventInfo));
     if (typeof pageProgressTracker.updateProgress === "function"
@@ -53,6 +59,7 @@ RunestoneBase.prototype.logRunEvent = function (eventInfo) {
         return;
     }
     eventInfo.course = eBookConfig.course;
+    eventInfo.clientLoginStatus = eBookConfig.isLoggedIn;
     eventInfo.timezoneoffset = (new Date()).getTimezoneOffset()/60
     if ( this.forceSave || (! 'to_save' in eventInfo) ) {
         eventInfo.save_code = "True"
@@ -63,6 +70,9 @@ RunestoneBase.prototype.logRunEvent = function (eventInfo) {
                 // data = JSON.parse(data);
                 if (data.message) {
                     alert(data.message);
+                    if (data.log == false) {
+                        location.href = eBookConfig.app + '/default/user/login?_next=' + location.pathname;
+                    }
                 }
                 this.forceSave = false;
             }).bind(this))