Mirrors/VILLASweb
1
0
Fork 0
mirror of https://git.rwth-aachen.de/acs/public/villas/web/ synced 2025-03-09 00:00:01 +01:00
Code Issues Releases Wiki Activity

save user information from login response of backend, omit users/me endpoint

Browse source
This commit is contained in:
Sonja Happ 2019-07-22 16:13:39 +02:00
parent f72d7b892f
commit 00544c2fe0
2 changed files with 22 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/data-managers/users-data-manager.js
View file

@ -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
// });
// });
//}
}

13
src/stores/user-store.js
View file

@ -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