refac: remove the verify_token and use get-current user for auth+user

This commit is contained in:
Anuraag Jain 2024-01-01 10:55:50 +02:00
parent 2d323b31e1
commit 77323d9b25
5 changed files with 12 additions and 41 deletions

View file

@ -19,12 +19,7 @@ from apps.web.models.auths import (
from apps.web.models.users import Users
from utils.utils import (
get_password_hash,
get_current_user,
create_token,
verify_auth_token,
)
from utils.utils import get_password_hash, get_current_user, create_token
from utils.misc import get_gravatar_url
from constants import ERROR_MESSAGES
@ -36,7 +31,7 @@ router = APIRouter()
############################
@router.get("/", response_model=UserResponse, dependencies=[Depends(verify_auth_token)])
@router.get("/", response_model=UserResponse)
async def get_session_user(user=Depends(get_current_user)):
return {
"id": user.id,
@ -52,9 +47,7 @@ async def get_session_user(user=Depends(get_current_user)):
############################
@router.post(
"/update/password", response_model=bool, dependencies=[Depends(verify_auth_token)]
)
@router.post("/update/password", response_model=bool)
async def update_password(
form_data: UpdatePasswordForm, session_user=Depends(get_current_user)
):

View file

@ -108,6 +108,7 @@ async def delete_chat_by_id(id: str, user=Depends(get_current_user)):
result = Chats.delete_chat_by_id_and_user_id(id, user.id)
return result
############################
# DeleteAllChats
############################

View file

@ -5,8 +5,6 @@ from typing import List, Union, Optional
from fastapi import APIRouter
from pydantic import BaseModel
import json
from apps.web.models.users import Users
from apps.web.models.modelfiles import (
Modelfiles,
ModelfileForm,
@ -15,7 +13,7 @@ from apps.web.models.modelfiles import (
ModelfileResponse,
)
from utils.utils import bearer_scheme, get_current_user
from utils.utils import get_current_user
from constants import ERROR_MESSAGES
router = APIRouter()
@ -26,7 +24,7 @@ router = APIRouter()
@router.get("/", response_model=List[ModelfileResponse])
async def get_modelfiles(skip: int = 0, limit: int = 50, cred=Depends(bearer_scheme)):
async def get_modelfiles(skip: int = 0, limit: int = 50, user=Depends(get_current_user)):
return Modelfiles.get_modelfiles(skip, limit)
@ -67,7 +65,7 @@ async def create_new_modelfile(
@router.post("/", response_model=Optional[ModelfileResponse])
async def get_modelfile_by_tag_name(form_data: ModelfileTagNameForm):
async def get_modelfile_by_tag_name(form_data: ModelfileTagNameForm, user=Depends(get_current_user)):
modelfile = Modelfiles.get_modelfile_by_tag_name(form_data.tag_name)
if modelfile: