yuuza/outline
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed persistent loading of user and team

Browse Source
This commit is contained in:
Jori Lallo
2016-05-02 21:58:39 -07:00
parent aa8dbe5626
commit f785e37fab
5 changed files with 40 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/actions/SlackAuthAction.js
View File

@@ -3,15 +3,12 @@ import { replace } from 'react-router-redux';
import { client } from 'utils/ApiClient';
import auth from 'utils/auth';
import { updateUser } from './UserActions';
import { updateTeam } from './TeamActions';
export const SLACK_AUTH_PENDING = 'SLACK_AUTH_PENDING';
export const SLACK_AUTH_SUCCESS = 'SLACK_AUTH_SUCCESS';
export const SLACK_AUTH_FAILURE = 'SLACK_AUTH_FAILURE';
const slackAuthPending = makeActionCreator(SLACK_AUTH_PENDING);
const slackAuthSuccess = makeActionCreator(SLACK_AUTH_SUCCESS, 'user');
const slackAuthSuccess = makeActionCreator(SLACK_AUTH_SUCCESS, 'user', 'team');
const slackAuthFailure = makeActionCreator(SLACK_AUTH_FAILURE, 'error');
export function slackAuthAsync(code) {
@@ -23,12 +20,11 @@ export function slackAuthAsync(code) {
})
.then(data => {
auth.setToken(data.data.accessToken);
dispatch(updateUser(data.data.user));
dispatch(updateTeam(data.data.team));
dispatch(slackAuthSuccess(data.data.user, data.data.team));
dispatch(replace('/dashboard'));
})
// .catch((err) => {
// dispatch(push('/error'));
// })
.catch((err) => {
dispatch(push('/error'));
})
};
};