From 39246d5df07e957415a9f79386376a7b094f8fe2 Mon Sep 17 00:00:00 2001
From: RunasSudo <runassudo@yingtongli.me>
Date: Tue, 28 Nov 2017 14:45:54 +1100
Subject: [PATCH] Reshuffle login flow to hopefully make things more robust

---
 eosweb/core/static/nunjucks/booth/cast.html   |  1 +
 eosweb/core/templates/auth/login.html         |  1 +
 .../core/templates/auth/login_complete.html   | 25 +++++++++++++++----
 3 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/eosweb/core/static/nunjucks/booth/cast.html b/eosweb/core/static/nunjucks/booth/cast.html
index 49862e4..bc91f0b 100644
--- a/eosweb/core/static/nunjucks/booth/cast.html
+++ b/eosweb/core/static/nunjucks/booth/cast.html
@@ -76,6 +76,7 @@
 			$("#cast_button").show();
 			$("#booth_logged_in_as").text("You are currently logged in as " + username + ".");
 			castBallot();
+			return true;
 		}
 		
 		function castBallot() {
diff --git a/eosweb/core/templates/auth/login.html b/eosweb/core/templates/auth/login.html
index a53667a..a6979a8 100644
--- a/eosweb/core/templates/auth/login.html
+++ b/eosweb/core/templates/auth/login.html
@@ -42,6 +42,7 @@
 		
 		function callback_complete(name) {
 			window.location = "/";
+			return true;
 		}
 	</script>
 {% endblock %}
diff --git a/eosweb/core/templates/auth/login_complete.html b/eosweb/core/templates/auth/login_complete.html
index 7da05e8..0733faa 100644
--- a/eosweb/core/templates/auth/login_complete.html
+++ b/eosweb/core/templates/auth/login_complete.html
@@ -23,18 +23,33 @@
 {% block basecontent %}
 	<div class="ui middle aligned center aligned grid" style="height: 100%;">
 		<div class="column" style="max-width: 400px;">
-			<div class="ui success message">
+			<div class="ui hidden success message">
 				<div class="header">Log in successful</div>
 				<p>You have successfully logged in to your account.</p>
 				<p>You may now close this window and return to your previous page.</p>
 			</div>
+			<div class="ui hidden error message">
+				<div class="header">Error logging in</div>
+				<p>Your log in details appear to be correct, however there was an unknown error while logging you in.</p>
+				<p>Please close this window try again. If the problem persists, contact your election administrator.</p>
+			</div>
 		</div>
 	</div>
 	
 	<script>
-		window.setTimeout(function() {
-			window.close();
-			window.opener.callback_complete("{{ session.user.name }}");
-		}, 1000);
+		try {
+			var result = window.opener.callback_complete("{{ session.user.name }}");
+			if (result) {
+				$(".success.message").removeClass("hidden");
+				
+				window.setTimeout(function() {
+					window.close();
+				}, 1000);
+			} else {
+				$(".error.message").removeClass("hidden");
+			}
+		} catch (ex) {
+			$(".error.message").removeClass("hidden");
+		}
 	</script>
 {% endblock %}