nlbone 0.7.24__py3-none-any.whl → 0.7.25__py3-none-any.whl

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/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/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/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")

{nlbone-0.7.24.dist-info → nlbone-0.7.25.dist-info}/METADATA

@@ -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.dist-info → nlbone-0.7.25.dist-info}/RECORD

@@ -58,7 +58,7 @@ nlbone/core/application/use_case.py,sha256=3GMQZ3CFK5cbLoBNBgohPft6GBq2j9_wr8iKR
 nlbone/core/application/services/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nlbone/core/domain/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nlbone/core/domain/base.py,sha256=dz3gwNnOk048zLghbNNM_Wa0qPXLoRmH5w72fwtXNFM,2592
-nlbone/core/domain/models.py,sha256=uCxdHqD8AJM-iq78bJ-nqAnGxtRiNK-5oFbkunXa7qc,3298
+nlbone/core/domain/models.py,sha256=_euaxgiZ8NZUrkvyc6jSMn0A_3m_mW1RIHcQ8o550Hg,4126
 nlbone/core/ports/__init__.py,sha256=syJg3fAjQALD5Rjfm9wi9bQpkIvNTWjE9AURBmy587o,132
 nlbone/core/ports/auth.py,sha256=C-GmUqHNx4bAku6KbW_OTpPXCEfurBWWyDi9KxpTi9M,553
 nlbone/core/ports/cache.py,sha256=8pP_z4ta7PNNG8UiSrEF4xMZRm2wLPxISZvdPt7QnxQ,2351
@@ -71,7 +71,7 @@ nlbone/core/ports/uow.py,sha256=VhqSc-Ryt9m-rlNMiXTzD3dPGz6mM_JxND8D0UJGRu4,962
 nlbone/interfaces/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nlbone/interfaces/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nlbone/interfaces/api/exception_handlers.py,sha256=vxNEBgAaQygLgAz1UNt3wHj0SdCJOwtLOv_BwTfir3o,4050
-nlbone/interfaces/api/exceptions.py,sha256=jshNmu6tqPEjUelTdHKByI3n5CX5jDErB8fEwn3X1oo,2696
+nlbone/interfaces/api/exceptions.py,sha256=Phv0nXaEHCgJVEAuQ2q8QHxpn_diXahKarupSHOATY0,2964
 nlbone/interfaces/api/routers.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nlbone/interfaces/api/schemas.py,sha256=NIEKeTdJtwwIkIxL7WURNZF8g34I4TlRAqs-x1Uq7YI,108
 nlbone/interfaces/api/additional_filed/__init__.py,sha256=BWemliLSQV9iq1vdUaF733q0FOSipSWBOQk9eYj732Q,318
@@ -82,14 +82,14 @@ nlbone/interfaces/api/additional_filed/default_field_rules/__init__.py,sha256=LU
 nlbone/interfaces/api/additional_filed/default_field_rules/image_field_rules.py,sha256=ecKqPeXZ-YiF14RK9PmK7ln3PCzpCUc18S5zm5IF3fw,339
 nlbone/interfaces/api/dependencies/__init__.py,sha256=rnYRrFVZCfICQrp_PVFlzNg3BeC57yM08wn2DbOHCfk,359
 nlbone/interfaces/api/dependencies/async_auth.py,sha256=s8qbMWuvHkS_9xnOmoO5kLLfKrZrOkvhKFfS9kQb51Y,1711
-nlbone/interfaces/api/dependencies/auth.py,sha256=u5XRn08Pn4MEAwrkWc6DayKwN6_vd_pRMhaCj-rXWDM,3085
+nlbone/interfaces/api/dependencies/auth.py,sha256=yre1ny3nRKDOmYP5Qto0wjbuEZF2Y53RyNW0xAR_a6g,3298
 nlbone/interfaces/api/dependencies/client_credential.py,sha256=Bo4dYx75Qw0JzTKD9ZfV5EXDEOuwndJk2D-V37K2ePg,1293
 nlbone/interfaces/api/dependencies/db.py,sha256=-UD39J_86UU7ZJs2ZncpdND0yhAG0NeeeALrgSDuuFw,466
 nlbone/interfaces/api/dependencies/uow.py,sha256=QfLEvLYLNWZJQN1k-0q0hBVtUld3D75P4j39q_RjcnE,1181
 nlbone/interfaces/api/middleware/__init__.py,sha256=zbX2vaEAfxRMIYwO2MVY_2O6bqG5H9o7HqGpX14U3Is,158
 nlbone/interfaces/api/middleware/access_log.py,sha256=vIkxxxfy2HcjqqKb8XCfGCcSrivAC8u6ie75FMq5x-U,1032
 nlbone/interfaces/api/middleware/add_request_context.py,sha256=rfqbXvteFPzd8DLg3V_69fVR_kP-FSzezs91wb1DvPM,1905
-nlbone/interfaces/api/middleware/authentication.py,sha256=EtzG9EAspF4CMPMcGM-5EYi1-mlnufxtvZHxN_NScdE,3129
+nlbone/interfaces/api/middleware/authentication.py,sha256=Bt6sYu4KtXAyUQnSIp-Z2Z1yKNNtfRy9Y3rOZcYTFhw,3299
 nlbone/interfaces/api/pagination/__init__.py,sha256=pA1uC4rK6eqDI5IkLVxmgO2B6lExnOm8Pje2-hifJZw,431
 nlbone/interfaces/api/pagination/offset_base.py,sha256=60X8a9uDOSd3qG45M49dqNG_FUjSxEDrgEyb9JD9V-o,4113
 nlbone/interfaces/api/schema/__init__.py,sha256=LAqgynfupeqOQ6u0I5ucrcYnojRMZUg9yW8IjKSQTNI,119
@@ -114,8 +114,8 @@ nlbone/utils/http.py,sha256=0yeI34j5FfelqvX3PJnKknSXji1jl15VYbVIIvrSbXg,997
 nlbone/utils/normalize_mobile.py,sha256=sGH4tV9gX-6eVKozviNWJhm1DN1J28Nj-ERldCYkS_E,732
 nlbone/utils/redactor.py,sha256=-V4HrHmHwPi3Kez587Ek1uJlgK35qGSrwBOvcbw8Jas,1279
 nlbone/utils/time.py,sha256=DjjyQ9GLsfXoT6NK8RDW2rOlJg3e6sF04Jw6PBUrSvg,1268
-nlbone-0.7.24.dist-info/METADATA,sha256=TALHyRIYFLxc26D-cl3aTYM6-E1TSNfiUcEgHjfg9lA,2295
-nlbone-0.7.24.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-nlbone-0.7.24.dist-info/entry_points.txt,sha256=CpIL45t5nbhl1dGQPhfIIDfqqak3teK0SxPGBBr7YCk,59
-nlbone-0.7.24.dist-info/licenses/LICENSE,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-nlbone-0.7.24.dist-info/RECORD,,
+nlbone-0.7.25.dist-info/METADATA,sha256=HUsDtSuUlRm9QCdUx_W0TV0pGHG8Dykh06paMC3d90g,2295
+nlbone-0.7.25.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+nlbone-0.7.25.dist-info/entry_points.txt,sha256=CpIL45t5nbhl1dGQPhfIIDfqqak3teK0SxPGBBr7YCk,59
+nlbone-0.7.25.dist-info/licenses/LICENSE,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+nlbone-0.7.25.dist-info/RECORD,,