Formatted everything with black
This commit is contained in:
@@ -52,7 +52,7 @@ oauth2_scheme = OAuth2PasswordBearer(
|
||||
"photos.write": "Modify photos.",
|
||||
"videos.list": "List videos.",
|
||||
"videos.read": "View videos.",
|
||||
"videos.write": "Modify videos."
|
||||
"videos.write": "Modify videos.",
|
||||
},
|
||||
)
|
||||
|
||||
@@ -66,8 +66,13 @@ def get_password_hash(password):
|
||||
|
||||
|
||||
def get_user(user: str):
|
||||
found_user = col_users.find_one( {"user": user} )
|
||||
return UserInDB(user=found_user["user"], email=found_user["email"], disabled=found_user["disabled"], hash=found_user["hash"])
|
||||
found_user = col_users.find_one({"user": user})
|
||||
return UserInDB(
|
||||
user=found_user["user"],
|
||||
email=found_user["email"],
|
||||
disabled=found_user["disabled"],
|
||||
hash=found_user["hash"],
|
||||
)
|
||||
|
||||
|
||||
def authenticate_user(user_name: str, password: str):
|
||||
@@ -79,19 +84,22 @@ def authenticate_user(user_name: str, password: str):
|
||||
return user
|
||||
|
||||
|
||||
def create_access_token( data: dict, expires_delta: Union[timedelta, None] = None ):
|
||||
def create_access_token(data: dict, expires_delta: Union[timedelta, None] = None):
|
||||
to_encode = data.copy()
|
||||
if expires_delta:
|
||||
expire = datetime.now(tz=timezone.utc) + expires_delta
|
||||
else:
|
||||
expire = datetime.now(tz=timezone.utc) + timedelta(days=ACCESS_TOKEN_EXPIRE_DAYS)
|
||||
expire = datetime.now(tz=timezone.utc) + timedelta(
|
||||
days=ACCESS_TOKEN_EXPIRE_DAYS
|
||||
)
|
||||
to_encode.update({"exp": expire})
|
||||
encoded_jwt = jwt.encode(to_encode, SECRET_KEY, algorithm=ALGORITHM)
|
||||
return encoded_jwt
|
||||
|
||||
|
||||
async def get_current_user( security_scopes: SecurityScopes, token: str = Depends(oauth2_scheme) ):
|
||||
|
||||
async def get_current_user(
|
||||
security_scopes: SecurityScopes, token: str = Depends(oauth2_scheme)
|
||||
):
|
||||
if security_scopes.scopes:
|
||||
authenticate_value = f'Bearer scope="{security_scopes.scope_str}"'
|
||||
else:
|
||||
@@ -112,7 +120,7 @@ async def get_current_user( security_scopes: SecurityScopes, token: str = Depend
|
||||
token_data = TokenData(scopes=token_scopes, user=user)
|
||||
except (JWTError, ValidationError):
|
||||
raise credentials_exception
|
||||
|
||||
|
||||
user = get_user(user=token_data.user)
|
||||
|
||||
if user is None:
|
||||
@@ -128,7 +136,9 @@ async def get_current_user( security_scopes: SecurityScopes, token: str = Depend
|
||||
return user
|
||||
|
||||
|
||||
async def get_current_active_user( current_user: User = Security(get_current_user, scopes=["me"]) ):
|
||||
async def get_current_active_user(
|
||||
current_user: User = Security(get_current_user, scopes=["me"])
|
||||
):
|
||||
if current_user.disabled:
|
||||
raise HTTPException(status_code=400, detail="Inactive user")
|
||||
return current_user
|
||||
return current_user
|
||||
|
Reference in New Issue
Block a user