nlbone 0.7.12__tar.gz → 0.7.13__tar.gz

{nlbone-0.7.12 → nlbone-0.7.13}/PKG-INFO

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

{nlbone-0.7.12 → nlbone-0.7.13}/pyproject.toml

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

{nlbone-0.7.12 → nlbone-0.7.13}/src/nlbone/core/domain/base.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+from _decimal import Decimal
 from dataclasses import dataclass
 from datetime import datetime, timezone
 from enum import Enum
@@ -38,6 +39,8 @@ class DomainEvent(Message):
         for k, v in d.items():
             if isinstance(v, BaseId):
                 d[k] = v.value
+            elif isinstance(v, Decimal):
+                d[k] = str(v)
         return d
 
 

{nlbone-0.7.12 → nlbone-0.7.13}/src/nlbone/interfaces/api/middleware/authentication.py

@@ -50,7 +50,9 @@ def authenticate_admin_user(request, auth_service):
             pass
 
 def authenticate_user(request):
-    token = request.cookies.get("access_token") or request.cookies.get("j_token")
+    token = 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)
 
     if token:
         request.state.token = token
@@ -72,7 +74,9 @@ class AuthenticationMiddleware(BaseHTTPMiddleware):
         request.state.client_id = request.headers.get("X-Client-Id")
         request.state.user_id = None
         request.state.token = None
-        if request.cookies.get("access_token"):
+        if request.headers.get('X-Client-Id') == 'website' and request.headers.get("Authorization"):
+            authenticate_user(request)
+        elif request.cookies.get("access_token"):
             authenticate_user(request)
         elif request.headers.get("Authorization"):
             authenticate_admin_user(request, auth_service=self._get_auth)