mirror of
https://github.com/EstrellaXD/Auto_Bangumi.git
synced 2026-04-27 12:00:32 +08:00
fix: old data support problem.
This commit is contained in:
@@ -1,2 +0,0 @@
|
||||
from .api import auth_user, get_current_user, get_token_data, update_user_info
|
||||
from .jwt import create_access_token
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
from fastapi import Depends, HTTPException, status
|
||||
from fastapi.security import OAuth2PasswordBearer
|
||||
|
||||
from module.database.user import UserDatabase
|
||||
from module.database import Database
|
||||
from module.models.user import User
|
||||
|
||||
from .jwt import verify_token
|
||||
@@ -20,8 +20,8 @@ async def get_current_user(token: str = Depends(oauth2_scheme)):
|
||||
status_code=status.HTTP_401_UNAUTHORIZED, detail="invalid token"
|
||||
)
|
||||
username = payload.get("sub")
|
||||
with UserDatabase as user_db:
|
||||
user = user_db.get_user(username)
|
||||
with Database() as db:
|
||||
user = db.user.get_user(username)
|
||||
if not user:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_401_UNAUTHORIZED, detail="invalid username"
|
||||
@@ -40,13 +40,13 @@ async def get_token_data(token: str = Depends(oauth2_scheme)):
|
||||
|
||||
def update_user_info(user_data: User, current_user):
|
||||
try:
|
||||
with UserDatabase as db:
|
||||
db.update_user(current_user.username, user_data)
|
||||
with Database() as db:
|
||||
db.user.update_user(current_user.username, user_data)
|
||||
return True
|
||||
except Exception as e:
|
||||
raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail=str(e))
|
||||
|
||||
|
||||
def auth_user(username, password):
|
||||
with UserDatabase() as db:
|
||||
db.auth_user(username, password)
|
||||
with Database() as db:
|
||||
db.user.auth_user(username, password)
|
||||
|
||||
Reference in New Issue
Block a user