bigbuffet/bigbuffet-rw
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Properly dispatch fetchMeFail, don't show white screen on VERIFY_CREDENTIALS_FAIL

Browse source
This commit is contained in:
Alex Gleason 2021-05-07 21:49:08 -05:00
parent 377c0fb64a
commit 9a859dad14
No known key found for this signature in database
GPG key ID: 7211D1F99744FBB7
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/soapbox/actions/auth.js
View file

@ -2,7 +2,7 @@ import api, { baseClient } from '../api';
import { importFetchedAccount } from './importer'; import { importFetchedAccount } from './importer';
import snackbar from 'soapbox/actions/snackbar'; import snackbar from 'soapbox/actions/snackbar';
import { createAccount } from 'soapbox/actions/accounts'; import { createAccount } from 'soapbox/actions/accounts';
import { fetchMeSuccess } from 'soapbox/actions/me'; import { fetchMeSuccess, fetchMeFail } from 'soapbox/actions/me';
export const SWITCH_ACCOUNT = 'SWITCH_ACCOUNT'; export const SWITCH_ACCOUNT = 'SWITCH_ACCOUNT';
@ -136,14 +136,16 @@ export function otpVerify(code, mfa_token) {
export function verifyCredentials(token) { export function verifyCredentials(token) {
return (dispatch, getState) => { return (dispatch, getState) => {
const me = getState().get('me');
dispatch({ type: VERIFY_CREDENTIALS_REQUEST }); dispatch({ type: VERIFY_CREDENTIALS_REQUEST });
return baseClient(token).get('/api/v1/accounts/verify_credentials').then(({ data: account }) => { return baseClient(token).get('/api/v1/accounts/verify_credentials').then(({ data: account }) => {
dispatch(importFetchedAccount(account)); dispatch(importFetchedAccount(account));
dispatch({ type: VERIFY_CREDENTIALS_SUCCESS, token, account }); dispatch({ type: VERIFY_CREDENTIALS_SUCCESS, token, account });
if (account.id === getState().get('me')) dispatch(fetchMeSuccess(account)); if (account.id === me) dispatch(fetchMeSuccess(account));
return account; return account;
}).catch(error => { }).catch(error => {
if (me === null) dispatch(fetchMeFail(error));
dispatch({ type: VERIFY_CREDENTIALS_FAIL, token, error }); dispatch({ type: VERIFY_CREDENTIALS_FAIL, token, error });
}); });
}; };