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

View File

@ -25,9 +25,12 @@ 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'], '')}`,
return axios.create({
headers: Object.assign(csrfHeader, authToken ? {
'Authorization': `Bearer ${authToken}}`,
} : {}), } : {}),
transformResponse: [function (data) { transformResponse: [function (data) {
@ -37,4 +40,5 @@ export default getState => axios.create({
return data; return data;
} }
}], }],
}); });
};