fetchface
Advanced tools
Comparing version 1.0.2 to 1.0.3
36
index.js
@@ -15,7 +15,23 @@ const defaultHeaders = { 'Content-Type': 'application/json' }; | ||
if (response.status >= 200 && response.status < 300) { | ||
return response.json().then(json => resolve(json)); | ||
try { | ||
response.json() | ||
.then(json => { | ||
resolve(json); | ||
}); | ||
} catch (err) { | ||
reject(err); | ||
} | ||
return; | ||
} | ||
// Reject if status indicates error | ||
return response.json().then(json => reject(json)); | ||
try { | ||
response.json() | ||
.then(json => { | ||
reject(json); | ||
}); | ||
} catch (err) { | ||
reject(err); | ||
} | ||
}; | ||
@@ -25,4 +41,8 @@ | ||
new Promise((resolve, reject) => { | ||
fetch(url, { headers: globalHeaders }) | ||
.then(response => handleResponse(resolve, reject, response)) | ||
fetch(url, { | ||
headers: globalHeaders, | ||
}) | ||
.then(response => { | ||
handleResponse(resolve, reject, response); | ||
}) | ||
.catch(reject); | ||
@@ -62,7 +82,11 @@ }); | ||
// Create the final payload with any/all local modifications | ||
payload = Object.assign({}, payload, { headers: localHeaders }); | ||
payload = Object.assign({}, payload, { | ||
headers: localHeaders, | ||
}); | ||
return new Promise((resolve, reject) => { | ||
fetch(url, payload) | ||
.then(response => handleResponse(resolve, reject, response)) | ||
.then(response => { | ||
handleResponse(resolve, reject, response); | ||
}) | ||
.catch(reject); | ||
@@ -69,0 +93,0 @@ }); |
{ | ||
"name": "fetchface", | ||
"version": "1.0.2", | ||
"version": "1.0.3", | ||
"description": "A convenient interface for the Fetch API", | ||
@@ -5,0 +5,0 @@ "main": "index.js", |
7657
103