routes

5 files changed, 27 insertions, 17 deletions

diff --git a/server/api/user.js b/server/api/user.js
index 099521a..b47d31a 100644
--- a/server/api/user.js
+++ b/server/api/user.js
@@ -10,4 +10,4 @@ module.exports = {
 
 	destroy: function (req, res) {
 	}
-}
\ No newline at end of file
+}
diff --git a/server/auth/index.js b/server/auth/index.js
index 709fd0d..37b023f 100644
--- a/server/auth/index.js
+++ b/server/auth/index.js
@@ -8,6 +8,11 @@ var passport = require('passport'),
 	User = require('../models/User');
 
 var auth = {
+	
+	guestUser: {
+		id: "guest",
+		username: "guest",
+	},
 
 	init: function () { 
 		passport.serializeUser(auth.serializeUser);
@@ -16,7 +21,7 @@ var auth = {
 		passport.use(new LocalStrategy(auth.verifyLocalUser))
 	},
 
-	loggedInLocal: function (req, res, next) {
+	login: function (req, res, next) {
 		passport.authenticate("local", function(err, user, info){
 			if (err) {
 				return res.json({ error: err });
@@ -25,14 +30,9 @@ var auth = {
 				return info ? res.json(info) : res.redirect("/login");
 			}
 			
-			user.last_ip = util.ip2num( req.ip )
-			user.save(function(err, data){ if (err) console.err('error setting ip for user') })
-
 			req.logIn(user, function(err) {
 				if (err) { return next(err); }
-				var returnTo = req.session.returnTo
-				delete req.session.returnTo
-				return res.json({ status: "OK", returnTo: returnTo || "/profile" })
+				return res.json({ status: "OK", user: user, returnTo: returnTo || "/profile" })
 			});
 		})(req, res, next);
 	},
@@ -47,12 +47,19 @@ var auth = {
 	},
 
 	deserializeUser: function (id, done) {
+		if (id == "guest") {
+			return auth.guestUser
+		}
 		User.find({ id: id }, function (err, user) {
 			done(err, user)
 		});
 	},
 
 	verifyLocalUser: function (username, password, done) {
+		if (username == "protocolsnyc" && password == "madhousenyc") {
+			return done(null, auth.guestUser)
+			return
+		}
 		User.findByUsername(username, function(err, user){
 			if (err) { return done(err); }
 			if (! user) {
diff --git a/server/index.js b/server/index.js
index 36a84f7..42092f6 100644
--- a/server/index.js
+++ b/server/index.js
@@ -82,10 +82,17 @@ site.setup = function(){
 }
 
 site.route = function(){
-  app.get('/', views.home)
-	app.post('/auth/signin', auth.loggedInLocal);
-	app.get('/logout', auth.logout);
-	
+	app.post('/login', auth.loggedInLocal)
+	app.get('/logout', auth.logout)
+
+	app.get('/api/party/list', middleware.ensureAuthenticated, api.party.list)
+	app.get('/api/party/view', middleware.ensureAuthenticated, api.party.view)
+	app.post('/api/party/edit', middleware.ensureAuthenticated, api.party.edit)
+
+	app.get('/api/user/all', middleware.ensureAuthenticated, api.user.all)
+	app.get('/api/user/view', middleware.ensureAuthenticated, api.user.view)
+	app.post('/api/user/edit', middleware.ensureAuthenticated, api.user.edit)
+	app.post('/api/user/destroy', middleware.ensureAuthenticated, api.user.destroy)
 }
 
 site.init()
diff --git a/server/middleware.js b/server/middleware.js
index c13aecb..a834822 100644
--- a/server/middleware.js
+++ b/server/middleware.js
@@ -19,7 +19,7 @@ var middleware = {
 	ensureAuthenticated: function (req, res, next) {
 		if (! req.isAuthenticated()) {
 			req.session.returnTo = req.path;
-			return res.redirect('/login');
+			return res.redirect('/');
 		}
 		next();
 	},
diff --git a/server/views/index.js b/server/views/index.js
index 9997ccb..98ce176 100644
--- a/server/views/index.js
+++ b/server/views/index.js
@@ -1,5 +1 @@
 var views = module.exports = {}
-
-views.home = function(req,res){
-	res.render('index')
-}