mirror of
https://github.com/NodeBB/NodeBB.git
synced 2026-01-02 05:40:43 +01:00
fix: don't try to parse response if request is head #11960
This commit is contained in:
@@ -69,18 +69,23 @@ async function xhr(options, cb) {
|
||||
const isJSON = contentType && contentType.startsWith('application/json');
|
||||
|
||||
let response;
|
||||
if (isJSON) {
|
||||
response = await res.json();
|
||||
} else {
|
||||
response = await res.text();
|
||||
if (options.method !== 'head') {
|
||||
if (isJSON) {
|
||||
response = await res.json();
|
||||
} else {
|
||||
response = await res.text();
|
||||
}
|
||||
}
|
||||
|
||||
if (!res.ok) {
|
||||
return cb(new Error(isJSON ? response.status.message : response));
|
||||
if (response) {
|
||||
return cb(new Error(isJSON ? response.status.message : response));
|
||||
}
|
||||
return cb(new Error(res.statusText));
|
||||
}
|
||||
|
||||
cb(null, (
|
||||
isJSON && response.hasOwnProperty('status') && response.hasOwnProperty('response') ?
|
||||
isJSON && response && response.hasOwnProperty('status') && response.hasOwnProperty('response') ?
|
||||
response.response :
|
||||
response
|
||||
));
|
||||
|
||||
Reference in New Issue
Block a user