bcpkgfox 0.17.7__tar.gz → 0.17.9__tar.gz

{bcpkgfox-0.17.7 → bcpkgfox-0.17.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bcpkgfox
-Version: 0.17.7
+Version: 0.17.9
 Summary: Biblioteca BCFOX
 Home-page: https://github.com/robotsbcfox/PacotePythonBCFOX
 Author: BCFOX

{bcpkgfox-0.17.7 → bcpkgfox-0.17.9}/bcpkgfox/invoke_api.py

@@ -149,7 +149,8 @@ def invoke_api_proc(link: str, payload_vars: dict, token: str, method: str, prin
                 time.sleep(5)
                 continue
 
-            else: raise ValueError("Api proc final falhou")
+            else:
+                raise ValueError("Api proc final falhou")
 
 def invoke_api_proc_log(link, id_robo, token):
     import requests
@@ -253,7 +254,8 @@ def login_2fac(driver, certificate, system, token, code_timeout=60):
                         time.sleep(5)
                         continue
                     else:
-                            raise('Todas as tentativas falharam!')
+                        self.driver.quit()
+                        raise('Todas as tentativas falharam!')
 
         def invoke_update_status(self, id):
 
@@ -277,6 +279,7 @@ def login_2fac(driver, certificate, system, token, code_timeout=60):
                         time.sleep(5)
                         continue
                     else:
+                        self.driver.quit()
                         raise('Todas as tentativas falharam!')
 
     class whoom_codes(login_2fac):
@@ -322,8 +325,16 @@ def login_2fac(driver, certificate, system, token, code_timeout=60):
 
             self.driver.get("https://chromewebstore.google.com/detail/whom-gerenciador-de-certi/lnidijeaekolpfeckelhkomndglcglhh")
 
+            try:
+                tools.find_element_with_wait(By.XPATH, "//span[contains(text(), 'no Chrome') or contains(text(), 'Usar') or contains(text(), 'Add to Chrome')]").click()
+
+            except:
+                tools.find_element_with_wait(By.XPATH, "//span[contains(text(), 'do Chrome') or contains(text(), 'Usar') or contains(text(), 'Add to Chrome')]").click()
+                pyautogui.press('enter')
+                time.sleep(1)
+                tools.find_element_with_wait(By.XPATH, "//span[contains(text(), 'no Chrome') or contains(text(), 'Usar') or contains(text(), 'Add to Chrome')]").click()
+
 
-            tools.find_element_with_wait(By.XPATH, "//span[contains(text(), 'no Chrome') or contains(text(), 'Usar') or contains(text(), 'Add to Chrome')]").click()
             time.sleep(5)
             import pygetwindow as gw
             windows = gw.getAllTitles()
@@ -435,6 +446,7 @@ def login_2fac(driver, certificate, system, token, code_timeout=60):
                         break
 
             if not(code_insertion):
+                self.driver.quit()
                 raise TimeoutError('Código WHOOM não chegou dentro do timeout estabelecido')
 
         def select_system(self):
@@ -444,6 +456,7 @@ def login_2fac(driver, certificate, system, token, code_timeout=60):
                                              timeout=1).click()
                 time.sleep(1)
                 self.codes_2_fac()
+                self.select_system()
                 return
             except:
                 pass
@@ -476,6 +489,7 @@ def login_2fac(driver, certificate, system, token, code_timeout=60):
 
             if not div_list:
                 mostrar_mensagem('Não conseguiu achar o sistema no certificado')
+                self.driver.quit()
                 raise ValueError('Não conseguiu achar o sistema no certificado')
 
             if len(div_list) == 1:
@@ -491,10 +505,22 @@ def login_2fac(driver, certificate, system, token, code_timeout=60):
 
                 if len(div_list) == 1:
                     div_list[0].click()
+                elif len(div_list) == 2:
+                    div_list[0].click()
                 else:
                     mostrar_mensagem('Mais de um sistema encontrado, verifique o nome do sistema no WHOOM e coloque um nome único na função')
+                    self.driver.quit()
                     raise ValueError('Mais de um sistema encontrado, verifique o nome')
 
+            try:
+                tools.find_element_with_wait(By.XPATH, '//input[@placeholder="Insira aqui o seu email"]',
+                                             timeout=1).click()
+                time.sleep(1)
+                self.codes_2_fac()
+                self.select_system()
+                return
+            except:
+                pass
 
             # Verifies if the system was opened
             for _ in range(30):

{bcpkgfox-0.17.7 → bcpkgfox-0.17.9}/bcpkgfox.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bcpkgfox
-Version: 0.17.7
+Version: 0.17.9
 Summary: Biblioteca BCFOX
 Home-page: https://github.com/robotsbcfox/PacotePythonBCFOX
 Author: BCFOX

{bcpkgfox-0.17.7 → bcpkgfox-0.17.9}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="bcpkgfox",
-    version="0.17.7",
+    version="0.17.9",
     author="BCFOX",
     author_email="bcfox@bcfox.com.br",
     description="Biblioteca BCFOX",