maverick/flex-template-web
1
0
Fork 0
mirror of https://github.com/kingomarnajjar/flex-template-web.git synced 2026-07-28 20:53:24 +10:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #521 from sharetribe/fix-auth-logout-error

Browse source 
Fix error when data was being loaded while logout was in progress
This commit is contained in:
Kimmo Puputti 2017-10-27 09:25:52 +03:00 • committed by GitHub
commit 610ee43751
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/ducks/Auth.duck.js
View file

@ -151,15 +151,16 @@ export const logout = () => (dispatch, getState, sdk) => {
}
dispatch(logoutRequest());
// Not that the thunk does not reject when the logout fails, it
// Note that the thunk does not reject when the logout fails, it
// just dispatches the logout error action.
return sdk
.logout()
.then(() => dispatch(clearCurrentUser()))
.then(() => dispatch(logoutSuccess()))
.then(() => {
dispatch(userLogout());
// The order of the dispatched actions
dispatch(logoutSuccess());
dispatch(clearCurrentUser());
log.clearUserId();
dispatch(userLogout());
})
.catch(e => dispatch(logoutError(storableError(e))));
};

2
src/ducks/Auth.test.js
View file

@ -274,8 +274,8 @@ describe('Auth duck', () => {
expect(sdk.logout.mock.calls.length).toEqual(1);
expect(dispatch.mock.calls).toEqual([
[logoutRequest()],
[clearCurrentUser()],
[logoutSuccess()],
[clearCurrentUser()],
[userLogout()],
]);
});