From 00544c2fe046954d194b175896adfa45ce3f2bea Mon Sep 17 00:00:00 2001
From: Sonja Happ <sonja.happ@eonerc.rwth-aachen.de>
Date: Mon, 22 Jul 2019 16:13:39 +0200
Subject: [PATCH] save user information from login response of backend, omit
 users/me endpoint

---
 src/data-managers/users-data-manager.js | 29 +++++++++++++------------
 src/stores/user-store.js                | 13 ++++++-----
 2 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/src/data-managers/users-data-manager.js b/src/data-managers/users-data-manager.js
index f5db8f8..07d1b12 100644
--- a/src/data-managers/users-data-manager.js
+++ b/src/data-managers/users-data-manager.js
@@ -32,7 +32,8 @@ class UsersDataManager extends RestDataManager {
     RestAPI.post(this.makeURL('/authenticate'), { username: username, password: password }).then(response => {
       AppDispatcher.dispatch({
         type: 'users/logged-in',
-        token: response.token
+        token: response.token,
+        user: response.user
       });
     }).catch(error => {
       AppDispatcher.dispatch({
@@ -42,19 +43,19 @@ class UsersDataManager extends RestDataManager {
     });
   }
 
-  getCurrentUser(token) {
-    RestAPI.get(this.makeURL('/users/me'), token).then(response => {
-      AppDispatcher.dispatch({
-        type: 'users/current-user',
-        user: response.user
-      });
-    }).catch(error => {
-      AppDispatcher.dispatch({
-        type: 'users/current-user-error',
-        error: error
-      });
-    });
-  }
+  //getCurrentUser(token) {
+  //  RestAPI.get(this.makeURL('/users/me'), token).then(response => {
+  //    AppDispatcher.dispatch({
+  //      type: 'users/current-user',
+  //      user: response.user
+  //    });
+  //  }).catch(error => {
+  //    AppDispatcher.dispatch({
+  //      type: 'users/current-user-error',
+  //      error: error
+  //    });
+  //  });
+  //}
   
 }
 
diff --git a/src/stores/user-store.js b/src/stores/user-store.js
index e8722c8..ecaede5 100644
--- a/src/stores/user-store.js
+++ b/src/stores/user-store.js
@@ -53,14 +53,15 @@ class UserStore extends ReduceStore {
         return Object.assign({}, state, { token: null, currentUser: null });
 
       case 'users/logged-in':
-        // request logged-in user data
-        UsersDataManager.getCurrentUser(action.token);
+        // // request logged-in user data
+        //UsersDataManager.getCurrentUser(action.token);
 
-        return Object.assign({}, state, { token: action.token });
+        //save token and logged-in user
+        return Object.assign({}, state, { token: action.token, currentUser: action.user  });
 
-      case 'users/current-user':
-        // save logged-in user
-        return Object.assign({}, state, { currentUser: action.user });
+      //case 'users/current-user':
+      //  // save logged-in user
+      //  return Object.assign({}, state, { currentUser: action.user });
 
       case 'users/current-user-error':
         // discard user token