adds better bath handling

Author: jajeffries

netboxlabs/diode/sdk/client.py

@@ -113,7 +113,6 @@ def __init__(
         self._client_id = _get_required_config_value(_CLIENT_ID_ENVVAR_NAME, client_id)
         self._client_secret = _get_required_config_value(_CLIENT_SECRET_ENVVAR_NAME, client_secret)
 
-
         self._metadata = (
             ("platform", self._platform),
             ("python-version", self._python_version),
@@ -289,7 +288,7 @@ def authenticate(self) -> str:
                 "client_secret": self._client_secret,
             }
         )
-        url = f"{self._path}/auth/token" if self._path and self._path != "/" else "/auth/token"
+        url = self._get_auth_url()
         conn.request("POST", url, data, headers)
         response = conn.getresponse()
         if response.status != 200:
@@ -302,6 +301,12 @@ def authenticate(self) -> str:
         _LOGGER.debug(f"Access token obtained for client {self._client_id}")
         return access_token
 
+    def _get_auth_url(self) -> str:
+        """Construct the authentication URL, handling trailing slashes in the path."""
+        # Ensure the path does not have trailing slashes
+        path = self._path.rstrip('/') if self._path else ''
+        return f"{path}/auth/token"
+
 
 class _ClientCallDetails(
     collections.namedtuple(

tests/test_client.py

@@ -588,7 +588,14 @@ def test_diode_authentication_failure(mock_diode_authentication):
             auth.authenticate()
         assert "Failed to obtain access token" in str(excinfo.value)
 
-@pytest.mark.parametrize("path", ["/diode", "", None])
+@pytest.mark.parametrize("path", [
+    "/diode",
+    "",
+    None,
+    "/diode/",
+    "diode",
+    "diode/",
+    ])
 def test_diode_authentication_url_with_path(mock_diode_authentication, path):
     """Test that the authentication URL is correctly formatted with a path."""
     auth = _DiodeAuthentication(
@@ -603,5 +610,5 @@ def test_diode_authentication_url_with_path(mock_diode_authentication, path):
         mock_conn_instance.getresponse.return_value.status = 200
         mock_conn_instance.getresponse.return_value.read.return_value = json.dumps({"access_token": "mocked_token"}).encode()
         auth.authenticate()
-        mock_conn_instance.request.assert_called_once_with("POST", f"{path or ''}/auth/token", mock.ANY, mock.ANY)
+        mock_conn_instance.request.assert_called_once_with("POST", f"{(path or '').rstrip('/')}/auth/token", mock.ANY, mock.ANY)