Merge branch 'fix_null_bearer' into 'develop'

Avoid redundant Doorkeeper queries when not signed in

See merge request gab/social/gab-social!57
This commit is contained in:
Free Speech Forever 2021-02-10 03:33:16 +00:00
commit 22c3fa995d
1 changed files with 16 additions and 12 deletions

View File

@ -25,16 +25,20 @@ function setCSRFHeader() {
ready(setCSRFHeader); ready(setCSRFHeader);
export default getState => axios.create({ export default getState => {
headers: Object.assign(csrfHeader, getState ? { const authToken = getState ? getState().getIn(['meta', 'access_token'], '') : null;
'Authorization': `Bearer ${getState().getIn(['meta', 'access_token'], '')}`,
} : {}),
transformResponse: [function (data) { return axios.create({
try { headers: Object.assign(csrfHeader, authToken ? {
return JSON.parse(data); 'Authorization': `Bearer ${authToken}}`,
} catch (Exception) { } : {}),
return data;
} transformResponse: [function (data) {
}], try {
}); return JSON.parse(data);
} catch (Exception) {
return data;
}
}],
});
};