Always check error.response before error.response.status

merge-requests/808/head
Alex Gleason 2021-10-20 17:50:35 -05:00
rodzic 5a19d52617
commit e42030daae
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 7211D1F99744FBB7
4 zmienionych plików z 28 dodań i 4 usunięć

Wyświetl plik

@ -20,7 +20,7 @@ const fetchExternalInstance = baseURL => {
.get('/api/v1/instance')
.then(({ data: instance }) => fromJS(instance))
.catch(error => {
if (error.response.status === 401) {
if (error.response && error.response.status === 401) {
// Authenticated fetch is enabled.
// Continue with a limited featureset.
return ImmutableMap({ version: '0.0.0' });

Wyświetl plik

@ -261,6 +261,14 @@ const persistAuthAccount = account => {
}
};
const deleteForbiddenToken = (state, error, token) => {
if (error.response && [401, 403].includes(error.response.status)) {
return deleteToken(state, token);
} else {
return state;
}
};
const reducer = (state, action) => {
switch(action.type) {
case AUTH_APP_CREATED:
@ -275,7 +283,7 @@ const reducer = (state, action) => {
persistAuthAccount(action.account);
return importCredentials(state, action.token, action.account);
case VERIFY_CREDENTIALS_FAIL:
return [401, 403].includes(action.error.response.status) ? deleteToken(state, action.token) : state;
return deleteForbiddenToken(state, action.error, action.token);
case SWITCH_ACCOUNT:
return state.set('me', action.account.get('url'));
case ME_FETCH_SKIP:

Wyświetl plik

@ -110,6 +110,14 @@ const persistInstance = instance => {
}
};
const handleInstanceFetchFail = (state, error) => {
if (error.response && error.response.status === 401) {
return handleAuthFetch(state);
} else {
return state;
}
};
export default function instance(state = initialState, action) {
switch(action.type) {
case PLEROMA_PRELOAD_IMPORT:
@ -120,7 +128,7 @@ export default function instance(state = initialState, action) {
persistInstance(action.instance);
return importInstance(state, fromJS(action.instance));
case INSTANCE_FETCH_FAIL:
return action.error.response.status === 401 ? handleAuthFetch(state) : state;
return handleInstanceFetchFail(state, action.error);
case NODEINFO_FETCH_SUCCESS:
return importNodeinfo(state, fromJS(action.nodeinfo));
case ADMIN_CONFIG_UPDATE_REQUEST:

Wyświetl plik

@ -12,6 +12,14 @@ import {
const initialState = null;
const handleForbidden = (state, error) => {
if (error.response && [401, 403].includes(error.response.status)) {
return false;
} else {
return state;
}
};
export default function me(state = initialState, action) {
switch(action.type) {
case ME_FETCH_SUCCESS:
@ -24,7 +32,7 @@ export default function me(state = initialState, action) {
case AUTH_LOGGED_OUT:
return false;
case ME_FETCH_FAIL:
return [401, 403].includes(action.error.response.status) ? false : state;
return handleForbidden(state, action.error);
default:
return state;
}