logging in for realzies

1 files changed, 9 insertions, 7 deletions

diff --git a/server/auth/index.js b/server/auth/index.js
index e5cb2ea..e8fb483 100644
--- a/server/auth/index.js
+++ b/server/auth/index.js
@@ -4,7 +4,8 @@ var passport = require('passport'),
 	LocalStrategy = require('passport-local').Strategy,
 	_ = require('lodash'),
 	config = require('../../config.json'),
-	User = require('../models/User');
+	User = require('../models/User'),
+	crypt = require('./crypt');
 
 var auth = module.exports = {
 	
@@ -73,16 +74,17 @@ var auth = module.exports = {
 		if (username == "protocolsnyc" && password == "madhousenyc") {
 			return done(null, auth.guestUser)
 		}
-		User.findByUsername(username, function(err, user){
-			if (err) { return done(err); }
-			if (! user) {
-				return done(null, false, { error: { errors: { username: { message: 'No such username.' } }}})
+		User.find({ where: { email: username } }).success(function(user){
+			if (! user.password || user.password.length < 2) {
+				return done(null, false, { error: { errors: { username: { message: 'No such user.' } }}})
 			}
-			if (! user.validPassword(password)) {
+			else if ( crypt(password, user.password) !== user.password) {
 				return done(null, false, { error: { errors: { password: { message: 'Incorrect password.' } }}})
 			}
 			return done(null, user);
-		});
+		}).error(function(){
+			return done(null, false, { error: { errors: { username: { message: 'No such username.' } }}})
+		})
 	}
 
 }