merge

1 files changed, 17 insertions, 11 deletions

diff --git a/server/lib/auth/index.js b/server/lib/auth/index.js
index c2275ff..46bff21 100644
--- a/server/lib/auth/index.js
+++ b/server/lib/auth/index.js
@@ -30,17 +30,23 @@ var auth = {
 			callbackURL: 'http://' + config.host + '/auth/twitter/callback'
 		}, auth.insertTwitterUser));
 		
-		/*
 		passport.use(new FacebookStrategy({
 			clientID: process.env.VVALLS_FACEBOOK_KEY || '719828821410310',
 			clientSecret: process.env.VVALLS_FACEBOOK_SECRET || 'f9aba78e08f37f621eadb88b1409d48c',
 			callbackURL: 'http://' + config.host + '/auth/facebook/callback',
 			enableProof: false,
 		}, auth.insertFacebookUser));
-		*/
+
 		auth.mail.init()
 	},
-	
+	initBasicAuth: function(app){
+		if (config.basicAuth) {
+			app.use(express.basicAuth(function(user, pass) {
+				return	user === config.basicAuth.user &&
+					pass === config.basicAuth.pass
+			}))
+		}
+	},
 	initSockets: function (io, SessionStore) {
 		io.set('authorization', passportSocketIo.authorize({
 			cookieParser: express.cookieParser,
@@ -87,9 +93,9 @@ var auth = {
 					return res.redirect('/auth/usernameTaken');
 				}
 				if (! user.created_ip) {
-					user.created_ip = util.ip2num( req.ip )
+					user.created_ip = util.ip2num( req.session.ip )
 				}
-				user.last_ip = util.ip2num( req.ip )
+				user.last_ip = util.ip2num( req.session.ip )
 				user.save(function(err, data){ if (err) console.err('error setting ip for user') })
 				
 				req.logIn(user, function(err) {
@@ -112,7 +118,7 @@ var auth = {
 			}
 			
 			user.last_seen = new Date ()
-			user.last_ip = util.ip2num( req.ip )
+			user.last_ip = util.ip2num( req.session.ip )
 			user.save(function(err, data){ if (err) console.err('error setting ip for user') })
 
 			req.logIn(user, function(err) {
@@ -136,12 +142,12 @@ var auth = {
 	deserializeUser: function (id, done) {
 		try {
 			var _id = mongoose.Types.ObjectId(id)
-			User.findOne({ _id: _id }, "_id displayName username photo isStaff", function (err, user) {
+			User.findOne({ _id: _id }, "_id displayName username photo isStaff plan_level", function (err, user) {
 				done(err, user);
 			});
 		}
 		catch (e) {
-			User.findOne({ twitter_id: id }, "_id displayName username photo isStaff", function (err, user) {
+			User.findOne({ twitter_id: id }, "_id displayName username photo isStaff plan_level", function (err, user) {
 				done(err, user);
 			});
 		}
@@ -172,8 +178,8 @@ var auth = {
 					displayName: username,
 					password: password,
 					email: email,
-					created_ip: util.ip2num( req.ip ),
-					last_ip: util.ip2num( req.ip ),
+					created_ip: util.ip2num( req.session.ip ),
+					last_ip: util.ip2num( req.session.ip ),
 					created_at: new Date (),
 			    last_seen: new Date (),
 				}
@@ -241,7 +247,7 @@ var auth = {
 				facebookUrl: profile.username ? "https://facebook.com/" + profile.username : ""
 			};
 
-			User.findOne({twitter_id: profile.id}, function(err, data){
+			User.findOne({facebook_id: profile.id}, function(err, data){
 				if (! err && data) {
 					return done(err, data);
 				}