fix repo

Author: giancarloromeo

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

@@ -1,6 +1,7 @@
+from datetime import timedelta
+
 from aiohttp import web
 from models_library.api_schemas_webserver import WEBSERVER_RPC_NAMESPACE
-from models_library.api_schemas_webserver.auth import ApiKeyCreateRequest
 from models_library.products import ProductName
 from models_library.rpc.webserver.auth.api_keys import ApiKeyGet
 from models_library.users import UserID
@@ -20,14 +21,15 @@ async def create_api_key(
     *,
     user_id: UserID,
     product_name: ProductName,
-    api_key: ApiKeyCreateRequest,
+    display_name: str,
+    expiration: timedelta | None = None,
 ) -> ApiKeyGet:
     created_api_key: ApiKey = await _service.create_api_key(
         app,
         user_id=user_id,
         product_name=product_name,
-        display_name=api_key.display_name,
-        expiration=api_key.expiration,
+        display_name=display_name,
+        expiration=expiration,
     )
 
     return ApiKeyGet.model_validate(created_api_key)

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

@@ -3,7 +3,6 @@
 
 import sqlalchemy as sa
 from aiohttp import web
-from asyncpg.exceptions import UniqueViolationError
 from models_library.products import ProductName
 from models_library.users import UserID
 from simcore_postgres_database.models.api_keys import api_keys
@@ -15,7 +14,6 @@
 from sqlalchemy.ext.asyncio import AsyncConnection
 
 from ..db.plugin import get_asyncpg_engine
-from .errors import ApiKeyDuplicatedDisplayNameError
 from .models import ApiKey
 
 _logger = logging.getLogger(__name__)
@@ -36,30 +34,6 @@ async def create_api_key(
     api_key: str,
     api_secret: str,
 ) -> ApiKey:
-    async with transaction_context(get_asyncpg_engine(app), connection) as conn:
-        stmt = pg_insert(api_keys).values(
-            display_name=display_name,
-            user_id=user_id,
-            product_name=product_name,
-            api_key=api_key,
-            api_secret=_hash_secret(api_secret),
-            expires_at=(sa.func.now() + expiration) if expiration else None,
-        )
-
-        try:
-            result = await conn.stream(stmt.returning(api_keys))
-            row = await result.one()
-        except UniqueViolationError as exc:
-            raise ApiKeyDuplicatedDisplayNameError(display_name=display_name) from exc
-
-        return ApiKey(
-            id=f"{row.id}",  # NOTE See: https://github.com/ITISFoundation/osparc-simcore/issues/6919
-            display_name=display_name,
-            expiration=expiration,
-            api_key=api_key,
-            api_secret=api_secret,
-        )
-
     async with transaction_context(get_asyncpg_engine(app), connection) as conn:
         stmt = (
             pg_insert(api_keys)