tpeetz/kontor
1
0
Fork 0
Code Issues 6 Pull Requests 2 Actions Packages Projects Releases 2 Wiki Activity

update usage of api for login by email or username

Browse Source
This commit is contained in:
Thomas Peetz
2026-04-15 11:32:18 +02:00
committed by Thomas Peetz
parent 2b7b483019
commit 72f6591819
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kontor-api/src/apis/version1/login.py
+3 -3
View File
@@ -6,7 +6,7 @@ from pydantic import BaseModel
from typing import Annotated from typing import Annotated
from src.core.config import settings from src.core.config import settings
from src.core.log_conf import logger from src.core.log_conf import logger
from src.core.security import authenticate_user, create_access_token from src.core.security import authenticate_user_by_email, authenticate_user_by_username, create_access_token
from src.schema.admin import Token from src.schema.admin import Token
login_router = APIRouter() login_router = APIRouter()
@@ -26,7 +26,7 @@ class LoginRequest(BaseModel):
) )
def login(request: LoginRequest) -> Token: def login(request: LoginRequest) -> Token:
logger.info(f"login with {request.email}") logger.info(f"login with {request.email}")
user = authenticate_user(request.email, request.password) user = authenticate_user_by_email(request.email, request.password)
scopes = ["admin", "read"] scopes = ["admin", "read"]
if not user: if not user:
raise HTTPException( raise HTTPException(
@@ -45,7 +45,7 @@ def login(request: LoginRequest) -> Token:
async def login_for_access_token( async def login_for_access_token(
form_data: Annotated[OAuth2PasswordRequestForm, Depends()], form_data: Annotated[OAuth2PasswordRequestForm, Depends()],
) -> Token: ) -> Token:
user = authenticate_user(form_data.username, form_data.password) user = authenticate_user_by_username(form_data.username, form_data.password)
if not user: if not user:
raise HTTPException(status_code=400, detail="Incorrect username or password") raise HTTPException(status_code=400, detail="Incorrect username or password")
access_token_expires = timedelta(minutes=settings.ACCESS_TOKEN_EXPIRE_MINUTES) access_token_expires = timedelta(minutes=settings.ACCESS_TOKEN_EXPIRE_MINUTES)