merge

1 files changed, 11 insertions, 4 deletions

diff --git a/server/lib/auth/index.js b/server/lib/auth/index.js
index a9a2400..46bff21 100644
--- a/server/lib/auth/index.js
+++ b/server/lib/auth/index.js
@@ -39,7 +39,14 @@ var auth = {
 
 		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,
@@ -135,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);
 			});
 		}
@@ -240,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);
 				}