Merged in lp:~michael.nelson/django-openid-auth/701484-optional-sreg-fields

django_openid_auth/tests/test_views.py

@@ -27,8 +27,6 @@
 # POSSIBILITY OF SUCH DAMAGE.
 
 import cgi
-import re
-import time
 import unittest
 
 from django.conf import settings
@@ -323,6 +321,26 @@ class RelyingPartyTests(TestCase):
         self.assertEquals(user.last_name, 'User')
         self.assertEquals(user.email, 'foo@example.com')
 
+    def test_login_uses_sreg_extra_fields(self):
+        # The configurable sreg attributes are used in the request.
+        settings.OPENID_SREG_EXTRA_FIELDS = ('language',)
+        user = User.objects.create_user('testuser', 'someone@example.com')
+        useropenid = UserOpenID(
+            user=user,
+            claimed_id='http://example.com/identity',
+            display_id='http://example.com/identity')
+        useropenid.save()
+
+        # Posting in an identity URL begins the authentication request:
+        response = self.client.post('/openid/login/',
+            {'openid_identifier': 'http://example.com/identity',
+             'next': '/getuser/'})
+
+        openid_request = self.provider.parseFormPost(response.content)
+        sreg_request = sreg.SRegRequest.fromOpenIDRequest(openid_request)
+        for field in ('email', 'fullname', 'nickname', 'language'):
+            self.assertTrue(field in sreg_request)
+
     def test_login_attribute_exchange(self):
         settings.OPENID_UPDATE_DETAILS_FROM_SREG = True
         user = User.objects.create_user('testuser', 'someone@example.com')

django_openid_auth/views.py

@@ -194,8 +194,11 @@ def login_begin(request, template_name='openid/login.html',
             fetch_request.add(ax.AttrInfo(attr, alias=alias, required=True))
         openid_request.addExtension(fetch_request)
     else:
+        sreg_optional_fields = ['email', 'fullname', 'nickname']
+        extra_fields = getattr(settings, 'OPENID_SREG_EXTRA_FIELDS', [])
+        sreg_optional_fields.extend(extra_fields)
         openid_request.addExtension(
-            sreg.SRegRequest(optional=['email', 'fullname', 'nickname']))
+            sreg.SRegRequest(optional=sreg_optional_fields))
 
     # Request team info
     teams_mapping_auto = getattr(settings, 'OPENID_LAUNCHPAD_TEAMS_MAPPING_AUTO', False)