Commit 10f0c4c8 by swillison

Fixed stupid bug introduced in last checkin

parent 00afc0da
...@@ -38,7 +38,11 @@ def is_valid_next_url(next): ...@@ -38,7 +38,11 @@ def is_valid_next_url(next):
# path, not a complete URL. # path, not a complete URL.
return bool(next_url_re.match(next)) return bool(next_url_re.match(next))
def begin(request, sreg=None, extension_args=None, redirect_to=None): def begin(request, sreg=None, extension_args=None, redirect_to=None,
on_failure=None):
on_failure = on_failure or default_on_failure
if request.GET.get('logo'): if request.GET.get('logo'):
# Makes for a better demo # Makes for a better demo
return HttpResponse( return HttpResponse(
...@@ -74,13 +78,13 @@ def begin(request, sreg=None, extension_args=None, redirect_to=None): ...@@ -74,13 +78,13 @@ def begin(request, sreg=None, extension_args=None, redirect_to=None):
if xri.identifierScheme(user_url) == 'XRI' and getattr( if xri.identifierScheme(user_url) == 'XRI' and getattr(
settings, 'OPENID_DISALLOW_INAMES', False settings, 'OPENID_DISALLOW_INAMES', False
): ):
return failure(request, 'i-names are not supported') return on_failure(request, 'i-names are not supported')
consumer = Consumer(request.session, DjangoOpenIDStore()) consumer = Consumer(request.session, DjangoOpenIDStore())
try: try:
auth_request = consumer.begin(user_url) auth_request = consumer.begin(user_url)
except DiscoveryFailure: except DiscoveryFailure:
return failure(request, "The OpenID was invalid") return on_failure(request, "The OpenID was invalid")
# Add extension args (for things like simple registration) # Add extension args (for things like simple registration)
for name, value in extension_args.items(): for name, value in extension_args.items():
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment