feat: Update access token to api token (#61)

* chore: update package

* chore: update package

* fix: testing async ... loop issues

* test: update datatype by lowerbound and upperbound tests

* fix: testing

Author: atstaeff

eventsourcingdb/client.py

@@ -27,13 +27,13 @@ class Client(AbstractBaseClient):
     def __init__(
         self,
         base_url: str,
-        access_token: str,
+        api_token: str,
         options: ClientOptions = ClientOptions()
     ):
         configuration = ClientConfiguration(
             base_url=base_url,
             timeout_seconds=options.timeout_seconds,
-            access_token=access_token,
+            api_token=api_token,
             protocol_version=options.protocol_version,
             max_tries=options.max_tries
         )

eventsourcingdb/client_configuration.py

@@ -5,6 +5,6 @@
 class ClientConfiguration:
     base_url: str
     timeout_seconds: int
-    access_token: str
+    api_token: str
     protocol_version: str
     max_tries: int

eventsourcingdb/handlers/ping.py

@@ -29,10 +29,6 @@ async def ping(client: AbstractBaseClient) -> None:
     except json.JSONDecodeError as exc:
         raise ServerError(f"Received unexpected response: {response_body}") from exc
 
-    # Check if it's a JSON with status field
-    if isinstance(response_json, dict) and response_json.get("status") == STATUS_OK:
-        return
-
     # Check if it's a CloudEvent format (has specversion, type fields)
     if (
         isinstance(response_json, dict)

eventsourcingdb/handlers/read_events/read_events_options.py

@@ -12,8 +12,8 @@
 class ReadEventsOptions:
     recursive: bool
     order: Order | None = None
-    lower_bound: LowerBound | None = None  # Changed from str to LowerBound
-    upper_bound: UpperBound | None = None  # Changed from str to UpperBound
+    lower_bound: LowerBound | None = None
+    upper_bound: UpperBound | None = None
     from_latest_event: ReadFromLatestEvent | None = None
 
     def validate(self) -> None:

eventsourcingdb/http_client/http_client.py

@@ -115,7 +115,7 @@ async def __validate_response(
     def __get_post_request_headers(self) -> dict[str, str]:
         headers = {
             'X-EventSourcingDB-Protocol-Version': self.__client_configuration.protocol_version,
-            'Authorization': f'Bearer {self.__client_configuration.access_token}',
+            'Authorization': f'Bearer {self.__client_configuration.api_token}',
             'Content-Type': 'application/json'
         }
 
@@ -155,7 +155,7 @@ def __get_get_request_headers(self, with_authorization: bool) -> dict[str, str]:
         }
 
         if with_authorization:
-            headers['Authorization'] = f'Bearer {self.__client_configuration.access_token}'
+            headers['Authorization'] = f'Bearer {self.__client_configuration.api_token}'
 
         return headers
 

poetry.lock

@@ -15,7 +15,7 @@ packages = [{include = "eventsourcingdb"}]
 
 [tool.poetry.dependencies]
 python = "^3.13"
-aiohttp = "3.11.13"
+aiohttp = "3.11.16"
 
 [tool.poetry.group.dev.dependencies]
 pytest = "8.3.5"

pyproject.toml

@@ -1,2 +1,3 @@
 [pytest]
 timeout = 20
+asyncio_default_fixture_loop_scope = function

pytest.ini

@@ -26,14 +26,14 @@ async def create(
         cls,
         image: Image,
         command: [str],
-        access_token: str,
+        api_token: str,
         options: ClientOptions = ClientOptions(),
     ) -> 'ContainerizedTestingDatabase':
         command.extend(['--http-enabled', '--https-enabled=false'])
         container = image.run(command, True, True)
         exposed_port = container.get_exposed_port(3_000)
         base_url = f'http://127.0.0.1:{exposed_port}'
-        client = Client(base_url, access_token=access_token, options=options)
+        client = Client(base_url, api_token=api_token, options=options)
         await client.initialize()
 
         await client.ping()

tests/shared/containerized_testing_database.py

@@ -27,16 +27,16 @@ def __init__(
     async def create(cls) -> 'Database':
         image = Image('eventsourcingdb', 'latest')
 
-        access_token = str(uuid.uuid4())
+        api_token = str(uuid.uuid4())
         with_authorization = await ContainerizedTestingDatabase.create(
             image,
-            ['run', '--api-token', f'{access_token}', '--data-directory-temporary'],
-            access_token,
+            ['run', '--api-token', f'{api_token}', '--data-directory-temporary'],
+            api_token,
             ClientOptions()
         )
 
         with_invalid_url_client = Client(
-            base_url='http://localhost.invalid', access_token=access_token
+            base_url='http://localhost.invalid', api_token=api_token
         )
         await with_invalid_url_client.initialize()
         with_invalid_url = TestingDatabase(