From ded2a87bfc3ab6913fd1e7d639f6bc2eaab3098b Mon Sep 17 00:00:00 2001 From: Udo Walter Date: Wed, 27 Mar 2019 15:34:54 +0000 Subject: rename api log to systemlog to prevent adblocker blocking it --- server/api/log.js | 34 ---------------------------------- server/api/systemlog.js | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 34 deletions(-) delete mode 100644 server/api/log.js create mode 100644 server/api/systemlog.js (limited to 'server/api') diff --git a/server/api/log.js b/server/api/log.js deleted file mode 100644 index d2bd10c..0000000 --- a/server/api/log.js +++ /dev/null @@ -1,34 +0,0 @@ -/* global __appdir */ -var path = require('path') -var db = require(path.join(__appdir, 'lib', 'sequelize')) -var express = require('express') -const { decorateApp } = require('@awaitjs/express') -var router = decorateApp(express.Router()) - -// ############################################################################ -// ########################### GET requests ################################# - -router.getAsync('', async (req, res) => { - const where = {} - if (req.query.from || req.query.to) { - where.timestamp = {} - if (req.query.from) where.timestamp[db.Op.gte] = req.query.from - if (req.query.to) where.timestamp[db.Op.lte] = req.query.to - } - if (req.query.categories) where.category = req.query.categories.split(',') - if (req.query.clients) where.clientId = req.query.clients.split(',') - if (req.query.groups) where.groupId = req.query.groups.split(',') - if (req.query.users) where.userId = req.query.users.split(',') - const log = await db.log.findAll({ where, include: ['client', 'group', 'user'], order: [['timestamp', 'DESC']] }) - log.forEach(entry => { - if (entry.clientSnapshot) entry.clientSnapshot = JSON.parse(entry.clientSnapshot) - if (entry.groupSnapshot) entry.groupSnapshot = JSON.parse(entry.groupSnapshot) - if (entry.userSnapshot) entry.userSnapshot = JSON.parse(entry.userSnapshot) - }) - res.send(log) -}) - -// ############################################################################ -// ############################################################################ - -module.exports.router = router diff --git a/server/api/systemlog.js b/server/api/systemlog.js new file mode 100644 index 0000000..d2bd10c --- /dev/null +++ b/server/api/systemlog.js @@ -0,0 +1,34 @@ +/* global __appdir */ +var path = require('path') +var db = require(path.join(__appdir, 'lib', 'sequelize')) +var express = require('express') +const { decorateApp } = require('@awaitjs/express') +var router = decorateApp(express.Router()) + +// ############################################################################ +// ########################### GET requests ################################# + +router.getAsync('', async (req, res) => { + const where = {} + if (req.query.from || req.query.to) { + where.timestamp = {} + if (req.query.from) where.timestamp[db.Op.gte] = req.query.from + if (req.query.to) where.timestamp[db.Op.lte] = req.query.to + } + if (req.query.categories) where.category = req.query.categories.split(',') + if (req.query.clients) where.clientId = req.query.clients.split(',') + if (req.query.groups) where.groupId = req.query.groups.split(',') + if (req.query.users) where.userId = req.query.users.split(',') + const log = await db.log.findAll({ where, include: ['client', 'group', 'user'], order: [['timestamp', 'DESC']] }) + log.forEach(entry => { + if (entry.clientSnapshot) entry.clientSnapshot = JSON.parse(entry.clientSnapshot) + if (entry.groupSnapshot) entry.groupSnapshot = JSON.parse(entry.groupSnapshot) + if (entry.userSnapshot) entry.userSnapshot = JSON.parse(entry.userSnapshot) + }) + res.send(log) +}) + +// ############################################################################ +// ############################################################################ + +module.exports.router = router -- cgit v1.2.3-55-g7522