self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2024-11-24 08:12:24 +02:00
Code Issues Releases Activity

Fixed FormData bug

Browse Source
This commit is contained in:
Laurent Cozic 2017-06-08 21:54:57 +01:00
parent a62c431723
commit d822ef8e38
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ReactNativeClient/src/web-api.js
View File

@ -39,6 +39,13 @@ class WebApi {
return this.session_;
}
// "form-data" node library doesn't like undefined or null values
// so make sure we only either return an empty string or a string
formatFormDataValue(v) {
if (v === undefined || v === null) return '';
return v.toString();
}
makeRequest(method, path, query, data) {
let url = this.baseUrl_;
if (path) url += '/' + path;
@ -51,7 +58,7 @@ class WebApi {
formData = new FormData();
for (var key in data) {
if (!data.hasOwnProperty(key)) continue;
formData.append(key, data[key]);
formData.append(key, this.formatFormDataValue(data[key]));
}
} else {
options.headers = { 'Content-Type': 'application/x-www-form-urlencoded' };
@ -94,6 +101,13 @@ class WebApi {
fetch(r.url, r.options).then(function(response) {
let responseClone = response.clone();
if (!response.ok) {
return responseClone.text().then(function(text) {
reject(new WebApiError('HTTP ' + response.status + ': ' + response.statusText + ': ' + text));
});
}
return response.json().then(function(data) {
if (data && data.error) {
reject(new WebApiError(data));
@ -102,7 +116,7 @@ class WebApi {
}
}).catch(function(error) {
responseClone.text().then(function(text) {
reject(new Error('Cannot parse JSON: ' + text));
reject(new WebApiError('Cannot parse JSON: ' + text));
});
});
}).then(function(data) {