ascribe/onion
1
0
Fork 0
mirror of https://github.com/ascribe/onion.git synced 2024-06-29 00:58:03 +02:00
Code Issues Releases Wiki Activity

Fix Request error case

Browse Source
This commit is contained in:
Brett Sun 2015-12-09 14:44:31 +01:00
parent 3e8e7a40e7
commit 7605f093ab
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
js/utils/requests.js
View File

@ -13,11 +13,17 @@ class Requests {
unpackResponse(response) { unpackResponse(response) {
if (response.status >= 500) { if (response.status >= 500) {
let err = new Error(response.status + ' - ' + response.statusText + ' - on URL:' + response.url); let err = new Error(response.status + ' - ' + response.statusText + ' - on URL:' + response.url);
response
return response
.text() .text()
.then((resText) => JSON.parse(resText)) .then((resText) => {
.then((resJSON) => { const resJson = JSON.parse(resText);
err = new Error(resJSON.errors.pop()); err = new Error(resJson.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();
}) })
.catch(() => { throw err; }); .catch(() => { throw err; });
} }
@ -57,9 +63,7 @@ class Requests {
resolve({}); resolve({});
} }
} }
}).catch((err) => { }).catch(reject);
reject(err);
});
}); });
} }