Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-13 09:25:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

refactoring installation scripts to use node prompt module, lots of other fixes

Browse Source 
fixed #263, fixed #264, fixed #265
This commit is contained in:
Julian Lam
2013-09-06 22:22:42 -04:00
parent a88ddc2a4d
commit bec0b46a2c
11 changed files with 216 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/login.js
View File

@@ -8,7 +8,6 @@ var user = require('./user.js'),
(function(Login){
Login.loginViaLocal = function(username, password, next) {
if (!username || !password) {
return next({
status: 'error',
@@ -26,8 +25,7 @@ var user = require('./user.js'),
}
user.getUserFields(uid, ['password', 'banned'], function(err, userData) {
if(err)
return next(err);
if(err) return next(err);
if(userData.banned && userData.banned === '1') {
return next({
@@ -38,7 +36,7 @@ var user = require('./user.js'),
bcrypt.compare(password, userData.password, function(err, res) {
if(err) {
winston.err(err);
winston.err(err.message);
next({
status: "error",
message: 'bcrypt compare error'