Merge branch 'subscriptions' of github.com:okfocus/vvalls into subscriptions

2 files changed, 9 insertions, 1 deletions

diff --git a/server/index.js b/server/index.js
index 8c8212f..7bc3f7f 100644
--- a/server/index.js
+++ b/server/index.js
@@ -39,6 +39,7 @@ site.ready = function(){
 site.setup = function(){
 	var SessionStore = new MongoStore({ mongoose_connection: mongoose.connection })
 
+	auth.initBasicAuth(app)
 	app.set('port', config.port);
 	app.set('views', path.join(__dirname, '../views'));
 	app.set('view engine', 'ejs');
diff --git a/server/lib/auth/index.js b/server/lib/auth/index.js
index 199377d..8e20bcc 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,