Merge remote-tracking branch 'agjohnson/github-to-str'

allauth/socialaccount/providers/github/provider.py

@@ -12,7 +12,15 @@ def get_avatar_url(self):
 
     def to_str(self):
         dflt = super(GitHubAccount, self).to_str()
-        return self.account.extra_data.get('name', dflt)
+        return next(
+            value
+            for value in (
+                self.account.extra_data.get('name', None),
+                self.account.extra_data.get('login', None),
+                dflt
+            )
+            if value is not None
+        )
 
 
 class GitHubProvider(OAuth2Provider):

allauth/socialaccount/providers/github/tests.py

@@ -1,8 +1,10 @@
 from allauth.socialaccount.tests import OAuth2TestsMixin
 from allauth.tests import MockedResponse, TestCase
+from allauth.socialaccount.models import SocialAccount
 
 from .provider import GitHubProvider
 
+
 class GitHubTests(OAuth2TestsMixin, TestCase):
     provider_id = GitHubProvider.id
 
@@ -38,3 +40,18 @@ def get_mocked_response(self):
             "events_url":"https://api.github.com/users/pennersr/events{/privacy}",
             "following_url":"https://api.github.com/users/pennersr/following"
         }""")
+
+    def test_account_name_null(self):
+        """String conversion when GitHub responds with empty name"""
+        data = """{
+            "type": "User",
+            "id": 201022,
+            "login": "pennersr",
+            "name": null
+        }"""
+        self.login(MockedResponse(200, data))
+        socialaccount = SocialAccount.objects.get(uid='201022')
+        self.assertIsNone(socialaccount.extra_data.get('name'))
+        account = socialaccount.get_provider_account()
+        self.assertIsNotNone(account.to_str())
+        self.assertEqual(account.to_str(), 'pennersr')