move sub dir to root
This commit is contained in:
parent
7281477269
commit
3ac4d21e3f
7 changed files with 11 additions and 11 deletions
4
main.py
4
main.py
|
|
@ -1,5 +1,5 @@
|
|||
from .config import app
|
||||
from .auth.router import router as auth_router
|
||||
from config import app
|
||||
from router import router as auth_router
|
||||
|
||||
app.include_router(auth_router)
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
from enum import Enum
|
||||
from backend.config import SECRET_KEY, ALGORITHM, ACCESS_TOKEN_EXPIRE_MINUTES
|
||||
from backend.config import pwd_context
|
||||
from config import SECRET_KEY, ALGORITHM, ACCESS_TOKEN_EXPIRE_MINUTES
|
||||
from config import pwd_context
|
||||
from datetime import datetime, timedelta, timezone
|
||||
from pydantic import BaseModel
|
||||
from fastapi import Depends, HTTPException
|
||||
|
|
@ -86,7 +86,7 @@ def authenticate_user(fake_db, username: str, password: str) -> UserInDb | bool:
|
|||
return False
|
||||
if not verify_password(password, user["hashed_password"]):
|
||||
return False
|
||||
|
||||
|
||||
return user
|
||||
|
||||
def create_access_token(
|
||||
|
|
@ -119,20 +119,20 @@ def get_current_user(token: Annotated[str, Depends(oauth2_scheme)]) -> UserPubli
|
|||
username : str = token_data.username
|
||||
if username is None:
|
||||
raise credentials_exception
|
||||
|
||||
|
||||
except jwt.PyJWTError:
|
||||
raise credentials_exception
|
||||
|
||||
|
||||
user = get_user(fake_db, username=username)
|
||||
if user is None:
|
||||
raise credentials_exception
|
||||
|
||||
|
||||
return user
|
||||
|
||||
async def get_current_active_user(
|
||||
current_user : Annotated[UserInDb, Depends(get_current_user)]
|
||||
) -> UserPublic | None:
|
||||
|
||||
|
||||
if current_user.status == Status.banned:
|
||||
raise HTTPException(status_code=400, detail="Inactive user")
|
||||
return current_user
|
||||
|
|
@ -2,7 +2,7 @@ from fastapi import APIRouter, Depends, HTTPException, status
|
|||
from .models import UserInDb, User, Role, Token, UserPublic
|
||||
from .models import get_current_active_user, authenticate_user, create_access_token , fake_db, get_current_user
|
||||
from datetime import timedelta, datetime, timezone
|
||||
from ..config import ACCESS_TOKEN_EXPIRE_MINUTES
|
||||
from .config import ACCESS_TOKEN_EXPIRE_MINUTES
|
||||
from typing import Annotated, Optional
|
||||
from fastapi.security import OAuth2PasswordRequestForm
|
||||
|
||||
|
|
@ -35,7 +35,7 @@ async def home(current_user : Annotated[User, Depends(ADMIN)]):
|
|||
async def login_for_access_token(
|
||||
form_data : Annotated[OAuth2PasswordRequestForm, Depends()],
|
||||
) -> Token:
|
||||
|
||||
|
||||
user = authenticate_user(fake_db, form_data.username, form_data.password)
|
||||
if not user:
|
||||
raise HTTPException(
|
||||
Loading…
Add table
Add a link
Reference in a new issue