Commit a8ab7eec by Michael Nelson

Correct signal name and provide openid_response as kwarg instead of sreg_response.

parent 8df11b12
......@@ -30,5 +30,5 @@
import django.dispatch
oauth_login_complete = django.dispatch.Signal(providing_args=[
'request', 'sreg_response'])
openid_login_complete = django.dispatch.Signal(providing_args=[
'request', 'openid_response'])
......@@ -33,6 +33,7 @@ from django.conf import settings
from django.contrib.auth.models import User, Group
from django.http import HttpRequest
from django.test import TestCase
from openid.consumer.consumer import SuccessResponse
from openid.extensions import ax, sreg
from openid.fetchers import (
HTTPFetcher, HTTPFetchingError, HTTPResponse, setDefaultFetcher)
......@@ -43,7 +44,7 @@ from openid.store.memstore import MemoryStore
from django_openid_auth import teams
from django_openid_auth.models import UserOpenID
from django_openid_auth.views import sanitise_redirect_url
from django_openid_auth.signals import oauth_login_complete
from django_openid_auth.signals import openid_login_complete
ET = importElementTree()
......@@ -554,16 +555,17 @@ class RelyingPartyTests(TestCase):
# Use a closure to test whether the signal handler was called.
self.signal_handler_called = False
def login_callback(sender, **kwargs):
self.assertTrue(kwargs.has_key('request'))
self.assertTrue(kwargs.has_key('sreg_response'))
self.assertTrue(isinstance(kwargs['request'], HttpRequest))
self.assertTrue(isinstance(
kwargs.get('request', None), HttpRequest))
self.assertTrue(isinstance(
kwargs.get('openid_response', None), SuccessResponse))
self.signal_handler_called = True
oauth_login_complete.connect(login_callback)
openid_login_complete.connect(login_callback)
response = self.complete(openid_response)
self.assertTrue(self.signal_handler_called)
oauth_login_complete.disconnect(login_callback)
openid_login_complete.disconnect(login_callback)
class HelperFunctionsTest(TestCase):
......
......@@ -53,7 +53,7 @@ from openid.extensions import sreg, ax
from django_openid_auth import teams
from django_openid_auth.forms import OpenIDLoginForm
from django_openid_auth.models import UserOpenID
from django_openid_auth.signals import oauth_login_complete
from django_openid_auth.signals import openid_login_complete
from django_openid_auth.store import DjangoOpenIDStore
......@@ -247,10 +247,8 @@ def login_complete(request, redirect_field_name=REDIRECT_FIELD_NAME,
response = HttpResponseRedirect(sanitise_redirect_url(redirect_to))
# Notify any listeners that we successfully logged in.
sreg_response = sreg.SRegResponse.fromSuccessResponse(
openid_response)
oauth_login_complete.send(sender=UserOpenID, request=request,
sreg_response=sreg_response)
openid_login_complete.send(sender=UserOpenID, request=request,
openid_response=openid_response)
return response
else:
......
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