Added totp_secret parameter to the login method for handling two-factor authentication

Author: d60

requirements.txt

@@ -1,3 +1,4 @@
 httpx
 filetype
-beautifulsoup4
+beautifulsoup4
+pyotp

setup.py

@@ -14,9 +14,10 @@
     install_requires=[
         'httpx',
         'filetype',
-        'beautifulsoup4'
+        'beautifulsoup4',
+        'pyotp'
     ],
-    python_requires='>=3.10',
+    python_requires='>=3.8',
     description='Twitter API wrapper for python with **no API key required**.',
     long_description=long_description,
     long_description_content_type='text/markdown',

twikit/__init__.py

@@ -7,7 +7,7 @@
 A Python library for interacting with the Twitter API.
 """
 
-__version__ = '1.7.0'
+__version__ = '1.7.1'
 
 from ._captcha import Capsolver
 from .bookmark import BookmarkFolder

twikit/client.py

@@ -9,6 +9,7 @@
 
 import filetype
 import httpx
+import pyotp
 from httpx import Response
 
 from .bookmark import BookmarkFolder
@@ -114,7 +115,7 @@ def request(
         if isinstance(response_data, dict) and 'errors' in response_data:
             error_code = response_data['errors'][0]['code']
             error_message = response_data['errors'][0].get('message')
-            if error_code == 37:
+            if error_code in (37, 64):
                 # Account suspended
                 raise AccountSuspended(error_message)
 
@@ -298,7 +299,8 @@ def login(
         *,
         auth_info_1: str,
         auth_info_2: str | None = None,
-        password: str
+        password: str,
+        totp_secret: str | None = None
     ) -> dict:
         """
         Logs into the account using the specified login information.
@@ -319,6 +321,9 @@ def login(
             It can be a username, email address, or phone number.
         password : :class:`str`
             The password associated with the account.
+        totp_secret : :class:`str`
+            The TOTP (Time-Based One-Time Password) secret key used for
+            two-factor authentication (2FA).
 
         Examples
         --------
@@ -385,12 +390,16 @@ def login(
         self._user_id = find_dict(flow.response, 'id_str')[0]
 
         if flow.task_id == 'LoginTwoFactorAuthChallenge':
-            print(find_dict(flow.response, 'secondary_text')[0]['text'])
+            if totp_secret is None:
+                print(find_dict(flow.response, 'secondary_text')[0]['text'])
+                totp_code = input('>>>')
+            else:
+                totp_code = pyotp.TOTP(totp_secret).now()
 
             flow.execute_task({
                 'subtask_id': 'LoginTwoFactorAuthChallenge',
                 'enter_text': {
-                    'text': input('>>> '),
+                    'text': totp_code,
                     'link': 'next_link'
                 }
             })

twikit/twikit_async/client.py

@@ -9,6 +9,7 @@
 
 import filetype
 import httpx
+import pyotp
 from httpx import Response
 
 from ..errors import (
@@ -116,7 +117,7 @@ async def request(
         if isinstance(response_data, dict) and 'errors' in response_data:
             error_code = response_data['errors'][0]['code']
             error_message = response_data['errors'][0].get('message')
-            if error_code == 37:
+            if error_code in (37, 64):
                 # Account suspended
                 raise AccountSuspended(error_message)
 
@@ -314,6 +315,7 @@ async def login(
         auth_info_1: str,
         auth_info_2: str | None = None,
         password: str,
+        totp_secret: str | None = None
     ) -> dict:
         """
         Logs into the account using the specified login information.
@@ -334,6 +336,9 @@ async def login(
             It can be a username, email address, or phone number.
         password : :class:`str`
             The password associated with the account.
+        totp_secret : :class:`str`
+            The TOTP (Time-Based One-Time Password) secret key used for
+            two-factor authentication (2FA).
 
         Examples
         --------
@@ -400,12 +405,16 @@ async def login(
         self._user_id = find_dict(flow.response, 'id_str')[0]
 
         if flow.task_id == 'LoginTwoFactorAuthChallenge':
-            print(find_dict(flow.response, 'secondary_text')[0]['text'])
+            if totp_secret is None:
+                print(find_dict(flow.response, 'secondary_text')[0]['text'])
+                totp_code = input('>>>')
+            else:
+                totp_code = pyotp.TOTP(totp_secret).now()
 
             await flow.execute_task({
                 'subtask_id': 'LoginTwoFactorAuthChallenge',
                 'enter_text': {
-                    'text': input('>>> '),
+                    'text': totp_code,
                     'link': 'next_link'
                 }
             })