drop unnecesary dependencies

Author: pcrespov

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

@@ -5,7 +5,6 @@
 import sqlalchemy as sa
 from aiohttp import web
 from models_library.users import UserID, UserThirdPartyToken
-from models_library.utils.fastapi_encoders import jsonable_encoder
 from sqlalchemy import and_, literal_column
 
 from ..db.models import tokens
@@ -21,7 +20,7 @@ async def create_token(
             tokens.insert().values(
                 user_id=user_id,
                 token_service=token.service,
-                token_data=jsonable_encoder(token),
+                token_data=token.model_dump(mode="json"),
             )
         )
         return token

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

@@ -27,6 +27,7 @@
     UsersRepo,
     generate_alternative_username,
 )
+from sqlalchemy import delete
 from sqlalchemy.engine.row import Row
 from sqlalchemy.ext.asyncio import AsyncConnection, AsyncEngine
 
@@ -328,6 +329,21 @@ async def get_user_billing_details(
         return UserBillingDetails.model_validate(row)
 
 
+async def delete_user_by_id(
+    engine: AsyncEngine, connection: AsyncConnection | None = None, *, user_id: UserID
+) -> bool:
+    async with pass_or_acquire_connection(engine, connection) as conn:
+        result = await conn.execute(
+            delete(users)
+            .where(users.c.id == user_id)
+            .returning(users.c.id)  # Return the ID of the deleted row otherwise None
+        )
+        deleted_user = result.fetchone()
+
+        # If no row was deleted, the user did not exist
+        return bool(deleted_user)
+
+
 #
 # USER PROFILE
 #

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

@@ -21,7 +21,6 @@
 )
 
 from ..db.plugin import get_asyncpg_engine
-from ..login.storage import AsyncpgStorage, get_plugin_storage
 from ..security.api import clean_auth_policy_cache
 from . import _preferences_api, _users_repository
 from ._common.models import (
@@ -276,17 +275,15 @@ async def delete_user_without_projects(app: web.Application, user_id: UserID) ->
     # otherwise this function will raise asyncpg.exceptions.ForeignKeyViolationError
     # Consider "marking" users as deleted and havning a background job that
     # cleans it up
-    # TODO: upgrade!!!
-    db: AsyncpgStorage = get_plugin_storage(app)
-    user = await db.get_user({"id": user_id})
-    if not user:
+    is_deleted = await _users_repository.delete_user_by_id(
+        engine=get_asyncpg_engine(app), user_id=user_id
+    )
+    if not is_deleted:
         _logger.warning(
             "User with id '%s' could not be deleted because it does not exist", user_id
         )
         return
 
-    await db.delete_user(dict(user))
-
     # This user might be cached in the auth. If so, any request
     # with this user-id will get thru producing unexpected side-effects
     await clean_auth_policy_cache(app)