Added ref login
This commit is contained in:
+19
-12
@@ -6,11 +6,13 @@ from fastapi import APIRouter, Depends, HTTPException, status
|
||||
from fastapi.security import OAuth2PasswordRequestForm
|
||||
|
||||
from ..schemas import Token
|
||||
from ..core.auth import create_access_token, get_current_user
|
||||
from ..core.auth import create_access_token, get_authenticated_user
|
||||
from ..core.config import (
|
||||
ACCESS_TOKEN_EXPIRE_MINUTES,
|
||||
ADMIN_HASH,
|
||||
ADMIN_USER,
|
||||
REF_HASH,
|
||||
REF_USER,
|
||||
verify_password,
|
||||
)
|
||||
|
||||
@@ -21,14 +23,18 @@ router = APIRouter(prefix="/auth", tags=["Auth"])
|
||||
async def login_for_access_token(
|
||||
form_data: Annotated[OAuth2PasswordRequestForm, Depends()],
|
||||
):
|
||||
if form_data.username != ADMIN_USER:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_401_UNAUTHORIZED,
|
||||
detail="Incorrect username or password",
|
||||
headers={"WWW-Authenticate": "Bearer"},
|
||||
)
|
||||
role = None
|
||||
|
||||
if not verify_password(form_data.password, ADMIN_HASH):
|
||||
if form_data.username == ADMIN_USER and verify_password(
|
||||
form_data.password, ADMIN_HASH
|
||||
):
|
||||
role = "admin"
|
||||
elif form_data.username == REF_USER and verify_password(
|
||||
form_data.password, REF_HASH
|
||||
):
|
||||
role = "ref"
|
||||
|
||||
if not role:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_401_UNAUTHORIZED,
|
||||
detail="Incorrect username or password",
|
||||
@@ -37,12 +43,13 @@ async def login_for_access_token(
|
||||
|
||||
access_token_expires = timedelta(minutes=ACCESS_TOKEN_EXPIRE_MINUTES)
|
||||
access_token = create_access_token(
|
||||
data={"sub": form_data.username}, expires_delta=access_token_expires
|
||||
data={"sub": form_data.username, "role": role},
|
||||
expires_delta=access_token_expires,
|
||||
)
|
||||
|
||||
return {"access_token": access_token, "token_type": "bearer"}
|
||||
return {"access_token": access_token, "token_type": "bearer", "role": role}
|
||||
|
||||
|
||||
@router.get("/check")
|
||||
async def check_auth(user: str = Depends(get_current_user)):
|
||||
return {"is_admin": True, "user": user}
|
||||
async def check_auth(user: dict = Depends(get_authenticated_user)):
|
||||
return {"role": user.get("role"), "user": user.get("sub")}
|
||||
|
||||
@@ -4,7 +4,7 @@ from sqlalchemy.orm import Session
|
||||
|
||||
from ... import crud, schemas
|
||||
from ...constants import SUCCESS
|
||||
from ...core.auth import get_current_user
|
||||
from ...core.auth import get_admin_user
|
||||
from ...core.websocket_manager import send_ws_update
|
||||
from ...database import get_db
|
||||
from . import router
|
||||
@@ -20,7 +20,7 @@ async def create_court(
|
||||
id: str,
|
||||
court: schemas.CourtCreate,
|
||||
db: Session = Depends(get_db),
|
||||
user: str = Depends(get_current_user),
|
||||
user: dict = Depends(get_admin_user),
|
||||
):
|
||||
new_court = crud.create_court(db, id, court)
|
||||
if not new_court:
|
||||
@@ -35,7 +35,7 @@ async def update_courts(
|
||||
id: str,
|
||||
courts: list[str],
|
||||
db: Session = Depends(get_db),
|
||||
user: str = Depends(get_current_user),
|
||||
user: dict = Depends(get_admin_user),
|
||||
):
|
||||
t = crud.update_tournament_courts(db, id, courts)
|
||||
if not t:
|
||||
@@ -50,7 +50,7 @@ async def delete_court(
|
||||
id: str,
|
||||
court_id: int,
|
||||
db: Session = Depends(get_db),
|
||||
user: str = Depends(get_current_user),
|
||||
user: dict = Depends(get_admin_user),
|
||||
):
|
||||
success = crud.delete_court(db, id, court_id)
|
||||
if not success:
|
||||
|
||||
@@ -6,13 +6,13 @@ from sqlalchemy.orm import Session
|
||||
|
||||
from ... import crud, schemas
|
||||
from ...database import get_db
|
||||
from ...core.auth import get_current_user
|
||||
from ...core.auth import get_admin_user
|
||||
from . import router
|
||||
|
||||
|
||||
@router.get("/{id}/settings", response_model=schemas.TournamentSettingsResponse)
|
||||
def get_tournament(
|
||||
id: str, db: Session = Depends(get_db), user: str = Depends(get_current_user)
|
||||
id: str, db: Session = Depends(get_db), user: dict = Depends(get_admin_user)
|
||||
):
|
||||
t = crud.get_tournament(db, id)
|
||||
if not t:
|
||||
|
||||
@@ -4,7 +4,7 @@ from sqlalchemy.orm import Session
|
||||
|
||||
from ... import crud, schemas
|
||||
from ...constants import SUCCESS
|
||||
from ...core.auth import get_current_user
|
||||
from ...core.auth import get_admin_user
|
||||
from ...core.websocket_manager import send_ws_update
|
||||
from ...database import get_db
|
||||
from . import router
|
||||
@@ -20,7 +20,7 @@ async def create_team(
|
||||
id: str,
|
||||
team: schemas.TeamCreate,
|
||||
db: Session = Depends(get_db),
|
||||
user: str = Depends(get_current_user),
|
||||
user: dict = Depends(get_admin_user),
|
||||
):
|
||||
new_team = crud.create_team(db, id, team)
|
||||
if not new_team:
|
||||
@@ -35,7 +35,7 @@ async def update_teams(
|
||||
id: str,
|
||||
teams: list[str],
|
||||
db: Session = Depends(get_db),
|
||||
user: str = Depends(get_current_user),
|
||||
user: dict = Depends(get_admin_user),
|
||||
):
|
||||
t = crud.update_tournament_teams(db, id, teams)
|
||||
if not t:
|
||||
@@ -50,7 +50,7 @@ async def delete_team(
|
||||
id: str,
|
||||
team_id: int,
|
||||
db: Session = Depends(get_db),
|
||||
user: str = Depends(get_current_user),
|
||||
user: dict = Depends(get_admin_user),
|
||||
):
|
||||
success = crud.delete_team(db, id, team_id)
|
||||
if not success:
|
||||
|
||||
@@ -6,7 +6,7 @@ from ... import crud, schemas
|
||||
from ...constants import SUCCESS
|
||||
from ...core.websocket_manager import send_ws_update
|
||||
from ...database import get_db
|
||||
from ...core.auth import get_current_user
|
||||
from ...core.auth import get_admin_user
|
||||
from . import router
|
||||
|
||||
|
||||
@@ -14,7 +14,7 @@ from . import router
|
||||
async def create_tournament(
|
||||
data: schemas.TournamentCreate,
|
||||
db: Session = Depends(get_db),
|
||||
user: str = Depends(get_current_user),
|
||||
user: dict = Depends(get_admin_user),
|
||||
):
|
||||
new_t = crud.create_tournament(db, data)
|
||||
await send_ws_update(new_t.id)
|
||||
@@ -39,7 +39,7 @@ async def update_settings(
|
||||
id: str,
|
||||
data: schemas.TournamentUpdate,
|
||||
db: Session = Depends(get_db),
|
||||
user: str = Depends(get_current_user),
|
||||
user: dict = Depends(get_admin_user),
|
||||
):
|
||||
t = crud.update_tournament_details(db, id, data)
|
||||
if not t:
|
||||
@@ -51,7 +51,7 @@ async def update_settings(
|
||||
|
||||
@router.delete("/{id}")
|
||||
async def delete_tournament(
|
||||
id: str, db: Session = Depends(get_db), user: str = Depends(get_current_user)
|
||||
id: str, db: Session = Depends(get_db), user: dict = Depends(get_admin_user)
|
||||
):
|
||||
success = crud.delete_tournament(db, id)
|
||||
if not success:
|
||||
|
||||
Reference in New Issue
Block a user