Support for 2FA connection [#76] Implemented two_factor_login

Author: adw0rd

docs/index.md

@@ -52,7 +52,7 @@ from instagrapi import Client
 from instagrapi.types import Location, StoryMention, StoryLocation, StoryLink, StoryHashtag
 
 cl = Client()
-cl.login(USERNAME, PASSWORD)
+cl.login(USERNAME, PASSWORD, verification_code='123456')  # with 2FA verification_code
 
 media_path = cl.video_download(
     cl.media_pk_from_url('https://www.instagram.com/p/CGgDsi7JQdS/')

docs/usage-guide/interactions.md

@@ -32,6 +32,7 @@
 
 ``` python
 cl.login("instagrapi", "42")
+# cl.login("instagrapi", "42", verification_code="123456")  # with 2FA verification_code
 # cl.login_by_sessionid("peiWooShooghahdi2Eip7phohph0eeng")
 cl.set_proxy("socks5://127.0.0.1:30235")
 # cl.set_proxy("http://username:[email protected]:8080")
@@ -42,6 +43,7 @@ print(cl.user_info(cl.user_id))
 ```
 
 * login(username: str, password: str): bool - Login by username and password (get new cookies if it does not exist in settings)
+* login(username, password, verification_code='<2FA CODE>') - Login by username and password with 2FA verification code
 * relogin(): bool - Re-login with clean cookies (required cl.username/cl.password)
 * login_by_sessionid(sessionid: str): bool - Login by sessionid from Instagram site
 * get_settings(): dict - Return settings dict

instagrapi/mixins/auth.py

@@ -9,11 +9,17 @@
 import uuid
 from pathlib import Path
 from typing import Dict, List
+from uuid import uuid4
 
 import requests
 
 from instagrapi import config
-from instagrapi.exceptions import PrivateError, PleaseWaitFewMinutes, ReloginAttemptExceeded
+from instagrapi.exceptions import (
+    PleaseWaitFewMinutes,
+    PrivateError,
+    ReloginAttemptExceeded,
+    TwoFactorRequired,
+)
 from instagrapi.utils import generate_jazoest
 from instagrapi.zones import CET
 
@@ -293,7 +299,7 @@ def login_by_sessionid(self, sessionid: str) -> bool:
         self.username = user.username
         return True
 
-    def login(self, username: str, password: str, relogin: bool = False) -> bool:
+    def login(self, username: str, password: str, relogin: bool = False, verification_code: str = '') -> bool:
         """
         Login
 
@@ -346,7 +352,28 @@ def login(self, username: str, password: str, relogin: bool = False) -> bool:
             "google_tokens": "[]",
             "login_attempt_count": "0"
         }
-        if self.private_request("accounts/login/", data, login=True):
+        try:
+            logged = self.private_request("accounts/login/", data, login=True)
+        except TwoFactorRequired as e:
+            if not verification_code.strip():
+                raise TwoFactorRequired(f'{e} (you did not provide verification_code for login method)')
+            two_factor_identifier = self.last_json.get(
+                'two_factor_info', {}
+            ).get('two_factor_identifier')
+            data = {
+                "verification_code": verification_code,
+                "phone_id": self.phone_id,
+                "_csrftoken": self.token,
+                "two_factor_identifier": two_factor_identifier,
+                "username": username,
+                "trust_this_device": "0",
+                "guid": self.uuid,
+                "device_id": self.device_id,
+                "waterfall_id": str(uuid4()),
+                "verification_method": "3"
+            }
+            logged = self.private_request("accounts/two_factor_login/", data, login=True)
+        if logged:
             self.login_flow()
             self.last_login = time.time()
             return True

setup.py

@@ -30,7 +30,7 @@
 
 setup(
     name='instagrapi',
-    version='1.6.5',
+    version='1.7.0',
     author='Mikhail Andreev',
     author_email='[email protected]',
     license='MIT',