p20319658
/
monkey
forked from p34709852/monkey
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

append options to existsing ones

This commit is contained in:
Itay Mizeretz 2018-02-25 17:06:40 +02:00
parent 6f827e5aa9
commit 38cf36e165
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
monkey_island/cc/ui/src/services/AuthService.js
View File

@ -40,7 +40,7 @@ export default class AuthService {
})
};
_authFetch = (url, options) => {
_authFetch = (url, options = {}) => {
const headers = {
'Accept': 'application/json',
'Content-Type': 'application/json'
@ -50,15 +50,21 @@ export default class AuthService {
headers['Authorization'] = 'JWT ' + this._getToken();
}
return fetch(url, {
headers,
...options
}).then(res => {
if (res.status === 401) {
this._removeToken();
if (options.hasOwnProperty('headers')) {
for (let header in headers) {
options['headers'][header] = headers[header];
}
return res;
});
} else {
options['headers'] = headers;
}
return fetch(url, options)
.then(res => {
if (res.status === 401) {
this._removeToken();
}
return res;
});
};
loggedIn() {