summaryrefslogtreecommitdiffstats
path: root/server
diff options
context:
space:
mode:
authorUdo Walter2019-01-13 03:04:22 +0100
committerUdo Walter2019-01-13 03:04:22 +0100
commite23e4bcc0dfdbe378deae02bfb0469379af35300 (patch)
treefb26f63d995a883b270f82f00c7378a871c54b90 /server
parentChange API to new structure (diff)
downloadbas-e23e4bcc0dfdbe378deae02bfb0469379af35300.tar.gz
bas-e23e4bcc0dfdbe378deae02bfb0469379af35300.tar.xz
bas-e23e4bcc0dfdbe378deae02bfb0469379af35300.zip
[server] eslint fixes
Diffstat (limited to 'server')
-rw-r--r--server/api/clients.js5
-rw-r--r--server/api/configurator.js6
-rw-r--r--server/api/groups.js3
-rw-r--r--server/api/registration.js8
4 files changed, 10 insertions, 12 deletions
diff --git a/server/api/clients.js b/server/api/clients.js
index 35c2648..71433b5 100644
--- a/server/api/clients.js
+++ b/server/api/clients.js
@@ -4,7 +4,7 @@ var db = require(path.join(__appdir, 'lib', 'sequelize'))
var io = require(path.join(__appdir, 'lib', 'socketio'))
const backendHelper = require(path.join(__appdir, 'lib', 'external-backends', 'backendhelper'))
var express = require('express')
-const { decorateApp } = require('@awaitjs/express');
+const { decorateApp } = require('@awaitjs/express')
var router = decorateApp(express.Router())
// ############################################################################
@@ -35,8 +35,7 @@ router.postAsync(['', '/:id'], async (req, res) => {
if (req.params.id === undefined) {
client = await db.client.create(req.body.data)
io.in('broadcast newClient').emit('notifications newAlert', { type: 'info', text: 'New client!' })
- }
- else {
+ } else {
client = await db.client.findOne({ where: { id: req.params.id } })
console.log('asd')
if (client) await client.update(req.body.data)
diff --git a/server/api/configurator.js b/server/api/configurator.js
index d0e4531..9ed349d 100644
--- a/server/api/configurator.js
+++ b/server/api/configurator.js
@@ -1,9 +1,8 @@
/* global __appdir */
var path = require('path')
var db = require(path.join(__appdir, 'lib', 'sequelize'))
-var Sequelize = require('sequelize')
var express = require('express')
-const { decorateApp } = require('@awaitjs/express');
+const { decorateApp } = require('@awaitjs/express')
var router = decorateApp(express.Router())
// ############################################################################
@@ -21,7 +20,8 @@ router.getAsync('/entries', async (req, res) => {
router.getAsync('/configs/:id/entries', async (req, res) => {
var config = await db.config.findOne({
- where: { id: req.params.id }, include: ['entries'],
+ where: { id: req.params.id },
+ include: ['entries'],
order: [[db.config.associations.entries, db.config.associations.entries.through, 'sortValue', 'ASC']]
})
if (config) res.status(200).send(config.entries)
diff --git a/server/api/groups.js b/server/api/groups.js
index f1825cc..40d2591 100644
--- a/server/api/groups.js
+++ b/server/api/groups.js
@@ -3,7 +3,7 @@ var path = require('path')
var db = require(path.join(__appdir, 'lib', 'sequelize'))
var groupUtil = require(path.join(__appdir, 'lib', 'grouputil'))
var express = require('express')
-const { decorateApp } = require('@awaitjs/express');
+const { decorateApp } = require('@awaitjs/express')
var router = decorateApp(express.Router())
// ############################################################################
@@ -33,7 +33,6 @@ router.getAsync('/:id', async (req, res) => {
}
})
-
// ############################################################################
// ########################## POST requests #################################
diff --git a/server/api/registration.js b/server/api/registration.js
index 29e47bd..39f069f 100644
--- a/server/api/registration.js
+++ b/server/api/registration.js
@@ -228,13 +228,13 @@ noAuthRouter.post('/:uuid/update', (req, res) => {
// System data. Sometime just string with whitespaces only.
c.system = {}
if (/\S/.test(sysManufacturer)) c.system.manufacturer = sysManufacturer
- else c.system.manufacturer = "Not set"
+ else c.system.manufacturer = 'Not set'
if (/\S/.test(sysModel)) c.system.model = sysModel
- else c.system.model = "Not set"
+ else c.system.model = 'Not set'
if (/\S/.test(sysSerial)) c.system.serialnumber = sysSerial
- else c.system.serialnumber = "Not set"
+ else c.system.serialnumber = 'Not set'
// TODO: MULTI GPU's ?!
c.cpu = { model: cpuModel, manufacturer: cpuManufacturer, type: cpuType, frequency: cpuFrequency, cores: cpuCores }
@@ -250,7 +250,7 @@ noAuthRouter.post('/:uuid/update', (req, res) => {
* Mehtod for uploading the tpm key and stuff.
*/
noAuthRouter.put('/:uuid/files', (req, res) => {
- db.client.findOne({ where: { uuid: req.params.uuid }}).then(client => {
+ db.client.findOne({ where: { uuid: req.params.uuid } }).then(client => {
backendHelper.uploadFiles(client.id, req.files)
res.send()
})