summaryrefslogtreecommitdiffstats
path: root/server/lib
diff options
context:
space:
mode:
authorUdo Walter2019-03-15 05:47:37 +0100
committerUdo Walter2019-03-15 05:47:37 +0100
commit204e6f1f57e6fc4ab80f607b4881df868bb1ebe7 (patch)
tree6ec32ad0852383453cffa2689290a8bf94a69ab7 /server/lib
parent[server/log] add log lib (diff)
parent[external-backends] Small bugfix to save the switch again & add tooltips to t... (diff)
downloadbas-204e6f1f57e6fc4ab80f607b4881df868bb1ebe7.tar.gz
bas-204e6f1f57e6fc4ab80f607b4881df868bb1ebe7.tar.xz
bas-204e6f1f57e6fc4ab80f607b4881df868bb1ebe7.zip
merge
Diffstat (limited to 'server/lib')
-rw-r--r--server/lib/external-backends/backendhelper.js2
-rw-r--r--server/lib/external-backends/backends/idoit-backend.js8
-rw-r--r--server/lib/external-backends/index.js25
3 files changed, 17 insertions, 18 deletions
diff --git a/server/lib/external-backends/backendhelper.js b/server/lib/external-backends/backendhelper.js
index 752ccf7..ae1af3d 100644
--- a/server/lib/external-backends/backendhelper.js
+++ b/server/lib/external-backends/backendhelper.js
@@ -32,7 +32,7 @@ module.exports = {
if (client.parents) {
var elements = backend.mappedGroups.filter(x => client.parents.includes(x.id))
if (elements.length > 1) {
- // TODO ADD MERGE CONFLICT
+ // Conflict occured!
const conflict = await db.conflict.create({ description: 'Multiple parents found' })
// Add backend to the conflict.
diff --git a/server/lib/external-backends/backends/idoit-backend.js b/server/lib/external-backends/backends/idoit-backend.js
index 43ab434..d3d992f 100644
--- a/server/lib/external-backends/backends/idoit-backend.js
+++ b/server/lib/external-backends/backends/idoit-backend.js
@@ -12,16 +12,16 @@ class IdoitBackend extends ExternalBackends {
*/
getCredentials () {
return [
- { type: 'text', id: 1, name: 'API url', icon: 'link' },
- { type: 'password', id: 2, name: 'API token', icon: 'vpn_key', show: false },
+ { type: 'text', id: 1, name: 'API URL', icon: 'link' },
+ { type: 'password', id: 2, name: 'API Token', icon: 'vpn_key', show: false },
{
type: 'switch',
id: 3,
name: 'Login',
icon: 'lock_open',
elements: [
- { type: 'text', id: 4, name: 'username', icon: 'person_outline' },
- { type: 'password', id: 5, name: 'password', icon: 'lock', show: false }
+ { type: 'text', id: 4, name: 'Username', icon: 'person_outline' },
+ { type: 'password', id: 5, name: 'Password', icon: 'lock', show: false }
]
}
]
diff --git a/server/lib/external-backends/index.js b/server/lib/external-backends/index.js
index a0ba25b..92e0f07 100644
--- a/server/lib/external-backends/index.js
+++ b/server/lib/external-backends/index.js
@@ -22,8 +22,7 @@ class ExternalBackends {
* { type: 'select', id: 4, name: '<NAME>', icon: '<ICON_NAME>' }, ...]
*/
getCredentials () {
- console.log('If this method gets called the backend class has NOT IMPLEMENTED the getCredentials method!')
- return null
+ return { error: 'NOT_IMPLEMENTED_EXCEPTION', message: 'The provided backend does not have a getCredentials method' }
}
/*
@@ -62,7 +61,7 @@ class ExternalBackends {
* return:
*/
async getClient (credentials, client) {
- return { status: 'NOT_IMPLEMENTED_EXCEPTION', error: 'The provided backend does not have a getClient method' }
+ return { error: 'NOT_IMPLEMENTED_EXCEPTION', message: 'The provided backend does not have a getClient method' }
}
/*
@@ -71,7 +70,7 @@ class ExternalBackends {
* Returns a list of all objects in the backend.
*/
async getObjects (credendtials) {
- return { status: 'NOT_IMPLEMENTED_EXCEPTION', error: 'The provided backend does not have a getObjects method' }
+ return { error: 'NOT_IMPLEMENTED_EXCEPTION', message: 'The provided backend does not have a getObjects method' }
}
/*
@@ -81,7 +80,7 @@ class ExternalBackends {
* Call the API of the backend and returns the information to the object including a list of childs.
*/
async getObject (credentials, oid) {
- return { status: 'NOT_IMPLEMENTED_EXCEPTION', error: 'The provided backend does not have a getObject method' }
+ return { error: 'NOT_IMPLEMENTED_EXCEPTION', message: 'The provided backend does not have a getObject method' }
}
/*
@@ -91,7 +90,7 @@ class ExternalBackends {
* Deletes the objecs from the backend.
*/
async deleteObjects (credentials, objectIds) {
- return { status: 'NOT_IMPLEMENTED_EXCEPTION', error: 'The provided backend does not have a deleteObject method' }
+ return { error: 'NOT_IMPLEMENTED_EXCEPTION', message: 'The provided backend does not have a deleteObject method' }
}
/*
@@ -102,7 +101,7 @@ class ExternalBackends {
* return: [{ gid: <GROUP_ID>, childs: [{ id: <EXTERNAL_ID>, }, ...]}, ...]
*/
async getDataTree (credendtials, objects) {
- return { status: 'NOT_IMPLEMENTED_EXCEPTION', error: 'The provided backend does not have a getDataTree method' }
+ return { error: 'NOT_IMPLEMENTED_EXCEPTION', message: 'The provided backend does not have a getDataTree method' }
}
/*
@@ -111,7 +110,7 @@ class ExternalBackends {
* return: { success: <boolean>, status: '<STATUS_CODE_IF_ERROR>', error: '<ERROR_MESSAGE>' }
*/
async checkConnection (backend) {
- return { success: false, status: 'NOT_IMPLEMENTED_EXCEPTION', error: 'The provided backend does not have a checkConnection method' }
+ return { success: false, error: 'NOT_IMPLEMENTED_EXCEPTION', message: 'The provided backend does not have a checkConnection method' }
}
/* Returns an empty array [] if the backends doesn't have such a function.
@@ -133,7 +132,7 @@ class ExternalBackends {
* }
*/
async addClient (credentials, client) {
- return { success: false, status: 'NOT_IMPLEMENTED_EXCEPTION', error: 'The provided backend does not have an addClient method' }
+ return { success: false, error: 'NOT_IMPLEMENTED_EXCEPTION', message: 'The provided backend does not have an addClient method' }
}
/*
@@ -151,18 +150,18 @@ class ExternalBackends {
* }
*/
async updateClient (credentials, client) {
- return { success: false, status: 'NOT_IMPLEMENTED_EXCEPTION', error: 'The provided backend does not have an updateClient method' }
+ return { success: false, error: 'NOT_IMPLEMENTED_EXCEPTION', message: 'The provided backend does not have an updateClient method' }
}
async uploadFiles (credentials, externalId, files) {
- return { success: false, status: 'NOT_IMPLEMENTED_EXCEPTION', error: 'The provided backend does not have an uploadFiles method' }
+ return { success: false, error: 'NOT_IMPLEMENTED_EXCEPTION', message: 'The provided backend does not have an uploadFiles method' }
}
async getFileList (credentials, externalId) {
- return { success: false, status: 'NOT_IMPLEMENTED_EXCEPTION', error: 'The provided backend does not have an getFileList method' }
+ return { success: false, error: 'NOT_IMPLEMENTED_EXCEPTION', message: 'The provided backend does not have an getFileList method' }
}
async getFile (credentials, externalId, filename) {
- return { success: false, status: 'NOT_IMPLEMENTED_EXCEPTION', error: 'The provided backend does not have an getFile method' }
+ return { success: false, error: 'NOT_IMPLEMENTED_EXCEPTION', message: 'The provided backend does not have an getFile method' }
}
}