Port PR #1028 by inlanger

python-social-auth · Dec 4, 2016 · 239a7bf · 239a7bf
1 parent 4954b11
commit 239a7bf
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -21,6 +21,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - Added Dockerfile to simplify the running of tests (`make docker-tox`)
 
 ### Changed
+- change username, email and fullname keys (port from [#1028](https://github.com/omab/python-social-auth/pull/1028)
+  by inlanger)
 - Moves fix convert username to string (port from [#1021](https://github.com/omab/python-social-auth/pull/1021)
   by WarmongeR1)
 - Fix auth_params for Stripe backend (port from [#1034](https://github.com/omab/python-social-auth/pull/1034)

diff --git a/social_core/backends/khanacademy.py b/social_core/backends/khanacademy.py
@@ -111,9 +111,9 @@ class KhanAcademyOAuth1(BrowserBasedOAuth1):
     def get_user_details(self, response):
         """Return user details from Khan Academy account"""
         return {
-            'username': response.get('key_email'),
-            'email': response.get('key_email'),
-            'fullname': '',
+            'username': response.get('email'),
+            'email': response.get('email'),
+            'fullname': response.get('nickname'),
             'first_name': '',
             'last_name': '',
             'user_id': response.get('user_id')

diff --git a/social_core/tests/backends/test_khanacademy.py b/social_core/tests/backends/test_khanacademy.py
@@ -20,7 +20,7 @@ class KhanAcademyOAuth1Test(OAuth1Test):
         'oauth_callback_confirmed': 'true'
     })
     user_data_body = json.dumps({
-        "key_email": "[email protected]",
+        "email": "[email protected]",
         "user_id": "http://googleid.khanacademy.org/11111111111111",
     })