refactor(api): use Annotated-style dependency injection

app/router/v2/session_verify.py

@@ -11,8 +11,8 @@ from app.config import settings
 from app.const import BACKUP_CODE_LENGTH, SUPPORT_TOTP_VERIFICATION_VER
 from app.database.auth import TotpKeys
 from app.dependencies.api_version import APIVersion
-from app.dependencies.database import Database, get_redis
-from app.dependencies.geoip import get_client_ip
+from app.dependencies.database import Database, Redis, get_redis
+from app.dependencies.geoip import IPAddress
 from app.dependencies.user import UserAndToken, get_client_user_and_token
 from app.dependencies.user_agent import UserAgentInfo
 from app.log import logger
@@ -27,7 +27,6 @@ from .router import router
 from fastapi import Depends, Form, Header, HTTPException, Request, Security, status
 from fastapi.responses import JSONResponse, Response
 from pydantic import BaseModel
-from redis.asyncio import Redis
 
 
 class VerifyMethod(BaseModel):
@@ -64,10 +63,14 @@ async def verify_session(
     db: Database,
     api_version: APIVersion,
     user_agent: UserAgentInfo,
+    ip_address: IPAddress,
     redis: Annotated[Redis, Depends(get_redis)],
-    verification_key: str = Form(..., description="8 位邮件验证码或者 6 位 TOTP 代码或 10 位备份码 （g0v0 扩展支持）"),
-    user_and_token: UserAndToken = Security(get_client_user_and_token),
-    web_uuid: str | None = Header(None, include_in_schema=False, alias="X-UUID"),
+    verification_key: Annotated[
+        str,
+        Form(..., description="8 位邮件验证码或者 6 位 TOTP 代码或 10 位备份码 （g0v0 扩展支持）"),
+    ],
+    user_and_token: Annotated[UserAndToken, Security(get_client_user_and_token)],
+    web_uuid: Annotated[str | None, Header(include_in_schema=False, alias="X-UUID")] = None,
 ) -> Response:
     current_user = user_and_token[0]
     token_id = user_and_token[1].id
@@ -82,7 +85,6 @@ async def verify_session(
         else await LoginSessionService.get_login_method(user_id, token_id, redis)
     )
 
-    ip_address = get_client_ip(request)
     login_method = "password"
 
     try:
@@ -182,12 +184,12 @@ async def verify_session(
     tags=["验证"],
 )
 async def reissue_verification_code(
-    request: Request,
     db: Database,
     user_agent: UserAgentInfo,
     api_version: APIVersion,
+    ip_address: IPAddress,
     redis: Annotated[Redis, Depends(get_redis)],
-    user_and_token: UserAndToken = Security(get_client_user_and_token),
+    user_and_token: Annotated[UserAndToken, Security(get_client_user_and_token)],
 ) -> SessionReissueResponse:
     current_user = user_and_token[0]
     token_id = user_and_token[1].id
@@ -203,7 +205,6 @@ async def reissue_verification_code(
         return SessionReissueResponse(success=False, message="当前会话不支持重新发送验证码")
 
     try:
-        ip_address = get_client_ip(request)
         user_id = current_user.id
         success, message = await EmailVerificationService.resend_verification_code(
             db,
@@ -233,17 +234,15 @@ async def reissue_verification_code(
 async def fallback_email(
     db: Database,
     user_agent: UserAgentInfo,
-    request: Request,
+    ip_address: IPAddress,
     redis: Annotated[Redis, Depends(get_redis)],
-    user_and_token: UserAndToken = Security(get_client_user_and_token),
+    user_and_token: Annotated[UserAndToken, Security(get_client_user_and_token)],
 ) -> VerifyMethod:
     current_user = user_and_token[0]
     token_id = user_and_token[1].id
     if not await LoginSessionService.get_login_method(current_user.id, token_id, redis):
         raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail="当前会话不需要回退")
 
-    ip_address = get_client_ip(request)
-
     await LoginSessionService.set_login_method(current_user.id, token_id, "mail", redis)
     success, message = await EmailVerificationService.resend_verification_code(
         db,