From e422da4c64a2449ff99e240206385a0227f94490 Mon Sep 17 00:00:00 2001
From: Nanne Baars <nanne.baars@owasp.org>
Date: Fri, 27 Apr 2018 18:33:31 +0200
Subject: [PATCH] Polling for lesson updates (updates the menu and page
 navigation)

---
 .../service/LessonProgressService.java        | 20 +++----
 .../static/js/goatApp/model/MenuCollection.js | 54 ++++++++++---------
 .../js/goatApp/view/LessonContentView.js      |  7 ++-
 3 files changed, 46 insertions(+), 35 deletions(-)

diff --git a/webgoat-container/src/main/java/org/owasp/webgoat/service/LessonProgressService.java b/webgoat-container/src/main/java/org/owasp/webgoat/service/LessonProgressService.java
index c9fbf8820..76e6187a5 100644
--- a/webgoat-container/src/main/java/org/owasp/webgoat/service/LessonProgressService.java
+++ b/webgoat-container/src/main/java/org/owasp/webgoat/service/LessonProgressService.java
@@ -40,17 +40,19 @@ public class LessonProgressService {
     @RequestMapping(value = "/service/lessonprogress.mvc", produces = "application/json")
     @ResponseBody
     public Map getLessonInfo() {
-        UserTracker userTracker = userTrackerRepository.findByUser(webSession.getUserName());
-        LessonTracker lessonTracker = userTracker.getLessonTracker(webSession.getCurrentLesson());
         Map json = Maps.newHashMap();
-        String successMessage = "";
-        boolean lessonCompleted = false;
-        if (lessonTracker != null) {
-            lessonCompleted = lessonTracker.isLessonSolved();
-            successMessage = "LessonCompleted"; //@todo we still use this??
+        UserTracker userTracker = userTrackerRepository.findByUser(webSession.getUserName());
+        if (webSession.getCurrentLesson() != null) {
+            LessonTracker lessonTracker = userTracker.getLessonTracker(webSession.getCurrentLesson());
+            String successMessage = "";
+            boolean lessonCompleted = false;
+            if (lessonTracker != null) {
+                lessonCompleted = lessonTracker.isLessonSolved();
+                successMessage = "LessonCompleted"; //@todo we still use this??
+            }
+            json.put("lessonCompleted", lessonCompleted);
+            json.put("successMessage", successMessage);
         }
-        json.put("lessonCompleted", lessonCompleted);
-        json.put("successMessage", successMessage);
         return json;
     }
 
diff --git a/webgoat-container/src/main/resources/static/js/goatApp/model/MenuCollection.js b/webgoat-container/src/main/resources/static/js/goatApp/model/MenuCollection.js
index 709c557f7..c4c01c70a 100644
--- a/webgoat-container/src/main/resources/static/js/goatApp/model/MenuCollection.js
+++ b/webgoat-container/src/main/resources/static/js/goatApp/model/MenuCollection.js
@@ -1,29 +1,33 @@
 define(['jquery',
-	'underscore',
-	'backbone',
-	'goatApp/model/MenuModel'], 
-	function($,_,Backbone,MenuModel) {
+        'underscore',
+        'backbone',
+        'goatApp/model/MenuModel'],
+    function ($, _, Backbone, MenuModel) {
 
-	return Backbone.Collection.extend({
-		model: MenuModel,
-		url:'service/lessonmenu.mvc',
-		initialize: function () {
-			var self = this;
-			this.fetch();
-		},
+        return Backbone.Collection.extend({
+            model: MenuModel,
+            url: 'service/lessonmenu.mvc',
 
-		onDataLoaded: function() {
-			this.trigger('menuData:loaded');
-		},
+            initialize: function () {
+                var self = this;
+                this.fetch();
+                setInterval(function () {
+                    this.fetch()
+                }.bind(this), 5000);
+            },
 
-		fetch: function() {
-			var self=this;
-			Backbone.Collection.prototype.fetch.apply(this,arguments).then(
-				function(data) {
-					this.models = data;
-					self.onDataLoaded();
-				}
-			);
-		}
-	});
-});
\ No newline at end of file
+            onDataLoaded: function () {
+                this.trigger('menuData:loaded');
+            },
+
+            fetch: function () {
+                var self = this;
+                Backbone.Collection.prototype.fetch.apply(this, arguments).then(
+                    function (data) {
+                        this.models = data;
+                        self.onDataLoaded();
+                    }
+                );
+            }
+        });
+    });
\ No newline at end of file
diff --git a/webgoat-container/src/main/resources/static/js/goatApp/view/LessonContentView.js b/webgoat-container/src/main/resources/static/js/goatApp/view/LessonContentView.js
index 65f45a63e..d246b8110 100644
--- a/webgoat-container/src/main/resources/static/js/goatApp/view/LessonContentView.js
+++ b/webgoat-container/src/main/resources/static/js/goatApp/view/LessonContentView.js
@@ -25,6 +25,9 @@ define(['jquery',
                 self.navToPage(page);
               }
             });
+            setInterval(function () {
+                this.updatePagination();
+            }.bind(this), 5000);
         },
 
         findPage: function(assignment) {
@@ -60,7 +63,9 @@ define(['jquery',
          },
 
          updatePagination: function() {
-            this.paginationControlView.updateCollection();
+            if ( this.paginationControlView != undefined ) {
+                this.paginationControlView.updateCollection();
+            }
          },
 
          getCurrentPage: function () {