优化user传递逻辑

Author: Chise1

fast_tmp/admin/depends.py

@@ -54,6 +54,7 @@ async def __get_user_or_none(access_token: Optional[str] = Cookie(None)) -> Opti
     return None
 
 
-async def __get_user(request: Request, user: Optional[User] = Depends(__get_user_or_none)):
-    if not user:
+async def get_user(request: Request, user: Optional[User] = Depends(__get_user_or_none)):
+    if not user or not user.is_active:
         raise NoAuthError
+    request.scope["user"] = user

fast_tmp/admin/endpoint.py

@@ -4,30 +4,21 @@
 from pydantic import BaseModel
 from starlette.requests import Request
 
-from fast_tmp.depends.auth import get_current_active_user
 from fast_tmp.site import ModelAdmin, get_model_site
 
 from ..models import User
 from ..responses import BaseRes, ListDataWithPage
-from .depends import __get_user
+from .depends import get_user
 
 router = APIRouter()
 
 
-async def get_data(request: Request) -> dict:
-    """
-    从异步函数里面读取数据
-    """
-    return await request.json()
-
-
-@router.get("/{resource}/list")
+@router.get("/{resource}/list", dependencies=[Depends(get_user)])
 async def list_view(
     request: Request,
     page_model: ModelAdmin = Depends(get_model_site),
     perPage: int = 10,
     page: int = 1,
-    user: Optional[User] = Depends(__get_user),
 ):
     datas = await page_model.list(request, perPage, page)
     return BaseRes(
@@ -38,15 +29,14 @@ async def list_view(
     )
 
 
-@router.get("/{resource}/prefetch/{field_name}")
+@router.get("/{resource}/prefetch/{field_name}", dependencies=[Depends(get_user)])
 async def prefetch_view(
     request: Request,
     field_name: str,
     pk: Optional[str] = None,
     perPage: Optional[int] = None,
     page: Optional[int] = None,
     page_model: ModelAdmin = Depends(get_model_site),
-    user: Optional[User] = Depends(__get_user),
 ):
     """
     对多对多外键进行额外的加载
@@ -55,15 +45,14 @@ async def prefetch_view(
     return BaseRes(data=datas)
 
 
-@router.get("/{resource}/select/{field_name}")
+@router.get("/{resource}/select/{field_name}", dependencies=[Depends(get_user)])
 async def select_view(
     request: Request,
     field_name: str,
     pk: Optional[str] = None,
     perPage: Optional[int] = None,
     page: Optional[int] = None,
     page_model: ModelAdmin = Depends(get_model_site),
-    user: Optional[User] = Depends(__get_user),
 ):
     """
     枚举字段的额外加载，主要用于外键
@@ -72,12 +61,11 @@ async def select_view(
     return BaseRes(data=datas)
 
 
-@router.post("/{resource}/patch/{pk}")
+@router.post("/{resource}/patch/{pk}", dependencies=[Depends(get_user)])
 async def patch_data(
     request: Request,
     pk: str,
     page_model: ModelAdmin = Depends(get_model_site),
-    user: Optional[User] = Depends(__get_user),
 ):
     """
     内联模式快速修改需要的接口
@@ -87,88 +75,49 @@ async def patch_data(
     return BaseRes().dict()
 
 
-@router.put("/{resource}/update/{pk}")
+@router.put("/{resource}/update/{pk}", dependencies=[Depends(get_user)])
 async def update_data(
     request: Request,
     pk: str,
     page_model: ModelAdmin = Depends(get_model_site),
-    user: Optional[User] = Depends(__get_user),
 ):
     data = await request.json()
     data = await page_model.put(request, pk, data)
     return BaseRes(data=data)
 
 
-@router.get("/{resource}/update/{pk}")
+@router.get("/{resource}/update/{pk}", dependencies=[Depends(get_user)])
 async def update_view(
     request: Request,
     pk: str,
     page_model: ModelAdmin = Depends(get_model_site),
-    user: Optional[User] = Depends(__get_user),
 ):
     data = await page_model.put_get(request, pk)
     return BaseRes(data=data)
 
 
-@router.post("/{resource}/create")
+@router.post("/{resource}/create", dependencies=[Depends(get_user)])
 async def create(
     request: Request,
     page_model: ModelAdmin = Depends(get_model_site),
-    user: Optional[User] = Depends(__get_user),
 ):
     data = await request.json()
     await page_model.create(request, data)
     return BaseRes(data=data)
 
 
-@router.delete("/{resource}/delete/{pk}")
+@router.delete("/{resource}/delete/{pk}", dependencies=[Depends(get_user)])
 async def delete_func(
     request: Request,
     pk: str,
     page_model: ModelAdmin = Depends(get_model_site),
-    user: Optional[User] = Depends(__get_user),
 ):
     await page_model.delete(request, pk)
     return BaseRes()
 
 
-# def clean_param(field_type, param: str):
-#     if isinstance(
-#         field_type, (Integer, DECIMAL, BigInteger, Float, INTEGER, Numeric, SmallInteger)
-#     ):
-#         return int(param)
-#     elif isinstance(field_type, DateTime):
-#         return datetime.strptime(param, "%Y-%m-%dT%H:%M:%S")
-#     else:
-#         return param
-#
-
-#
-# def search_pk_list(model, request: Request):
-#     """
-#     获取要查询的单个instance的主键
-#     """
-#     params = dict(request.query_params)
-#     pks = get_pk(model)
-#     w = []
-#     for k, v in params.items():
-#         if pks.get(k) is not None:
-#             field = pks[k]
-#             if isinstance(
-#                 field.type, (Integer, DECIMAL, BigInteger, Float, INTEGER, Numeric, SmallInteger)
-#             ):
-#                 w.append(pks[k] == int(v))
-#             elif isinstance(field.type, DateTime):
-#                 w.append(pks[k] == datetime.strptime(v, "%Y-%m-%dT%H:%M:%S"))
-#             else:
-#                 w.append(pks[k] == v)
-#         else:
-#             return key_error
-#     return w
-
-
-class DIDS(BaseModel):
-    ids: List[int]
+# class DIDS(BaseModel):
+#     ids: List[int]
 
 
 #  todo next version
@@ -181,10 +130,9 @@ class DIDS(BaseModel):
 #     return BaseRes()
 
 
-@router.get("/{resource}/schema")
+@router.get("/{resource}/schema", dependencies=[Depends(get_user)])
 async def get_schema(
     request: Request,
     page: ModelAdmin = Depends(get_model_site),
-    user: Optional[User] = Depends(__get_user),
 ):
     return BaseRes(data=page.get_app_page(request))

fast_tmp/admin/model.py

@@ -5,7 +5,7 @@
 from fastapi import Depends, FastAPI, Form, Request
 from fastapi.templating import Jinja2Templates
 from starlette import status
-from starlette.responses import JSONResponse, RedirectResponse
+from starlette.responses import RedirectResponse
 from tortoise.exceptions import BaseORMException
 
 from fast_tmp.admin.site import GroupAdmin, UserAdmin
@@ -36,11 +36,9 @@
 admin.exception_handler(BaseORMException)(tortoise_exception_handler)
 
 
-@admin.post("/", name="index")
-@admin.get("/", name="index")
-async def index(request: Request, user: Optional[User] = Depends(__get_user_or_none)):
-    if not user:
-        return RedirectResponse(request.url_for("admin:login"))
+@admin.post("/", name="index", dependencies=[Depends(__get_user_or_none)])
+@admin.get("/", name="index", dependencies=[Depends(__get_user_or_none)])
+async def index(request: Request):
     return templates.TemplateResponse(
         "index.html",
         {"request": request, "title": admin.title},