bcpkgfox 0.17.3__tar.gz → 0.17.5__tar.gz

{bcpkgfox-0.17.3 → bcpkgfox-0.17.5}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.1
 Name: bcpkgfox
-Version: 0.17.3
+Version: 0.17.5
 Summary: Biblioteca BCFOX
 Home-page: https://github.com/robotsbcfox/PacotePythonBCFOX
 Author: Guilherme Neri
@@ -42,12 +42,3 @@ Requires-Dist: pymupdf; extra == "full"
 Requires-Dist: Pillow; extra == "full"
 Requires-Dist: psutil; extra == "full"
 Requires-Dist: pynput; extra == "full"
-Dynamic: author
-Dynamic: author-email
-Dynamic: classifier
-Dynamic: description-content-type
-Dynamic: home-page
-Dynamic: provides-extra
-Dynamic: requires-dist
-Dynamic: requires-python
-Dynamic: summary

{bcpkgfox-0.17.3 → bcpkgfox-0.17.5}/bcpkgfox/invoke_api.py

@@ -167,7 +167,7 @@ def invoke_api_proc_log(link, id_robo, token):
         "POST", link, json=payload, headers=headers)
     print(f"\n{responseinsert.json()}")
 
-def login_2fac(driver, certificate, system, token, code_timeout=60):
+def login_2fac(driver, certificate, system, token, code_timeout=10):
     import requests
     import pyautogui
     from . import mostrar_mensagem
@@ -332,9 +332,13 @@ def login_2fac(driver, certificate, system, token, code_timeout=60):
             self.driver.get('chrome-extension://lnidijeaekolpfeckelhkomndglcglhh/index.html')
 
         def codes_2_fac(self):
-
+            element_sistema = '//input[(contains(@placeholder,"selecione um sistema pra acessar") or contains(@name, "system")) and contains(@role, "combobox")]'
+            element_email = '//input[contains(@placeholder,"Insira aqui o seu email") or contains(@placeholder,"e-mail")]'
+            email = 'eliezer@bcfox.com.br'
+            element_code = '//input[contains(@placeholder,"Digite aqui o código que enviamos para o seu e-mail") or contains(@placeholder,"código") or contains(@type,"password")]'
+            element_submit ='//button[contains(@type, "submit")]'
             try:
-                tools.find_element_with_wait(By.XPATH, '//input[@placeholder="Digite ou selecione um sistema pra acessar"]', timeout=2).send_keys(self.system)
+                tools.find_element_with_wait(By.XPATH, f'{element_sistema}', timeout=2).send_keys(self.system)
                 code_insertion = True
 
             except:
@@ -342,9 +346,9 @@ def login_2fac(driver, certificate, system, token, code_timeout=60):
 
                 # Request the code
                 for _ in range(50):  # Wait the extension to load
-
+                    time.sleep(1)
                     try:
-                        tools.find_element_with_wait(By.XPATH, '//input[@placeholder="Insira aqui o seu email"]', timeout=1).send_keys('eliezer@bcfox.com.br')
+                        tools.find_element_with_wait(By.XPATH, f'{element_email}', timeout=1).send_keys(f'{email}')
                         time.sleep(1)
                         break
                     except:
@@ -353,136 +357,145 @@ def login_2fac(driver, certificate, system, token, code_timeout=60):
                 # Envia o código pro email, o for é só para tratativa de bugs
                 for _ in range(10):
                     try:
-                        tools.find_element_with_wait(By.XPATH, '//input[@placeholder="Digite aqui o código que enviamos para o seu e-mail"]', timeout=1)
+                        tools.find_element_with_wait(By.XPATH, f'{element_code}', timeout=1)
                         break
 
                     except:
                         try:
-                            element = tools.find_element_with_wait(By.XPATH, '//input[@placeholder="Insira aqui o seu email"]', timeout=1)
+                            element = tools.find_element_with_wait(By.XPATH, f'{element_email}', timeout=1)
                             element.clear()
-                            element.send_keys('eliezer@bcfox.com.br')
-                            tools.find_element_with_wait(By.XPATH, '//button').click()
+                            element.send_keys(f'{email}')
+                            tools.find_element_with_wait(By.XPATH, f'{element_submit}').click()
                             time.sleep(1)
                         except:
                             break
 
                 # Attempts the new codes until success or requests limit
                 for _ in range(code_timeout):
