From e014b1fe2663393dc3a48526b4b32ae4ecb88a2e Mon Sep 17 00:00:00 2001
From: python273 <iam@python273.pw>
Date: Tue, 17 Nov 2020 23:15:41 +0300
Subject: [PATCH 1/4] Fix second factor auth

---
 vk_api/utils.py  |  7 ++++++-
 vk_api/vk_api.py | 21 ++++++++++++++-------
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/vk_api/utils.py b/vk_api/utils.py
index 82d413c6..a8448a8d 100644
--- a/vk_api/utils.py
+++ b/vk_api/utils.py
@@ -143,11 +143,16 @@ def send(self, request, **kwargs):
 
             total = end - start
 
+            body = request.body
+            if body and len(body) > 1024:
+                body = body[:1024] + '[STRIPPED]'
+
             print(
-                '{:0.2f} {} {} {} {}'.format(
+                '{:0.2f} {} {} {} {} {}'.format(
                     total,
                     request.method,
                     request.url,
+                    repr(body),
                     response.status_code,
                     response.history
                 )
diff --git a/vk_api/vk_api.py b/vk_api/vk_api.py
index d03bbe7d..ace7c46c 100644
--- a/vk_api/vk_api.py
+++ b/vk_api/vk_api.py
@@ -27,9 +27,7 @@
 RE_LOGIN_HASH = re.compile(r'name="lg_h" value="([a-z0-9]+)"')
 RE_CAPTCHAID = re.compile(r"onLoginCaptcha\('(\d+)'")
 RE_NUMBER_HASH = re.compile(r"al_page: '3', hash: '([a-z0-9]+)'")
-RE_AUTH_HASH = re.compile(
-    r"\{.*?act: 'a_authcheck_code'.+?hash: '([a-z_0-9]+)'.*?\}"
-)
+RE_AUTH_HASH = re.compile(r"Authcheck\.init\('([a-z_0-9]+)'")
 RE_TOKEN_URL = re.compile(r'location\.href = "(.*?)"\+addr;')
 
 RE_PHONE_PREFIX = re.compile(r'label ta_r">\+(.*?)<')
@@ -317,19 +315,28 @@ def _pass_twofactor(self, auth_response):
 
         :param auth_response: страница с приглашением к аутентификации
         """
-        code, remember_device = self.error_handlers[TWOFACTOR_CODE]()
 
         auth_hash = search_re(RE_AUTH_HASH, auth_response.text)
 
+        if not auth_hash:
+            raise TwoFactorError(
+                'Two factor authentication can not be passed:'
+                ' could not find "hash" value. Please create a bugreport'
+            )
+
+        code, remember_device = self.error_handlers[TWOFACTOR_CODE]()
+
         values = {
-            'act': 'a_authcheck_code',
             'al': '1',
             'code': code,
-            'remember': int(remember_device),
             'hash': auth_hash,
+            'remember': int(remember_device),
         }
 
-        response = self.http.post('https://vk.com/al_login.php', values)
+        response = self.http.post(
+            'https://vk.com/al_login.php?act=a_authcheck_code',
+            values
+        )
         data = json.loads(response.text.lstrip('<!--'))
         status = data['payload'][0]
 

From 04f5fc0f381a29d19e0272f3d70206fa0b4686a3 Mon Sep 17 00:00:00 2001
From: python273 <iam@python273.pw>
Date: Tue, 17 Nov 2020 23:28:32 +0300
Subject: [PATCH 2/4] Update 2FA exception messages

---
 vk_api/vk_api.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/vk_api/vk_api.py b/vk_api/vk_api.py
index ace7c46c..0c164dce 100644
--- a/vk_api/vk_api.py
+++ b/vk_api/vk_api.py
@@ -289,7 +289,7 @@ def _vk_login(self, captcha_sid=None, captcha_key=None):
             raise BadPassword('Bad password')
 
         if 'act=authcheck' in response.text:
-            self.logger.info('Two factor is required')
+            self.logger.info('2FA is required')
 
             response = self.http.get('https://vk.com/login?act=authcheck')
 
@@ -320,8 +320,8 @@ def _pass_twofactor(self, auth_response):
 
         if not auth_hash:
             raise TwoFactorError(
-                'Two factor authentication can not be passed:'
-                ' could not find "hash" value. Please create a bugreport'
+                'Two-factor authentication can not be passed:'
+                ' could not find "hash" value. Please send a bugreport'
             )
 
         code, remember_device = self.error_handlers[TWOFACTOR_CODE]()
@@ -350,7 +350,10 @@ def _pass_twofactor(self, auth_response):
         elif status == '2':
             raise TwoFactorError('Recaptcha required')
 
-        raise TwoFactorError('Two factor authentication failed')
+        raise TwoFactorError(
+            'Two-factor authentication can not be passed.'
+            ' Please send a bugreport'
+        )
 
     def _pass_security_check(self, response=None):
         """ Функция для обхода проверки безопасности (запрос номера телефона)

From 77e058e1440fd7cb1e43a16004bbde7b2d997573 Mon Sep 17 00:00:00 2001
From: python273 <iam@python273.pw>
Date: Thu, 19 Nov 2020 06:07:32 +0300
Subject: [PATCH 3/4] Add VkKeyboardButton to docs

---
 docs/keyboard.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/keyboard.rst b/docs/keyboard.rst
index bfd36674..f0b1c2d1 100644
--- a/docs/keyboard.rst
+++ b/docs/keyboard.rst
@@ -8,3 +8,5 @@ VkKeyboard
     :members:
 .. autoclass:: VkKeyboardColor
     :members:
+.. autoclass:: VkKeyboardButton
+    :members:

From 600d184e4611cc53134d2a7b913373a08faed6e4 Mon Sep 17 00:00:00 2001
From: python273 <iam@python273.pw>
Date: Thu, 19 Nov 2020 06:10:52 +0300
Subject: [PATCH 4/4] Update version to 11.9.1

---
 setup.py           | 2 +-
 vk_api/__init__.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.py b/setup.py
index 0b893a20..1165a840 100644
--- a/setup.py
+++ b/setup.py
@@ -11,7 +11,7 @@
 """
 
 
-version = '11.9.0'
+version = '11.9.1'
 
 with open('README.md', encoding='utf-8') as f:
     long_description = f.read()
diff --git a/vk_api/__init__.py b/vk_api/__init__.py
index 7a5831f3..e647e786 100644
--- a/vk_api/__init__.py
+++ b/vk_api/__init__.py
@@ -14,5 +14,5 @@
 
 
 __author__ = 'python273'
-__version__ = '11.9.0'
+__version__ = '11.9.1'
 __email__ = 'vk_api@python273.pw'