Merge lp:~lfaraone/django-openid-auth/custom_response into lp:~django-openid-auth/django-openid-auth/trunk

[Luke Faraone]

This branch allows you to specify a custom render failure handler.

This is used in one deployment to redirect users to a registration form when they authenticate without already first having an account on our system.

Unmerged revisions

108. By Luke Faraone <email address hidden> on 2013-11-19

Add an openid_response parameter to default_render_failure

This allows the failure handler to take actions depending on the contents of
the failure.

For example, we might want to handle "Unknown user" specially and maybe create
an account for the user.

=== modified file 'django_openid_auth/tests/test_views.py'
--- django_openid_auth/tests/test_views.py	2013-06-21 17:24:18 +0000
+++ django_openid_auth/tests/test_views.py	2013-11-19 18:36:44 +0000
@@ -538,6 +538,7 @@
         # Override the login_failure handler
         def mock_login_failure_handler(request, message, status=403,
                                        template_name=None,
+                                       openid_response=None,
                                        exception=None):
            self.assertTrue(isinstance(exception, MissingPhysicalMultiFactor))
            return HttpResponse('Test Failure Override', status=200)
@@ -946,6 +947,7 @@
         # Override the login_failure handler
         def mock_login_failure_handler(request, message, status=403,
                                        template_name=None,
+                                       openid_response=None,
                                        exception=None):
            self.assertTrue(isinstance(exception, (RequiredAttributeNotReturned, MissingUsernameViolation)))
            return HttpResponse('Test Failure Override', status=200)
@@ -1016,6 +1018,7 @@
         # Override the login_failure handler
         def mock_login_failure_handler(request, message, status=403,
                                        template_name=None,
+                                       openid_response=None,
                                        exception=None):
            self.assertTrue(isinstance(exception, DuplicateUsernameViolation))
            return HttpResponse('Test Failure Override', status=200)

=== modified file 'django_openid_auth/views.py'
--- django_openid_auth/views.py	2013-06-18 13:28:28 +0000
+++ django_openid_auth/views.py	2013-11-19 18:36:44 +0000
@@ -122,6 +122,7 @@
 
 def default_render_failure(request, message, status=403,
                            template_name='openid/failure.html',
+                           openid_response=None,
                            exception=None):
     """Render an error page to the user."""
     data = render_to_string(
@@ -283,7 +284,7 @@
         try:
             user = authenticate(openid_response=openid_response)
         except DjangoOpenIDException, e:
-            return render_failure(request, e.message, exception=e)
+            return render_failure(request, e.message, exception=e, openid_response=openid_response)
 
         if user is not None:
             if user.is_active:
@@ -296,15 +297,16 @@
 
                 return response
             else:
-                return render_failure(request, 'Disabled account')
+                return render_failure(request, 'Disabled account', openid_response=openid_response)
         else:
-            return render_failure(request, 'Unknown user')
+            return render_failure(request, 'Unknown user', openid_response=openid_response)
     elif openid_response.status == FAILURE:
         return render_failure(
             request, 'OpenID authentication failed: %s' %
-            openid_response.message)
+            openid_response.message,
+            openid_response=openid_response)
     elif openid_response.status == CANCEL:
-        return render_failure(request, 'Authentication cancelled')
+        return render_failure(request, 'Authentication cancelled', openid_response=openid_response)
     else:
         assert False, (
             "Unknown OpenID response type: %r" % openid_response.status)