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);
export default getState => axios.create({
headers: Object.assign(csrfHeader, getState ? {
'Authorization': `Bearer ${getState().getIn(['meta', 'access_token'], '')}`,
} : {}),
export default getState => {
const authToken = getState ? getState().getIn(['meta', 'access_token'], '') : null;
transformResponse: [function (data) {
try {
return JSON.parse(data);
} catch (Exception) {
return data;
}
}],
});
return axios.create({
headers: Object.assign(csrfHeader, authToken ? {
'Authorization': `Bearer ${authToken}}`,
} : {}),
transformResponse: [function (data) {
try {
return JSON.parse(data);
} catch (Exception) {
return data;
}
}],
});
};