uses client

Author: pcrespov

services/director-v2/src/simcore_service_director_v2/modules/osparc_variables/_api_auth_rpc.py

@@ -1,19 +1,15 @@
 from datetime import timedelta
 
 from fastapi import FastAPI
-from models_library.api_schemas_webserver import WEBSERVER_RPC_NAMESPACE
 from models_library.products import ProductName
-from models_library.rabbitmq_basic_types import RPCMethodName
-from models_library.rpc.webserver.auth.api_keys import ApiKeyGet
+from models_library.rpc.webserver.auth.api_keys import ApiKeyCreate, ApiKeyGet
 from models_library.users import UserID
-from pydantic import TypeAdapter
+from servicelib.rabbitmq.rpc_interfaces.webserver.auth import (
+    api_keys as webserver_auth_api_keys_rpc,
+)
 
 from ..rabbitmq import get_rabbitmq_rpc_client
 
-#
-# RPC interface
-#
-
 
 async def create_api_key(
     app: FastAPI,
@@ -24,15 +20,13 @@ async def create_api_key(
     expiration: timedelta | None = None,
 ) -> ApiKeyGet:
     rpc_client = get_rabbitmq_rpc_client(app)
-    result = await rpc_client.request(
-        WEBSERVER_RPC_NAMESPACE,
-        TypeAdapter(RPCMethodName).validate_python("create_api_key"),
-        product_name=product_name,
+
+    return await webserver_auth_api_keys_rpc.create_api_key(
+        rpc_client,
         user_id=user_id,
-        display_name=display_name,
-        expiration=expiration,
+        product_name=product_name,
+        api_key=ApiKeyCreate(display_name=display_name, expiration=expiration),
     )
-    return ApiKeyGet.model_validate(result)
 
 
 async def delete_api_key_by_key(
@@ -43,10 +37,12 @@ async def delete_api_key_by_key(
     api_key: str,
 ) -> None:
     rpc_client = get_rabbitmq_rpc_client(app)
-    await rpc_client.request(
-        WEBSERVER_RPC_NAMESPACE,
-        TypeAdapter(RPCMethodName).validate_python("delete_api_key_by_key"),
+
+    result = await webserver_auth_api_keys_rpc.delete_api_key_by_key(
+        rpc_client,
         product_name=product_name,
         user_id=user_id,
         api_key=api_key,
     )
+
+    assert result is None