Fixed eslint errors

app.js

@@ -4,7 +4,6 @@ const config = require('config');
 const log = require('npmlog');
 
 const _ = require('./lib/translate')._;
-const util = require('util');
 
 const express = require('express');
 const bodyParser = require('body-parser');

lib/handlebars-helpers.js

@@ -1,8 +1,10 @@
 'use strict';
 
+const util = require('util');
+
 const _ = require('../lib/translate')._;
 
-module.exports.registerHelpers = (handlebars) => {
+module.exports.registerHelpers = handlebars => {
     // {{#translate}}abc{{/translate}}
     handlebars.registerHelper('translate', function (context, options) { // eslint-disable-line prefer-arrow-callback
         if (typeof options === 'undefined' && context) {
@@ -30,15 +32,16 @@ module.exports.registerHelpers = (handlebars) => {
      {{/case}}
      {{/switch}}
      */
-    handlebars.registerHelper("switch", function(value, options) {
+    /* eslint no-invalid-this: "off" */
+    handlebars.registerHelper('switch', function(value, options) {
         this._switch_value_ = value;
-        var html = options.fn(this); // Process the body of the switch block
+        const html = options.fn(this); // Process the body of the switch block
         delete this._switch_value_;
         return html;
     });
 
-    handlebars.registerHelper("case", function(value, options) {
+    handlebars.registerHelper('case', function(value, options) {
-        if (value == this._switch_value_) {
+        if (value === this._switch_value_) {
             return options.fn(this);
         }
     });

lib/models/report-templates.js

@@ -44,13 +44,13 @@ module.exports.get = (id, callback) => {
             const template = tools.convertKeys(rows[0]);
 
             const userFields = template.userFields.trim();
-            if (userFields != '') {
+            if (userFields !== '') {
                 try {
                     template.userFieldsObject = JSON.parse(userFields);
                 } catch (err) {
                     // This is to handle situation when for some reason we get corrupted JSON in the DB.
                     template.userFieldsObject = {};
-                    template.userFields = "{}";
+                    template.userFields = '{}';
                 }
             } else {
                 template.userFieldsObject = {};
@@ -91,7 +91,7 @@ module.exports.createOrUpdate = (createMode, data, callback) => {
         if (key === 'user_fields') {
             value = value.trim();
 
-            if (value != '') {
+            if (value !== '') {
                 try {
                     JSON.parse(value);
                 } catch (err) {
@@ -129,7 +129,7 @@ module.exports.createOrUpdate = (createMode, data, callback) => {
             if (createMode) {
                 return callback(null, result && result.insertId || false);
             } else {
-                return callback(null, result && result.affectedRows || false)
+                return callback(null, result && result.affectedRows || false);
             }
         });
     });

lib/models/reports.js

@@ -6,7 +6,6 @@ const fields = require('./fields');
 const reportTemplates = require('./report-templates');
 const tools = require('../tools');
 const _ = require('../translate')._;
-const log = require('npmlog');
 
 const allowedKeys = ['name', 'description', 'report_template', 'params'];
 
@@ -25,7 +24,7 @@ module.exports.list = (start, limit, callback) => {
 
 module.exports.listWithState = (state, start, limit, callback) => {
     tableHelpers.list('reports', ['*'], 'name', { where: 'state=?', values: [state] }, start, limit, callback);
-}
+};
 
 module.exports.filter = (request, callback) => {
     tableHelpers.filter('reports JOIN report_templates ON reports.report_template = report_templates.id',
@@ -58,7 +57,7 @@ module.exports.get = (id, callback) => {
             const template = tools.convertKeys(rows[0]);
 
             const params = template.params.trim();
-            if (params != '') {
+            if (params !== '') {
                 try {
                     template.paramsObject = JSON.parse(params);
                 } catch (err) {
@@ -77,7 +76,7 @@ module.exports.get = (id, callback) => {
 module.exports.updateFields = (id, fieldValueMap, callback) => {
     db.getConnection((err, connection) => {
         if (err) {
-            return next(err);
+            return callback(err);
         }
 
         const clauses = [];
@@ -96,7 +95,7 @@ module.exports.updateFields = (id, fieldValueMap, callback) => {
                 return callback(err);
             }
 
-            return callback(null, result && result.affectedRows || false)
+            return callback(null, result && result.affectedRows || false);
         });
     });
 };
@@ -119,7 +118,7 @@ module.exports.createOrUpdate = (createMode, report, callback) => {
     const reportTemplateId = Number(report.reportTemplate);
     reportTemplates.get(reportTemplateId, (err, reportTemplate) => {
         if (err) {
-            callback(err);
+            return callback(err);
         }
 
         const params = report.paramsObject;
@@ -153,7 +152,7 @@ module.exports.createOrUpdate = (createMode, report, callback) => {
 
         db.getConnection((err, connection) => {
             if (err) {
-                return next(err);
+                return callback(err);
             }
 
             let query;
@@ -174,7 +173,7 @@ module.exports.createOrUpdate = (createMode, report, callback) => {
                 if (createMode) {
                     return callback(null, result && result.insertId || false);
                 } else {
-                    return callback(null, result && result.affectedRows || false)
+                    return callback(null, result && result.affectedRows || false);
                 }
             });
         });
@@ -206,13 +205,13 @@ module.exports.delete = (id, callback) => {
 };
 
 const campaignFieldsMapping = {
-    'tracker_count': 'tracker.count',
+    tracker_count: 'tracker.count',
-    'country': 'tracker.country',
+    country: 'tracker.country',
-    'device_type': 'tracker.device_type',
+    device_type: 'tracker.device_type',
-    'status': 'campaign.status',
+    status: 'campaign.status',
-    'first_name': 'subscribers.first_name',
+    first_name: 'subscribers.first_name',
-    'last_name': 'subscribers.last_name',
+    last_name: 'subscribers.last_name',
-    'email': 'subscribers.email'
+    email: 'subscribers.email'
 };
 
 module.exports.getCampaignResults = (campaign, select, clause, callback) => {
@@ -236,7 +235,7 @@ module.exports.getCampaignResults = (campaign, select, clause, callback) => {
                 const item = select[idx];
                 if (item in fieldsMapping) {
                     selFields.push(fieldsMapping[item] + ' AS ' + item);
-                } else if (item == '*') {
+                } else if (item === '*') {
                     selFields = selFields.concat(Object.keys(fieldsMapping).map(item => fieldsMapping[item] + ' AS ' + item));
                 } else {
                     selFields.push(item);

lib/table-helpers.js

@@ -1,8 +1,7 @@
 'use strict';
 
-let db = require('./db');
+const db = require('./db');
-let tools = require('./tools');
+const tools = require('./tools');
-let log = require('npmlog');
 
 module.exports.list = (source, fields, orderBy, queryData, start, limit, callback) => {
     db.getConnection((err, connection) => {
@@ -107,7 +106,7 @@ module.exports.filter = (source, fields, request, columns, searchFields, default
                 let searchVal = '%' + request.search.value.replace(/\\/g, '\\\\').replace(/([%_])/g, '\\$1') + '%';
 
                 searchWhere = searchFields.map(field => field + ' LIKE ?').join(' OR ');
-                searchArgs = searchFields.map(field => searchVal)
+                searchArgs = searchFields.map(() => searchVal);
             }
 
             let query = 'SELECT SQL_CALC_FOUND_ROWS ' + fields.join(', ') + ' FROM ' + source +' WHERE ' + (searchWhere ? '(' + searchWhere + ')': '1') + (queryData ? ' AND (' + queryData.where + ')' : '') + ' ORDER BY ' + ordering.join(', ') + ' LIMIT ? OFFSET ?';

routes/reports.js

@@ -217,7 +217,7 @@ router.post('/delete', passport.parseForm, passport.csrfProtection, (req, res) =
     });
 });
 
-router.get('/view/:id', passport.csrfProtection, (req, res) => {
+router.get('/view/:id', (req, res) => {
     reports.get(req.params.id, (err, report) => {
         if (err || !report) {
             req.flash('danger', err && err.message || err || _('Could not find report with specified ID'));
@@ -269,7 +269,7 @@ router.get('/view/:id', passport.csrfProtection, (req, res) => {
     });
 });
 
-router.get('/output/:id', passport.csrfProtection, (req, res) => {
+router.get('/output/:id', (req, res) => {
     reports.get(req.params.id, (err, report) => {
         if (err || !report) {
             req.flash('danger', err && err.message || err || _('Could not find report with specified ID'));

views/reports/create-select-template.hbs

@@ -9,7 +9,6 @@
 <hr>
 
 <form class="form-horizontal" method="get" action="/reports/create">
-    <input type="hidden" name="_csrf" value="{{csrfToken}}">
 
 {{> report_select_template }}