Adding the `on_cas_login` signal, which is sent just before the final redirect upon...

[django-cas-provider.git] / cas_provider / views.py

diff --git a/cas_provider/views.py b/cas_provider/views.py
index 5ed1c57..4121a11 100644 (file)
--- a/cas_provider/views.py
+++ b/cas_provider/views.py
@@ -26,7 +26,8 @@ def _build_service_url(service, ticket):
         return service + '&ticket=' + ticket
 
 
-def login(request, template_name='cas/login.html', success_redirect='/account/', merge=False):
+def login(request, template_name='cas/login.html', success_redirect='/account/', **kwargs):
+    merge = kwargs.get('merge', False)
     logging.debug('CAS Provider Login view. Method is %s, merge is %s, template is %s.',
                   request.method, merge, template_name)
 
@@ -93,6 +94,16 @@ def login(request, template_name='cas/login.html', success_redirect='/account/',
         if not user.is_active:
             errors.append('This account is disabled.')
         else:
+            # Send the on_cas_login signal. If we get an HttpResponse, return that.
+            for receiver, response in signals.on_cas_login(sender=login, request=request,
+                                                           kwargs=kwargs):
+                if isinstance(response, HttpResponse):
+                    return response
+            
+            if service is None:
+                # Try and pull the service off the session
+                service = request.session.pop('service', service)
+            
             if service is None:
                 # Normal internal success redirection.
                 logging.debug('Redirecting to %s', success_redirect)
@@ -112,29 +123,6 @@ def login(request, template_name='cas/login.html', success_redirect='/account/',
     return render_to_response(template_name, {'form': form, 'errors': errors}, context_instance=RequestContext(request))
 
 
-def socialauth_login(request, template_name='cas/login.html', success_redirect='/account/'):
-    """ Similiar to login but user has been authenticated already through social auth.
-        This step authenticates the login and generates a service ticket.
-    """
-    user = request.user
-    user.backend = 'django.contrib.auth.backends.ModelBackend'
-    service = request.session.pop('service', '/')
-    errors = []
-    if user is not None:
-        if user.is_active:
-            auth_login(request, user)
-            if service is not None:
-                ticket = create_service_ticket(user, service)
-                return HttpResponseRedirect(_build_service_url(service, ticket.ticket))
-            else:
-                return HttpResponseRedirect(success_redirect)
-        else:
-            errors.append('This account is disabled.')
-    else:
-        errors.append('Incorrect username and/or password.')
-    return render_to_response(template_name, {'errors': errors}, context_instance=RequestContext(request))
-
-
 def validate(request):
     service = request.GET.get('service', None)
     ticket_string = request.GET.get('ticket', None)