maleo-foundation 0.3.72__py3-none-any.whl → 0.3.75__py3-none-any.whl

maleo_foundation/authentication.py

@@ -1,17 +1,6 @@
-from pydantic import BaseModel, ConfigDict, Field, model_validator
 from starlette.authentication import AuthCredentials, BaseUser
-from typing import Optional, Self, Sequence
-from maleo_foundation.enums import BaseEnums
-from maleo_foundation.models.transfers.general.token import (
-    MaleoFoundationTokenGeneralTransfers,
-)
-
-
-class Token(BaseModel):
-    type: BaseEnums.TokenType = Field(..., description="Token's type")
-    payload: MaleoFoundationTokenGeneralTransfers.DecodePayload = Field(
-        ..., description="Token's payload"
-    )
+from typing import Optional, Sequence
+from maleo_foundation.models.transfers.general.authentication import Token
 
 
 class Credentials(AuthCredentials):
@@ -26,11 +15,6 @@ class Credentials(AuthCredentials):
         return self._token
 
 
-class CredentialsModel(BaseModel):
-    token: Optional[Token] = Field(None, description="Token")
-    scopes: Optional[Sequence[str]] = Field(None, description="Scopes")
-
-
 class User(BaseUser):
     def __init__(
         self, authenticated: bool = False, username: str = "", email: str = ""
@@ -50,33 +34,3 @@ class User(BaseUser):
     @property
     def identity(self) -> str:
         return self._email
-
-
-class UserModel(BaseModel):
-    is_authenticated: bool = Field(False, description="Authenticated")
-    display_name: str = Field("", description="Username")
-    identity: str = Field("", description="Email")
-
-
-class Authentication(BaseModel):
-    model_config = ConfigDict(arbitrary_types_allowed=True)
-
-    credentials: Credentials = Field(
-        ..., description="Credentials's information", exclude=True
-    )
-    credentials_model: CredentialsModel = Field(
-        default_factory=CredentialsModel,  # type: ignore
-        description="Credential's model",
-        serialization_alias="credentials",
-    )
-    user: User = Field(..., description="User's information", exclude=True)
-    user_model: UserModel = Field(default_factory=UserModel, description="User's model", serialization_alias="user")  # type: ignore
-
-    @model_validator(mode="after")
-    def define_models(self) -> Self:
-        self.credentials_model.token = self.credentials.token
-        self.credentials_model.scopes = self.credentials.scopes
-        self.user_model.is_authenticated = self.user.is_authenticated
-        self.user_model.display_name = self.user.display_name
-        self.user_model.identity = self.user.identity
-        return self

maleo_foundation/constants.py

@@ -1,9 +1,11 @@
 import re
+from fastapi.security import HTTPBearer
 from typing import List
 from uuid import UUID
 from maleo_foundation.enums import BaseEnums
 from maleo_foundation.types import BaseTypes
 
+TOKEN_SCHEME = HTTPBearer()
 EMAIL_REGEX: str = r"^[^\s@]+@[^\s@]+\.[^\s@]+$"
 TOKEN_COOKIE_KEY_NAME = "token"
 REFRESH_TOKEN_DURATION_DAYS: int = 7

maleo_foundation/enums.py

@@ -69,10 +69,12 @@ class BaseEnums:
 
     class ExceptionType(StrEnum):
         TIMEOUT = "timeout"
+        BAD = "bad"
         UNAUTHORIZED = "unauthorized"
         FORBIDDEN = "forbidden"
         NOT_FOUND = "not_found"
         VALIDATION = "validation"
+        RATE_LIMIT = "rate_limit"
         INTERNAL = "internal"
         UNAVAILABLE = "unavailable"
 
@@ -91,6 +93,7 @@ class BaseEnums:
         SERVICE = "service"
 
     class OperationLayer(StrEnum):
+        MIDDLEWARE = "middleware"
         ROUTER = "router"
         CONTROLLER = "controller"
         SERVICE = "service"
@@ -122,6 +125,7 @@ class BaseEnums:
         READ = "read"
         UPDATE = "update"
         DELETE = "delete"
+        OTHER = "other"
 
     class CreateType(StrEnum):
         CREATE = "create"
@@ -185,12 +189,14 @@ class BaseEnums:
         APPLICATION = "application"
         CACHE = "cache"
         CLIENT = "client"
+        CONTROLLER = "controller"
         DATABASE = "database"
         MIDDLEWARE = "middleware"
         REPOSITORY = "repository"
+        ROUTER = "router"
         SERVICE = "service"
 
-    class LoggerLevel(IntEnum):
+    class LogLevel(IntEnum):
         CRITICAL = logging.CRITICAL
         FATAL = logging.FATAL
         ERROR = logging.ERROR

maleo_foundation/managers/middleware.py

@@ -4,6 +4,7 @@ from maleo_foundation.models.schemas import BaseGeneralSchemas
 from maleo_foundation.models.transfers.general.configurations.middleware import (
     MiddlewareConfigurations,
 )
+from maleo_foundation.models.transfers.general.settings import Settings
 from maleo_foundation.middlewares.authentication import add_authentication_middleware
 from maleo_foundation.middlewares.base import add_base_middleware
 from maleo_foundation.middlewares.cors import add_cors_middleware
@@ -14,12 +15,14 @@ class MiddlewareManager:
     def __init__(
         self,
         app: FastAPI,
+        settings: Settings,
         configurations: MiddlewareConfigurations,
         keys: BaseGeneralSchemas.RSAKeys,
         logger: MiddlewareLogger,
         maleo_foundation: MaleoFoundationClientManager,
     ):
         self._app = app
+        self._settings = settings
         self._configurations = configurations
         self._keys = keys
         self._logger = logger
@@ -33,23 +36,20 @@ class MiddlewareManager:
     def add_cors(self) -> None:
         add_cors_middleware(
             app=self._app,
-            allow_origins=self._configurations.general.allow_origins,
-            allow_methods=self._configurations.general.allow_methods,
-            allow_headers=self._configurations.general.allow_headers,
-            allow_credentials=self._configurations.general.allow_credentials,
+            allow_origins=self._configurations.cors.allow_origins,
+            allow_methods=self._configurations.cors.allow_methods,
+            allow_headers=self._configurations.cors.allow_headers,
+            allow_credentials=self._configurations.cors.allow_credentials,
             expose_headers=self._configurations.cors.expose_headers,
         )
 
     def add_base(self):
         add_base_middleware(
             app=self._app,
+            settings=self._settings,
             keys=self._keys,
             logger=self._logger,
             maleo_foundation=self._maleo_foundation,
-            allow_origins=self._configurations.general.allow_origins,
-            allow_methods=self._configurations.general.allow_methods,
-            allow_headers=self._configurations.general.allow_headers,
-            allow_credentials=self._configurations.general.allow_credentials,
             limit=self._configurations.base.limit,
             window=self._configurations.base.window,
             cleanup_interval=self._configurations.base.cleanup_interval,

maleo_foundation/managers/service.py

@@ -40,6 +40,7 @@ from maleo_foundation.utils.logging import (
     DatabaseLogger,
     MiddlewareLogger,
     RepositoryLogger,
+    RouterLogger,
     ServiceLogger,
 )
 from .credential import CredentialManager
@@ -60,10 +61,6 @@ class ServiceManager:
         self._log_config = log_config  # * Declare log config
         self._settings = settings  # * Initialize settings
 
-        # * Disable google cloud logging if environment is local
-        if self._settings.ENVIRONMENT == "local":
-            self._log_config.google_cloud_logging = None
-
         # * Initialize Credential Manager
         self._credential_manager = CredentialManager(
             settings=self._settings, log_config=self._log_config
@@ -156,6 +153,11 @@ class ServiceManager:
             service_key=self.settings.SERVICE_KEY,
             **self._log_config.model_dump(),
         )
+        router = RouterLogger(
+            environment=self.settings.ENVIRONMENT,
+            service_key=self.settings.SERVICE_KEY,
+            **self._log_config.model_dump(),
+        )
         service = ServiceLogger(
             environment=self.settings.ENVIRONMENT,
             service_key=self.settings.SERVICE_KEY,
@@ -167,6 +169,7 @@ class ServiceManager:
             database=database,
             middleware=middleware,
             repository=repository,
+            router=router,
             service=service,
         )
 
@@ -306,6 +309,7 @@ class ServiceManager:
         self._loggers.application.info("Configuring middlewares")
         self._middleware = MiddlewareManager(
             app=self._app,
+            settings=self._settings,
             configurations=self.configurations.middleware,
             keys=self._keys,
             logger=self._loggers.middleware,

maleo_foundation/middlewares/authentication.py

@@ -3,10 +3,11 @@ from starlette.authentication import AuthenticationBackend, AuthenticationError
 from starlette.middleware.authentication import AuthenticationMiddleware
 from starlette.requests import HTTPConnection
 from typing import Tuple
-from maleo_foundation.authentication import Token, Credentials, User
+from maleo_foundation.authentication import Credentials, User
 from maleo_foundation.enums import BaseEnums
 from maleo_foundation.client.manager import MaleoFoundationClientManager
 from maleo_foundation.models.schemas import BaseGeneralSchemas
+from maleo_foundation.models.transfers.general.authentication import Token
 from maleo_foundation.models.transfers.parameters.token import (
     MaleoFoundationTokenParametersTransfers,
 )
@@ -67,7 +68,7 @@ class Backend(AuthenticationBackend):
                     User(authenticated=True, username=payload.u_u, email=payload.u_e),
                 )
 
-        return Credentials(), User(authenticated=False)
+        return Credentials(), User()
 
 
 def add_authentication_middleware(