fix delete method

Author: giancarloromeo

packages/service-library/src/servicelib/rabbitmq/rpc_interfaces/webserver/auth/api_keys.py

@@ -52,18 +52,18 @@ async def get_api_key(
 
 
 @log_decorator(_logger, level=logging.DEBUG)
-async def delete_api_key(
+async def delete_api_key_by_key(
     rabbitmq_rpc_client: RabbitMQRPCClient,
     *,
     user_id: UserID,
     product_name: str,
-    api_key_id: IDStr,
+    api_key: str,
 ) -> None:
     result = await rabbitmq_rpc_client.request(
         WEBSERVER_RPC_NAMESPACE,
-        TypeAdapter(RPCMethodName).validate_python("delete_api_key"),
+        TypeAdapter(RPCMethodName).validate_python("delete_api_key_by_key"),
         user_id=user_id,
         product_name=product_name,
-        api_key_id=api_key_id,
+        api_key=api_key,
     )
     assert result is None  # nosec

services/web/server/tests/unit/with_dbs/01/test_api_keys_rpc.py

@@ -8,6 +8,7 @@
 import pytest
 from aiohttp.test_utils import TestServer
 from faker import Faker
+from models_library.basic_types import IDStr
 from models_library.products import ProductName
 from models_library.rpc.webserver.auth.api_keys import ApiKeyCreate
 from pytest_mock import MockerFixture
@@ -17,7 +18,7 @@
 from servicelib.rabbitmq import RabbitMQRPCClient
 from servicelib.rabbitmq.rpc_interfaces.webserver.auth.api_keys import (
     create_api_key,
-    delete_api_key,
+    delete_api_key_by_key,
     get_api_key,
 )
 from settings_library.rabbit import RabbitSettings
@@ -114,7 +115,7 @@ async def test_get_api_key(
             rpc_client,
             user_id=logged_user["id"],
             product_name=osparc_product_name,
-            api_key_id=api_key.id,
+            api_key_id=IDStr(api_key.id),
         )
         assert result.id == api_key.id
 
@@ -147,14 +148,16 @@ async def test_api_keys_workflow(
     assert queried_api_key.display_name == key_name
 
     assert created_api_key.id == queried_api_key.id
+    assert created_api_key.api_key
+    assert created_api_key.api_key == queried_api_key.api_key
     assert created_api_key.display_name == queried_api_key.display_name
 
     # remove the key
-    await delete_api_key(
+    await delete_api_key_by_key(
         rpc_client,
         user_id=logged_user["id"],
         product_name=osparc_product_name,
-        api_key_id=created_api_key.id,
+        api_key=created_api_key.api_key,
     )
 
     with pytest.raises(ApiKeyNotFoundError):