diff --git a/src/server/controllers/admin.js b/src/server/controllers/admin.js index 3073ae5..dac0115 100644 --- a/src/server/controllers/admin.js +++ b/src/server/controllers/admin.js @@ -1,4 +1,3 @@ - import authentication from './authentication'; import { Accounts } from '../../models'; diff --git a/src/server/controllers/user/settings.js b/src/server/controllers/user/settings.js index 47adf33..11f2e45 100644 --- a/src/server/controllers/user/settings.js +++ b/src/server/controllers/user/settings.js @@ -7,8 +7,7 @@ export async function SetResearchStatus(userId, status) { } export async function GetResearchStatus(userId) { - return Accounts.findOne({where: {id: userId}, attributes: ['research_enabled']}) + return Accounts.findOne({ where: { id: userId }, attributes: ['research_enabled'] }); } - export default null; diff --git a/src/server/router/api/index.js b/src/server/router/api/index.js index ec20778..0d22a3a 100644 --- a/src/server/router/api/index.js +++ b/src/server/router/api/index.js @@ -1,5 +1,4 @@ import express from 'express'; -import log4js from 'log4js'; import admin from './admin'; import auth from './auth'; diff --git a/src/server/router/api/user/settings.js b/src/server/router/api/user/settings.js index e8b5dc1..9447cad 100644 --- a/src/server/router/api/user/settings.js +++ b/src/server/router/api/user/settings.js @@ -1,34 +1,25 @@ -import bodyParser from 'body-parser'; -import crypto from 'crypto'; -import dirTree from 'directory-tree'; import express from 'express'; -import log4js from 'log4js'; import { requireAuthenticated } from '../../../middlewares/authentication'; import { SetResearchStatus, GetResearchStatus } from '../../../controllers/user/settings'; -const logger = log4js.getLogger(); - // /api/devices const router = express.Router(); router.patch('/research/:enabled', requireAuthenticated, async (req, res) => { - const { enabled } = req.params; - if (!enabled) { res.json({ bad: true }); } - const doEnable = enabled === 'true'; - const accountId = req.account.id; - - const update = await SetResearchStatus(req.account.id, doEnable); - - return res.json({ success: true, data: req.account }); - }); + const { enabled } = req.params; + if (!enabled) { res.json({ bad: true }); } + const doEnable = enabled === 'true'; - router.get('/research/', requireAuthenticated, async (req, res) => { - const accountId = req.account.id; - - const update = await GetResearchStatus(req.account.id); - - return res.json({ success: true, data: update }); - }); + await SetResearchStatus(req.account.id, doEnable); + + return res.json({ success: true, data: req.account }); +}); + +router.get('/research/', requireAuthenticated, async (req, res) => { + const update = await GetResearchStatus(req.account.id); + + return res.json({ success: true, data: update }); +}); export default router;