certapi 0.4.6__tar.gz → 0.4.7__tar.gz

{certapi-0.4.6/src/certapi.egg-info → certapi-0.4.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: certapi
-Version: 0.4.6
+Version: 0.4.7
 Summary: Python Package for managing keys, request SSL certificates from ACME.
 Home-page: https://github.com/mesudip/certapi
 Author: Sudip Bhattarai
@@ -26,27 +26,21 @@ You can install CertApi using pip
 pip install certapi
 ```
 
-## Use Low level API
+## Example: Obtain Certificate with Cloudflare
 
 ```python
 import json
-import os
-from certapi import FileSystemKeyStore, CertApiException, CloudflareChallengeSolver, AcmeCertManager, AcmeCertIssuer
+from certapi import CertApiException, CloudflareChallengeSolver, Key, AcmeCertIssuer
 
 
-# Initialize the key store and create acme account key
-key_store = FileSystemKeyStore("data")
-
-acme_key = key_store._get_or_generate_key("acme_account", "rsa")[0]
-
 # Initialize the Cloudflare challenge solver
 # The API key is read from the CLOUDFLARE_API_KEY environment variable, or you can set it below.
 challenge_solver = CloudflareChallengeSolver(api_key=None)
 
-## initialize cert issuer
-cert_issuer = AcmeCertIssuer(acme_key, challenge_solver)
+## initialize cert issuer with a new account key
+cert_issuer = AcmeCertIssuer(Key.generate('rsa'), challenge_solver)
 
-# Setup ACME account.
+# Preform setup i.e. fetching directory and registering ACME account
 cert_issuer.setup()
 
 try:
@@ -61,3 +55,9 @@ except CertApiException as e:
     print(f"An error occurred:", json.dumps(e.json_obj(), indent=2))
 
 ```
+
+
+## Example: Use High Leve API
+
+```
+```

{certapi-0.4.6 → certapi-0.4.7}/README.md

@@ -13,27 +13,21 @@ You can install CertApi using pip
 pip install certapi
 ```
 
-## Use Low level API
+## Example: Obtain Certificate with Cloudflare
 
 ```python
 import json
-import os
-from certapi import FileSystemKeyStore, CertApiException, CloudflareChallengeSolver, AcmeCertManager, AcmeCertIssuer
+from certapi import CertApiException, CloudflareChallengeSolver, Key, AcmeCertIssuer
 
 
-# Initialize the key store and create acme account key
-key_store = FileSystemKeyStore("data")
-
-acme_key = key_store._get_or_generate_key("acme_account", "rsa")[0]
-
 # Initialize the Cloudflare challenge solver
 # The API key is read from the CLOUDFLARE_API_KEY environment variable, or you can set it below.
 challenge_solver = CloudflareChallengeSolver(api_key=None)
 
-## initialize cert issuer
-cert_issuer = AcmeCertIssuer(acme_key, challenge_solver)
+## initialize cert issuer with a new account key
+cert_issuer = AcmeCertIssuer(Key.generate('rsa'), challenge_solver)
 
-# Setup ACME account.
+# Preform setup i.e. fetching directory and registering ACME account
 cert_issuer.setup()
 
 try:
@@ -48,3 +42,9 @@ except CertApiException as e:
     print(f"An error occurred:", json.dumps(e.json_obj(), indent=2))
 
 ```
+
+
+## Example: Use High Leve API
+
+```
+```

{certapi-0.4.6 → certapi-0.4.7}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="certapi",
-    version="0.4.6",
+    version="0.4.7",
     packages=find_packages(where="src"),
     package_dir={"": "src"},
     install_requires=[

{certapi-0.4.6 → certapi-0.4.7}/src/certapi/__init__.py

@@ -1,4 +1,4 @@
-from .acme.Acme import Acme, Order, AcmeNetworkError, AcmeHttpError, Challenge
+from .acme.Acme import Acme, Order, AcmeNetworkError, AcmeHttpError,AcmeError, Challenge
 from .manager.acme_cert_manager import AcmeCertManager
 from .http.types import CertificateResponse, IssuedCert
 from .errors import CertApiException

{certapi-0.4.6 → certapi-0.4.7}/src/certapi/acme/Acme.py

@@ -29,7 +29,6 @@ class Acme:
         # json web key format for public key
         self.jwk = account_key.jwk()
         self.alg_name = account_key.algorithm_name()
-        print(self.jwk)
         self.nonce = []
         self.acme_url = url if url else os.environ.get("ACME_API_URL", self.URL_STAGING)
         self.key_id = None

{certapi-0.4.6 → certapi-0.4.7}/src/certapi/challenge_solver/dns/cloudflare/cloudflare_challenge_solver.py

@@ -33,7 +33,7 @@ class CloudflareChallengeSolver(ChallengeSolver):
 
         record_id = self.cloudflare.create_record(name=key, data=value, domain=domain)
         self.challenges_map[key] = record_id
-        print(f"CloudflareChallengeSolver[{domain}]: Added Record {key}")
+        print(f"CloudflareChallengeSolver [ {domain} ]: Added Record {key}")
 
     def get_challenge(self, key: str, domain: str) -> str:
         if domain is None:

{certapi-0.4.6 → certapi-0.4.7/src/certapi.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: certapi
-Version: 0.4.6
+Version: 0.4.7
 Summary: Python Package for managing keys, request SSL certificates from ACME.
 Home-page: https://github.com/mesudip/certapi
 Author: Sudip Bhattarai
@@ -26,27 +26,21 @@ You can install CertApi using pip
 pip install certapi
 ```
 
-## Use Low level API
+## Example: Obtain Certificate with Cloudflare
 
 ```python
 import json
-import os
-from certapi import FileSystemKeyStore, CertApiException, CloudflareChallengeSolver, AcmeCertManager, AcmeCertIssuer
+from certapi import CertApiException, CloudflareChallengeSolver, Key, AcmeCertIssuer
 
 
-# Initialize the key store and create acme account key
-key_store = FileSystemKeyStore("data")
-
-acme_key = key_store._get_or_generate_key("acme_account", "rsa")[0]
-
 # Initialize the Cloudflare challenge solver
 # The API key is read from the CLOUDFLARE_API_KEY environment variable, or you can set it below.
 challenge_solver = CloudflareChallengeSolver(api_key=None)
 
-## initialize cert issuer
-cert_issuer = AcmeCertIssuer(acme_key, challenge_solver)
+## initialize cert issuer with a new account key
+cert_issuer = AcmeCertIssuer(Key.generate('rsa'), challenge_solver)
 
-# Setup ACME account.
+# Preform setup i.e. fetching directory and registering ACME account
 cert_issuer.setup()
 
 try:
@@ -61,3 +55,9 @@ except CertApiException as e:
     print(f"An error occurred:", json.dumps(e.json_obj(), indent=2))
 
 ```
+
+
+## Example: Use High Leve API
+
+```
+```