Extract cookie logout service

Author: koldakov

futuramaapi/routers/rest/root/api.py

@@ -1,10 +1,7 @@
 from fastapi import APIRouter, Depends, status
 from fastapi.responses import RedirectResponse
-from sqlalchemy.ext.asyncio.session import AsyncSession
 
-from futuramaapi.repositories.models import AuthSessionModel
-from futuramaapi.repositories.session import get_async_session
-from futuramaapi.routers.rest.users.dependencies import cookie_user_from_form_data, user_from_cookies
+from futuramaapi.routers.rest.users.dependencies import cookie_user_from_form_data
 from futuramaapi.routers.rest.users.schemas import User
 
 router = APIRouter()
@@ -31,23 +28,3 @@ async def auth_user(
         expires=user.cookie_expiration_time,
     )
     return response
-
-
-@router.post(
-    "/logout",
-    include_in_schema=False,
-    name="user_logout",
-)
-async def cookie_logout_user(
-    session: AsyncSession = Depends(get_async_session),  # noqa: B008
-    user: User | None = Depends(user_from_cookies),  # noqa: B008
-) -> RedirectResponse:
-    if user is None:
-        return RedirectResponse("/auth", status_code=status.HTTP_302_FOUND)
-
-    if user._cookie_session is not None:
-        await AuthSessionModel.do_expire(session, user._cookie_session)
-
-    response: RedirectResponse = RedirectResponse("/auth", status_code=status.HTTP_302_FOUND)
-    response.delete_cookie(User.cookie_auth_key)
-    return response

futuramaapi/routers/rest/users/dependencies.py

@@ -99,18 +99,3 @@ async def cookie_user_from_form_data(
 
     user._cookie_session = auth_session.key
     return user
-
-
-async def user_from_cookies(
-    request: Request,
-    session: AsyncSession = Depends(get_async_session),  # noqa: B008
-) -> User | None:
-    try:
-        session_id: str = request.cookies[User.cookie_auth_key]
-    except KeyError:
-        return None
-
-    try:
-        return await User.from_cookie_session_id(session, session_id)
-    except ModelNotFoundError:
-        raise HTTPException(status_code=status.HTTP_401_UNAUTHORIZED) from None

futuramaapi/routers/services/auth/logout_cookie_session_user.py

@@ -0,0 +1,38 @@
+from typing import ClassVar
+
+from fastapi import Request, status
+from fastapi.responses import RedirectResponse
+from sqlalchemy import Update, update
+
+from futuramaapi.repositories.models import AuthSessionModel
+from futuramaapi.routers.services import BaseSessionService
+
+
+class LogoutCookieSessionUserService(BaseSessionService[RedirectResponse]):
+    cookie_auth_key: ClassVar[str] = "Authorization"
+
+    @property
+    def request(self) -> Request:
+        if self.context is None:
+            raise AttributeError("Request is not defined.")
+
+        if "request" not in self.context:
+            raise AttributeError("Request is not defined.")
+
+        return self.context["request"]
+
+    @property
+    def _expire_session_statement(self) -> Update:
+        key: str = self.request.cookies[self.cookie_auth_key]
+        return update(AuthSessionModel).where(AuthSessionModel.key == key).values(expired=True)
+
+    async def process(self, *args, **kwargs) -> RedirectResponse:
+        await self.session.execute(self._expire_session_statement)
+        await self.session.commit()
+
+        response: RedirectResponse = RedirectResponse(
+            "/auth",
+            status_code=status.HTTP_302_FOUND,
+        )
+        response.delete_cookie(self.cookie_auth_key)
+        return response

futuramaapi/routers/views/api.py

@@ -1,9 +1,10 @@
 from fastapi import APIRouter, Request, Response, status
 from fastapi.openapi.docs import get_redoc_html, get_swagger_ui_html
-from fastapi.responses import FileResponse, HTMLResponse
+from fastapi.responses import FileResponse, HTMLResponse, RedirectResponse
 
 from futuramaapi.routers.services.about.get_about import GetAboutService
 from futuramaapi.routers.services.auth.get_user_auth import GetUserAuthService
+from futuramaapi.routers.services.auth.logout_cookie_session_user import LogoutCookieSessionUserService
 from futuramaapi.routers.services.changelog.get_changelog import GetChangelogService
 from futuramaapi.routers.services.index.get_index import GetIndexService
 from futuramaapi.routers.services.sitemaps.get_sitemap import GetSiteMapService
@@ -127,3 +128,19 @@ async def user_auth(
         },
     )
     return await service()
+
+
+@router.post(
+    "/logout",
+    include_in_schema=False,
+    name="logout_cookie_session_user",
+)
+async def logout_cookie_session_user(
+    request: Request,
+) -> RedirectResponse:
+    service: LogoutCookieSessionUserService = LogoutCookieSessionUserService(
+        context={
+            "request": request,
+        },
+    )
+    return await service()

templates/base.html

@@ -79,7 +79,7 @@
                 {% else %}
                 <form
                   method="POST"
-                  action="{{ relative_path_for('user_logout') }}"
+                  action="{{ relative_path_for('logout_cookie_session_user') }}"
                 >
                   <button
                     type="submit"