maleo-foundation 0.1.68__tar.gz → 0.1.70__tar.gz

{maleo_foundation-0.1.68 → maleo_foundation-0.1.70}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: maleo_foundation
-Version: 0.1.68
+Version: 0.1.70
 Summary: Foundation package for Maleo
 Author-email: Agra Bima Yuda <agra@nexmedis.com>
 License: MIT

{maleo_foundation-0.1.68 → maleo_foundation-0.1.70}/maleo_foundation/authentication.py

@@ -1,7 +1,5 @@
-from starlette.authentication import (
-    AuthCredentials,
-    BaseUser
-)
+from pydantic import BaseModel, Field
+from starlette.authentication import AuthCredentials, BaseUser
 from typing import Optional, Sequence
 from maleo_foundation.models.transfers.general.token import BaseTokenGeneralTransfers
 from maleo_foundation.types import BaseTypes
@@ -46,4 +44,11 @@ class User(BaseUser):
 
     @property
     def identity(self) -> str:
-        return self._email
+        return self._email
+
+class Authentication(BaseModel):
+    credentials:Credentials = Field(..., description="Credentials's information")
+    user:User = Field(..., description="User's information")
+
+    class Config:
+        arbitrary_types_allowed=True

{maleo_foundation-0.1.68 → maleo_foundation-0.1.70}/maleo_foundation/middlewares/authentication.py

@@ -9,7 +9,6 @@ from maleo_foundation.client.manager import MaleoFoundationClientManager
 from maleo_foundation.models.schemas import BaseGeneralSchemas
 from maleo_foundation.models.transfers.parameters.token import BaseTokenParametersTransfers
 from maleo_foundation.utils.exceptions import BaseExceptions
-from maleo_foundation.utils.extractor import BaseExtractors
 from maleo_foundation.utils.logging import MiddlewareLogger
 
 class Backend(AuthenticationBackend):
@@ -20,26 +19,21 @@ class Backend(AuthenticationBackend):
         self._maleo_foundation = maleo_foundation
 
     async def authenticate(self, conn:HTTPConnection) -> Tuple[Credentials, User]:
-        client_ip = BaseExtractors.extract_client_ip(conn)
         if "Authorization" not in conn.headers:
-            self._logger.info(f"Request | IP: {client_ip} | URL: {conn.url.path} - Result | General: Header did not contain authorization")
             return Credentials(), User(authenticated=False)
 
         auth = conn.headers["Authorization"]
         scheme, token = auth.split()
         if scheme != 'Bearer':
-            self._logger.info(f"Request | IP: {client_ip} | URL: {conn.url.path} - Result | General: Authorization scheme is not Bearer")
             raise AuthenticationError("Authorization scheme must be Bearer token")
 
         decode_token_parameters = BaseTokenParametersTransfers.Decode(key=self._keys.public, token=token)
         decode_token_result = self._maleo_foundation.services.token.decode(parameters=decode_token_parameters)
         if not decode_token_result.success:
-            self._logger.error(f"Request | IP: {client_ip} | URL: {conn.url.path} - Result | General: Failed decoding authorization token")
             raise AuthenticationError("Invalid Bearer token, unable to decode token")
         if decode_token_result.data.exp_dt <= datetime.now(tz=timezone.utc):
             raise AuthenticationError("Expired Bearer token, request new or refresh token")
 
-        self._logger.info(f"Request | IP: {client_ip} | URL: {conn.url.path} - Result | Username: {decode_token_result.data.u_u} | Email: {decode_token_result.data.u_e}")
         return Credentials(token=token, payload=decode_token_result.data, scopes=["authenticated"]), User(authenticated=True, username=decode_token_result.data.u_u, email=decode_token_result.data.u_e)
 
 def add_authentication_middleware(app:FastAPI, keys:BaseGeneralSchemas.RSAKeys, logger:MiddlewareLogger, maleo_foundation:MaleoFoundationClientManager) -> None:

{maleo_foundation-0.1.68 → maleo_foundation-0.1.70}/maleo_foundation/middlewares/base.py

@@ -148,8 +148,8 @@ class BaseMiddleware(BaseHTTPMiddleware):
         response = self._add_response_headers(request, response, request_timestamp, response_timestamp, process_time)
         log_func = getattr(self._logger, log_level)
         log_func(
-            f"Request {authentication_info} | IP: {client_ip} | Method: {request.method} | URL: {request.url.path} | "
-            f"Headers: {dict(request.headers)} - Response | Status: {response.status_code} | "
+            f"Request {authentication_info} | IP: {client_ip} | Host: {request.client.host} | Port: {request.client.port} | Method: {request.method} | URL: {request.url.path} | "
+            f"Headers: {dict(request.headers)} - Response | Status: {response.status_code}"
         )
         return response
 
@@ -179,7 +179,7 @@ class BaseMiddleware(BaseHTTPMiddleware):
         )
 
         self._logger.error(
-            f"Request {authentication_info} | IP: {client_ip} | Method: {request.method} | URL: {request.url.path} | "
+            f"Request {authentication_info} | IP: {client_ip} | Host: {request.client.host} | Port: {request.client.port} | Method: {request.method} | URL: {request.url.path} | "
             f"Headers: {dict(request.headers)} - Response | Status: 500 | Exception:\n{json.dumps(error_details, indent=4)}"
         )
 

{maleo_foundation-0.1.68 → maleo_foundation-0.1.70}/maleo_foundation/models/responses.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 from fastapi import status
 from pydantic import Field, model_validator
+from typing import Dict, Type, Union
 from maleo_foundation.models.schemas.general import BaseGeneralSchemas
 from maleo_foundation.models.schemas.result import BaseResultSchemas
 from maleo_foundation.types import BaseTypes
@@ -88,7 +89,7 @@ class BaseResponses:
             return values
 
     #* ----- ----- Responses Class ----- ----- *#
-    other_responses={
+    other_responses:Dict[int, Dict[str, Union[str, Type[Fail]]]]={
         status.HTTP_400_BAD_REQUEST: {
             "description": "Bad Request Response",
             "model": BadRequest

{maleo_foundation-0.1.68 → maleo_foundation-0.1.70}/maleo_foundation/utils/exceptions.py

@@ -21,11 +21,9 @@ class BaseExceptions:
 
     @staticmethod
     async def http_exception_handler(request:Request, exc:StarletteHTTPException):
-        if exc.status_code == 404:
-            return JSONResponse(content=BaseResponses.NotFound().model_dump(), status_code=status.HTTP_404_NOT_FOUND)
-
-        #* Handle other HTTP exceptions normally
-        return None
+        if exc.status_code in BaseResponses.other_responses:
+            return JSONResponse(content=BaseResponses.other_responses[exc.status_code]["model"]().model_dump(), status_code=exc.status_code)
+        return JSONResponse(content=BaseResponses.ServerError().model_dump(), status_code=status.HTTP_500_INTERNAL_SERVER_ERROR)
 
     @staticmethod
     def database_exception_handler(

{maleo_foundation-0.1.68 → maleo_foundation-0.1.70}/maleo_foundation.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: maleo_foundation
-Version: 0.1.68
+Version: 0.1.70
 Summary: Foundation package for Maleo
 Author-email: Agra Bima Yuda <agra@nexmedis.com>
 License: MIT

{maleo_foundation-0.1.68 → maleo_foundation-0.1.70}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "maleo_foundation"
-version = "0.1.68"
+version = "0.1.70"
 description = "Foundation package for Maleo"
 authors = [
     { name = "Agra Bima Yuda", email = "agra@nexmedis.com" }