Nuke tokens on VERIFY_CREDENTIALS_FAIL

merge-requests/451/head
Alex Gleason 4 years ago
parent 760bac1377
commit 79c9c46a9a
No known key found for this signature in database
GPG Key ID: 7211D1F99744FBB7

@ -5,6 +5,7 @@ import {
AUTH_LOGGED_OUT,
SWITCH_ACCOUNT,
VERIFY_CREDENTIALS_SUCCESS,
VERIFY_CREDENTIALS_FAIL,
} from '../actions/auth';
import { Map as ImmutableMap, fromJS } from 'immutable';
@ -32,6 +33,26 @@ const importCredentials = (state, token, account) => {
});
};
// If `me` doesn't match an existing user, attempt to shift it.
const maybeShiftMe = state => {
const users = state.get('users', ImmutableMap());
const me = state.get('me');
if (!users.get(me)) {
return state.set('me', users.first(ImmutableMap()).get('id'));
} else {
return state;
}
};
const importFailedToken = (state, token) => {
return state.withMutations(state => {
state.update('tokens', ImmutableMap(), tokens => tokens.delete(token));
state.update('users', ImmutableMap(), users => users.filterNot(user => user.get('access_token') === token));
maybeShiftMe(state);
});
};
const reducer = (state, action) => {
switch(action.type) {
case AUTH_APP_CREATED:
@ -44,6 +65,8 @@ const reducer = (state, action) => {
return state.set('user', ImmutableMap());
case VERIFY_CREDENTIALS_SUCCESS:
return importCredentials(state, action.token, action.account);
case VERIFY_CREDENTIALS_FAIL:
return importFailedToken(state, action.token);
case SWITCH_ACCOUNT:
return state.set('me', action.accountId);
default:
@ -51,11 +74,12 @@ const reducer = (state, action) => {
}
};
export default function auth(state = initialState, action) {
state = reducer(state, action);
export default function auth(oldState = initialState, action) {
const state = reducer(oldState, action);
localStorage.setItem('soapbox:auth', JSON.stringify(state.toJS()));
if (action.type === SWITCH_ACCOUNT) {
// Reload the page when the current user changes.
if (state.get('me') !== oldState.get('me')) {
location.reload();
}

Loading…
Cancel
Save