tokens update

Author: pcrespov

api/specs/web-server/_users.py

@@ -12,9 +12,9 @@
     MyProfileGet,
     MyProfilePatch,
     MyTokenCreate,
+    MyTokenGet,
     UserGet,
     UsersSearchQueryParams,
-    UserThirdPartyToken,
 )
 from models_library.api_schemas_webserver.users_preferences import PatchRequestBody
 from models_library.generics import Envelope
@@ -73,15 +73,15 @@ async def set_frontend_preference(
 
 @router.get(
     "/me/tokens",
-    response_model=Envelope[list[UserThirdPartyToken]],
+    response_model=Envelope[list[MyTokenGet]],
 )
 async def list_tokens():
     ...
 
 
 @router.post(
     "/me/tokens",
-    response_model=Envelope[UserThirdPartyToken],
+    response_model=Envelope[MyTokenGet],
     status_code=status.HTTP_201_CREATED,
 )
 async def create_token(_token: MyTokenCreate):
@@ -90,7 +90,7 @@ async def create_token(_token: MyTokenCreate):
 
 @router.get(
     "/me/tokens/{service}",
-    response_model=Envelope[UserThirdPartyToken],
+    response_model=Envelope[MyTokenGet],
 )
 async def get_token(_params: Annotated[_TokenPathParams, Depends()]):
     ...

packages/models-library/src/models_library/api_schemas_webserver/users.py

@@ -213,8 +213,8 @@ class MyTokenCreate(InputSchemaWithoutCamelCase):
         str,
         Field(description="uniquely identifies the service where this token is used"),
     ]
-    token_key: Annotated[UUID, Field(..., description="basic token key")]
-    token_secret: UUID | None = None
+    token_key: UUID
+    token_secret: UUID
 
     def to_model(self) -> UserThirdPartyToken:
         return UserThirdPartyToken(
@@ -224,6 +224,18 @@ def to_model(self) -> UserThirdPartyToken:
         )
 
 
+class MyTokenGet(OutputSchema):
+    service: str
+    token_key: UUID
+    token_secret: Annotated[
+        UUID | None, Field(deprecated=True, description="Will be removed")
+    ] = None
+
+    @classmethod
+    def from_model(cls, token: UserThirdPartyToken) -> Self:
+        return cls(service=token.service, token_key=token.token_key, token_secret=None)
+
+
 #
 # PERMISSIONS
 #

services/web/server/src/simcore_service_webserver/users/_notifications_handlers.py

@@ -129,10 +129,5 @@ async def list_user_permissions(request: web.Request) -> web.Response:
         request.app, user_id=req_ctx.user_id, product_name=req_ctx.product_name
     )
     return envelope_json_response(
-        [
-            MyPermissionGet.model_construct(
-                _fields_set=p.model_fields_set, **p.model_dump()
-            )
-            for p in list_permissions
-        ]
+        [MyPermissionGet.from_model(p) for p in list_permissions]
     )

services/web/server/src/simcore_service_webserver/users/_tokens.py

@@ -4,11 +4,8 @@
 """
 import sqlalchemy as sa
 from aiohttp import web
-from models_library.api_schemas_webserver.users import (
-    MyTokenCreate,
-    UserThirdPartyToken,
-)
-from models_library.users import UserID
+from models_library.api_schemas_webserver.users import UserThirdPartyToken
+from models_library.users import UserID, UserThirdPartyToken
 from models_library.utils.fastapi_encoders import jsonable_encoder
 from sqlalchemy import and_, literal_column
 
@@ -18,7 +15,7 @@
 
 
 async def create_token(
-    app: web.Application, user_id: UserID, token: MyTokenCreate
+    app: web.Application, user_id: UserID, token: UserThirdPartyToken
 ) -> UserThirdPartyToken:
     async with get_database_engine(app).acquire() as conn:
         await conn.execute(

services/web/server/src/simcore_service_webserver/users/_tokens_handlers.py

@@ -2,7 +2,7 @@
 import logging
 
 from aiohttp import web
-from models_library.api_schemas_webserver.users import MyTokenCreate
+from models_library.api_schemas_webserver.users import MyTokenCreate, MyTokenGet
 from pydantic import BaseModel
 from servicelib.aiohttp import status
 from servicelib.aiohttp.requests_validation import (
@@ -46,7 +46,7 @@ async def _wrapper(request: web.Request) -> web.StreamResponse:
 async def list_tokens(request: web.Request) -> web.Response:
     req_ctx = UsersRequestContext.model_validate(request)
     all_tokens = await _tokens.list_tokens(request.app, req_ctx.user_id)
-    return envelope_json_response(all_tokens)
+    return envelope_json_response([MyTokenGet.from_model(t) for t in all_tokens])
 
 
 @routes.post(f"/{API_VTAG}/me/tokens", name="create_token")
@@ -56,8 +56,12 @@ async def list_tokens(request: web.Request) -> web.Response:
 async def create_token(request: web.Request) -> web.Response:
     req_ctx = UsersRequestContext.model_validate(request)
     token_create = await parse_request_body_as(MyTokenCreate, request)
-    await _tokens.create_token(request.app, req_ctx.user_id, token_create)
-    return envelope_json_response(token_create, web.HTTPCreated)
+
+    token = await _tokens.create_token(
+        request.app, req_ctx.user_id, token_create.to_model()
+    )
+
+    return envelope_json_response(MyTokenGet.from_model(token), web.HTTPCreated)
 
 
 class _TokenPathParams(BaseModel):
@@ -71,10 +75,12 @@ class _TokenPathParams(BaseModel):
 async def get_token(request: web.Request) -> web.Response:
     req_ctx = UsersRequestContext.model_validate(request)
     req_path_params = parse_request_path_parameters_as(_TokenPathParams, request)
+
     token = await _tokens.get_token(
         request.app, req_ctx.user_id, req_path_params.service
     )
-    return envelope_json_response(token)
+
+    return envelope_json_response(MyTokenGet.from_model(token))
 
 
 @routes.delete(f"/{API_VTAG}/me/tokens/{{service}}", name="delete_token")
@@ -84,5 +90,7 @@ async def get_token(request: web.Request) -> web.Response:
 async def delete_token(request: web.Request) -> web.Response:
     req_ctx = UsersRequestContext.model_validate(request)
     req_path_params = parse_request_path_parameters_as(_TokenPathParams, request)
+
     await _tokens.delete_token(request.app, req_ctx.user_id, req_path_params.service)
+
     return web.json_response(status=status.HTTP_204_NO_CONTENT)