moon
/
soapbox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'settings-fix' into 'develop' 

Fix verify_credentials bug, fixes #638

Closes #638

See merge request soapbox-pub/soapbox-fe!495
This commit is contained in:
Alex Gleason 2021-05-09 15:53:13 +00:00
parent aa575b1010 82e026b010
commit f5441f30bc
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/soapbox/actions/auth.js
View File

@ -136,16 +136,15 @@ 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 === me) dispatch(fetchMeSuccess(account)); if (account.id === getState().get('me')) dispatch(fetchMeSuccess(account));
return account; return account;
}).catch(error => { }).catch(error => {
if (me === null) dispatch(fetchMeFail(error)); if (getState().get('me') === null) dispatch(fetchMeFail(error));
dispatch({ type: VERIFY_CREDENTIALS_FAIL, token, error }); dispatch({ type: VERIFY_CREDENTIALS_FAIL, token, error });
}); });
}; };