closed #297

src/login.js

@@ -14,14 +14,13 @@ var user = require('./user.js'),
 				message: 'invalid-user'
 			});
 		} else {
-			RDB.get('username:' + username + ':uid', function(err, uid) {
+			user.get_uid_by_username(username, function(err, uid) {
-				RDB.handle(err);
+				if (err) {
+					return next(new Error('redis-error'));
+				}
 
 				if (uid == null) {
-					return next({
+					return next(new Error('invalid-user'));
-						status: 'error',
-						message: 'invalid-user'
-					});
 				}
 
 				user.getUserFields(uid, ['password', 'banned'], function(err, userData) {
@@ -37,25 +36,14 @@ var user = require('./user.js'),
 					bcrypt.compare(password, userData.password, function(err, res) {
 						if(err) {
 							winston.err(err.message);
-							next({
+							next(new Error('bcrypt compare error'));
-								status: "error",
-								message: 'bcrypt compare error'
-							});
 							return;
 						}
 
 						if (res) {
-							next({
+							next(null, { user: { uid: uid } });
-								status: "ok",
-								user: {
-									uid: uid
-								}
-							});
 						} else {
-							next({
+							next(new Error('invalid-password'));
-								status: 'error',
-								message: 'invalid-password'
-							});
 						}
 					});
 				});

src/routes/authentication.js

@@ -12,9 +12,9 @@
 		login_module = require('./../login.js');
 
 	passport.use(new passportLocal(function(user, password, next) {
-		login_module.loginViaLocal(user, password, function(login) {
+		login_module.loginViaLocal(user, password, function(err, login) {
-			if (login.status === 'ok') next(null, login.user);
+			if (!err) next(null, login.user);
-			else next(null, false, login);
+			else next(null, false, err);
 		});
 	}));
 

src/user.js

@@ -628,12 +628,7 @@ var utils = require('./../public/src/utils.js'),
 	}
 
 	User.get_uid_by_username = function(username, callback) {
-		RDB.hget('username::uid', username, function(err, data) {
+		RDB.hget('username:uid', username, callback);
-			if (err) {
-				RDB.handle(err);
-			}
-			callback(data);
-		});
 	};
 
 	User.get_uid_by_userslug = function(userslug, callback) {