auth is mostly done

Author: mzhang28

api/auth.js

@@ -50,10 +50,12 @@ exports.is_authorized = function(req, res) {
 exports.login = function(req, res) {
 	if (req.param("teamname") && req.param("password")) {
 		authenticate(req, res, req.param("teamname"), req.param("password"), false, function(result) {
-			if (!req.cookies.teamname)
-				res.cookie("teamname", teamname);
-			if (!req.cookies.password)
-				res.cookie("password", common.encryptPass(password));
+			if (result.success == 1) {
+				if (!req.cookies.teamname && req.param("teamname"))
+					res.cookie("teamname", req.param("teamname"));
+				if (!req.cookies.password && req.param("password"))
+					res.cookie("password", result.password);
+			}
 			res.send(result);
 			return;
 		})
@@ -166,7 +168,8 @@ var authenticate = function(req, res, teamname, password, isHash, callback) {
 				req.session.tID = team._id.valueOf();
 				callback({
 					success: 1,
-					message: "Logged in."
+					message: "Logged in.",
+					password: pwHash
 				});
 				return;
 			} else {

web/js/dependencies.js

@@ -69,6 +69,32 @@ function build_navbar (set) {
 function display_navbar () {
 	var now = new Date();
 	var during = startDate < now && endDate > now;
+
+	$.ajax({
+		url: "/api/auth/loggedin",
+		method: "GET",
+		dataType: "json"
+	}).done(function(data) {
+		console.dir(data);
+		build_navbar(2);
+		if (data.success === 1) {
+			$.ajax({
+				url: "/api/auth/authorized",
+				method: "GET",
+				dataType: "json"
+			}).done(function(data2) {
+				if (data2.success === 1) {
+					build_navbar(0);
+				} else {
+					build_navbar(3);
+				}
+			});
+		} else {
+			build_navbar(1);
+		}
+	});
+
+	/*
 	$.ajax({
 		url: "/api/auth/authorized",
 		method: "GET",
@@ -118,6 +144,7 @@ function display_navbar () {
 			});
 		}
 	});
+	*/
 }
 
 function load_footer() {