Blacklist functionality

Some API improvements

routes/blacklist-legacy-integration.js

@@ -0,0 +1,10 @@
+'use strict';
+
+const _ = require('../lib/translate')._;
+const clientHelpers = require('../lib/client-helpers');
+
+const router = require('../lib/router-async').create();
+
+clientHelpers.registerRootRoute(router, 'blacklist', _('Blacklist'));
+
+module.exports = router;

routes/blacklist.js

@@ -1,68 +0,0 @@
-'use strict';
-let express = require('express');
-let router = new express.Router();
-let passport = require('../lib/passport');
-let htmlescape = require('escape-html');
-let blacklist = require('../lib/models/blacklist');
-let tools = require('../lib/tools');
-let helpers = require('../lib/helpers');
-let _ = require('../lib/translate')._;
-
-router.all('/*', (req, res, next) => {
-    if (!req.user) {
-        req.flash('danger', _('Need to be logged in to access restricted content'));
-        return res.redirect('/account/login?next=' + encodeURIComponent(req.originalUrl));
-    }
-    res.setSelectedMenu('blacklist');
-    next();
-});
-
-router.get('/', passport.csrfProtection, (req, res) => {
-    res.render('blacklist', {csrfToken: req.csrfToken()});
-});
-
-router.post('/ajax/', (req, res) => {
-    let start = parseInt(req.body.start || 0, 10);
-    let limit = parseInt(req.body.length || 50, 10);
-    let search = req.body.search.value || '';
-    blacklist.get(start, limit, search, (err, data, total) => {
-        if (err) {
-            req.flash('danger', err.message || err);
-            return res.redirect('/');
-        }
-        res.json({
-            draw: req.body.draw,
-            recordsTotal: total,
-            recordsFiltered: total,
-            data: data.map((row, i) => [
-                (Number(req.body.start) || 0) + 1 + i,
-                htmlescape(row),
-                '<button class="btn btn-danger btn-sm" onclick="document.getElementById(\'delete-email-input\').value = \'' + row + '\'; document.getElementById(\'delete-email-form\').submit();">Delete</button>'
-            ])
-        });
-    });
-});
-
-router.post('/ajax/add', passport.csrfProtection, (req, res) => {
-    let email = req.body.email;
-    blacklist.add(email, (err) => {
-        if (err) {
-            req.flash('danger', err.message || err);
-            return res.redirect(req.body.next);
-        }
-        return res.redirect(req.body.next)
-    });
-});
-
-router.post('/ajax/delete', passport.csrfProtection, (req, res) => {
-    let email = req.body.email;
-    blacklist.delete(email, (err) => {
-        if (err) {
-            req.flash('danger', err.message || err);
-            return res.redirect(req.body.next);
-        }
-        return res.redirect(req.body.next);
-    });
-});
-
-module.exports = router;

routes/rest/account.js

@@ -18,7 +18,7 @@ router.postAsync('/account', passport.loggedIn, passport.csrfProtection, async (
     const data = req.body;
     data.id = req.user.id;
 
-    await users.updateWithConsistencyCheck(req.body, true);
+    await users.updateWithConsistencyCheck(contextHelpers.getAdminContext(), req.body, true);
     return res.json();
 });
 
@@ -26,7 +26,7 @@ router.postAsync('/account-validate', passport.loggedIn, passport.csrfProtection
     const data = req.body;
     data.id = req.user.id;
 
-    return res.json(await users.serverValidate(req.context, data, true));
+    return res.json(await users.serverValidate(contextHelpers.getAdminContext(), data, true));
 });
 
 router.getAsync('/access-token', passport.loggedIn, async (req, res) => {

routes/rest/blacklist.js

@@ -0,0 +1,27 @@
+'use strict';
+
+const passport = require('../../lib/passport');
+const blacklist = require('../../models/blacklist');
+
+const router = require('../../lib/router-async').create();
+
+
+router.postAsync('/blacklist-table', passport.loggedIn, async (req, res) => {
+    return res.json(await blacklist.listDTAjax(req.context, req.body));
+});
+
+router.postAsync('/blacklist', passport.loggedIn, passport.csrfProtection, async (req, res) => {
+    await blacklist.add(req.context, req.body.email);
+    return res.json();
+});
+
+router.deleteAsync('/blacklist/:email', passport.loggedIn, passport.csrfProtection, async (req, res) => {
+    await blacklist.remove(req.context, req.params.email);
+    return res.json();
+});
+
+router.postAsync('/blacklist-validate', passport.loggedIn, async (req, res) => {
+    return res.json(await blacklist.serverValidate(req.context, req.body));
+});
+
+module.exports = router;

routes/rest/report-templates.js

@@ -40,9 +40,4 @@ router.getAsync('/report-template-user-fields/:reportTemplateId', passport.logge
     return res.json(userFields);
 });
 
-router.getAsync('/report-templates-create-permitted', passport.loggedIn, async (req, res) => {
-    return res.json(await shares.checkTypePermission(req.context, 'namespace', 'createReportTemplate'));
-});
-
-
 module.exports = router;