From 3203398b575527792dec27708da30b04cb53bd74 Mon Sep 17 00:00:00 2001
From: Matias <mati108@gmail.com>
Date: Fri, 24 May 2019 20:28:36 -0300
Subject: [PATCH] Removing sessionToken

---
 Dashboard.js                        |  3 ---
 StrategySpace/StrategizerGateway.js |  2 --
 TopSpace/CurrentEvent.js            | 12 ++++++------
 TopSpace/Login.js                   | 12 +++---------
 4 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/Dashboard.js b/Dashboard.js
index 663c7cfa6..773606797 100644
--- a/Dashboard.js
+++ b/Dashboard.js
@@ -120,7 +120,6 @@ function newDashboard () {
                     isTrader
                     avatarHandle
                     avatarChangeDate
-                    sessionToken
                     role {
                     id
                     }
@@ -136,8 +135,6 @@ function newDashboard () {
                         }
                     })
                         .then(response => {
-                            sessionToken = response.data.users_UserByAuthId.sessionToken;
-
                             window.localStorage.setItem('loggedInUser', JSON.stringify(response.data.users_UserByAuthId));
                             resolve({ user: response.data.users_UserByAuthId })
                         })
diff --git a/StrategySpace/StrategizerGateway.js b/StrategySpace/StrategizerGateway.js
index 26db512ec..60d4cff73 100644
--- a/StrategySpace/StrategizerGateway.js
+++ b/StrategySpace/StrategizerGateway.js
@@ -262,8 +262,6 @@ function newStrategizerGateway () {
 
       const authId = user.authId
 
-      let sessionToken
-
       const apolloClient = new Apollo.lib.ApolloClient({
         networkInterface: Apollo.lib.createNetworkInterface({
           uri: window.canvasApp.graphQL.masterAppApiUrl,
diff --git a/TopSpace/CurrentEvent.js b/TopSpace/CurrentEvent.js
index b2831e277..29b9b1ab7 100644
--- a/TopSpace/CurrentEvent.js
+++ b/TopSpace/CurrentEvent.js
@@ -86,9 +86,9 @@ function newCurrentEvent () {
   return thisObject
 
   function initialize (pSharedStatus) {
-    let sessionToken = window.localStorage.getItem('sessionToken')
+    let accessToken = window.localStorage.getItem('access_token')
 
-    if (sessionToken === null || sessionToken === '') {
+    if (accessToken === null || accessToken === '') {
             /* not logged in */
       return
     }
@@ -126,9 +126,9 @@ function newCurrentEvent () {
   }
 
   function onClick () {
-    let sessionToken = window.localStorage.getItem('sessionToken')
+    let accessToken = window.localStorage.getItem('access_token')
 
-    if (sessionToken === null || sessionToken === '') {
+    if (accessToken === null || accessToken === '') {
             /* not logged in */
       return
     }
@@ -169,9 +169,9 @@ function newCurrentEvent () {
   }
 
   function draw () {
-    let sessionToken = window.localStorage.getItem('sessionToken')
+    let accessToken = window.localStorage.getItem('access_token')
 
-    if (sessionToken === null || sessionToken === '') {
+    if (accessToken === null || accessToken === '') {
             /* not logged in */
       return
     }
diff --git a/TopSpace/Login.js b/TopSpace/Login.js
index 61aa996c1..c5a8a58af 100644
--- a/TopSpace/Login.js
+++ b/TopSpace/Login.js
@@ -44,7 +44,6 @@ function newLogin () {
               // if there is no user that means that we are logged off, which means it is time to clean the local storage of things from the last log in.
 
         window.localStorage.removeItem('loggedInUser')
-        window.localStorage.removeItem('sessionToken')
         return
       }
 
@@ -52,8 +51,6 @@ function newLogin () {
 
       const authId = user.authId
 
-      let sessionToken
-
       const apolloClient = new Apollo.lib.ApolloClient({
         networkInterface: Apollo.lib.createNetworkInterface({
           uri: window.canvasApp.graphQL.masterAppApiUrl,
@@ -79,7 +76,6 @@ function newLogin () {
                       isTrader
                       avatarHandle
                       avatarChangeDate
-                      sessionToken
                       role {
                       id
                       }
@@ -95,8 +91,6 @@ function newLogin () {
             }
           })
                       .then(response => {
-                        sessionToken = response.data.users_UserByAuthId.sessionToken
-
                         window.localStorage.setItem('loggedInUser', JSON.stringify(response.data.users_UserByAuthId))
                         resolve({ user: response.data.users_UserByAuthId})
                       })
@@ -342,9 +336,10 @@ function newLogin () {
       thisObject.container.eventHandler.listenToEvent('onMouseClick', onClick)
 
       async function authenticateUser () {
-        if (sessionToken === undefined) { sessionToken = '' }
+        // TODO USER_PROFILE should be retrieved from saweb-api ecosystem
+        return
 
-        let path = window.canvasApp.urlPrefix + 'AABrowserAPI/authenticateUser/' + sessionToken
+        let path = window.canvasApp.urlPrefix + 'AABrowserAPI/authenticateUser/'
 
         return new Promise(
                   function (resolve, reject) {
@@ -359,7 +354,6 @@ function newLogin () {
                       }
 
                       window.USER_PROFILE = responseFromServer.userProfile
-                      window.localStorage.setItem('sessionToken', sessionToken)
 
                       currentLabel = 'Logged In'
                       resolve()