-                    responses = api.invoke_get_codes()
-
-                    # Try new codes
-                    code_insertion = False
-                    for response in responses:
-
-                        CODE = response['CODIGO']
-                        ID = response['ID']
-
-                        element = tools.find_element_with_wait(By.XPATH, '//input[@type="password"]')
-                        element.clear()
-                        element.send_keys(CODE)
-
-                        for _ in range(10):
-                            try:
-                                tools.find_element_with_wait(By.XPATH, '//div/div[2]/button', timeout=2).click()
-                                time.sleep(1)
-                            except:
-                                break
-
-                        # Check the code result
-                        for _ in range(30):
-
-                            # Correct
-                            try:
-                                # input('\n\n > Selecione o sistema e aperte alguma tecla.')
-                                tools.find_element_with_wait(By.XPATH, '//input[@placeholder="Digite ou selecione um sistema pra acessar"]', timeout=1).send_keys(self.system)
-                                api.invoke_update_status(ID)  #FIX: Update
-                                code_insertion = True
-                                break
-
-                            except:
-                                pass
+                    def adicionar_code():
+                        responses = api.invoke_get_codes()
+                        if not responses:
+                            time.sleep(2)
+                            return [], None
+                        # Try new codes
+                        code_insertion = False
+                        for response in responses:
+                            time.sleep(1)
 
-                            # Wrong
-                            try:
-                                tools.find_element_with_wait(By.XPATH, "//span[contains(text(), 'Senha inválida')]", timeout=1)
-                                tools.find_element_with_wait(By.XPATH, "//button[text()='Voltar']", timeout=1).click()
-                                code_insertion = False
+                            if 'Escolha um certificado' in self.driver.page_source:
                                 break
 
-                            except:
-                                pass
+                            CODE = response['CODIGO']
+                            ID = response['ID']
 
-                    # If the 'new_response' loop succeeds immediately
-                    if not responses:
-                        time.sleep(1)
-
-                    if code_insertion:
+                            element = tools.find_element_with_wait(By.XPATH, '//input[@type="password"]')
+                            element.clear()
+                            element.send_keys(CODE)
+                            button_entrar_click = False
+                            for _ in range(20):
+                                try:
+                                    button = tools.find_element_with_wait(By.XPATH, f'{element_submit}', timeout=2)
+                                    if button.get_attribute('disabled'):
+                                        time.sleep(1.5)
+                                        continue
+                                    button.click()
+                                    button_entrar_click = True
+                                    if 'Escolha um certificado' in self.driver.page_source:
+                                        break
+
+                                    time.sleep(1)
+                                except:
+                                    break
+
+                                if int(_) == 20 and button_entrar_click == False:
+                                    raise TimeoutError('Código Whom falhou ao entrar')
+
+                            return responses, ID
+
+                    responses, ID = adicionar_code()
+
+                    if 'Sair' in self.driver.page_source and not 'Verifique seu e-mail' in self.driver.page_source:
+                        api.invoke_update_status(ID)  # FIX: Update
                         break
 
-            if not(code_insertion):
-                raise TimeoutError('Código WHOOM não chegou dentro do timeout estabelecido')
-
-            # Selects the system to access
-            lines = tools.find_elements_with_wait(By.XPATH, '//div[@role="menu"]//div[@role="menuitem"]')
+                    if 'Verifique seu e-mail':
+                        responses,ID = adicionar_code()
 
-            finded = False
-            div_list = []
-
-            # This loop extract the lines with the system name
-            for line in lines:
+                    for _ in range(60):
+                        if not(responses):
+                            responses,ID  = adicionar_code()
+                            time.sleep(1)
+                        else:
+                            break
 
-                titulo_element = line.find_elements(By.XPATH, './span[*[name()="svg"]]')
+                    if not (responses):
+                        raise TimeoutError('Código WHOOM não chegou dentro do timeout estabelecido')
+                        # Wrong
 
-                if not titulo_element and not finded:
-                    continue
+                    try:
+                        tools.find_element_with_wait(By.XPATH, "//span[contains(text(), 'Senha inválida')]",
+                                                     timeout=1)
+                        tools.find_element_with_wait(By.XPATH, "//button[text()='Voltar']", timeout=1).click()
+                        code_insertion = False
+                        break
 
-                elif titulo_element and not finded:
-                    titulo_text = line.find_element(By.XPATH, './span').text
-                    if self.certificate.lower().strip() in titulo_text.lower().strip():
-                        finded = True
-                        continue
+                    except:
+                        pass
 
-                elif not titulo_element and finded:
-                    div_list.append(line)
+                    if 'Sair' in self.driver.page_source and not 'Verifique seu e-mail' in self.driver.page_source:
+                        api.invoke_update_status(ID)  # FIX: Update
+                        break
 
