aas-http-client 0.4.4__tar.gz → 0.4.6__tar.gz

{aas_http_client-0.4.4 → aas_http_client-0.4.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aas-http-client
-Version: 0.4.4
+Version: 0.4.6
 Summary: Generic python HTTP client for communication with various types of AAS servers
 Author-email: Daniel Klein <daniel.klein@em.ag>
 License: # :em engineering methods AG Software License

{aas_http_client-0.4.4 → aas_http_client-0.4.6}/aas_http_client/client.py

@@ -62,7 +62,8 @@ def log_response_errors(response: Response):  # noqa: C901
             result_error_messages.append(response.text)
 
     except json.JSONDecodeError:
-        result_error_messages.append(response.content)
+        if response.content and response.content != "b''":
+            result_error_messages.append(response.content)
 
     logger.error(f"Status code: {response.status_code}")
     for result_error_message in result_error_messages:
@@ -159,7 +160,7 @@ class AasHttpClient(BaseModel):
             )
 
         if token:
-            self._session.headers.update({self.service_provider_auth.auth_header_name: f"Bearer {token}"})
+            self._session.headers.update({self.service_provider_auth.header_name: f"Bearer {token}"})
 
     # region shells
 
@@ -729,14 +730,7 @@ def get_token_by_basic_auth(endpoint: str, username: str, password: str, timeout
 
     auth = HTTPBasicAuth(username, password)
 
-    try:
-        response = requests.post(endpoint, auth=auth, data=data, timeout=timeout)
-        logger.info(f"Request URL: {response.url}")
-        response.raise_for_status()
-        return response.json().get("access_token")
-    except requests.RequestException as e:
-        logger.error(f"Error getting token: {e}")
-        return None
+    return _get_token(endpoint, data, auth, timeout)
 
 
 def get_token_by_password(endpoint: str, username: str, password: str, timeout=200) -> dict | None:
@@ -750,10 +744,10 @@ def get_token_by_password(endpoint: str, username: str, password: str, timeout=2
     """
     data = {"grant_type": "password", "username": username, "password": password}
 
-    return _get_token(endpoint, data, timeout)
+    return _get_token(endpoint, data, None, timeout)
 
 
-def _get_token(endpoint: str, data: dict[str, str], timeout: int = 200) -> dict | None:
+def _get_token(endpoint: str, data: dict[str, str], auth: HTTPBasicAuth | None = None, timeout: int = 200) -> dict | None:
     """Get token from a specific authentication service provider.
 
     :param endpoint: Get token endpoint for the authentication service provider
@@ -762,13 +756,20 @@ def _get_token(endpoint: str, data: dict[str, str], timeout: int = 200) -> dict
     :return: Access token or None if an error occurred
     """
     try:
-        response = requests.post(endpoint, json=data, timeout=timeout)
-        logger.info(f"Request URL: {response.url}")
-        response.raise_for_status()
-        return response.json().get("access_token")
-    except requests.RequestException as e:
-        logger.error(f"Error getting token: {e}")
-        return None
+        response = requests.post(endpoint, auth=auth, data=data, timeout=timeout)
+        logger.debug(f"Call REST API url '{response.url}'")
+
+        if response.status_code != STATUS_CODE_200:
+            log_response_errors(response)
+            return None
+
+    except requests.exceptions.RequestException as e:
+        logger.error(f"Error call REST API: {e}")
+        return False
+
+    content = response.content.decode("utf-8")
+    data = json.loads(content)
+    return data.get("access_token", None)
 
 
 def create_client_by_url(

{aas_http_client-0.4.4 → aas_http_client-0.4.6}/aas_http_client.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aas-http-client
-Version: 0.4.4
+Version: 0.4.6
 Summary: Generic python HTTP client for communication with various types of AAS servers
 Author-email: Daniel Klein <daniel.klein@em.ag>
 License: # :em engineering methods AG Software License

{aas_http_client-0.4.4 → aas_http_client-0.4.6}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "aas-http-client"
-version = "0.4.4"
+version = "0.4.6"
 description = "Generic python HTTP client for communication with various types of AAS servers"
 readme = "README.md"
 license = { file = "LICENSE" }