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

Desktop: API: Fixed externalEditWatcher/noteIsWatched call, fixed tests

Browse Source
This commit is contained in:
Laurent Cozic
2020-06-20 12:03:22 +01:00
parent 6350506ce7
commit 89ca8e08d6
6 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ReactNativeClient/lib/ClipperServer.js
View File

@ -4,6 +4,7 @@ const { Logger } = require('lib/logger.js');
const { randomClipperPort, startPort } = require('lib/randomClipperPort');
const enableServerDestroy = require('server-destroy');
const Api = require('lib/services/rest/Api');
const actionApi = require('lib/services/rest/ActionApi.desktop').default;
const ApiResponse = require('lib/services/rest/ApiResponse');
const multiparty = require('multiparty');
@ -15,7 +16,7 @@ class ClipperServer {
this.port_ = null;
this.api_ = new Api(() => {
return Setting.value('api.token');
});
}, actionApi);
}
static instance() {
@ -143,6 +144,8 @@ class ClipperServer {
writeResponseInstance(code, response);
} else if (typeof response === 'string') {
writeResponseText(code, response);
} else if (response === null || response === undefined) {
writeResponseText(code, '');
} else {
writeResponseJson(code, response);
}
@ -155,7 +158,7 @@ class ClipperServer {
const execRequest = async (request, body = '', files = []) => {
try {
const response = await this.api_.route(request.method, url.pathname, url.query, body, files);
writeResponse(200, response ? response : '');
writeResponse(200, response);
} catch (error) {
this.logger().error(error);
const httpCode = error.httpCode ? error.httpCode : 500;