From ff89d233cf94754cdd22dc6a2a72dfc82f8ec7a0 Mon Sep 17 00:00:00 2001 From: Slava Bacherikov Date: Thu, 3 May 2012 19:05:27 +0300 Subject: [PATCH] Change in VK_EXTRA_DATA --- README.rst | 2 +- social_auth/backends/contrib/vkontakte.py | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/README.rst b/README.rst index 188810d..c33fad0 100644 --- a/README.rst +++ b/README.rst @@ -943,7 +943,7 @@ Vkontakte uses OAuth v2 for Authentication - Define VK_EXTRA_DATA to pass extra fields when gathering the user profile data, like:: - VK_EXTRA_DATA = 'photo,country' + VK_EXTRA_DATA = ['photo','country'] - Also it's possible to define extra permissions with:: diff --git a/social_auth/backends/contrib/vkontakte.py b/social_auth/backends/contrib/vkontakte.py index 0f91fab..62dfd2a 100644 --- a/social_auth/backends/contrib/vkontakte.py +++ b/social_auth/backends/contrib/vkontakte.py @@ -15,7 +15,7 @@ VK_AUTHORIZATION_URL = 'http://oauth.vk.com/authorize' VK_ACCESS_TOKEN_URL = 'https://oauth.vk.com/access_token' VK_USER_DATA_URL = 'https://api.vk.com/method/users.get' VK_SERVER = 'vk.com' -VK_DEFAULT_DATA = 'first_name,last_name,screen_name,nickname' +VK_DEFAULT_DATA = ['first_name','last_name','screen_name','nickname'] class VkontakteBackend(OAuthBackend): @@ -50,10 +50,7 @@ class VkontakteAuth(BaseOAuth2): def user_data(self, access_token, response, *args, **kwargs): """Loads user data from service""" - fields = VK_DEFAULT_DATA - if setting('VK_EXTRA_DATA'): - fields += ',' + setting('VK_EXTRA_DATA') - + fields = ','.join(VK_DEFAULT_DATA + setting('VK_EXTRA_DATA',[])) params = {'access_token': access_token, 'fields': fields, 'uids': response.get('user_id')} -- 2.39.5