Merge pull request #132 from benadida/benadida/auth-flow-bug-fixes

add better error handling of edge cases that are causing the most errors

helios/views.py

@@ -592,7 +592,7 @@ def one_election_cast_confirm(request, election):
   user = get_user(request)    
 
   # if no encrypted vote, the user is reloading this page or otherwise getting here in a bad way
-  if not request.session.has_key('encrypted_vote'):
+  if (not request.session.has_key('encrypted_vote')) or request.session['encrypted_vote'] == None:
     return HttpResponseRedirect(settings.URL_HOST)
 
   # election not frozen or started

helios_auth/auth_systems/google.py

@@ -33,7 +33,9 @@ def get_auth_url(request, redirect_url):
 
 def get_user_info_after_auth(request):
   flow = get_flow(request.session['google-redirect-url'])
-  del request.session['google-redirect-url']
+
+  if not request.GET.has_key('code'):
+    return None
   
   code = request.GET['code']
   credentials = flow.step2_exchange(code)