Mirrors/mealie
1
0
Fork 0
mirror of https://github.com/mealie-recipes/mealie.git synced 2025-12-14 14:25:53 -05:00
Code Issues Packages Projects Releases Wiki Activity

refactor(backend): ♻️ rename UserInDb -> PrivateUser

Browse Source
This commit is contained in:
hay-kot
2021-08-28 17:31:05 -08:00
parent df002c383c
commit 4a7f8428c5
24 changed files with 151 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mealie/core/dependencies/dependencies.py
View File

@@ -9,7 +9,7 @@ from sqlalchemy.orm.session import Session
from mealie.core.config import app_dirs, settings
from mealie.db.database import db
from mealie.db.db_setup import generate_session
from mealie.schema.user import LongLiveTokenInDB, TokenData, UserInDB
from mealie.schema.user import LongLiveTokenInDB, TokenData, PrivateUser
oauth2_scheme = OAuth2PasswordBearer(tokenUrl="/api/auth/token")
oauth2_scheme_soft_fail = OAuth2PasswordBearer(tokenUrl="/api/auth/token", auto_error=False)
@@ -48,7 +48,7 @@ async def is_logged_in(token: str = Depends(oauth2_scheme_soft_fail), session=De
return False
async def get_current_user(token: str = Depends(oauth2_scheme), session=Depends(generate_session)) -> UserInDB:
async def get_current_user(token: str = Depends(oauth2_scheme), session=Depends(generate_session)) -> PrivateUser:
credentials_exception = HTTPException(
status_code=status.HTTP_401_UNAUTHORIZED,
detail="Could not validate credentials",
@@ -75,13 +75,13 @@ async def get_current_user(token: str = Depends(oauth2_scheme), session=Depends(
return user
async def get_admin_user(current_user=Depends(get_current_user)) -> UserInDB:
async def get_admin_user(current_user=Depends(get_current_user)) -> PrivateUser:
if not current_user.admin:
raise HTTPException(status.HTTP_403_FORBIDDEN)
return current_user
def validate_long_live_token(session: Session, client_token: str, id: int) -> UserInDB:
def validate_long_live_token(session: Session, client_token: str, id: int) -> PrivateUser:
tokens: list[LongLiveTokenInDB] = db.api_tokens.get(session, id, "parent_id", limit=9999)

16
mealie/core/dependencies/grouped.py
View File

@@ -1,6 +1,8 @@
from fastapi import BackgroundTasks, Depends
from sqlalchemy.orm.session import Session
from mealie.schema.user.user import PrivateUser
from .dependencies import generate_session, get_current_user, is_logged_in
@@ -21,9 +23,9 @@ class ReadDeps:
session: Session = Depends(generate_session),
user=Depends(is_logged_in),
):
self.session = session
self.background_tasks = background_tasks
self.user = user
self.session: Session = session
self.bg_tasks: BackgroundTasks = background_tasks
self.user: bool = user
class WriteDeps:
@@ -34,7 +36,7 @@ class WriteDeps:
Args:
background_tasks: BackgroundTasks
session: Session
user: bool
user: UserInDB
"""
def __init__(
@@ -43,6 +45,6 @@ class WriteDeps:
session: Session = Depends(generate_session),
user=Depends(get_current_user),
):
self.session = session
self.background_tasks = background_tasks
self.user = user
self.session: Session = session
self.bg_task: BackgroundTasks = background_tasks
self.user: PrivateUser = user