nlbone 0.7.13__tar.gz → 0.7.15__tar.gz

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

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

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

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

{nlbone-0.7.13 → nlbone-0.7.15}/src/nlbone/adapters/http_clients/pricing/pricing_service.py

@@ -86,7 +86,8 @@ class PricingService:
         r = self._client.post(
             f"{self._base_url}/price/calculate",
             params={"response": response},
-            headers=auth_headers(self._token_provider.get_access_token()),
+            headers={'X-Api-Key': get_settings().PRICING_API_SECRET, 'X-Client-Id': get_settings().KEYCLOAK_CLIENT_ID},
+            # headers=auth_headers(self._token_provider.get_access_token()),
             json=body,
             timeout=self._timeout,
             verify=False,

{nlbone-0.7.13 → nlbone-0.7.15}/src/nlbone/config/settings.py

@@ -60,6 +60,7 @@ class Settings(BaseSettings):
     KEYCLOAK_REALM_NAME: str = Field(default="numberland")
     KEYCLOAK_CLIENT_ID: str = Field(default="nlbone")
     KEYCLOAK_CLIENT_SECRET: SecretStr = Field(default=SecretStr("dev-secret"))
+    PRICING_API_SECRET: str = ''
 
     AUTH_SERVICE_URL:  AnyHttpUrl = Field(default="https://auth.numberland.ir")
 

{nlbone-0.7.13 → nlbone-0.7.15}/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.config.settings import get_settings
 from nlbone.adapters.auth.auth_service import AuthService
 
 try:
@@ -71,9 +72,13 @@ class AuthenticationMiddleware(BaseHTTPMiddleware):
         self._get_auth = _to_factory(auth)
 
     async def dispatch(self, request: Request, call_next):
-        request.state.client_id = request.headers.get("X-Client-Id")
+        request.state.client_id = None
         request.state.user_id = None
         request.state.token = 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")
+                return await call_next(request)
         if request.headers.get('X-Client-Id') == 'website' and request.headers.get("Authorization"):
             authenticate_user(request)
         elif request.cookies.get("access_token"):

{nlbone-0.7.13 → nlbone-0.7.15}/src/nlbone/utils/cache.py

@@ -2,7 +2,7 @@ import asyncio
 import inspect
 import json
 from typing import Any, Callable, Iterable, Optional, Mapping
-
+import hashlib
 from makefun import wraps as mf_wraps
 
 from nlbone.interfaces.api.additional_filed import AdditionalFieldsRequest
@@ -78,7 +78,7 @@ def _key_from_template(
         payload,
         sort_keys=True,
     )
-    return f"{func.__module__}:{func.__qualname__}:{hash(payload)}"
+    return f"{func.__module__}:{func.__qualname__}:{hashlib.sha1(payload.encode('utf-8')).hexdigest()}"
 
 
 def _format_tags(