Remove unnecessary import of http client.

wparad · wparad · commit a57cc2df12f6 · 2024-09-27T09:25:35.000+02:00
diff --git a/authress/api/access_records_api.py b/authress/api/access_records_api.py
@@ -37,7 +37,6 @@
 from authress.models.access_request_response import AccessRequestResponse
 from authress.models.claim_request import ClaimRequest
 
-from authress.http_client import HttpClient
 from authress.api_response import ApiResponse
 from authress.exceptions import (  # noqa: F401
     ApiTypeError,
@@ -53,8 +52,6 @@ class AccessRecordsApi(object):
     """
 
     def __init__(self, api_client=None):
-        if api_client is None:
-            api_client = HttpClient.get_default()
         self.api_client = api_client
 
     @validate_arguments
diff --git a/authress/api/accounts_api.py b/authress/api/accounts_api.py
@@ -37,7 +37,6 @@
 from authress.models.identity_collection import IdentityCollection
 from authress.models.identity_request import IdentityRequest
 
-from authress.http_client import HttpClient
 from authress.api_response import ApiResponse
 from authress.exceptions import (  # noqa: F401
     ApiTypeError,
@@ -53,8 +52,6 @@ class AccountsApi(object):
     """
 
     def __init__(self, api_client=None):
-        if api_client is None:
-            api_client = HttpClient.get_default()
         self.api_client = api_client
 
     @validate_arguments
diff --git a/authress/api/applications_api.py b/authress/api/applications_api.py
@@ -30,7 +30,6 @@
 
 from authress.models.application_delegation import ApplicationDelegation
 
-from authress.http_client import HttpClient
 from authress.api_response import ApiResponse
 from authress.exceptions import (  # noqa: F401
     ApiTypeError,
@@ -46,8 +45,6 @@ class ApplicationsApi(object):
     """
 
     def __init__(self, api_client=None):
-        if api_client is None:
-            api_client = HttpClient.get_default()
         self.api_client = api_client
 
     @validate_arguments
diff --git a/authress/api/connections_api.py b/authress/api/connections_api.py
@@ -32,7 +32,6 @@
 from authress.models.connection_collection import ConnectionCollection
 from authress.models.user_connection_credentials import UserConnectionCredentials
 
-from authress.http_client import HttpClient
 from authress.api_response import ApiResponse
 from authress.exceptions import (  # noqa: F401
     ApiTypeError,
@@ -48,8 +47,6 @@ class ConnectionsApi(object):
     """
 
     def __init__(self, api_client=None):
-        if api_client is None:
-            api_client = HttpClient.get_default()
         self.api_client = api_client
 
     @validate_arguments
diff --git a/authress/api/extensions_api.py b/authress/api/extensions_api.py
@@ -36,7 +36,6 @@
 from authress.models.o_auth_token_request import OAuthTokenRequest
 from authress.models.o_auth_token_response import OAuthTokenResponse
 
-from authress.http_client import HttpClient
 from authress.api_response import ApiResponse
 from authress.exceptions import (  # noqa: F401
     ApiTypeError,
@@ -52,8 +51,6 @@ class ExtensionsApi(object):
     """
 
     def __init__(self, api_client=None):
-        if api_client is None:
-            api_client = HttpClient.get_default()
         self.api_client = api_client
 
     @validate_arguments
diff --git a/authress/api/groups_api.py b/authress/api/groups_api.py
@@ -33,7 +33,6 @@
 from authress.models.group import Group
 from authress.models.group_collection import GroupCollection
 
-from authress.http_client import HttpClient
 from authress.api_response import ApiResponse
 from authress.exceptions import (  # noqa: F401
     ApiTypeError,
@@ -49,8 +48,6 @@ class GroupsApi(object):
     """
 
     def __init__(self, api_client=None):
-        if api_client is None:
-            api_client = HttpClient.get_default()
         self.api_client = api_client
 
     @validate_arguments
diff --git a/authress/api/invites_api.py b/authress/api/invites_api.py
@@ -31,7 +31,6 @@
 from authress.models.account import Account
 from authress.models.invite import Invite
 
-from authress.http_client import HttpClient
 from authress.api_response import ApiResponse
 from authress.exceptions import (  # noqa: F401
     ApiTypeError,
@@ -47,8 +46,6 @@ class InvitesApi(object):
     """
 
     def __init__(self, api_client=None):
-        if api_client is None:
-            api_client = HttpClient.get_default()
         self.api_client = api_client
 
     @validate_arguments
diff --git a/authress/api/resource_permissions_api.py b/authress/api/resource_permissions_api.py
@@ -34,7 +34,6 @@
 from authress.models.permissioned_resource_collection import PermissionedResourceCollection
 from authress.models.resource_users_collection import ResourceUsersCollection
 
-from authress.http_client import HttpClient
 from authress.api_response import ApiResponse
 from authress.exceptions import (  # noqa: F401
     ApiTypeError,
@@ -50,8 +49,6 @@ class ResourcePermissionsApi(object):
     """
 
     def __init__(self, api_client=None):
-        if api_client is None:
-            api_client = HttpClient.get_default()
         self.api_client = api_client
 
     @validate_arguments
diff --git a/authress/api/roles_api.py b/authress/api/roles_api.py
@@ -28,7 +28,6 @@
 from authress.models.role import Role
 from authress.models.role_collection import RoleCollection
 
-from authress.http_client import HttpClient
 from authress.api_response import ApiResponse
 from authress.exceptions import (  # noqa: F401
     ApiTypeError,
@@ -44,8 +43,6 @@ class RolesApi(object):
     """
 
     def __init__(self, api_client=None) -> None:
-        if api_client is None:
-            api_client = HttpClient.get_default()
         self.api_client = api_client
 
     @validate_arguments
diff --git a/authress/api/service_clients_api.py b/authress/api/service_clients_api.py
@@ -34,7 +34,6 @@
 from authress.models.client_access_key import ClientAccessKey
 from authress.models.client_collection import ClientCollection
 
-from authress.http_client import HttpClient
 from authress.api_response import ApiResponse
 from authress.exceptions import (  # noqa: F401
     ApiTypeError,
@@ -50,8 +49,6 @@ class ServiceClientsApi(object):
     """
 
     def __init__(self, api_client=None):
-        if api_client is None:
-            api_client = HttpClient.get_default()
         self.api_client = api_client
 
     @validate_arguments
diff --git a/authress/api/tenants_api.py b/authress/api/tenants_api.py
@@ -27,7 +27,6 @@
 from authress.models.tenant_collection import TenantCollection
 from authress.models.tenant_user import TenantUser
 
-from authress.http_client import HttpClient
 from authress.api_response import ApiResponse
 from authress.exceptions import (  # noqa: F401
     ApiTypeError,
@@ -43,8 +42,6 @@ class TenantsApi:
     """
 
     def __init__(self, api_client=None) -> None:
-        if api_client is None:
-            api_client = HttpClient.get_default()
         self.api_client = api_client
 
     @validate_arguments
diff --git a/authress/api/token_verifier.py b/authress/api/token_verifier.py
@@ -11,7 +11,11 @@
 from authress.utils import service_client_token_provider, PackageVersionProvider
 
 class TokenVerifier(object):
-  def __init__(self):
+  def __init__(self, http_client=None):
+    self.http_client = http_client
+    if http_client is None:
+      self.http_client = rest.RESTClientObject()
+
     self.keyMap = dict()
     self.package_version_provider = PackageVersionProvider()
 
@@ -72,14 +76,12 @@ def get_public_key(self, jwkKeyListUrl, kid):
       self.keyMap[hashKey] = self.get_key_uncached(jwkKeyListUrl, kid)
       return self.keyMap[hashKey]
 
-  def get_key_uncached(self, jwkKeyListUrl, kid):
-    rest_client = rest.RESTClientObject()
-    
+  def get_key_uncached(self, jwkKeyListUrl, kid):    
     version = self.package_version_provider.get_version()
     headers = {
       'User-Agent': f'Authress SDK; Python; {version};'
     }
-    result = rest_client.get_request(jwkKeyListUrl, headers=headers)
+    result = self.http_client.get_request_with_retries(jwkKeyListUrl, headers=headers)
 
     for index, key in enumerate(json.loads(result.data)['keys']):
       if key['kid'] == kid:
diff --git a/authress/api/user_permissions_api.py b/authress/api/user_permissions_api.py
@@ -34,7 +34,6 @@
 from authress.models.user_resources_collection import UserResourcesCollection
 from authress.models.user_role_collection import UserRoleCollection
 
-from authress.http_client import HttpClient
 from authress.api_response import ApiResponse
 from authress.exceptions import (  # noqa: F401
     ApiTypeError,
@@ -50,8 +49,6 @@ class UserPermissionsApi(object):
     """
 
     def __init__(self, api_client=None):
-        if api_client is None:
-            api_client = HttpClient.get_default()
         self.api_client = api_client
 
     @validate_arguments
diff --git a/authress/api/users_api.py b/authress/api/users_api.py
@@ -34,7 +34,6 @@
 from authress.models.user_identity import UserIdentity
 from authress.models.user_identity_collection import UserIdentityCollection
 
-from authress.http_client import HttpClient
 from authress.api_response import ApiResponse
 from authress.exceptions import (  # noqa: F401
     ApiTypeError,
@@ -50,8 +49,6 @@ class UsersApi(object):
     """
 
     def __init__(self, api_client=None):
-        if api_client is None:
-            api_client = HttpClient.get_default()
         self.api_client = api_client
 
     @validate_arguments
diff --git a/authress/authress_client.py b/authress/authress_client.py
@@ -23,11 +23,12 @@
 from authress.api import token_verifier
 
 class AuthressClient(object):
-    def __init__(self, authress_api_url=None, service_client_access_key=None):
+    def __init__(self, authress_api_url=None, service_client_access_key=None, user_agent=None):
         self._host = authress_api_url if authress_api_url.startswith('http') else f"https://{authress_api_url}"
         self._host = re.sub(r'/+$', '', self._host)
-        self._token_verifier = token_verifier.TokenVerifier()
-        self._http_client = HttpClient(host=self._host, access_key=service_client_access_key)
+        
+        self._http_client = HttpClient(host=self._host, access_key=service_client_access_key, user_agent=user_agent)
+        self._token_verifier = token_verifier.TokenVerifier(http_client=_http_client)
 
     def set_token(self, token: str):
         self._http_client.set_token(token)
diff --git a/authress/http_client.py b/authress/http_client.py
@@ -48,7 +48,7 @@ class HttpClient(object):
     }
     _pool = None
 
-    def __init__(self, host=None, access_key=None):
+    def __init__(self, host=None, access_key=None, user_agent=None):
         self.host = host if host is not None and host.startswith('http') else f"https://{host}"
         self.access_key = access_key
         self.pool_threads = 1
@@ -60,7 +60,7 @@ def __init__(self, host=None, access_key=None):
         self.service_client_token_provider = service_client_token_provider.ServiceClientTokenProvider(self.access_key, self.host)
         
         version = PackageVersionProvider().get_version()
-        self.default_headers['User-Agent'] = f'Authress SDK; Python; {version};'
+        self.default_headers['User-Agent'] = f'Authress SDK; Python; {version}; {user_agent or ""}'
 
     def set_token(self, token):
         self.default_headers['Authorization'] = f'Bearer {token.replace("Bearer", "").strip()}'
