fix: actions

Author: tiptenbrink

actions/local_actions.py

@@ -18,10 +18,10 @@
 from apiserver.define import DEFINE
 from apiserver.env import load_config
 from apiserver.lib.model.entities import SignedUp, UserNames
-from auth.core.model import IdInfo
 from auth.data.authentication import get_apake_setup
 from auth.data.keys import get_keys
 from auth.data.relational.opaque import get_setup
+from auth.data.relational.user import EmptyIdUserData
 from auth.define import refresh_exp, access_exp, id_exp
 from auth.token.build import create_tokens, finish_tokens
 from datacontext.context import DontReplaceContext
@@ -57,14 +57,14 @@ async def admin_access(local_dsrc):
     admin_id = "admin_test"
     scope = "member admin"
     utc_now = auth.core.util.utc_timestamp()
-    id_info = IdInfo()
+    id_userdata = EmptyIdUserData()
     access_token_data, id_token_data, access_scope, refresh_save = create_tokens(
         admin_id,
         scope,
         utc_now - 1,
         "test_nonce",
         utc_now,
-        id_info,
+        id_userdata,
         DEFINE.issuer,
         DEFINE.frontend_client_id,
         DEFINE.backend_client_id,
@@ -79,7 +79,7 @@ async def admin_access(local_dsrc):
         keys.symmetric,
         access_token_data,
         id_token_data,
-        id_info,
+        id_userdata,
         utc_now,
         keys.signing,
         access_exp,
@@ -97,7 +97,7 @@ async def test_get_admin_token(admin_access):
 @pytest.mark.asyncio
 async def test_generate_admin(local_dsrc):
     admin_password = "admin"
-    setup = await get_apake_setup(local_dsrc.store)
+    setup = await get_apake_setup(DontReplaceContext(), local_dsrc.store)
 
     cl_req, cl_state = opq.register_client(admin_password)
     serv_resp = opq.register(setup, cl_req, util.usp_hex("0_admin"))

src/apiserver/app/routers/ranking.py

@@ -13,11 +13,15 @@
 from apiserver.app.ops.header import Authorization
 from apiserver.app.response import RawJSONResponse
 from apiserver.app.routers.helper import require_admin, require_member
-from apiserver.lib.model.entities import UserPointsNames, UserPointsNamesList
+from apiserver.lib.model.entities import (
+    UserPointsNames,
+    UserPointsNamesList,
+    UserEventsList,
+    EventsList,
+)
 from apiserver.data import Source, get_conn
 from apiserver.data.api.classifications import events_in_class, get_event_user_points
 from apiserver.data.special import user_events_in_class
-from apiserver.lib.model.entities import UserPointsNamesList, UserEventsList, EventsList
 
 router = APIRouter()
 
@@ -92,6 +96,7 @@ async def sync_publish_classification(
     do_publish = publish == "publish"
     await sync_publish_ranking(dsrc, do_publish)
 
+
 @router.get("/admin/class/events/user/{user_id}/")
 async def get_user_events_in_class(
     user_id: str,

src/auth/data/relational/user.py

@@ -1,5 +1,5 @@
 from enum import StrEnum
-from typing import Any, Protocol, Self, Type
+from typing import Any, Protocol, Type
 
 from sqlalchemy.ext.asyncio import AsyncConnection
 
@@ -28,7 +28,7 @@ async def update_password_file(
 
 class IdUserData(Protocol):
     @classmethod
-    def from_id_token(cls, id_token: dict[str, Any]) -> Self: ...
+    def from_id_token(cls, id_token: dict[str, Any]) -> "IdUserData": ...
 
     """id_userdata_from_token"""
 
@@ -47,15 +47,15 @@ async def get_id_userdata_by_id(
     def get_type(cls) -> Type[IdUserData]: ...
 
 
-# class IdUserDataOps(Protocol, Generic[IdUserDataT]):
-#     @classmethod
-#     async def get_id_userdata_by_id(cls, conn: AsyncConnection, user_id: str) -> IdUserDataT:
-#         """Throws NoDataError if user does not exist."""
-#         ...
+class EmptyIdUserData(IdUserData):
+    def __init__(self) -> None:
+        pass
 
-#     @classmethod
-#     def id_info_from_id_userdata(cls, ud: IdUserDataT) -> dict[str, Any]: ...
+    @classmethod
+    def from_id_token(cls, id_token: dict[str, Any]) -> "EmptyIdUserData":
+        return EmptyIdUserData()
 
+    """id_userdata_from_token"""
 
-#     @classmethod
-#     def id_userdata_from_token(cls, id_token: dict[str, Any]) -> IdUserDataT: ...
+    def id_info(self) -> dict[str, Any]:
+        return dict()