ascribe
/
onion
mirror of https://github.com/ascribe/onion.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Check if baseRequest throws a Response before assuming so

This commit is contained in:
Brett Sun 2016-06-15 14:46:35 +02:00
parent c0ddea975a
commit 685ac0d941
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
js/utils/request.js
View File

@ -32,12 +32,15 @@ export default function request(url, config) {
.then((apiUrl) => (
baseRequest(apiUrl, requestConfig)
// Catch any errors resulting from baseRequest first
.catch((res) => {
if (res == null) {
.catch((err) => {
if (err == null) {
throw new Error(`For: ${apiUrl} - Server did not respond to the request. ` +
'(Not even displayed a 500)');
} else {
let err = new Error(`${res.status} - ${res.statusText} - on URL: ${res.url}`);
} else if (err instanceof Response) {
const res = err;
let responseErr = new Error(
`${res.status} - ${res.statusText} - on URL: ${res.url}`
);
// Try to parse the response body to see if we added more descriptive errors
// before rejecting with the error above.
@ -45,15 +48,19 @@ export default function request(url, config) {
.json()
.then((body) => {
if (body && Array.isArray(body.errors) && body.errors.length) {
err = new Error(body.errors.pop());
responseErr = new Error(body.errors.pop());
}
// ES6 promises don't have a .finally() clause so we fake that here
// by forcing the .catch() clause to run
return Promise.reject();
})
// If parsing the response body throws, just rethrow the original error
.catch(() => { throw err; });
// If parsing the response body throws, just rethrow the original
// response error
.catch(() => { throw responseErr; });
} else {
// Just rethrow the error since it's not a Response
throw err;
}
})
// Handle successful requests