From 3a97e5925bb5704e20186a987e36596dc5d8dd80 Mon Sep 17 00:00:00 2001
From: Luis Fernando Molina <Luis-Fernando-Molina@users.noreply.github.com>
Date: Thu, 25 Oct 2018 09:46:59 +0200
Subject: [PATCH] Session Token moved into canvasApp context

---
 Scripts/AppPreLoader.js |  2 +-
 index.html              | 12 ++++++++++--
 server.js               |  2 +-
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/Scripts/AppPreLoader.js b/Scripts/AppPreLoader.js
index d2e03e9b1..1a175a911 100644
--- a/Scripts/AppPreLoader.js
+++ b/Scripts/AppPreLoader.js
@@ -66,7 +66,7 @@ function loadAdvancedAlgosPlatform() {
 
     /* The second thing to do is to send the tokenSession to the server, so that it can prepare the server side data structures needed. */
 
-    let sessionToken = window.SESSION_TOKEN;
+    let sessionToken = window.canvasApp.sessionToken;
     if (sessionToken === undefined) { sessionToken = ""}
 
     let path = window.URL_PREFIX  + "AABrowserAPI/authenticateUser/" + sessionToken;
diff --git a/index.html b/index.html
index 92d8c0a37..7797a5f94 100644
--- a/index.html
+++ b/index.html
@@ -12,14 +12,22 @@
 </head>
 <body id="body" style="margin: 0px; padding: 0px; border: 0px; overflow:hidden;" onload="
 
+    window.canvasApp = {
+        sessionToken: '',
+        executingAt:  'Master App',
+        visible = true,
+        topMargin: 85,
+        urlPrefix: 'https://develop.advancedalgos.net/'   /* 'http://localhost:1337/'   */
+    }
 
-
-    window.SESSION_TOKEN = '';
+    window.canvasApp.sessionToken = '';
     window.EXECUTING_AT = 'Master App';
     window.TOP_MARGIN = 85;
     window.CANVAS_VISIBLE = true;
     window.URL_PREFIX = 'https://develop.advancedalgos.net/';
     //window.URL_PREFIX = 'http://localhost:1337/';
+
+
     loadAdvancedAlgosPlatform();
 
     ">
diff --git a/server.js b/server.js
index 7d36a84fa..98f818a7b 100644
--- a/server.js
+++ b/server.js
@@ -1047,7 +1047,7 @@ function onBrowserRequest(request, response) {
 
                         if (requestParameters[2] !== "" && requestParameters[2] !== undefined) {
 
-                            fileContent = fileContent.replace("window.SESSION_TOKEN = ''", "window.SESSION_TOKEN = '" + requestParameters[2] + "'")
+                            fileContent = fileContent.replace("window.canvasApp.sessionToken = ''", "window.canvasApp.sessionToken = '" + requestParameters[2] + "'")
 
                         }