fixes login/register and auth routes in relative path install

public/src/app.js

@@ -23,7 +23,7 @@ var socket,
 				} else {
 					var max_reconnection_attemps = 5;
 					var reconnection_delay = 200;
-					socket = io.connect(RELATIVE_PATH, {
+					socket = io.connect('', {
 						'max reconnection attempts': max_reconnection_attemps,
 						'reconnection delay': reconnection_delay
 					});

src/routes/admin.js

@@ -20,7 +20,7 @@ var nconf = require('nconf'),
 	Admin.isAdmin = function (req, res, next) {
 		user.isAdministrator((req.user && req.user.uid) ? req.user.uid : 0, function (err, isAdmin) {
 			if (!isAdmin) {
-				 res.redirect('/403');
+				 res.redirect(403, '/403');
 			} else {
 				next();
 			}

src/routes/api.js

@@ -18,6 +18,7 @@ var path = require('path'),
 
 (function (Api) {
 	Api.createRoutes = function (app) {
+
 		app.namespace('/api', function () {
 			app.get('/get_templates_listing', function (req, res) {
 				utils.walk(path.join(__dirname, '../../', 'public/templates'), function (err, data) {

src/routes/authentication.js

@@ -126,92 +126,94 @@
 	}
 
 	Auth.createRoutes = function(app) {
-		app.post('/logout', function(req, res) {
+		app.namespace(nconf.get('relative_path'), function () {
-			if (req.user && req.user.uid > 0) {
+			app.post('/logout', function(req, res) {
-				winston.info('[Auth] Session ' + req.sessionID + ' logout (uid: ' + req.user.uid + ')');
+				if (req.user && req.user.uid > 0) {
+					winston.info('[Auth] Session ' + req.sessionID + ' logout (uid: ' + req.user.uid + ')');
 
-				var ws = require('./../websockets');
+					var ws = require('./../websockets');
-				ws.logoutUser(req.user.uid);
+					ws.logoutUser(req.user.uid);
 
-				req.logout();
+					req.logout();
+				}
+
+				res.send(200)
+			});
+
+			for (var i in login_strategies) {
+				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'
+				}));
 			}
 
-			res.send(200)
+			app.get('/reset/:code', function(req, res) {
-		});
+				app.build_header({
-
+					req: req,
-		for (var i in login_strategies) {
+					res: res
-			var strategy = login_strategies[i];
+				}, function(err, header) {
-			app.get(strategy.url, passport.authenticate(strategy.name, {
+					res.send(header + app.create_route('reset/' + req.params.code) + templates['footer']);
-				scope: strategy.scope
-			}));
-
-			app.get(strategy.callbackURL, passport.authenticate(strategy.name, {
-				successRedirect: '/',
-				failureRedirect: '/login'
-			}));
-		}
-
-		app.get('/reset/:code', function(req, res) {
-			app.build_header({
-				req: req,
-				res: res
-			}, function(err, header) {
-				res.send(header + app.create_route('reset/' + req.params.code) + templates['footer']);
-			});
-		});
-
-		app.get('/reset', function(req, res) {
-			app.build_header({
-				req: req,
-				res: res
-			}, function(err, header) {
-				res.send(header + app.create_route('reset') + templates['footer']);
-			});
-		});
-
-		app.post('/login', function(req, res, next) {
-			passport.authenticate('local', function(err, user, info) {
-				if (err) {
-					return next(err);
-				}
-				if (!user) {
-					return res.send({
-						success: false,
-						message: info.message
-					});
-				}
-				req.login({
-					uid: user.uid
-				}, function() {
-					res.send({
-						success: true,
-						message: 'authentication succeeded'
-					});
 				});
-			})(req, res, next);
+			});
-		});
 
-		app.post('/register', function(req, res) {
+			app.get('/reset', function(req, res) {
-			if(meta.config.allowRegistration !== undefined && parseInt(meta.config.allowRegistration, 10) === 0) {
+				app.build_header({
-				return res.send(403);
+					req: req,
-			}
+					res: res
+				}, function(err, header) {
+					res.send(header + app.create_route('reset') + templates['footer']);
+				});
+			});
 
-			user.create(req.body.username, req.body.password, req.body.email, function(err, uid) {
+			app.post('/login', function(req, res, next) {
-				if (err === null && uid) {
+				passport.authenticate('local', function(err, user, info) {
+					if (err) {
+						return next(err);
+					}
+					if (!user) {
+						return res.send({
+							success: false,
+							message: info.message
+						});
+					}
 					req.login({
-						uid: uid
+						uid: user.uid
 					}, function() {
-
+						res.send({
-						require('./../websockets').emitUserCount();
+							success: true,
-
+							message: 'authentication succeeded'
-						if(req.body.referrer)
+						});
-							res.redirect(req.body.referrer);
-						else
-							res.redirect(nconf.get('relative_path') + '/');
 					});
-				} else {
+				})(req, res, next);
-					res.redirect(nconf.get('relative_path') + '/register');
+			});
+
+			app.post('/register', function(req, res) {
+				if(meta.config.allowRegistration !== undefined && parseInt(meta.config.allowRegistration, 10) === 0) {
+					return res.send(403);
 				}
+
+				user.create(req.body.username, req.body.password, req.body.email, function(err, uid) {
+					if (err === null && uid) {
+						req.login({
+							uid: uid
+						}, function() {
+
+							require('./../websockets').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');
+					}
+				});
 			});
 		});
 	}