fixed login routes on subfolder installs

src/routes/authentication.js

@@ -40,89 +40,87 @@
 	};
 
 	Auth.createRoutes = function(app) {
-		app.namespace(nconf.get('relative_path'), function () {
+		app.post('/logout', function(req, res) {
-			app.post('/logout', function(req, res) {
+			if (req.user && parseInt(req.user.uid, 10) > 0) {
-				if (req.user && parseInt(req.user.uid, 10) > 0) {
+				winston.info('[Auth] Session ' + req.sessionID + ' logout (uid: ' + req.user.uid + ')');
-					winston.info('[Auth] Session ' + req.sessionID + ' logout (uid: ' + req.user.uid + ')');
 
-					var ws = require('../socket.io');
+				var ws = require('../socket.io');
-					ws.logoutUser(req.user.uid);
+				ws.logoutUser(req.user.uid);
 
-					req.logout();
+				req.logout();
+			}
+
+			res.send(200);
+		});
+
+		for (var i in login_strategies) {
+			if (login_strategies.hasOwnProperty(i)) {
+				var strategy = login_strategies[i];
+				app.get(strategy.url, passport.authenticate(strategy.name, {
+					scope: strategy.scope
+				}));
+
+				app.get(strategy.callbackURL, passport.authenticate(strategy.name, {
+					successRedirect: '/',
+					failureRedirect: '/login'
+				}));
+			}
+		}
+
+		app.post('/login', function(req, res, next) {
+			passport.authenticate('local', function(err, userData, info) {
+				if (err) {
+					return next(err);
 				}
 
-				res.send(200);
+				if (!userData) {
-			});
+					return res.json(403, info);
+				}
 
-			for (var i in login_strategies) {
+				// Alter user cookie depending on passed-in option
-				if (login_strategies.hasOwnProperty(i)) {
+				if (req.body.remember === 'true') {
-					var strategy = login_strategies[i];
+					var duration = 1000*60*60*24*parseInt(meta.configs.loginDays || 14, 10);
-					app.get(strategy.url, passport.authenticate(strategy.name, {
+					req.session.cookie.maxAge = duration;
-						scope: strategy.scope
+					req.session.cookie.expires = new Date(Date.now() + duration);
-					}));
+				} else {
-
+					req.session.cookie.maxAge = false;
-					app.get(strategy.callbackURL, passport.authenticate(strategy.name, {
+					req.session.cookie.expires = false;
-						successRedirect: '/',
-						failureRedirect: '/login'
-					}));
 				}
-			}
 
-			app.post('/login', function(req, res, next) {
+				req.login({
-				passport.authenticate('local', function(err, userData, info) {
+					uid: userData.uid
-					if (err) {
+				}, function() {
-						return next(err);
+					if (userData.uid) {
+						user.logIP(userData.uid, req.ip);
 					}
 
-					if (!userData) {
+					res.json(200, info);
-						return res.json(403, info);
+				});
-					}
+			})(req, res, next);
+		});
 
-					// Alter user cookie depending on passed-in option
+		app.post('/register', function(req, res) {
-					if (req.body.remember === 'true') {
+			if(meta.config.allowRegistration !== undefined && parseInt(meta.config.allowRegistration, 10) === 0) {
-						var duration = 1000*60*60*24*parseInt(meta.configs.loginDays || 14, 10);
+				return res.send(403);
-						req.session.cookie.maxAge = duration;
+			}
-						req.session.cookie.expires = new Date(Date.now() + duration);
-					} else {
-						req.session.cookie.maxAge = false;
-						req.session.cookie.expires = false;
-					}
 
+			user.create({username: req.body.username, password: req.body.password, email: req.body.email, ip: req.ip}, function(err, uid) {
+				if (err === null && uid) {
 					req.login({
-						uid: userData.uid
+						uid: uid
 					}, function() {
-						if (userData.uid) {
-							user.logIP(userData.uid, req.ip);
-						}
 
-						res.json(200, info);
+						require('../socket.io').emitUserCount();
-					});
-				})(req, res, next);
-			});
 
-			app.post('/register', function(req, res) {
+						if(req.body.referrer) {
-				if(meta.config.allowRegistration !== undefined && parseInt(meta.config.allowRegistration, 10) === 0) {
+							res.redirect(req.body.referrer);
-					return res.send(403);
+						} else {
+							res.redirect(nconf.get('relative_path') + '/');
+						}
+					});
+				} else {
+					res.redirect(nconf.get('relative_path') + '/register');
 				}
-
-				user.create({username: req.body.username, password: req.body.password, email: req.body.email, ip: req.ip}, function(err, uid) {
-					if (err === null && uid) {
-						req.login({
-							uid: uid
-						}, function() {
-
-							require('../socket.io').emitUserCount();
-
-							if(req.body.referrer) {
-								res.redirect(req.body.referrer);
-							} else {
-								res.redirect(nconf.get('relative_path') + '/');
-							}
-						});
-					} else {
-						res.redirect(nconf.get('relative_path') + '/register');
-					}
-				});
 			});
 		});
 	};