fix: support jump back to page require login

server/__init__.py

@@ -96,7 +96,7 @@ async def index(request: Request) -> Template:
     )
 
 
-def __index_row_sorter(r: asyncpg.Record):
+def __index_row_sorter(r: asyncpg.Record) -> tuple[int, datetime]:
     if r["state"] == PatchState.Pending:
         return 1, r["created_at"]
 

server/auth.py

@@ -29,7 +29,7 @@ async def retrieve_user_from_session(
     try:
         return __user_from_session(session)
     except KeyError:
-        req.clear_session()
+        return None
 
 
 def __user_from_session(session: dict[str, Any]) -> User:
@@ -121,6 +121,12 @@ async def callback(code: str, request: Request) -> Redirect:
 
     group_id = user["user_group"]
 
+    # litestar type this as dict[str, Any], but it maybe Empty
+    if request.session is not Empty:  # type: ignore
+        back_to = request.session.get("backTo", "/")
+    else:
+        back_to = "/"
+
     request.set_session(
         {
             "user_id": user_id,
@@ -132,7 +138,7 @@ async def callback(code: str, request: Request) -> Redirect:
         }
     )
 
-    return Redirect("/")
+    return Redirect(back_to)
 
 
 def require_user_editor(connection: ASGIConnection[Any, Any, Any, Any], _: Any) -> None:

server/contrib.py

@@ -1,9 +1,10 @@
 from dataclasses import dataclass
 from datetime import datetime
-from typing import Annotated
+from typing import Annotated, Any
 
 import litestar
 import orjson
+from litestar import Response
 from litestar.enums import RequestEncodingType
 from litestar.exceptions import (
     HTTPException,
@@ -21,9 +22,14 @@
 
 
 @litestar.get("/suggest")
-async def suggest_ui(subject_id: int = 0) -> Template:
+async def suggest_ui(request: Request, subject_id: int = 0) -> Response[Any]:
     if subject_id == 0:
         return Template("select-subject.html.jinja2")
+
+    if not request.auth:
+        request.set_session({"backTo": request.url.path + f"?subject_id={subject_id}"})
+        return Redirect("/login")
+
     async with http_client.get(
         f"https://next.bgm.tv/p1/wiki/subjects/{subject_id}", allow_redirects=False
     ) as res:

server/model.py

@@ -28,10 +28,6 @@ def is_access_token_fresh(self) -> bool:
     def allow_edit(self) -> bool:
         return self.group_id in {2, 11}
 
-    @property
-    def allow_admin(self) -> bool:
-        return self.group_id in {2}
-
 
 class PatchState(enum.IntEnum):
     Pending = 0