rev 4
This commit is contained in:
@@ -26,36 +26,36 @@ async def get_current_user(
|
||||
payload = decode_token(token)
|
||||
except ExpiredSignatureError as e:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_401_UNAUTHORIZED, detail="Token expired"
|
||||
status_code=status.HTTP_401_UNAUTHORIZED, detail="Токен истёк"
|
||||
) from e
|
||||
except InvalidTokenError as e:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_401_UNAUTHORIZED, detail="Invalid token"
|
||||
status_code=status.HTTP_401_UNAUTHORIZED, detail="Недействительный токен"
|
||||
) from e
|
||||
|
||||
if payload.get("type") != "access":
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_401_UNAUTHORIZED, detail="Invalid token"
|
||||
status_code=status.HTTP_401_UNAUTHORIZED, detail="Недействительный токен"
|
||||
)
|
||||
|
||||
sub = payload.get("sub")
|
||||
if not sub:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_401_UNAUTHORIZED, detail="Invalid token"
|
||||
status_code=status.HTTP_401_UNAUTHORIZED, detail="Недействительный токен"
|
||||
)
|
||||
|
||||
try:
|
||||
user_id = uuid.UUID(str(sub))
|
||||
except ValueError as e:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_401_UNAUTHORIZED, detail="Invalid token"
|
||||
status_code=status.HTTP_401_UNAUTHORIZED, detail="Недействительный токен"
|
||||
) from e
|
||||
|
||||
user_repo = UserRepository(db)
|
||||
user = await user_repo.get_by_id(user_id)
|
||||
if user is None or not user.is_active:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_401_UNAUTHORIZED, detail="Invalid credentials"
|
||||
status_code=status.HTTP_401_UNAUTHORIZED, detail="Неверные учётные данные"
|
||||
)
|
||||
|
||||
return user
|
||||
|
||||
@@ -98,6 +98,7 @@ class Settings(BaseSettings):
|
||||
|
||||
# SaluteSpeech
|
||||
salute_auth_key: str = Field(default="", alias="SALUTE_AUTH_KEY")
|
||||
salute_ssl_verify: bool = Field(default=True, alias="SALUTE_SSL_VERIFY")
|
||||
salute_ca_cert_path: Path | None = Field(
|
||||
default=None, alias="SALUTE_CA_CERT_PATH"
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user