fnp
/
django-cas-provider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Changed the signature of the login hijack signal.
[django-cas-provider.git]
/
cas_provider
/
views.py
diff --git
a/cas_provider/views.py
b/cas_provider/views.py
index
fdae99f
..
5ba62e6
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
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)
logging.debug('CAS Provider Login view. Method is %s, merge is %s, template is %s.',
request.method, merge, template_name)
@@
-93,6
+94,11
@@
def login(request, template_name='cas/login.html', success_redirect='/account/',
if not user.is_active:
errors.append('This account is disabled.')
else:
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.send(sender=login, request=request, **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:
# Try and pull the service off the session
service = request.session.pop('service', service)