* Rework user.js and User object to ES6

* Update download stats for user when web download is completed

core/bbs.js

@@ -196,19 +196,18 @@ function initialize(cb) {
 				//	* We do this every time as the op is free to change this information just
 				//	  like any other user
 				//				
-				const user		= require('./user.js');
+				const User = require('./user.js');
 
 				async.waterfall(
 					[
 						function getOpUserName(next) {
-							return user.getUserName(1, next);
+							return User.getUserName(1, next);
 						},
 						function getOpProps(opUserName, next) {
 							const propLoadOpts = {
-								userId	: 1,
 								names	: [ 'real_name', 'sex', 'email_address', 'location', 'affiliation' ],
 							};
-							user.loadProperties(propLoadOpts, (err, opProps) => {
+							User.loadProperties(User.RootUserID, propLoadOpts, (err, opProps) => {
 								return next(err, opUserName, opProps);
 							});
 						}

core/client.js

@@ -34,7 +34,7 @@
 //	ENiGMA½
 const term		= require('./client_term.js');
 const ansi		= require('./ansi_term.js');
-const user		= require('./user.js');
+const User		= require('./user.js');
 const Config	= require('./config.js').config;
 const MenuStack	= require('./menu_stack.js');
 const ACS		= require('./acs.js');
@@ -77,7 +77,7 @@ function Client(input, output) {
 
 	const self	= this;
 	
-	this.user				= new user.User();
+	this.user				= new User();
 	this.currentTheme		= { info : { name : 'N/A', description : 'None' } };
 	this.lastKeyPressMs		= Date.now();
 	this.menuStack			= new MenuStack(this);

core/file_area_web.js

@@ -9,6 +9,10 @@ const FileEntry				= require('./file_entry.js');
 const getServer				= require('./listening_server.js').getServer;
 const Errors				= require('./enig_error.js').Errors;
 const ErrNotEnabled			= require('./enig_error.js').ErrorReasons.NotEnabled;
+const StatLog				= require('./stat_log.js');
+const User					= require('./user.js');
+const Log					= require('./logger.js').log;
+const getConnectionByUserId	= require('./client_connections.js').getConnectionByUserId;
 
 //	deps
 const hashids		= require('hashids');
@@ -277,7 +281,7 @@ class FileAreaWebAccess {
 
 					resp.on('finish', () => {
 						//	transfer completed fully
-						//	:TODO: we need to update the users stats - bytes xferred, credit stuff, etc.
+						this.updateDownloadStatsForUserId(servedItem.userId, stats.size);
 					});
 
 					const headers = {
@@ -293,6 +297,37 @@ class FileAreaWebAccess {
 			});									
 		});
 	}
+
+	updateDownloadStatsForUserId(userId, dlBytes, cb) {
+		async.waterfall(
+			[
+				function fetchActiveUser(callback) {
+					const clientForUserId = getConnectionByUserId(userId);
+					if(clientForUserId) {
+						return callback(null, clientForUserId.user);
+					}
+
+					//	not online now - look 'em up
+					User.getUser(userId, (err, assocUser) => {
+						return callback(err, assocUser);
+					});
+				},
+				function updateStats(user, callback) {
+					StatLog.incrementUserStat(user, 'dl_total_count', 1);
+					StatLog.incrementUserStat(user, 'dl_total_bytes', dlBytes);
+					StatLog.incrementSystemStat('dl_total_count', 1);
+					StatLog.incrementSystemStat('dl_total_bytes', dlBytes);
+					
+					return callback(null);
+				}
+			],
+			err => {
+				if(cb) {
+					return cb(err);
+				}
+			}
+		);
+	}
 }
 
 module.exports = new FileAreaWebAccess();

core/fse.js

@@ -9,7 +9,7 @@ const theme							= require('./theme.js');
 const Message						= require('./message.js');
 const updateMessageAreaLastReadId	= require('./message_area.js').updateMessageAreaLastReadId;
 const getMessageAreaByTag			= require('./message_area.js').getMessageAreaByTag;
-const getUserIdAndName				= require('./user.js').getUserIdAndName;
+const User							= require('./user.js');
 const cleanControlCodes				= require('./string_util.js').cleanControlCodes;
 const StatLog						= require('./stat_log.js');
 const stringFormat					= require('./string_format.js');
@@ -373,7 +373,7 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
 							callback(null);
 						} else {
 							//	we need to look it up
-							getUserIdAndName(self.message.toUserName, function userInfo(err, toUserId) {
+							User.getUserIdAndName(self.message.toUserName, function userInfo(err, toUserId) {
 								if(err) {
 									callback(err);
 								} else {

core/oputil/oputil_help.js

@@ -17,7 +17,6 @@ global args:
 where <command> is one of:
   user                  : user utilities
   config                : config file management
-  file-base
   fb                    : file base management
 
 `,
@@ -39,7 +38,7 @@ valid args:
   --new                 : generate a new/initial configuration
 `,
 	FileBase :
-`usage: oputil.js file-base <action> [<args>] [<action_specific>]
+`usage: oputil.js fb <action> [<args>] [<action_specific>]
 
 where <action> is one of:
   scan <args> AREA_TAG         : (re)scan area specified by AREA_TAG for new files
@@ -47,6 +46,8 @@ where <action> is one of:
 
 valid scan <args>:
   --tags TAG1,TAG2,...  : specify tag(s) to assign to discovered entries
+
+ARE_TAG can optionally contain @STORAGE_TAG; for example: retro_pc@bbs
 `
 };
 

core/oputil/oputil_main.js

@@ -34,7 +34,6 @@ module.exports = function() {
 			handleConfigCommand();
 			break;
 
-		case 'file-base' :
 		case 'fb' :
 			handleFileBaseCommand();
 			break;

core/oputil/oputil_user.js

@@ -7,8 +7,8 @@ const ExitCodes					= require('./oputil_common.js').ExitCodes;
 const argv						= require('./oputil_common.js').argv;
 const initConfigAndDatabases	= require('./oputil_common.js').initConfigAndDatabases;
 
-
 const async						= require('async');
+const _							= require('lodash');
 
 exports.handleUserCommand		= handleUserCommand;
 
@@ -55,13 +55,13 @@ function handleUserCommand() {
 }
 
 function getUser(userName, cb) {
-	const user = require('./core/user.js');
+	const User = require('../../core/user.js');
-	user.getUserIdAndName(argv.user, function userNameAndId(err, userId) {
+	User.getUserIdAndName(argv.user, function userNameAndId(err, userId) {
 		if(err) {
 			process.exitCode = ExitCodes.BAD_ARGS;
 			return cb(new Error('Failed to retrieve user'));
 		} else {
-			let u = new user.User();
+			let u = new User();
 			u.userId = userId;
 			return cb(null, u);
 		}
@@ -97,7 +97,7 @@ function setAccountStatus(userName, active) {
 				initAndGetUser(argv.user, callback);
 			},
 			function activateUser(user, callback) {
-				const AccountStatus = require('./core/user.js').User.AccountStatus;
+				const AccountStatus = require('../../core/user.js').AccountStatus;
 				user.persistProperty('account_status', active ? AccountStatus.active : AccountStatus.inactive, callback);
 			}
 		],

core/system_view_validate.js

@@ -2,7 +2,7 @@
 'use strict';
 
 //	ENiGMA½
-const user		= require('./user.js');
+const User		= require('./user.js');
 const Config	= require('./config.js').config;
 
 exports.validateNonEmpty		= validateNonEmpty;
@@ -38,7 +38,7 @@ function validateUserNameAvail(data, cb) {
 		} else if(/^[0-9]+$/.test(data)) {
 			return cb(new Error('Username cannot be a number'));
 		} else {
-			user.getUserIdAndName(data, function userIdAndName(err) {
+			User.getUserIdAndName(data, function userIdAndName(err) {
 				if(!err) {	//	err is null if we succeeded -- meaning this user exists already
 					return cb(new Error('Username unavailable'));
 				}
@@ -56,7 +56,7 @@ function validateUserNameExists(data, cb) {
 		return cb(invalidUserNameError);
 	}
 
-	user.getUserIdAndName(data, (err) => {
+	User.getUserIdAndName(data, (err) => {
 		return cb(err ? invalidUserNameError : null);
 	});
 }
@@ -80,7 +80,7 @@ function validateEmailAvail(data, cb) {
 		return cb(new Error('Invalid email address'));
 	}
 
-	user.getUserIdsWithProperty('email_address', data, function userIdsWithEmail(err, uids) {
+	User.getUserIdsWithProperty('email_address', data, function userIdsWithEmail(err, uids) {
 		if(err) {
 			return cb(new Error('Internal system error'));
 		} else if(uids.length > 0) {

core/user.js

@@ -1,171 +1,169 @@
 /* jslint node: true */
 'use strict';
 
-var userDb			= require('./database.js').dbs.user;
+const userDb		= require('./database.js').dbs.user;
-var Config			= require('./config.js').config;
+const Config		= require('./config.js').config;
-var userGroup		= require('./user_group.js');
+const userGroup		= require('./user_group.js');
+const Errors		= require('./enig_error.js').Errors;
 
-var crypto			= require('crypto');
+//	deps
-var assert			= require('assert');
+const crypto		= require('crypto');
-var async			= require('async');
+const assert		= require('assert');
-var _				= require('lodash');
+const async			= require('async');
-var moment			= require('moment');
+const _				= require('lodash');
-
+const moment		= require('moment');
-exports.User						= User;
-exports.getUserIdAndName			= getUserIdAndName;
-exports.getUserName					= getUserName;
-exports.loadProperties				= loadProperties;
-exports.getUserIdsWithProperty		= getUserIdsWithProperty;
-exports.getUserList					= getUserList;
 
 exports.isRootUserId = function(id) { return 1 === id; };
 
-function User() {
+module.exports = class User {
-	var self = this;
+	constructor() {
-
 		this.userId		= 0;
 		this.username	= '';
 		this.properties	= {};	//	name:value
 		this.groups		= [];	//	group membership(s)
-
-	this.isAuthenticated = function() {
-		return true === self.authenticated;
-	};
-
-	this.isValid = function() {
-		if(self.userId <= 0 || self.username.length < Config.users.usernameMin) {
-			return false;
 	}
 
-		return this.hasValidPassword();
+	//	static property accessors
-	};
+	static get RootUserID() {
-
+		return 1;
-	this.hasValidPassword = function() {
-		if(!this.properties || !this.properties.pw_pbkdf2_salt || !this.properties.pw_pbkdf2_dk) {
-			return false;
 	}
 
-		return this.properties.pw_pbkdf2_salt.length === User.PBKDF2.saltLen * 2 &&
+	static get PBKDF2() {
-			this.prop_name.pw_pbkdf2_dk.length === User.PBKDF2.keyLen * 2;
+		return {
-	};
-
-	this.isRoot = function() {
-		return 1 === this.userId;
-	};
-
-	this.isSysOp = this.isRoot;	//	alias
-
-	this.isGroupMember = function(groupNames) {
-		if(_.isString(groupNames)) {
-			groupNames = [ groupNames ];
-		}
-
-		const isMember = groupNames.some(gn => (-1 !== self.groups.indexOf(gn))); 
-		return isMember;
-	};
-
-	this.getLegacySecurityLevel = function() {
-		if(self.isRoot() || self.isGroupMember('sysops')) {
-			return 100;
-		}
-		
-		if(self.isGroupMember('users')) {
-			return 30;
-		}
-		
-		return 10;	//	:TODO: Is this what we want?
-	};
-
-}
-
-User.PBKDF2 = {
 			iterations	: 1000,
 			keyLen		: 128,
 			saltLen		: 32,
 		};
+	}
 
-User.StandardPropertyGroups = {
+	static get StandardPropertyGroups() {
+		return {
 			password	: [ 'pw_pbkdf2_salt', 'pw_pbkdf2_dk' ],
 		};
+	}
 
-User.AccountStatus = {
+	static get AccountStatus() {
+		return {
 			disabled	: 0,
 			inactive	: 1,
 			active		: 2,
 		};
+	}
 	
-User.prototype.load = function(userId, cb) {
+	isAuthenticated() {
+		return true === this.authenticated;
+	}
 
-};
+	isValid() {
+		if(this.userId <= 0 || this.username.length < Config.users.usernameMin) {
+			return false;
+		}
 
-User.prototype.authenticate = function(username, password, cb) {
+		return this.hasValidPassword();
+	}
+
+	hasValidPassword() {
+		if(!this.properties || !this.properties.pw_pbkdf2_salt || !this.properties.pw_pbkdf2_dk) {
+			return false;
+		}
+
+		return this.properties.pw_pbkdf2_salt.length === User.PBKDF2.saltLen * 2 && this.prop_name.pw_pbkdf2_dk.length === User.PBKDF2.keyLen * 2;
+	}
+
+	isRoot() {
+		return User.isRootUserId(this.userId);
+	}
+
+	isSysOp() {	//	alias to isRoot()
+		return this.isRoot();
+	}
+
+	isGroupMember(groupNames) {
+		if(_.isString(groupNames)) {
+			groupNames = [ groupNames ];
+		}
+
+		const isMember = groupNames.some(gn => (-1 !== this.groups.indexOf(gn))); 
+		return isMember;
+	}
+
+	getLegacySecurityLevel() {
+		if(this.isRoot() || this.isGroupMember('sysops')) {
+			return 100;
+		}
+		
+		if(this.isGroupMember('users')) {
+			return 30;
+		}
+		
+		return 10;	//	:TODO: Is this what we want?
+	}
+
+	authenticate(username, password, cb) {
 		const self = this;
-
 		const cachedInfo = {};
 
 		async.waterfall(
 			[
 				function fetchUserId(callback) {
 					//	get user ID
-				getUserIdAndName(username, function onUserId(err, uid, un) {
+					User.getUserIdAndName(username, (err, uid, un) => {
 						cachedInfo.userId	= uid;
 						cachedInfo.username	= un;
 
-					callback(err);
+						return callback(err);
 					});
 				},
-
 				function getRequiredAuthProperties(callback) {
 					//	fetch properties required for authentication
-				loadProperties( { userId : cachedInfo.userId, names : User.StandardPropertyGroups.password }, function onProps(err, props) {
+					User.loadProperties(cachedInfo.userId, { names : User.StandardPropertyGroups.password }, (err, props) => {
-					callback(err, props);
+						return callback(err, props);
 					});
 				},
 				function getDkWithSalt(props, callback) {
 					//	get DK from stored salt and password provided
-				generatePasswordDerivedKey(password, props.pw_pbkdf2_salt, function onDk(err, dk) {
+					User.generatePasswordDerivedKey(password, props.pw_pbkdf2_salt, (err, dk) => {
-					callback(err, dk, props.pw_pbkdf2_dk);
+						return callback(err, dk, props.pw_pbkdf2_dk);
 					});
 				},
 				function validateAuth(passDk, propsDk, callback) {
 					//
 					//	Use constant time comparison here for security feel-goods
 					//
-				var passDkBuf	= new Buffer(passDk,	'hex');
+					const passDkBuf		= new Buffer(passDk,	'hex');
-				var propsDkBuf	= new Buffer(propsDk,	'hex');
+					const propsDkBuf	= new Buffer(propsDk,	'hex');
 
 					if(passDkBuf.length !== propsDkBuf.length) {
-					callback(new Error('Invalid password'));
+						return callback(Errors.AccessDenied('Invalid password'));
-					return;
 					}
 
-				var c = 0;
+					let c = 0;
-				for(var i = 0; i < passDkBuf.length; i++) {
+					for(let i = 0; i < passDkBuf.length; i++) {
 						c |= passDkBuf[i] ^ propsDkBuf[i];
 					}
 
-				callback(0 === c ? null : new Error('Invalid password'));
+					return callback(0 === c ? null : Errors.AccessDenied('Invalid password'));
 				},
 				function initProps(callback) {
-				loadProperties( { userId : cachedInfo.userId }, function onProps(err, allProps) {
+					User.loadProperties(cachedInfo.userId, (err, allProps) => {
 						if(!err) {
 							cachedInfo.properties = allProps;
 						}
 
-					callback(err);
+						return callback(err);
 					});
 				},
 				function initGroups(callback) {
-				userGroup.getGroupsForUser(cachedInfo.userId, function groupsLoaded(err, groups) {
+					userGroup.getGroupsForUser(cachedInfo.userId, (err, groups) => {
 						if(!err) {
 							cachedInfo.groups = groups;
 						}
 
-					callback(err);
+						return callback(err);
 					});
 				}
 			],
-		function complete(err) {
+			err => {
 				if(!err) {
 					self.userId			= cachedInfo.userId;
 					self.username		= cachedInfo.username;
@@ -177,15 +175,16 @@ User.prototype.authenticate = function(username, password, cb) {
 				return cb(err);
 			}
 		);
-};
+	}
 
-User.prototype.create = function(options, cb) {
+	create(password, cb) {
 		assert(0 === this.userId);
-	assert(this.username.length > 0);	//	:TODO: Min username length? Max?
-	assert(_.isObject(options));
-	assert(_.isString(options.password));
 
-	var self = this;
+		if(this.username.length < Config.users.usernameMin || this.username.length > Config.users.usernameMax) {
+			return cb(Errors.Invalid('Invalid username length'));
+		}
+
+		const self = this;
 
 		//	:TODO: set various defaults, e.g. default activation status, etc.
 		self.properties.account_status = Config.users.requireActivation ? User.AccountStatus.inactive : User.AccountStatus.active;
@@ -193,139 +192,139 @@ User.prototype.create = function(options, cb) {
 		async.series(
 			[
 				function beginTransaction(callback) {
-				userDb.run('BEGIN;', function transBegin(err) {
+					userDb.run('BEGIN;', err => {
-					callback(err);
+						return callback(err);
 					});
 				},
 				function createUserRec(callback) {
 					userDb.run(
-					'INSERT INTO user (user_name) ' +
+						`INSERT INTO user (user_name)
-					'VALUES (?);',
+						VALUES (?);`,
 						[ self.username ],
-					function userInsert(err) {
+						function inserted(err) {	//	use classic function for |this|
 							if(err) {
-							callback(err);
+								return callback(err);
-						} else {
+							}
+							
 							self.userId = this.lastID;
 
 							//	Do not require activation for userId 1 (root/admin)
-							if(1 === self.userId) {
+							if(User.RootUserID === self.userId) {
 								self.properties.account_status = User.AccountStatus.active;
 							}
 							
-							callback(null);
+							return callback(null);
-						}
 						}
 					);
 				},
 				function genAuthCredentials(callback) {
-				generatePasswordDerivedKeyAndSalt(options.password, function dkAndSalt(err, info) {
+					User.generatePasswordDerivedKeyAndSalt(password, (err, info) => {
 						if(err) {
-						callback(err);
+							return callback(err);
-					} else {
+						}
+						
 						self.properties.pw_pbkdf2_salt	= info.salt;
 						self.properties.pw_pbkdf2_dk	= info.dk;
-						callback(null);
+						return callback(null);
-					}
 					});
 				},
 				function setInitialGroupMembership(callback) {
 					self.groups = Config.users.defaultGroups;
 
-				if(1 === self.userId) {	//	root/SysOp?
+					if(User.RootUserID === self.userId) {	//	root/SysOp?
 						self.groups.push('sysops');
 					}
 
-				callback(null);
+					return callback(null);
 				},
 				function saveAll(callback) {
-				self.persist(false, function persisted(err) {
+					self.persist(false, err => {
-					callback(err);
+						return callback(err);
 					});
 				}
 			],
-		function complete(err) {
+			err => {
 				if(err) {
-				var originalError = err;
+					const originalError = err;
-				userDb.run('ROLLBACK;', function rollback(err) {
+					userDb.run('ROLLBACK;', err => {
 						assert(!err);
-					cb(originalError);
+						return cb(originalError);
 					});
 				} else {
-				userDb.run('COMMIT;', function commited(err) {
+					userDb.run('COMMIT;', err => {
-					cb(err);
+						return cb(err);
 					});
 				}
 			}
 		);
-};
+	}
 
-User.prototype.persist = function(useTransaction, cb) {
+	persist(useTransaction, cb) {
 		assert(this.userId > 0);
 
-	var self = this;
+		const self = this;
 
 		async.series(
 			[
 				function beginTransaction(callback) {
 					if(useTransaction) {
-					userDb.run('BEGIN;', function transBegin(err) {
+						userDb.run('BEGIN;', err => {
-						callback(err);
+							return callback(err);
 						});
 					} else {
-					callback(null);
+						return callback(null);
 					}
 				},
 				function saveProps(callback) {
-				self.persistAllProperties(function persisted(err) {
+					self.persistProperties(self.properties, err => {
-					callback(err);
+						return callback(err);
 					});
 				},
 				function saveGroups(callback) {
-				userGroup.addUserToGroups(self.userId, self.groups, function groupsSaved(err) {
+					userGroup.addUserToGroups(self.userId, self.groups, err => {
-					callback(err);
+						return callback(err);
 					});
 				}
 			],
-		function complete(err) {
+			err => {
 				if(err) {
 					if(useTransaction) {
-					userDb.run('ROLLBACK;', function rollback(err) {
+						userDb.run('ROLLBACK;', err => {
-						cb(err);
+							return cb(err);
 						});
 					} else {
-					cb(err);
+						return cb(err);
 					}
 				} else {
 					if(useTransaction) {
-					userDb.run('COMMIT;', function commited(err) {
+						userDb.run('COMMIT;', err => {
-						cb(err);
+							return cb(err);
 						});
 					} else {
-					cb(null);
+						return cb(null);
 					}
 				}
 			}
 		);
-};
+	}
 
-User.prototype.persistProperty = function(propName, propValue, cb) {
+	persistProperty(propName, propValue, cb) {
 		//	update live props
 		this.properties[propName] = propValue;
 
 		userDb.run(
-		'REPLACE INTO user_property (user_id, prop_name, prop_value) ' + 
+			`REPLACE INTO user_property (user_id, prop_name, prop_value)
-		'VALUES (?, ?, ?);', 
+			VALUES (?, ?, ?);`, 
 			[ this.userId, propName, propValue ], 
-		function ran(err) {
+			err => {
 				if(cb) {
-				cb(err);
+					return cb(err);
 				}
 			}
 		);
-};
+	}
 
-User.prototype.removeProperty = function(propName, cb) {
+	removeProperty(propName, cb) {
 		//	update live
 		delete this.properties[propName];
 
@@ -339,231 +338,261 @@ User.prototype.removeProperty = function(propName, cb) {
 				}
 			}
 		);
-};
+	}
 
-User.prototype.persistProperties = function(properties, cb) {
+	persistProperties(properties, cb) {
-	var self = this;
+		const self = this;
 
 		//	update live props
 		_.merge(this.properties, properties);
 
-	var stmt = userDb.prepare(
+		const stmt = userDb.prepare(
-		'REPLACE INTO user_property (user_id, prop_name, prop_value) ' + 
+			`REPLACE INTO user_property (user_id, prop_name, prop_value)
-		'VALUES (?, ?, ?);');
+			VALUES (?, ?, ?);`
+		);
 
-	async.each(Object.keys(properties), function property(propName, callback) {
+		async.each(Object.keys(properties), (propName, nextProp) => {
-		stmt.run(self.userId, propName, properties[propName], function onRun(err) {
+			stmt.run(self.userId, propName, properties[propName], err => {
-			callback(err);
+				return nextProp(err);
 			});
-	}, function complete(err) {
+		},
+		err => {
 			if(err) {
-			cb(err);
+				return cb(err);
-		} else {
+			}
-			stmt.finalize(function finalized() {
+			
-				cb(null);
+			stmt.finalize( () => {
+				return cb(null);
+			});
 		});
 	}
-	});
-};
 
-User.prototype.persistAllProperties = function(cb) {
+	setNewAuthCredentials(password, cb) {
-	assert(this.userId > 0);
+		User.generatePasswordDerivedKeyAndSalt(password, (err, info) => {
-
-	this.persistProperties(this.properties, cb);
-};
-
-User.prototype.setNewAuthCredentials = function(password, cb) {
-	var self = this;
-
-	generatePasswordDerivedKeyAndSalt(password, function dkAndSalt(err, info) {
 			if(err) {
-			cb(err);
+				return cb(err);
-		} else {
+			}
-			var newProperties = {
+			
+			const newProperties = {
 				pw_pbkdf2_salt	: info.salt,
 				pw_pbkdf2_dk	: info.dk,
 			};
 
-			self.persistProperties(newProperties, function persisted(err) {
+			this.persistProperties(newProperties, err => {
-				cb(err);
+				return cb(err);
+			});
 		});
 	}
-	});
-};
 
-User.prototype.getAge = function() {
+	getAge() {
 		if(_.has(this.properties, 'birthdate')) {
 			return moment().diff(this.properties.birthdate, 'years');
 		}
-};
-
-///////////////////////////////////////////////////////////////////////////////
-//	Exported methods
-///////////////////////////////////////////////////////////////////////////////
-function getUserIdAndName(username, cb) {
-	userDb.get(
-		'SELECT id, user_name ' +
-		'FROM user ' +
-		'WHERE user_name LIKE ?;',
-		[ username ],
-		function onResults(err, row) {
-			if(err) {
-				cb(err);
-			} else {
-				if(row) {
-					cb(null, row.id, row.user_name);
-				} else {
-					cb(new Error('No matching username'));
-				}
-			}
-		}
-	);
 	}
 
-function getUserName(userId, cb) {
+	static getUser(userId, cb) {
-	userDb.get(
-		'SELECT user_name ' +
-		'FROM user '		+
-		'WHERE id=?;', [ userId ],
-		function got(err, row) {
-			if(err) {
-				cb(err);
-			} else {
-				if(row) {
-					cb(null, row.user_name);
-				} else {
-					cb(new Error('No matching user ID'));
-				}
-			}
-		}
-	);
-}
-
-///////////////////////////////////////////////////////////////////////////////
-//	Internal utility methods
-///////////////////////////////////////////////////////////////////////////////
-function generatePasswordDerivedKeyAndSalt(password, cb) {
 		async.waterfall(
 			[
-			function getSalt(callback) {
+				function fetchUserId(callback) {
-				generatePasswordDerivedKeySalt(function onSalt(err, salt) {
+					User.getUserName(userId, (err, userName) => {
-					callback(err, salt);
+						return callback(null, userName);
 					});
 				},
-			function getDk(salt, callback) {
+				function initProps(userName, callback) {
-				generatePasswordDerivedKey(password, salt, function onDk(err, dk) {
+					User.loadProperties(userId, (err, properties) => {
-					callback(err, salt, dk);
+						return callback(err, userName, properties);
+					});
+				},
+				function initGroups(userName, properties, callback) {
+					userGroup.getGroupsForUser(userId, (err, groups) => {
+						return callback(null, userName, properties, groups);
 					});
 				}
 			],
-		function onComplete(err, salt, dk) {
+			(err, userName, properties, groups) => {
-			cb(err, { salt : salt, dk : dk });
+				const user = new User();
+				user.userId			= userId;
+				user.username		= userName;
+				user.properties		= properties;
+				user.groups			= groups;
+				user.authenticated	= false;	//	this is NOT an authenticated user!
+
+				return cb(err, user);
 			}
 		);
 	}
 	
-function generatePasswordDerivedKeySalt(cb) {
+	static isRootUserId(userId) {
-	crypto.randomBytes(User.PBKDF2.saltLen, function onRandSalt(err, salt) {
+		return (User.RootUserID === userId);
+	}
+
+	static getUserIdAndName(username, cb) {
+		userDb.get(
+			`SELECT id, user_name
+			FROM user
+			WHERE user_name LIKE ?;`,
+			[ username ],
+			(err, row) => {
 				if(err) {
-			cb(err);
+					return cb(err);
-		} else {
-			cb(null, salt.toString('hex'));
-		}
-	});
 				}
 
-function generatePasswordDerivedKey(password, salt, cb) {
+				if(row) {
-	password = new Buffer(password).toString('hex');
+					return cb(null, row.id, row.user_name);
-	crypto.pbkdf2(password, salt, User.PBKDF2.iterations, User.PBKDF2.keyLen, 'sha1', function onDerivedKey(err, dk) {
+				}
+				
+				return cb(Errors.DoesNotExist('No matching username'));
+			}
+		);
+	}
+
+	static getUserName(userId, cb) {
+		userDb.get(
+			`SELECT user_name
+			FROM user
+			WHERE id = ?;`,
+			[ userId ],
+			(err, row) => {
 				if(err) {
-			cb(err);
+					return cb(err);
-		} else {
-			cb(null, dk.toString('hex'));
-		}
-	});
 				}
 				
-function loadProperties(options, cb) {
+				if(row) {
-	assert(options.userId);
+					return cb(null, row.user_name);
+				}
 				
-	var sql =
+				return cb(Errors.DoesNotExist('No matching user ID'));
-		'SELECT prop_name, prop_value ' +
+			}
-		'FROM user_property ' +
+		);
-		'WHERE user_id = ?';
+	}
+
+	static loadProperties(userId, options, cb) {
+		if(!cb && _.isFunction(options)) {
+			cb = options;
+			options = {};
+		}
+
+		let sql =
+			`SELECT prop_name, prop_value
+			FROM user_property
+			WHERE user_id = ?`;
 
 		if(options.names) {
-		sql +=' AND prop_name IN("' + options.names.join('","') + '");';
+			sql += ` AND prop_name IN("${options.names.join('","')}");`;
 		} else {
 			sql += ';';
 		}
 
-	var properties = {};
+		let properties = {};
-
+		userDb.each(sql, [ userId ], (err, row) => {
-	userDb.each(sql, [ options.userId ], function onRow(err, row) {
 			if(err) {
-			cb(err);
+				return cb(err);
-			return;
-		} else {
-			properties[row.prop_name] = row.prop_value;
 			}
-	}, function complete() {
+			properties[row.prop_name] = row.prop_value;			
-		cb(null, properties);
+		}, () => {
+			return cb(null, properties);
 		});
 	}
 
 	//	:TODO: make this much more flexible - propValue should allow for case-insensitive compare, etc.
-function getUserIdsWithProperty(propName, propValue, cb) {
+	static getUserIdsWithProperty(propName, propValue, cb) {
-	var userIds = [];
+		let userIds = [];
 
 		userDb.each(
-		'SELECT user_id '		+
+			`SELECT user_id
-		'FROM user_property	'	+
+			FROM user_property
-		'WHERE prop_name = ? AND prop_value = ?;',
+			WHERE prop_name = ? AND prop_value = ?;`,
 			[ propName, propValue ], 
-		function rowEntry(err, row) {
+			(err, row) => {
-			if(!err) {
+				if(row) {
 					userIds.push(row.user_id);
 				}
 			}, 
-		function complete() {
+			() => {
-			cb(null, userIds);
+				return cb(null, userIds);
 			}
 		);
 	}
 
-function getUserList(options, cb) {
+	static getUserList(options, cb) {
-	var userList = [];
+		let userList = [];
-
+		let orderClause = 'ORDER BY ' + (options.order || 'user_name');
-	var orderClause = 'ORDER BY ' + (options.order || 'user_name');
 
 		userDb.each(
-		'SELECT id, user_name '			+
+			`SELECT id, user_name
-		'FROM user '					+
+			FROM user
-		orderClause + ';',
+			${orderClause};`,
-		function userRow(err, row) {
+			(err, row) => {
+				if(row) {
 					userList.push({
 						userId		: row.id,
 						userName	: row.user_name,
 					});
+				}
 			},
-		function usersComplete(err) {
+			() => {
 				options.properties = options.properties || [];
-			async.map(userList, function iter(user, callback) {
+				async.map(userList, (user, nextUser) => {
 					userDb.each(
-					'SELECT prop_name, prop_value '	+
+						`SELECT prop_name, prop_value
-					'FROM user_property '			+
+						FROM user_property
-					'WHERE user_id=? AND prop_name IN ("' + options.properties.join('","') + '");',
+						WHERE user_id = ? AND prop_name IN ("${options.properties.join('","')}");`,
 						[ user.userId ],
-					function propRow(err, row) {
+						(err, row) => {
+							if(row) {
 								user[row.prop_name] = row.prop_value;
+							}
 						},
-					function complete(err) {							
+						err => {
-						callback(err, user);
+							return nextUser(err, user);
 						}
 					);
-			}, function propsComplete(err, transformed) {
+				}, 
-				cb(err, transformed);
+				(err, transformed) => {
+					return cb(err, transformed);
 				});
 			}
 		);
 	}
+
+	static generatePasswordDerivedKeyAndSalt(password, cb) {
+		async.waterfall(
+			[
+				function getSalt(callback) {
+					User.generatePasswordDerivedKeySalt( (err, salt) => {
+						return callback(err, salt);
+					});
+				},
+				function getDk(salt, callback) {
+					User.generatePasswordDerivedKey(password, salt, (err, dk) => {
+						return callback(err, salt, dk);
+					});
+				}
+			],
+			(err, salt, dk) => {
+				return cb(err, { salt : salt, dk : dk } );
+			}
+		);
+	}
+
+	static generatePasswordDerivedKeySalt(cb) {
+		crypto.randomBytes(User.PBKDF2.saltLen, (err, salt) => {
+			if(err) {
+				return cb(err);
+			}
+			return cb(null, salt.toString('hex'));
+		});
+	}
+
+	static generatePasswordDerivedKey(password, salt, cb) {	
+		password = new Buffer(password).toString('hex');
+
+		crypto.pbkdf2(password, salt, User.PBKDF2.iterations, User.PBKDF2.keyLen, 'sha1', (err, dk) => {
+			if(err) {
+				return cb(err);
+			}
+			
+			return cb(null, dk.toString('hex'));
+		});
+	}
+};

mods/bbs_list.js

@@ -7,7 +7,7 @@ const getModDatabasePath	= require('../core/database.js').getModDatabasePath;
 const ViewController		= require('../core/view_controller.js').ViewController;
 const ansi					= require('../core/ansi_term.js');
 const theme					= require('../core/theme.js');
-const getUserName			= require('../core/user.js').getUserName;
+const User					= require('../core/user.js');
 const stringFormat			= require('../core/string_format.js');
 
 //	deps
@@ -284,7 +284,7 @@ exports.getModule = class BBSListModule extends MenuModule {
 				},
 				function getUserNames(entriesView, callback) {
 					async.each(self.entries, (entry, next) => {
-						getUserName(entry.submitterUserId, (err, username) => {
+						User.getUserName(entry.submitterUserId, (err, username) => {
 							if(username) {
 								entry.submitter = username;
 							} else {

mods/last_callers.js

@@ -5,9 +5,7 @@
 const MenuModule		= require('../core/menu_module.js').MenuModule;
 const ViewController	= require('../core/view_controller.js').ViewController;
 const StatLog			= require('../core/stat_log.js');
-const getUserName		= require('../core/user.js').getUserName;
+const User				= require('../core/user.js');
-const loadProperties	= require('../core/user.js').loadProperties;
-const isRootUserId		= require('../core/user.js').isRootUserId;
 const stringFormat		= require('../core/string_format.js');
 
 //	deps
@@ -73,7 +71,7 @@ exports.getModule = class LastCallersModule extends MenuModule {
 
 							if(self.menuConfig.config.hideSysOpLogin) {
 								const noOpLoginHistory = loginHistory.filter(lh => {
-									return false === isRootUserId(parseInt(lh.log_value));	//	log_value=userId
+									return false === User.isRootUserId(parseInt(lh.log_value));	//	log_value=userId
 								});
 
 								//
@@ -106,11 +104,10 @@ exports.getModule = class LastCallersModule extends MenuModule {
 								item.userId = parseInt(item.log_value);
 								item.ts		= moment(item.timestamp).format(dateTimeFormat);						
 
-								getUserName(item.userId, (err, userName) => {
+								User.getUserName(item.userId, (err, userName) => {
 									item.userName = userName;
-									getPropOpts.userId	= item.userId;
 
-									loadProperties(getPropOpts, (err, props) => {
+									User.loadProperties(item.userId, getPropOpts, (err, props) => {
 										if(!err) {
 											item.location 		= props.location;
 											item.affiliation	= item.affils = props.affiliation;

mods/msg_area_reply_fse.js

@@ -2,13 +2,6 @@
 'use strict';
 
 var FullScreenEditorModule		= require('../core/fse.js').FullScreenEditorModule;
-var Message						= require('../core/message.js');
-var messageArea					= require('../core/message_area.js');
-var user						= require('../core/user.js');
-
-var _							= require('lodash');
-var async					 	= require('async');
-var assert						= require('assert');
 
 exports.getModule				= AreaReplyFSEModule;
 

mods/nua.js

@@ -3,7 +3,7 @@
 
 //	ENiGMA½
 const MenuModule	= require('../core/menu_module.js').MenuModule;
-const user			= require('../core/user.js');
+const User			= require('../core/user.js');
 const theme			= require('../core/theme.js');
 const login			= require('../core/system_menu_method.js').login;
 const Config		= require('../core/config.js').config;
@@ -61,7 +61,7 @@ exports.getModule = class NewUserAppModule extends MenuModule {
 			//	Submit handlers
 			//
 			submitApplication : function(formData, extraArgs, cb) {
-				const newUser = new user.User();
+				const newUser = new User();
 
 				newUser.username = formData.value.username;
 
@@ -102,7 +102,7 @@ exports.getModule = class NewUserAppModule extends MenuModule {
 				}
 				
 				//	:TODO: User.create() should validate email uniqueness!
-				newUser.create( { password : formData.value.password }, err => {
+				newUser.create(formData.value.password, err => {
 					if(err) {
 						self.client.log.info( { error : err, username : formData.value.username }, 'New user creation failed');
 
@@ -124,7 +124,7 @@ exports.getModule = class NewUserAppModule extends MenuModule {
 							};
 						}
 
-						if(user.User.AccountStatus.inactive === self.client.user.properties.account_status) {
+						if(User.AccountStatus.inactive === self.client.user.properties.account_status) {
 							return self.gotoMenu(extraArgs.inactive, cb);
 						} else {
 							//

mods/user_list.js

@@ -2,7 +2,7 @@
 'use strict';
 
 const MenuModule		= require('../core/menu_module.js').MenuModule;
-const getUserList		= require('../core/user.js').getUserList;
+const User				= require('../core/user.js');
 const ViewController	= require('../core/view_controller.js').ViewController;
 const stringFormat		= require('../core/string_format.js');
 
@@ -64,7 +64,7 @@ exports.getModule = class UserListModule extends MenuModule {
 					},
 					function fetchUserList(callback) {
 						//	:TODO: Currently fetching all users - probably always OK, but this could be paged
-						getUserList(USER_LIST_OPTS, function got(err, ul) {
+						User.getUserList(USER_LIST_OPTS, function got(err, ul) {
 							userList = ul;
 							callback(err);
 						});