Minor stuff
This commit is contained in:
@@ -1,7 +1,8 @@
|
||||
from datetime import datetime, timedelta
|
||||
|
||||
import jwt
|
||||
from fastapi import HTTPException
|
||||
from fastapi import Depends, HTTPException
|
||||
from fastapi.security import HTTPAuthorizationCredentials, HTTPBearer
|
||||
from sqlalchemy.orm import Session
|
||||
|
||||
from crud.users import get_user_by_username, pwd_context
|
||||
@@ -15,6 +16,25 @@ jwt_secret = "secret_key"
|
||||
ALGORITHM = "HS256"
|
||||
ACCESS_TOKEN_EXPIRE_MINUTES = 44640 # One month
|
||||
|
||||
bearer_scheme = HTTPBearer()
|
||||
|
||||
|
||||
def get_current_user_name(
|
||||
token: HTTPAuthorizationCredentials = Depends(bearer_scheme),
|
||||
):
|
||||
try:
|
||||
payload = jwt.decode(
|
||||
token.credentials,
|
||||
jwt_secret,
|
||||
algorithms=[ALGORITHM],
|
||||
)
|
||||
username = payload.get("sub")
|
||||
if username is None:
|
||||
raise HTTPException(status_code=401, detail="Invalid JWT token")
|
||||
return username
|
||||
except jwt.exceptions.DecodeError:
|
||||
raise HTTPException(status_code=401, detail="Invalid JWT token")
|
||||
|
||||
|
||||
def authenticate_user(db: Session, username: str, password: str):
|
||||
"""Checks whether the provided credentials match with an existing User"""
|
||||
@@ -29,10 +49,14 @@ def authenticate_user(db: Session, username: str, password: str):
|
||||
|
||||
def register(db: Session, username: str, password: str, avatar: str):
|
||||
"""Register a new user"""
|
||||
if avatar == "":
|
||||
raise HTTPException(status_code=400, detail="No avatar was provided")
|
||||
db_user = get_user_by_username(db, username)
|
||||
if db_user:
|
||||
raise HTTPException(status_code=400, detail="Username already registered")
|
||||
db_user = User(username = username, hashed_password = pwd_context.hash(password), avatar = avatar)
|
||||
db_user = User(
|
||||
username=username, hashed_password=pwd_context.hash(password), avatar=avatar
|
||||
)
|
||||
db.add(db_user)
|
||||
db.commit()
|
||||
db.refresh(db_user)
|
||||
|
||||
Reference in New Issue
Block a user