Remove some old crud functions

This commit is contained in:
Sebastiaan
2025-05-24 11:04:23 +02:00
parent c1442f430e
commit 28eb10fcce
12 changed files with 135 additions and 126 deletions

View File

@@ -5,12 +5,12 @@ from fastapi import APIRouter, Depends, HTTPException
from fastapi.responses import HTMLResponse
from fastapi.security import OAuth2PasswordRequestForm
from app import crud
from app.api.deps import CurrentUser, SessionDep, get_current_active_superuser
from app.core import security
from app.core.config import settings
from app.core.security import get_password_hash
from app.models import Message, NewPassword, Token, UserPublic
from app.models.base import Message
from app.models.user import User, NewPassword, Token, UserPublic
from app.utils import (
generate_password_reset_token,
generate_reset_password_email,
@@ -28,7 +28,7 @@ def login_access_token(
"""
OAuth2 compatible token login, get an access token for future requests
"""
user = crud.authenticate(
user = User.authenticate(
session=session, email=form_data.username, password=form_data.password
)
if not user:
@@ -56,7 +56,7 @@ def recover_password(email: str, session: SessionDep) -> Message:
"""
Password Recovery
"""
user = crud.get_user_by_email(session=session, email=email)
user = User.get_by_email(session=session, email=email)
if not user:
raise HTTPException(
@@ -83,7 +83,7 @@ def reset_password(session: SessionDep, body: NewPassword) -> Message:
email = verify_password_reset_token(token=body.token)
if not email:
raise HTTPException(status_code=400, detail="Invalid token")
user = crud.get_user_by_email(session=session, email=email)
user = User.get_by_email(session=session, email=email)
if not user:
raise HTTPException(
status_code=404,
@@ -107,7 +107,7 @@ def recover_password_html_content(email: str, session: SessionDep) -> Any:
"""
HTML Content for Password Recovery
"""
user = crud.get_user_by_email(session=session, email=email)
user = User.get_by_email(session=session, email=email)
if not user:
raise HTTPException(