logging in

1 files changed, 21 insertions, 31 deletions

diff --git a/public/js/protocols_site.js b/public/js/protocols_site.js
index b5d3352..5d3d95c 100644
--- a/public/js/protocols_site.js
+++ b/public/js/protocols_site.js
@@ -17,6 +17,7 @@ function scrollToBottom (div)
 function warn(s)
 	{
 //	return
+	console.log(s)
 	var h = document.getElementById('msg').innerHTML
 	h = s + '<br/>' + h
 	document.getElementById('msg').innerHTML = h
@@ -770,28 +771,19 @@ var Auth =
 	isHost: false,
 	loginPrompt: false,
 	hosts: {},
-	init: function ()
-		{
-		if (document.cookie.indexOf("sid.protocols") !== -1)
-			{
-			warn('got cookie')
-			$.post(URL.auth.login, {}, Auth.loginCallback)
-			return
-			}
-		Auth.load()
-		},
-	unload: function ()
-		{
-		if (Auth.loginPrompt)
-			{
+	init: function () {
+		$.post(URL.auth.login, {}, Auth.loginCallback)
+	},
+	unload: function () {
+		if (Auth.loginPrompt) {
 			Auth.loginPrompt = false
 			$('#login').fadeOut(1000, function(){ Main.load()} )
-			}
-		else
+		}
+		else {
 			Main.load()
-		},
-	load: function ()
-		{
+		}
+	},
+	load: function () {
 		$('#login').fadeIn(1000)
 		$('#login-email').focus()
 		$('#login-email').keydown(Main.kp)
@@ -800,37 +792,35 @@ var Auth =
 		Auth.loginPrompt = true
 		Main.saveFunction = Auth.login
 		Main.saving = false
-		},
-	login: function ()
-		{
+	},
+	login: function () {
 		if (Main.saving)
 			return
 		Main.saving = true
 		warn("attempting login")
-		var data =
-			{
+		var data = {
 			username: $('#login-email').val(),
 			password: $('#login-password').val(),
-			}
+		}
 		$('#login-password').val(''),
 		$.post(URL.auth.login, data, Auth.loginCallback)
-		},
-	loginCallback: function (json)
-		{
+	},
+	loginCallback: function (json) {
 		Main.saving = false
 
-		if (json.error)
-			{
+		if (! json || json.error) {
 			if (! Auth.loginPrompt)
 				Auth.load()
 			else
 				warn("bad login!")
 			return
-			}
+		}
 
 		// 0 id  1 name  2 firstname  3 email  4 access
 		var user = Auth.user = json.user
 
+console.log(user)
+
 		var name = user.name.split(' ')[0] || user.email.split('@')[0]
 		warn( "Logged in! Hello "+name )
 		Auth.userID = user.id