diff --git a/MediaManager/src/auth/__init__.py b/MediaManager/src/auth/__init__.py index a47b0ca..44aaff7 100644 --- a/MediaManager/src/auth/__init__.py +++ b/MediaManager/src/auth/__init__.py @@ -28,12 +28,12 @@ ALGORITHM = "HS256" ACCESS_TOKEN_EXPIRE_MINUTES = 30 log = logging.getLogger(__name__) -log.level = logging.DEBUG -log.addHandler(logging.StreamHandler()) + +oauth2_scheme = OAuth2PasswordBearer(tokenUrl="api/v1/token") router = APIRouter() -async def get_current_user(token: str) -> UserInternal: +async def get_current_user(token: str = Depends(oauth2_scheme)) -> UserInternal: credentials_exception = HTTPException( status_code=status.HTTP_401_UNAUTHORIZED, detail="Could not validate credentials", @@ -63,7 +63,7 @@ def create_access_token(data: dict, expires_delta: timedelta | None = None): if expires_delta: expire = datetime.now(timezone.utc) + expires_delta else: - expire = datetime.now(timezone.utc) + timedelta(minutes=15) + expire = datetime.now(timezone.utc) + timedelta(minutes=ACCESS_TOKEN_EXPIRE_MINUTES) to_encode.update({"exp": expire}) encoded_jwt = jwt.encode(to_encode, SECRET_KEY, algorithm=ALGORITHM) return encoded_jwt diff --git a/MediaManager/src/auth/password.py b/MediaManager/src/auth/password.py index b79e648..59b2fcd 100644 --- a/MediaManager/src/auth/password.py +++ b/MediaManager/src/auth/password.py @@ -9,7 +9,6 @@ import database from auth import ACCESS_TOKEN_EXPIRE_MINUTES, create_access_token, Token, router from database import UserInternal -oauth2_scheme = OAuth2PasswordBearer(tokenUrl="token") @@ -46,7 +45,6 @@ def authenticate_user(email: str, password: str) -> bool | UserInternal: async def login_for_access_token( form_data: Annotated[OAuth2PasswordRequestForm, Depends()], ) -> Token: - print("post:", form_data.username, form_data.password) user = authenticate_user(form_data.username, form_data.password) if not user: raise HTTPException( diff --git a/MediaManager/src/database.py b/MediaManager/src/database.py index 9123af3..0e3ddb1 100644 --- a/MediaManager/src/database.py +++ b/MediaManager/src/database.py @@ -10,8 +10,6 @@ from psycopg.rows import dict_row from pydantic import BaseModel log = getLogger(__name__) -log.level = logging.DEBUG -log.addHandler(logging.StreamHandler()) class User(BaseModel): diff --git a/MediaManager/src/main.py b/MediaManager/src/main.py index 4b468bc..1eaccea 100644 --- a/MediaManager/src/main.py +++ b/MediaManager/src/main.py @@ -1,3 +1,6 @@ +import logging +import pprint +import sys import uvicorn from fastapi import FastAPI @@ -5,11 +8,14 @@ from fastapi import FastAPI from routers import users from auth import password -app = FastAPI() +logging.basicConfig(level=logging.DEBUG,format="%(asctime)s - %(levelname)s - module: %(name)s - %(funcName)s(): %(message)s", stream=sys.stdout) + +app = FastAPI(root_path="/api/v1") app.include_router(users.router, tags=["users"]) app.include_router(password.router, tags=["authentication"]) if __name__ == "__main__": - uvicorn.run(app, host="127.0.0.1", port=5049) \ No newline at end of file + uvicorn.run(app, host="127.0.0.1", port=5049) + diff --git a/MediaManager/src/routers/__init__.py b/MediaManager/src/routers/__init__.py index c3e9a82..acb3b64 100644 --- a/MediaManager/src/routers/__init__.py +++ b/MediaManager/src/routers/__init__.py @@ -1,4 +1,3 @@ import logging -log = logging.getLogger(__name__) -log.level = logging.DEBUG \ No newline at end of file +log = logging.getLogger(__name__) \ No newline at end of file