* ButtonView is now MCI BT. BN is pre-defined "Board Name"

* Client current theme info loaded & used for e.g. passwordChar
* Code cleanup
This commit is contained in:
Bryan Ashby 2015-04-15 22:46:45 -06:00
parent 5eee568586
commit 586f3d60b3
16 changed files with 169 additions and 114 deletions

View file

@ -2,6 +2,8 @@
'use strict';
var userDb = require('./database.js').dbs.user;
var Config = require('./config.js').config;
var crypto = require('crypto');
var assert = require('assert');
var async = require('async');
@ -55,6 +57,12 @@ User.StandardPropertyGroups = {
password : [ 'pw_pbkdf2_salt', 'pw_pbkdf2_dk' ],
};
User.AccountStatus = {
disabled : -1,
inactive : 0,
active : 1,
};
User.prototype.authenticate = function(username, password, cb) {
var self = this;
@ -154,6 +162,9 @@ User.prototype.create = function(options, cb) {
var 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;
async.series(
[
function beginTransaction(callback) {
@ -171,6 +182,12 @@ User.prototype.create = function(options, cb) {
callback(err);
} else {
self.userId = this.lastID;
// Do not SGRValuesre activation for userId 1 (root/admin)
if(1 === self.userId) {
self.properties.account_status = User.AccountStatus.active;
}
callback(null);
}
}