Update cookies format

Author: python273

vk_api/utils.py

@@ -12,6 +12,8 @@
 except ImportError:
     import json
 
+from http.cookiejar import Cookie
+
 
 def search_re(reg, string):
     """ Поиск по регулярке """
@@ -53,3 +55,36 @@ def sjson_dumps(*args, **kwargs):
     kwargs['separators'] = (',', ':')
 
     return json.dumps(*args, **kwargs)
+
+
+HTTP_COOKIE_ARGS = [
+    'version', 'name', 'value',
+    'port', 'port_specified',
+    'domain', 'domain_specified',
+    'domain_initial_dot',
+    'path', 'path_specified',
+    'secure', 'expires', 'discard', 'comment', 'comment_url', 'rest', 'rfc2109'
+]
+
+
+def cookie_to_dict(cookie):
+    cookie_dict = {
+        k: v for k, v in cookie.__dict__.items() if k in HTTP_COOKIE_ARGS
+    }
+
+    cookie_dict['rest'] = cookie._rest
+
+    return cookie_dict
+
+
+def cookie_from_dict(d):
+    return Cookie(**d)
+
+
+def cookies_to_list(cookies):
+    return [cookie_to_dict(cookie) for cookie in cookies]
+
+
+def set_cookies_from_list(cookie_jar, l):
+    for cookie in l:
+        cookie_jar.set_cookie(cookie_from_dict(cookie))

vk_api/vk_api.py

@@ -16,9 +16,13 @@
 
 import jconfig
 from .exceptions import *
-from .utils import code_from_number, search_re, clean_string
+from .utils import (
+    code_from_number, search_re, clean_string,
+    cookies_to_list, set_cookies_from_list
+)
 
 DELAY = 0.34  # ~3 requests per second
+
 TOO_MANY_RPS_CODE = 6
 NEED_VALIDATION_CODE = 17
 HTTP_ERROR_CODE = -1
@@ -68,15 +72,14 @@ def __init__(self, login=None, password=None, token=None,
         self.login = login
         self.password = password
 
-        self.sid = None
         self.token = {'access_token': token}
 
         self.api_version = api_version
         self.app_id = app_id
         self.scope = scope
         self.client_secret = client_secret
 
-        self.settings = config(self.login, filename=config_filename)
+        self.storage = config(self.login, filename=config_filename)
 
         self.http = requests.Session()
         self.http.headers.update({
@@ -97,6 +100,13 @@ def __init__(self, login=None, password=None, token=None,
 
         self.logger = logging.getLogger('vk_api')
 
+    @property
+    def sid(self):
+        return (
+            self.http.cookies.get('remixsid') or
+            self.http.cookies.get('remixsid6')
+        )
+
     def auth(self, reauth=False, token_only=False):
         """ Аутентификация
 
@@ -126,8 +136,12 @@ def auth(self, reauth=False, token_only=False):
 
         self.logger.info('Auth with login: {}'.format(self.login))
 
-        self.sid = self.settings.remixsid
-        self.token = self.settings.setdefault('token', {}).get(str(self.scope))
+        set_cookies_from_list(
+            self.http.cookies,
+            self.storage.setdefault('cookies', [])
+        )
+
+        self.token = self.storage.setdefault('token', {}).get(str(self.scope))
 
         if not token_only:
             self._auth_cookies(reauth=reauth)
@@ -139,7 +153,7 @@ def _auth_cookies(self, reauth=False):
         if reauth:
             self.logger.info('Auth forced')
 
-            self.settings.clear_section()
+            self.storage.clear_section()
 
             self.vk_login()
             self.api_login()
@@ -253,25 +267,11 @@ def vk_login(self, captcha_sid=None, captcha_key=None):
 
             self.twofactor(response)
 
-        remixsid = (
-            self.http.cookies.get('remixsid') or
-            self.http.cookies.get('remixsid6')
-        )
-
-        if remixsid:
+        if self.sid:
             self.logger.info('Got remixsid')
 
-            self.settings.remixsid = remixsid
-
-            # Нужно для авторизации в API
-            self.settings.forapilogin = {
-                'p': self.http.cookies['p'],
-                'l': self.http.cookies['l']
-            }
-
-            self.settings.save()
-
-            self.sid = remixsid
+            self.storage.cookies = cookies_to_list(self.http.cookies)
+            self.storage.save()
         else:
             self.logger.info('Unknown auth error')
 
@@ -358,14 +358,7 @@ def check_sid(self):
             self.logger.info('No remixsid')
             return
 
-        url = 'https://vk.com/feed2.php'
-        self.http.cookies.update({
-            'remixsid': self.sid,
-            'remixlang': '0',
-            'remixsslsid': '1'
-        })
-
-        response = self.http.get(url).json()
+        response = self.http.get('https://vk.com/feed2.php').json()
 
         if response['user']['id'] != -1:
             self.logger.info('remixsid is valid')
@@ -376,20 +369,21 @@ def check_sid(self):
     def api_login(self):
         """ Получение токена через Desktop приложение """
 
-        if not self.sid or not self.settings.forapilogin:
-            raise AuthError('API authorization error (no cookies)')
-
-        url = 'https://oauth.vk.com/authorize'
-        values = {
-            'client_id': self.app_id,
-            'scope': self.scope,
-            'response_type': 'token',
-        }
-
-        self.http.cookies.update(self.settings.forapilogin)
-        self.http.cookies.update({'remixsid': self.sid})
-
-        response = self.http.get(url, params=values)
+        if not self.sid:
+            raise AuthError('API auth error (no remixsid)')
+
+        for cookie_name in ['p', 'l']:
+            if not self.http.cookies.get(cookie_name, domain='.login.vk.com'):
+                raise AuthError('API auth error (no login cookies)')
+
+        response = self.http.get(
+            'https://oauth.vk.com/authorize',
+            params={
+                'client_id': self.app_id,
+                'scope': self.scope,
+                'response_type': 'token'
+            }
+        )
 
         if 'access_token' not in response.url:
             url = search_re(RE_TOKEN_URL, response.text)
@@ -398,20 +392,29 @@ def api_login(self):
                 response = self.http.get(url)
 
         if 'access_token' in response.url:
-            params = response.url.split('#')[1].split('&')
-
-            token = {}
-            for i in params:
-                x = i.split('=')
-                token.update({x[0]: x[1]})
+            params = response.url.split('#', 1)[1].split('&')
+            token = dict(param.split('=', 1) for param in params)
 
-            self.settings.setdefault('token', {})[str(self.scope)] = token
-            self.settings.save()
             self.token = token
 
+            self.storage.setdefault('token', {})[str(self.scope)] = token
+            self.storage.save()
+
             self.logger.info('Got access_token')
+
+        elif 'oauth.vk.com/error' in response.url:
+            error_data = response.json()
+
+            error_text = error_data.get('error_description')
+
+            # Deletes confusing error text
+            if error_text and '@vk.com' in error_text:
+                error_text = error_data.get('error')
+
+            raise AuthError('API auth error: {}'.format(error_text))
+
         else:
-            raise AuthError('Authorization error (api)')
+            raise AuthError('Unknown API auth error')
 
     def server_auth(self):
         """ Серверная авторизация """