Refactor getTokenCert.py to remove redundant code

getTokenCert.py

@@ -55,7 +55,6 @@ def finalize_order(client, order, deadline):
         data = client.poll_and_finalize(order, deadline=deadline)
         return data
     except Exception as e:
-        data = client.poll_and_finalize(order, deadline=deadline)
         print(f"Error finalizing order: {e}")
         return None
 

main.py

@@ -127,14 +127,14 @@ def main(i_domains, wildcard, email, ca_server, key_type, key_size=None, key_cur
             cf_non_wildcard(verification_tokens, email, exchange)
     except Exception as e:
         print(f"Error adding TXT records: {e}")
-    for i in range(30):
+    for i in range(10):
         print(f"Waiting for {30-i} seconds", end="\r")
         time.sleep(1)
     retries = 0
     while not verify_txt_records(verification_tokens, exchange):
         print("TXT records not verified yet")
         retries = retries+1
-        if retries >=50:
+        if retries >=3:
             break
         time.sleep(5)
     cert = verify_tokens(pgk_client, challs, order)
@@ -145,9 +145,14 @@ def main(i_domains, wildcard, email, ca_server, key_type, key_size=None, key_cur
             print("TXT records deleted successfully")
         except Exception as e:
             print(f"Error deleting TXT records or no TXT records exist: {e}")
-    private_key = private_key.decode("utf-8")
-    csr = csr.decode("utf-8")
-    cert = cert.decode("utf-8")
+    try:
+        private_key = private_key.decode("utf-8")
+        csr = csr.decode("utf-8")
+        cert = cert.decode("utf-8")
+    except Exception as e:
+        private_key = "Failed to obtain private key"
+        csr = "Failed to obtain CSR"
+        cert = "Failed to obtain certificate"
     generation_details = f"""
     SSL Certificate for {i_domains} were generated successfully, using Project Gatekeeper, a free SSL Certificate creator tool.
     SSL Provider = {ca_server}
@@ -164,8 +169,8 @@ def main(i_domains, wildcard, email, ca_server, key_type, key_size=None, key_cur
     return private_key, csr, cert, email_status
 
 if __name__ == "__main__":
-    DOMAINS = 'thenayankasturi.eu.org'    
-    ca_server = "Google" #Let's Encrypt (Testing), Let's Encrypt, Google (Testing), Google, Buypass (Testing), Buypass, ZeroSSL, SSL.com
+    DOMAINS = 'nayankasturi.eu.org'    
+    ca_server = "Let's Encrypt (Testing)" #Let's Encrypt (Testing), Let's Encrypt, Google (Testing), Google, Buypass (Testing), Buypass, ZeroSSL, SSL.com
     EMAIL = "[email protected]"
     key_type = "ecc"
     key_curve = "ec384"