* Code cleanup and eslint since -- remove unused variables, clean up RegExs, so on...

This commit is contained in:
Bryan Ashby 2018-01-15 12:22:11 -07:00
parent a106050ba3
commit ac1433e84b
112 changed files with 1375 additions and 1898 deletions

View file

@ -1,11 +1,10 @@
/* jslint node: true */
'use strict';
var userDb = require('./database.js').dbs.user;
var Config = require('./config.js').config;
const userDb = require('./database.js').dbs.user;
var async = require('async');
var _ = require('lodash');
const async = require('async');
const _ = require('lodash');
exports.getGroupsForUser = getGroupsForUser;
exports.addUserToGroup = addUserToGroup;
@ -13,23 +12,22 @@ exports.addUserToGroups = addUserToGroups;
exports.removeUserFromGroup = removeUserFromGroup;
function getGroupsForUser(userId, cb) {
var sql =
'SELECT group_name ' +
'FROM user_group_member ' +
'WHERE user_id=?;';
const sql =
`SELECT group_name
FROM user_group_member
WHERE user_id=?;`;
var groups = [];
const groups = [];
userDb.each(sql, [ userId ], function rowData(err, row) {
userDb.each(sql, [ userId ], (err, row) => {
if(err) {
cb(err);
return;
} else {
groups.push(row.group_name);
return cb(err);
}
groups.push(row.group_name);
},
function complete() {
cb(null, groups);
() => {
return cb(null, groups);
});
}
@ -40,31 +38,31 @@ function addUserToGroup(userId, groupName, transOrDb, cb) {
}
transOrDb.run(
'REPLACE INTO user_group_member (group_name, user_id) ' +
'VALUES(?, ?);',
`REPLACE INTO user_group_member (group_name, user_id)
VALUES(?, ?);`,
[ groupName, userId ],
function complete(err) {
cb(err);
err => {
return cb(err);
}
);
}
function addUserToGroups(userId, groups, transOrDb, cb) {
async.each(groups, function item(groupName, next) {
addUserToGroup(userId, groupName, transOrDb, next);
}, function complete(err) {
cb(err);
async.each(groups, (groupName, nextGroupName) => {
return addUserToGroup(userId, groupName, transOrDb, nextGroupName);
}, err => {
return cb(err);
});
}
function removeUserFromGroup(userId, groupName, cb) {
userDb.run(
'DELETE FROM user_group_member ' +
'WHERE group_name=? AND user_id=?;',
`DELETE FROM user_group_member
WHERE group_name=? AND user_id=?;`,
[ groupName, userId ],
function complete(err) {
cb(err);
err => {
return cb(err);
}
);
}