Skip to content

Commit 5761e24

Browse files
fix rpc
1 parent 777a9d6 commit 5761e24

File tree

2 files changed

+12
-10
lines changed

2 files changed

+12
-10
lines changed

services/web/server/src/simcore_service_webserver/api_keys/_rpc.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
from models_library.products import ProductName
77
from models_library.users import UserID
88
from servicelib.rabbitmq import RPCRouter
9+
from simcore_service_webserver.api_keys.errors import ApiKeyNotFoundError
910

1011
from ..rabbitmq import get_rabbitmq_rpc_server
1112
from . import _api
@@ -39,7 +40,7 @@ async def delete_api_keys(
3940
)
4041

4142

42-
@router.expose()
43+
@router.expose(reraise_if_error_type=(ApiKeyNotFoundError,))
4344
async def api_key_get(
4445
app: web.Application,
4546
*,

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

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
from servicelib.rabbitmq import RabbitMQRPCClient
2222
from settings_library.rabbit import RabbitSettings
2323
from simcore_postgres_database.models.users import UserRole
24+
from simcore_service_webserver.api_keys.errors import ApiKeyNotFoundError
2425
from simcore_service_webserver.application_settings import ApplicationSettings
2526

2627
pytest_simcore_core_services_selection = [
@@ -156,12 +157,12 @@ async def test_api_keys_workflow(
156157
)
157158
assert delete_key_result is None
158159

159-
# key no longer present
160-
query_missing_query = await rpc_client.request(
161-
WEBSERVER_RPC_NAMESPACE,
162-
TypeAdapter(RPCMethodName).validate_python("api_key_get"),
163-
product_name=osparc_product_name,
164-
user_id=logged_user["id"],
165-
api_key_id=created_api_key.id_,
166-
)
167-
assert query_missing_query is None
160+
with pytest.raises(ApiKeyNotFoundError):
161+
# key no longer present
162+
await rpc_client.request(
163+
WEBSERVER_RPC_NAMESPACE,
164+
TypeAdapter(RPCMethodName).validate_python("api_key_get"),
165+
product_name=osparc_product_name,
166+
user_id=logged_user["id"],
167+
api_key_id=created_api_key.id_,
168+
)

0 commit comments

Comments
 (0)