sign in with email and password

2 files changed, 9 insertions, 6 deletions

diff --git a/server/lib/auth.js b/server/lib/auth.js
index 262d5f8..ede52b6 100644
--- a/server/lib/auth.js
+++ b/server/lib/auth.js
@@ -94,7 +94,7 @@ var auth = {
 		
 		User.findOne({ username: username }, function (err, user) {
 			if (user) {
-				res.json({ error: { errors: { username: "Username has been taken" } } })
+				res.json({ error: { errors: { username: { message: "Username has been taken" } } } })
 				return
 			}
 			var data = {
@@ -103,9 +103,12 @@ var auth = {
 				password: password,
 				email: email
 			}
-			new User(data).save(function(err, data){
+			new User(data).save(function(err, user){
 				if (err || ! data) { return res.json({ error: err }) }
-				res.json({ status: "OK", payload: data })
+
+				req.login(user, function(){
+					res.json({ status: "OK", payload: user })
+				})
 			})
 		})
 	},
@@ -114,10 +117,10 @@ var auth = {
 		User.findOne({ username: username }, function(err, user){
 			if (err) { return done(err); }
 			if (!user) {
-				return done(null, false, { message: 'Incorrect username.' });
+				return done(null, false, { error: { errors: { username: { message: 'Incorrect username.' } }}})
 			}
 			if (! user.validPassword(password)) {
-				return done(null, false, { message: 'Incorrect password.' });
+				return done(null, false, { error: { errors: { password: { message: 'Incorrect password.' } }}})
 			}
 			return done(null, user);
 		});
diff --git a/server/lib/schemas/User.js b/server/lib/schemas/User.js
index c619685..ef8fef6 100644
--- a/server/lib/schemas/User.js
+++ b/server/lib/schemas/User.js
@@ -64,7 +64,7 @@ var UserSchema = new mongoose.Schema({
 });
 
 UserSchema.methods.validPassword = function (pw) {
-	return this.password !== pw
+	return this.password === pw
 }
 
 module.exports = exports = mongoose.model('user', UserSchema);