routes

1 files changed, 14 insertions, 7 deletions

diff --git a/server/auth/index.js b/server/auth/index.js
index 709fd0d..37b023f 100644
--- a/server/auth/index.js
+++ b/server/auth/index.js
@@ -8,6 +8,11 @@ var passport = require('passport'),
 	User = require('../models/User');
 
 var auth = {
+	
+	guestUser: {
+		id: "guest",
+		username: "guest",
+	},
 
 	init: function () { 
 		passport.serializeUser(auth.serializeUser);
@@ -16,7 +21,7 @@ var auth = {
 		passport.use(new LocalStrategy(auth.verifyLocalUser))
 	},
 
-	loggedInLocal: function (req, res, next) {
+	login: function (req, res, next) {
 		passport.authenticate("local", function(err, user, info){
 			if (err) {
 				return res.json({ error: err });
@@ -25,14 +30,9 @@ var auth = {
 				return info ? res.json(info) : res.redirect("/login");
 			}
 			
-			user.last_ip = util.ip2num( req.ip )
-			user.save(function(err, data){ if (err) console.err('error setting ip for user') })
-
 			req.logIn(user, function(err) {
 				if (err) { return next(err); }
-				var returnTo = req.session.returnTo
-				delete req.session.returnTo
-				return res.json({ status: "OK", returnTo: returnTo || "/profile" })
+				return res.json({ status: "OK", user: user, returnTo: returnTo || "/profile" })
 			});
 		})(req, res, next);
 	},
@@ -47,12 +47,19 @@ var auth = {
 	},
 
 	deserializeUser: function (id, done) {
+		if (id == "guest") {
+			return auth.guestUser
+		}
 		User.find({ id: id }, function (err, user) {
 			done(err, user)
 		});
 	},
 
 	verifyLocalUser: function (username, password, done) {
+		if (username == "protocolsnyc" && password == "madhousenyc") {
+			return done(null, auth.guestUser)
+			return
+		}
 		User.findByUsername(username, function(err, user){
 			if (err) { return done(err); }
 			if (! user) {