XSS lesson updates

webgoat-container/src/main/java/org/owasp/webgoat/session/UserSessionData.java

@@ -18,6 +18,10 @@ public class UserSessionData {
 
     //GETTERS & SETTERS
     public Object getValue(String key) {
+        if (!userSessionData.containsKey(key)) {
+            return null;
+        }
+        // else
         return userSessionData.get(key);
     }
 

webgoat-container/src/main/resources/static/js/goatApp/view/GoatRouter.js

@@ -54,7 +54,7 @@ define(['jquery',
             webgoat.customjs.jquery = $; //passing jquery into custom js scope ... still klunky, but works for now
             webgoat.customjs.jqueryVuln = $vuln;
 
-            // temporary shim to support dom-xss lesson
+            // temporary shim to support dom-xss assignment
             webgoat.customjs.phoneHome = function (e) {
                 console.log('phoneHome invoked');
                 console.log(arguments.callee);
@@ -97,6 +97,11 @@ define(['jquery',
             this.menuController.updateMenu(name);
         },
 
+        testRoute: function (param) {
+            this.lessonController.testHandler(param);
+            //this.menuController.updateMenu(name);
+        },
+
         welcomeRoute: function () {
             render();
             this.lessonController.loadWelcome();

webgoat-container/src/main/resources/static/js/goatApp/view/LessonContentView.js

@@ -114,7 +114,9 @@ define(['jquery',
             this.renderFeedback(data.feedback);
 
             this.renderOutput(data.output || "");
-            if (data.assignmentCompleted) {
+            //TODO: refactor back assignmentCompleted in Java
+            if (data.lessonCompleted || data.assignmentCompleted) {
+
                 this.markAssignmentComplete();
                 this.trigger('assignment:complete');
             } else {