apply feedback

minvws · Dec 4, 2024 · f986e45 · f986e45
1 parent 4af7331
commit f986e45
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 15 deletions.
diff --git a/app/acme.py b/app/acme.py
@@ -57,7 +57,7 @@ def get_nonce(self):
         as with all updates, as every request answers with a new nonce.
         """
         response = requests.get(
-            self._directory_configuration.new_nonce_url.geturl(),
+            self._directory_configuration.new_nonce_url,
             timeout=60,
         )
         self.nonce = response.headers["Replay-Nonce"]
@@ -74,7 +74,7 @@ def account_request(self, request):
         protected = {
             "alg": "ES256",
             "nonce": self.nonce,
-            "url": self._directory_configuration.new_account_url.geturl(),
+            "url": self._directory_configuration.new_account_url,
             "jwk": self.key.export_public(True),
         }
         token = jwt.JWS(payload=json.dumps(request))
@@ -83,7 +83,7 @@ def account_request(self, request):
         headers = {"Content-Type": "application/jose+json"}
 
         response = requests.post(
-            self._directory_configuration.new_account_url.geturl(),
+            self._directory_configuration.new_account_url,
             data=token.serialize(),
             headers=headers,
             timeout=60,
@@ -103,7 +103,7 @@ def create_order(self, keynum, order):
         """
         print("Order")
 
-        new_order_url = self._directory_configuration.new_order_url.geturl()
+        new_order_url = self._directory_configuration.new_order_url
 
         protected = {
             "alg": "ES256",

diff --git a/app/acme_directory_configuration.py b/app/acme_directory_configuration.py
@@ -1,5 +1,4 @@
 from dataclasses import dataclass
-from urllib.parse import ParseResult as URLParseResult
 
 
 @dataclass
@@ -8,7 +7,7 @@ class ACMEDirectoryConfiguration:
     This data is generated from the directory endpoint. These endpoints can be different per server.
     """
 
-    new_order_url: URLParseResult
-    new_account_url: URLParseResult
-    new_nonce_url: URLParseResult
-    revoke_cert_url: URLParseResult
+    new_order_url: str
+    new_account_url: str
+    new_nonce_url: str
+    revoke_cert_url: str
diff --git a/app/acme_directory_configuration_parser.py b/app/acme_directory_configuration_parser.py
@@ -7,16 +7,16 @@
 
 class ACMEDirectoryConfigurationParser:
     def _build_conf_from_json(self, json: dict[str, Any]) -> ACMEDirectoryConfiguration:
-        new_nonce_url = urlparse(
+        new_nonce_url = str(
             json["newNonce"],
         )
-        new_account_url = urlparse(
+        new_account_url = str(
             json["newAccount"],
         )
-        new_order_url = urlparse(
+        new_order_url = str(
             json["newOrder"],
         )
-        revoke_cert_url = urlparse(
+        revoke_cert_url = str(
             json["revokeCert"],
         )
         conf = ACMEDirectoryConfiguration(

diff --git a/tests/test_acme_url_configuration_parser.py b/tests/test_acme_url_configuration_parser.py
@@ -22,11 +22,11 @@
 )
 def test_url_parse(request_get_mock: MagicMock):
     base_url = urlparse("http://localhost:9090/")
-    expected_request_url = urljoin(base_url.geturl(), "acme/directory")
+    expected_request_url = urljoin(base_url.geturl(), "/directory")
 
     result: ACMEDirectoryConfiguration = ACMEDirectoryConfigurationParser().parse(
         base_url
     )
 
-    assert result.new_nonce_url.geturl() == "123"
+    assert result.new_nonce_url == "123"
     request_get_mock.assert_called_with(expected_request_url)