Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-02-28 01:21:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: don't try to parse response if request is head #11960

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2023-08-28 22:23:02 -04:00
parent 50d44777fa
commit 440299e661
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
public/src/modules/api.js
View File

@@ -69,18 +69,23 @@ async function xhr(options, cb) {
const isJSON = contentType && contentType.startsWith('application/json'); const isJSON = contentType && contentType.startsWith('application/json');
let response; let response;
if (isJSON) { if (options.method !== 'head') {
response = await res.json(); if (isJSON) {
} else { response = await res.json();
response = await res.text(); } else {
response = await res.text();
}
} }
if (!res.ok) { 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, ( cb(null, (
isJSON && response.hasOwnProperty('status') && response.hasOwnProperty('response') ? isJSON && response && response.hasOwnProperty('status') && response.hasOwnProperty('response') ?
response.response : response.response :
response response
)); ));