Change in VK_EXTRA_DATA

diff --git a/README.rst b/README.rst
index 188810d23ff762ec6c76e27e47da55af325cec7b..c33fad04ee94c70249f33548d3b74a6b783a09a8 100644 (file)
--- 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 0f91faba6bd6455ea31da25a5d77ac84e28177e3..62dfd2a9b86d8c9847f928743ec5e42595dd2df1 100644 (file)
--- 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')}