Merge pull request #4 from MarkusLuan/update3

Update3 - Correção no login

Author: MarkusLuan

instagram/constants.py

@@ -5,7 +5,7 @@ class Constants:
        https://github.com/ping/instagram_private_api/tree/master/instagram_private_api
     """
 
-    APP_VERSION = '76.0.0.15.395'
+    APP_VERSION = '128.0.0.26.128'
     WIN_VERSION = "10.0"
     CHROME_VERSION = "83.0.4103.106"
 
@@ -17,7 +17,7 @@ class Constants:
     PHONE_DPI = '240dpi'
     PHONE_RESOLUTION = '720x1280'
     PHONE_CHIPSET = 'mk6737'
-    VERSION_CODE = '138226743'
+    VERSION_CODE = '197825254'
 
     USER_AGENT = \
         "Mozilla/5.0 (Linux; Android %s; %s; wv) " \
@@ -49,4 +49,4 @@ class Constants:
         )
 
     DEVICE = uuid.uuid1()
-    ANDROID_DEVICE = "android:%s" % DEVICE
+    ANDROID_DEVICE = "android-%s" % DEVICE

instagram/login.py

@@ -27,19 +27,25 @@ def fazerLogin(self, usuario, senha):
             "password": senha
         })
         token = self.__session.atualizarCSRFToken(req.cookies["csrftoken"])
-
-        res = req.json()
+        if req.text.index("{") == -1:
+            return req.text
 
+        res = req.json()
+
         self.__cookies = self.__session.cookies.copy()
-        self.__cookies.update({"usuario": req.cookies["ds_user"]})
         self.__cookies.update({"csrf_token": token})
 
         if res["status"] != "ok" or res["logged_in_user"] is None:
             if res["message"] == "challenge_required":
                 self.auth = res["challenge"]["api_path"]
                 self.__cookies.update({"a": self.auth})
-                raise Exception("Erro no login: Necessário autentificar!")
-            raise Exception("Erro no login: %s" % res)
+                print("Necessário Autentificar!")
+                return
+            if res["message"] == "The password you entered is incorrect. Please try again.":
+                return "Login invalido"
+            return res["message"]
+
+        self.__cookies.update({"usuario": req.cookies["ds_user"]})
 
         print("Logado com sucesso!")
         print()

login.py

@@ -45,19 +45,14 @@ def fazerLogin():
 
             loginMgr = instagram.LoginMgr(instagram.getSession)
 
+            loginStatus = None
             try:
-                loginMgr.fazerLogin(usuario, senha)
+                loginStatus = loginMgr.fazerLogin(usuario, senha)
 
-                res = redirect("/")
-                cookies = loginMgr.getCookies()
-                for c in cookies:
-                    if ".com" not in c.domain:
-                        res.set_cookie(c.name, c.value)
-                    else:
-                        res.set_cookie("i." + c.name, c.value)
+                if loginStatus is not None:
+                    print("Erro no login: %s" % loginStatus)
+                    return redirect("/login?status=%s" % loginStatus)
 
-                return res
-            except Exception as e:
                 if loginMgr.auth:
                     res = redirect("/login/auth")
                     cookies = loginMgr.getCookies()
@@ -69,8 +64,22 @@ def fazerLogin():
 
                     return res
 
-                print("Erro no login: %s" % e)
-                return redirect("/login?status=Login invalido!")
+                res = redirect("/")
+                cookies = loginMgr.getCookies()
+                for c in cookies:
+                    if ".com" not in c.domain:
+                        res.set_cookie(c.name, c.value)
+                    else:
+                        res.set_cookie("i." + c.name, c.value)
+
+                return res
+            except Exception as e:
+                erro = e
+                if loginStatus is not None:
+                    erro = loginStatus
+
+                print("Erro no login: %s" % erro)
+                return redirect("/login?status=%s" % erro)
 
         @app.route("/login/sair", methods=["GET"])
         def desconectar():

version.txt

@@ -0,0 +1 @@
+1.0.3