Принудительный вход по паролю и рефакторинг (#525)

Author: kyzima-spb

vk_api/credentials.py

@@ -11,7 +11,7 @@
 
 import requests
 
-from .exceptions import ParseError
+from .exceptions import AuthError
 from .utils import (
     set_cookies_from_list,
     generate_device_id,
@@ -65,7 +65,7 @@ def __init__(
         json_config = search_re(pattern, response.text)
 
         if json_config is None:
-            raise ParseError('Failed to get the value of variable window.init.')
+            raise AuthError('Failed to get the value of variable window.init.')
 
         self._config = json.loads(json_config)
 

vk_api/enums.py

@@ -8,12 +8,19 @@
 
 import enum
 
+try:
+    from enum import StrEnum
+except ImportError:
+    class StrEnum(str, enum.Enum):
+        def _generate_next_value_(name, start, count, last_values):
+            return name.lower()
 
-class VerificationMethod(enum.StrEnum):
+
+class VerificationMethod(StrEnum):
     """
     Перечисление способов подтверждения входа в аккаунт.
 
-    EMAIL, SMS и PUSH требуют вызова метода API для отправки.
+    EMAIL, SMS, CALLRESET и PUSH требуют вызова метода API для отправки.
     """
     PUSH = enum.auto()
     EMAIL = enum.auto()

vk_api/exceptions.py

@@ -48,23 +48,6 @@ class TwoFactorError(AuthError):
     pass
 
 
-class ParseError(AuthError):
-    """Любая ошибка при парсинге исходных кодов сайта."""
-
-
-class AuthorizeError(AuthError):
-    """
-    Любая ошибка, которая может возникнуть в момент авторизации
-    существующего пользователя с проверенным кодом подтверждения или паролем.
-    (https://login.vk.com/?act=connect_authorize)
-    """
-    def __init__(self, error: t.Dict[str, t.Any]) -> None:
-        self.error = error
-
-    def __str__(self) -> str:
-        return '[{error_code}] {error_info}'.format(**self.error)
-
-
 class SecurityCheck(AuthError):
 
     def __init__(self, phone_prefix=None, phone_postfix=None, response=None):

vk_api/vk_api.py

@@ -291,19 +291,27 @@ def _vk_login(self, captcha_sid=None, captcha_key=None):
             }
         )
 
+        if 'sid' not in account:
+            raise AuthError('Account not exists')
+
         credentials.sid = account['sid']
         next_step = account.get('next_step')
 
         if next_step is not None and next_step['verification_method'] != VerificationMethod.PASSWORD:
-            self.logger.info('Confirmation code is required')
-            self._pass_confirmation_code(next_step['verification_method'], credentials)
+            if (
+                not next_step.get('has_another_verification_methods')
+                or
+                VerificationMethod.PASSWORD not in self._get_allowed_verification_methods(credentials)
+            ):
+                self.logger.info('Confirmation code is required')
+                self._pass_confirmation_code(next_step['verification_method'], credentials)
 
         if not credentials.can_skip_password and not self.password:
             raise PasswordRequired('Password is required to login')
 
         response_dict = self.vk_login_method(
             action='connect_authorize',
-            data={
+            values={
                 'username': self.login,
                 'password': self.password,
                 'auth_token': credentials.access_token,
@@ -323,12 +331,7 @@ def _vk_login(self, captcha_sid=None, captcha_key=None):
             },
         )
 
-        if response_dict['type'] != 'okay':
-            if response_dict['error_code'] == 'incorrect_password':
-                raise BadPassword('Bad password')
-            raise AuthorizeError(response_dict)
-
-        if response_dict['data']['is_user_banned']:
+        if response_dict['is_user_banned']:
             raise AccountBlocked('Account is blocked')
 
         if not self._sid:
@@ -437,6 +440,23 @@ def _vk_login_legacy(self, response, captcha_sid=None, captcha_key=None):
         if 'act=blocked' in response.url:
             raise AccountBlocked('Account is blocked')
 
+    def _get_allowed_verification_methods(self, credentials: WebLoginCredentials) -> t.Set[VerificationMethod]:
+        """Возвращает множество доступных для подтверждения входа методов."""
+        verification_methods = set(VerificationMethod)
+        response = self.method(
+            with_cookies=True,
+            method='ecosystem.getVerificationMethods',
+            values={
+                'v': credentials.api_version,
+                'client_id': credentials.app_id,
+                'sid': credentials.sid,
+                'device_id': credentials.device_id,
+                'anonymous_token': credentials.anonymous_token,
+                'access_token': '',
+            },
+        )
+        return {VerificationMethod(m['name']) for m in response['methods'] if m['name'] in verification_methods}
+
     def _pass_confirmation_code(
         self,
         verification_method: str,
@@ -918,7 +938,7 @@ def method(
     def vk_login_method(
         self,
         action: str,
-        data: t.Dict[str, t.Any],
+        values: t.Dict[str, t.Any],
         headers: t.Optional[t.Dict[str, t.Any]] = None,
         captcha_sid: t.Optional[str] = None,
         captcha_key: t.Optional[str] = None,
@@ -929,8 +949,8 @@ def vk_login_method(
         :param action: имя действия, например, connect_authorize или connect_internal
         :type action: str
 
-        :param data: данные/поля формы
-        :type data: dict
+        :param values: данные/поля формы
+        :type values: dict
 
         :param headers: HTTP заголовки
         :type headers: dict
@@ -943,16 +963,15 @@ def vk_login_method(
         """
         if captcha_sid and captcha_key:
             self.logger.info(f'Using captcha code: {captcha_sid}: {captcha_key}')
-            data['captcha_sid'] = captcha_sid
-            data['captcha_key'] = captcha_key
+            values['captcha_sid'] = captcha_sid
+            values['captcha_key'] = captcha_key
 
         response = self.http.post(
             url=f'https://login.vk.com/?act={action}',
-            data=data,
+            data=values,
             headers=headers,
         )
         response_dict = response.json()
-        self.logger.debug(response_dict)
 
         if response_dict['type'] == 'captcha':
             captcha_type = response_dict['captcha_type']
@@ -965,14 +984,25 @@ def vk_login_method(
                 func=self.vk_login_method,
                 kwargs={
                     'action': action,
-                    'data': data,
+                    'values': values,
                     'headers': headers,
                 },
             )
 
             return self.error_handlers[CAPTCHA_ERROR_CODE](captcha)
 
-        return response_dict
+        if response_dict['type'] != 'okay':
+            if response_dict['error_code'] == 'incorrect_password':
+                raise BadPassword(response_dict['error_info'])
+
+            if response_dict['error_code']:
+                error_message = '[{error_code}] {error_info}'.format(**response_dict)
+            else:
+                error_message = response_dict['error_info']
+
+            raise AuthError(error_message)
+
+        return response_dict.get('data', response_dict)
 
 
 class VkApiGroup(VkApi):