self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-06-15 23:00:36 +02:00
Code Issues Releases Activity

First pass at linting lib dir

Browse Source
This commit is contained in:
Laurent Cozic
2019-07-29 15:43:53 +02:00
parent 64b7bc3d62
commit 86dc72b204
170 changed files with 4140 additions and 3119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
ReactNativeClient/lib/WebDavApi.js
View File

@ -13,7 +13,6 @@ const base64 = require('base-64');
// In general, we should only deal with things in "d:", which is the standard DAV namespace.
class WebDavApi {
constructor(options) {
this.logger_ = new Logger();
this.options_ = options;
@ -52,7 +51,7 @@ class WebDavApi {
async xmlToJson(xml) {
let davNamespaces = []; // Yes, there can be more than one... xmlns:a="DAV:" xmlns:D="DAV:"
const nameProcessor = (name) => {
const nameProcessor = name => {
if (name.indexOf('xmlns:') !== 0) {
// Check if the current name is within the DAV namespace. If it is, normalise it
// by moving it to the "d:" namespace, which is what all the functions are using.
@ -72,13 +71,13 @@ class WebDavApi {
const p = name.split(':');
davNamespaces.push(p[p.length - 1]);
}
}
};
const options = {
tagNameProcessors: [nameProcessor],
attrNameProcessors: [nameProcessor],
attrValueProcessors: [attrValueProcessor]
}
attrValueProcessors: [attrValueProcessor],
};
return new Promise((resolve, reject) => {
parseXmlString(xml, options, (error, result) => {
@ -91,7 +90,7 @@ class WebDavApi {
});
}
valueFromJson(json, keys, type) {
valueFromJson(json, keys, type) {
let output = json;
for (let i = 0; i < keys.length; i++) {
@ -192,14 +191,17 @@ class WebDavApi {
// <propname/>
// </propfind>`;
const body = `<?xml version="1.0" encoding="UTF-8"?>
const body =
`<?xml version="1.0" encoding="UTF-8"?>
<d:propfind xmlns:d="DAV:">
<d:prop xmlns:oc="http://owncloud.org/ns">
` + fieldsXml + `
` +
fieldsXml +
`
</d:prop>
</d:propfind>`;
return this.exec('PROPFIND', path, body, { 'Depth': depth }, options);
return this.exec('PROPFIND', path, body, { Depth: depth }, options);
}
requestToCurl_(url, options) {
@ -216,7 +218,7 @@ class WebDavApi {
if (options.body) output.push('--data ' + "'" + options.body + "'");
output.push(url);
return output.join(' ');
return output.join(' ');
}
handleNginxHack_(jsonResponse, newErrorHandler) {
@ -333,7 +335,8 @@ class WebDavApi {
} else if (options.target == 'string') {
if (typeof body === 'string') fetchOptions.headers['Content-Length'] = shim.stringByteLength(body) + '';
response = await shim.fetch(url, fetchOptions);
} else { // file
} else {
// file
response = await shim.fetchBlob(url, fetchOptions);
}
@ -347,7 +350,7 @@ class WebDavApi {
// JSON. That way the error message will still show there's a problem but without filling up the log or screen.
const shortResponseText = (responseText + '').substr(0, 1024);
return new JoplinError(method + ' ' + path + ': ' + message + ' (' + code + '): ' + shortResponseText, code);
}
};
let responseJson_ = null;
const loadResponseJson = async () => {
@ -356,7 +359,7 @@ class WebDavApi {
responseJson_ = await this.xmlToJson(responseText);
if (!responseJson_) throw newError('Cannot parse XML response', response.status);
return responseJson_;
}
};
if (!response.ok) {
// When using fetchBlob we only get a string (not xml or json) back
@ -371,13 +374,13 @@ class WebDavApi {
if (json && json['d:error']) {
const code = json['d:error']['s:exception'] ? json['d:error']['s:exception'].join(' ') : response.status;
const message = json['d:error']['s:message'] ? json['d:error']['s:message'].join("\n") : 'Unknown error 1';
const message = json['d:error']['s:message'] ? json['d:error']['s:message'].join('\n') : 'Unknown error 1';
throw newError(message + ' (Exception ' + code + ')', response.status);
}
throw newError('Unknown error 2', response.status);
}
if (options.responseFormat === 'text') return responseText;
// The following methods may have a response depending on the server but it's not
@ -394,7 +397,6 @@ class WebDavApi {
return output;
}
}
module.exports = WebDavApi;
module.exports = WebDavApi;