-                elif titulo_element and finded:
-                    break
+                code_insertion = False
+                # Check the code result
+                for _ in range(30):
+                    if code_insertion:
+                        break
+                    # Correct
+                    try:
+                        tools.find_element_with_wait(By.XPATH,"//input[(contains(@name,'certificate') or contains(@placeholder,'certificado')) and not(contains(@type, 'hidden'))]", timeout=1).send_keys(self.certificate)
+                        list_certific = tools.find_elements_with_wait(By.XPATH,'//div[contains(@role,"option")]')
+                        list_certific[0].click()
+                        time.sleep(1)
+                        code_insertion = True
+                        break
+                    except:
+                        pass
 
-            if not div_list:
-                mostrar_mensagem('Não conseguiu achar o sistema no certificado')
-                raise ValueError('Não conseguiu achar o sistema no certificado')
+                time.sleep(4)
+                code_insertion = False
+                for _ in range(30):
+                    try:
+                        # input('\n\n > Selecione o sistema e aperte alguma tecla.')
+                        tools.find_element_with_wait(By.XPATH, f'{element_sistema}', timeout=1).send_keys(self.system)
+                        time.sleep(1)
+                        list_sistemas = tools.find_elements_with_wait(By.XPATH, '//div[contains(@role,"option")]')
+                        if len(list_sistemas) == 1:
+                            list_sistemas[0].click()
+                            code_insertion = True
+                            break
+                        else:
+                            mostrar_mensagem(
+                                'Mais de um sistema encontrado, verifique o nome do sistema no WHOOM e coloque um nome único na função')
+                            raise ValueError('Mais de um sistema encontrado, verifique o nome')
+                    except:
+                        pass
 
-            if len(div_list) == 1:
-                div_list[0].click()
+                    if code_insertion:
+                        break
 
-            # Just do this loop if there are more than one system
+            if code_insertion:
+                tools.find_element_with_wait(By.XPATH, f"//button[contains(@data-testid,'submit') or contains(text(), 'Acessar')]").click()
+                print('Logado')
             else:
-                for div in div_list:
-                    div_text = div.find_element(By.XPATH, './span').text
-                    if self.system.lower().strip() not in div_text.lower().strip():
-                        div_list.remove(div)
-
-                if len(div_list) == 1:
-                    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')
-                    raise ValueError('Mais de um sistema encontrado, verifique o nome')
-
-            # Verifies if the system was opened
-            for _ in range(30):
-                time.sleep(1)
-                if len(self.driver.window_handles) == 1:
-                    try:
-                        tools.find_element_with_wait(By.XPATH, "//button[text()='Acessar']", timeout=1).click()
-                    except:
-                        time.sleep(1)
-                else:
-                    time.sleep(3)
-                    break
+                raise TimeoutError('Código WHOOM não chegou dentro do timeout estabelecido')
 
+            time.sleep(2)
             self.driver.switch_to.window(self.driver.window_handles[-1])
             attempt = 0
             while 'whoom' in self.driver.title.strip().lower() and attempt <= 180:
+                if 'Sistema temporariamente indisponível. Tente novamente mais tarde.' in self.driver.page_source:
+                    raise SystemError('Sistema indisponivel no momento.')
                 time.sleep(1)
                 attempt += 1
             time.sleep(5)

{bcpkgfox-0.17.3 → bcpkgfox-0.17.5}/bcpkgfox.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.1
 Name: bcpkgfox
-Version: 0.17.3
+Version: 0.17.5
 Summary: Biblioteca BCFOX
 Home-page: https://github.com/robotsbcfox/PacotePythonBCFOX
 Author: Guilherme Neri
@@ -42,12 +42,3 @@ Requires-Dist: pymupdf; extra == "full"
 Requires-Dist: Pillow; extra == "full"
 Requires-Dist: psutil; extra == "full"
 Requires-Dist: pynput; extra == "full"
-Dynamic: author
-Dynamic: author-email
-Dynamic: classifier
-Dynamic: description-content-type
-Dynamic: home-page
-Dynamic: provides-extra
-Dynamic: requires-dist
-Dynamic: requires-python
-Dynamic: summary

{bcpkgfox-0.17.3 → bcpkgfox-0.17.5}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="bcpkgfox",
-    version="0.17.3",
+    version="0.17.5",
     author="Guilherme Neri",
     author_email="guilherme.neri@bcfox.com.br",
     description="Biblioteca BCFOX",