fix: token (token model TBU)

src/fastapi_app/.env.example

@@ -10,5 +10,6 @@ API_HOST=0.0.0.0
 API_PORT=8000
 
 JWT_SECRET_KEY=v9LctjUWwol4XbvczPiLFMDtZ8aal7mm
+JWT_ALGORITHM=HS256
 
 APP_RELOAD=True

src/fastapi_app/lib/api/v1/schemas/__init__.py

@@ -1,6 +1,5 @@
-from .base import *
+from .base import HealthResponseModel
 
 __all__ = [
     "HealthResponseModel",
-    "TokenResponseModel",
 ]

src/fastapi_app/lib/api/v1/schemas/base.py

@@ -1,12 +1,5 @@
-import uuid
-
 import pydantic
 
 
-class TokenResponseModel(pydantic.BaseModel):
-    sub: uuid.UUID
-    exp: int | None = None
-
-
 class HealthResponseModel(pydantic.BaseModel):
     status: str = pydantic.Field(default=..., examples=["healthy"], description="Схема доступности сервиса")

src/fastapi_app/lib/api/v1/services/token.py

@@ -1,26 +0,0 @@
-import fastapi
-from jose import JWTError, jwt
-from pydantic import ValidationError
-
-import lib.app.settings as app_settings
-from lib.api.v1 import schemas as app_schemas
-
-app = fastapi.FastAPI()
-settings = app_settings.settings
-
-security = fastapi.security.HTTPBearer()
-
-
-def get_token_data(
-    authorization: fastapi.security.HTTPAuthorizationCredentials = fastapi.Security(security),
-) -> app_schemas.entity.Token:
-    token = authorization.credentials
-    try:
-        secret_key = settings.project.jwt_secret_key
-        payload = jwt.decode(token, secret_key, algorithms=["HS256"])
-        return app_schemas.entity.Token(**payload)
-    except (JWTError, ValidationError):
-        raise fastapi.HTTPException(
-            status_code=fastapi.status.HTTP_401_UNAUTHORIZED,
-            detail="Could not validate credentials",
-        )

src/fastapi_app/lib/app/split_settings/project.py

@@ -5,6 +5,8 @@ import lib.app.split_settings.utils as app_split_settings_utils
 
 
 class ProjectSettings(pydantic_settings.BaseSettings):
+    """Project settings."""
+
     model_config = pydantic_settings.SettingsConfigDict(
         env_file=app_split_settings_utils.ENV_PATH,
         env_file_encoding="utf-8",
@@ -12,7 +14,8 @@ class ProjectSettings(pydantic_settings.BaseSettings):
     )
 
     debug: str = "false"
-    jwt_secret_key: pydantic.SecretStr = pydantic.Field(default=..., validation_alias="jwt_secret_key")
+    jwt_secret_key: str = pydantic.Field(default=..., validation_alias="jwt_secret_key")
+    jwt_algorithm: str = "HS256"
 
     @pydantic.field_validator("debug")
     def validate_debug(cls, v: str) -> bool:

src/fastapi_app/lib/models/__init__.py

@@ -1,3 +1,4 @@
 from .base_sqlalchemy import Base
+from .token import Token
 
-__all__ = ["Base"]
+__all__ = ["Base", "Token"]

src/fastapi_app/lib/models/token.py

@@ -0,0 +1,9 @@
+import uuid
+
+import pydantic
+
+
+# TODO: TBU
+class Token(pydantic.BaseModel):
+    sub: uuid.UUID
+    exp: int | None = None

src/fastapi_app/lib/utils/token.py

@@ -0,0 +1,25 @@
+import fastapi
+import fastapi.security
+import jose
+import jose.jwt
+import pydantic
+
+import lib.app.settings as app_settings
+import lib.models as models
+
+
+def get_token_data(
+    authorization: fastapi.security.HTTPAuthorizationCredentials = fastapi.Security(fastapi.security.HTTPBearer()),
+) -> models.Token:
+    settings = app_settings.Settings()
+
+    token = authorization.credentials
+    try:
+        secret_key = settings.project.jwt_secret_key
+        payload = jose.jwt.decode(token, secret_key, algorithms=[settings.project.jwt_algorithm])
+        return models.Token(**payload)
+    except (jose.JWTError, pydantic.ValidationError) as error:
+        raise fastapi.HTTPException(
+            status_code=fastapi.status.HTTP_401_UNAUTHORIZED,
+            detail="Could not validate credentials",
+        ) from error