nlbone 0.7.24__tar.gz → 0.7.25__tar.gz

{nlbone-0.7.24 → nlbone-0.7.25}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nlbone
-Version: 0.7.24
+Version: 0.7.25
 Summary: Backbone package for interfaces and infrastructure in Python projects
 Author-email: Amir Hosein Kahkbazzadeh <a.khakbazzadeh@gmail.com>
 License: MIT

{nlbone-0.7.24 → nlbone-0.7.25}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "nlbone"
-version = "0.7.24"
+version = "0.7.25"
 description = "Backbone package for interfaces and infrastructure in Python projects"
 readme = "README.md"
 requires-python = ">=3.10"

{nlbone-0.7.24 → nlbone-0.7.25}/src/nlbone/core/domain/models.py

@@ -1,7 +1,8 @@
 import enum
 import uuid
+from dataclasses import dataclass
 from datetime import datetime, timedelta, timezone
-from typing import Any, Dict, Optional
+from typing import Any, Dict, Optional, List
 
 from sqlalchemy import JSON, DateTime, Index, Integer, String, Text
 from sqlalchemy import JSON as SA_JSON
@@ -22,6 +23,35 @@ except Exception:
     UUIDType = String(36)
 
 
+@dataclass
+class CurrentUserData:
+    active: bool
+    id: int
+    email: str
+    exp: int
+    iat: int
+    preferred_username: str
+    name: str
+    phone_number: str
+    verifications: List[str]
+    allowed_permissions: List[str]
+
+    @classmethod
+    def from_dict(cls, data: dict) -> "CurrentUserData":
+        return cls(
+            active=data.get("active"),
+            id=data.get("sub"),
+            email=data.get("email"),
+            exp=data.get("exp"),
+            iat=data.get("iat"),
+            preferred_username=data.get("preferred_username"),
+            name=data.get("name"),
+            phone_number=data.get("phone_number"),
+            verifications=data.get("verifications", []),
+            allowed_permissions=data.get("allowed_permissions", []),
+        )
+
+
 class AuditLog(Base):
     __tablename__ = "audit_logs"
 

{nlbone-0.7.24 → nlbone-0.7.25}/src/nlbone/interfaces/api/dependencies/auth.py

@@ -1,5 +1,6 @@
 import functools
 
+from nlbone.core.domain.models import CurrentUserData
 from nlbone.adapters.auth import KeycloakAuthService
 from nlbone.adapters.auth.keycloak import get_auth_service
 from nlbone.config.settings import get_settings
@@ -21,6 +22,13 @@ def current_user_id() -> int:
     raise UnauthorizedException()
 
 
+def current_user() -> CurrentUserData:
+    user = current_request().state.user
+    if user.id is None:
+        raise UnauthorizedException()
+    return user
+
+
 def current_client_id() -> str:
     request = current_request()
     if client_id := KeycloakAuthService().get_client_id(request.state.token):

{nlbone-0.7.24 → nlbone-0.7.25}/src/nlbone/interfaces/api/exceptions.py

@@ -1,4 +1,4 @@
-from typing import Any, Iterable
+from typing import Any, Iterable, Dict, List
 
 from fastapi import HTTPException, status
 
@@ -83,9 +83,14 @@ class UnprocessableEntityException(BaseHttpException):
         )
 
 
-class LogicalValidationException(UnprocessableEntityException):
-    def __init__(self, detail: str, loc: Iterable[Any] | None = None, type_: str = "logical_error"):
-        super().__init__(detail=detail, loc=loc, type_=type_)
+class LogicalValidationException(HTTPException):
+    def __init__(self, detail: str = None, loc: Iterable[Any] | None = None, type_: str = "logical_error",
+                 errors: List[Dict[str, Any]] = None):
+        self.errors = errors
+        if errors:
+            super().__init__(detail=errors, status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,)
+        else:
+            super().__init__(detail=_errors(loc, detail, type_), status_code=status.HTTP_422_UNPROCESSABLE_ENTITY)
 
 
 class GoneException(BaseHttpException):

{nlbone-0.7.24 → nlbone-0.7.25}/src/nlbone/interfaces/api/middleware/authentication.py

@@ -3,6 +3,7 @@ from typing import Callable, Optional, Union
 from fastapi import Request
 from starlette.middleware.base import BaseHTTPMiddleware
 
+from nlbone.core.domain.models import CurrentUserData
 from nlbone.adapters.auth.auth_service import AuthService
 from nlbone.config.settings import get_settings
 
@@ -53,7 +54,8 @@ def authenticate_admin_user(request, auth_service):
 
 def authenticate_user(request):
     token = (
-        request.cookies.get("access_token") or request.cookies.get("j_token") or request.headers.get("Authorization")
+            request.cookies.get("access_token") or request.cookies.get("j_token") or request.headers.get(
+        "Authorization")
     )
     if request.headers.get("Authorization"):
         scheme, token = request.headers.get("Authorization").split(" ", 1)
@@ -64,6 +66,7 @@ def authenticate_user(request):
             service: BaseAuthService = AuthService()
             data = service.verify_token(token)
             if data:
+                request.state.user = CurrentUserData.from_dict(data)
                 request.state.user_id = data.get("sub")
         except Exception:
             pass
@@ -78,6 +81,7 @@ class AuthenticationMiddleware(BaseHTTPMiddleware):
         request.state.client_id = None
         request.state.user_id = None
         request.state.token = None
+        request.state.user = None
         if request.headers.get("X-Client-Id") and request.headers.get("X-Api-Key"):
             if request.headers.get("X-Api-Key") == get_settings().PRICING_API_SECRET:
                 request.state.client_id = request.headers.get("X-Client-Id")