rb-commons 0.5.16__py3-none-any.whl → 0.5.18__py3-none-any.whl

rb_commons/http/base_api.py

@@ -67,10 +67,10 @@ class BaseAPI:
                     data = {}
             except ValueError as e:
                 error_message = data.get("message") or data.get("detail") or response.text
-                raise BadRequestException(f"Invalid JSON response: {response.text}", additional_info={"error_message": error_message})
+                raise BadRequestException(f"Invalid JSON response", additional_info={"error_message": error_message})
             if not (200 <= response.status_code < 300):
                 error_message = data.get("message") or data.get("detail") or response.text
-                raise BadRequestException(f"Unexpected error occured: {response.text}", additional_info={"error_message": error_message})
+                raise BadRequestException(f"Unexpected error occured", additional_info={"error_message": error_message})
 
             return response
 

rb_commons/permissions/role_permissions.py

@@ -23,7 +23,8 @@ class IsAdmin(BasePermission):
 
 class IsCustomer(BasePermission):
     def has_permission(self, claims: Claims) -> bool:
-        return claims.user_role == UserRole.CUSTOMER and claims.user_id is not None and claims.shop_id is not None
+        return claims.user_role == UserRole.CUSTOMER and claims.user_id is not None and claims.shop_id is not None \
+        and claims.customer_id is not None
 
 
 IsAdminDep = Annotated[Claims, Depends(IsAdmin())]

rb_commons/schemes/jwt.py

@@ -14,6 +14,7 @@ class Claims(BaseModel):
     model_config = ConfigDict(extra="ignore")
 
     user_id: Optional[int] = Field(None, alias="x-user-id")
+    customer_id: Optional[int] = Field(None, alias="x-customer-id")
     user_role: UserRole = Field(UserRole.GUEST, alias="x-user-role")
     shop_id: Optional[uuid.UUID] = Field(None, alias="x-shop-id")
     jwt_token: Optional[str] = Field(None, alias="x-jwt-token")
@@ -22,6 +23,7 @@ class Claims(BaseModel):
     def from_headers(cls, headers: dict) -> 'Claims':
         raw_claims = {
             "x-user-id": headers.get("x-user-id"),
+            "x-customer-id": headers.get("x-customer-id"),
             "x-user-role": headers.get("x-user-role", "admin"),
             "x-shop-id": headers.get("x-shop-id"),
             "x-jwt-token": headers.get("x-jwt-token")
@@ -34,6 +36,12 @@ class Claims(BaseModel):
                 except ValueError as e:
                     raise ValueError(f"Invalid user_id format: {e}")
 
+            if raw_claims["x-customer-id"]:
+                try:
+                    raw_claims["x-customer-id"] = int(raw_claims["x-customer-id"])
+                except ValueError as e:
+                    raise ValueError(f"Invalid customer_id format: {e}")
+
             if raw_claims["x-shop-id"]:
                 try:
                     raw_claims["x-shop-id"] = uuid.UUID(raw_claims["x-shop-id"])

{rb_commons-0.5.16.dist-info → rb_commons-0.5.18.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rb-commons
-Version: 0.5.16
+Version: 0.5.18
 Summary: Commons of project and simplified orm based on sqlalchemy.
 Home-page: https://github.com/RoboSell-organization/rb-commons
 Author: Abdulvoris

{rb_commons-0.5.16.dist-info → rb_commons-0.5.18.dist-info}/RECORD

@@ -8,7 +8,7 @@ rb_commons/configs/rabbitmq.py,sha256=vUqa_PcZkPp1lX0B6HLSAXVMUcPR2_8-8cN-C7xFxR
 rb_commons/configs/v2/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rb_commons/configs/v2/config.py,sha256=kZ02y_HIMD-SXqA990yR1r9qrkpvzwn4Nda6fhVMcmo,1581
 rb_commons/http/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-rb_commons/http/base_api.py,sha256=L4bZmJJrtfIp0N9vdlc9m8FzyZXb3dZ7_RMe4RQVers,5313
+rb_commons/http/base_api.py,sha256=ZiSJX5z-1QbL5RuKm30wf-3kbOu4s2plb8q3v0DQUKo,5279
 rb_commons/http/consul.py,sha256=Ioq72VD1jGwoC96set7n2SgxN40olzI-myA2lwKkYi4,1864
 rb_commons/http/exceptions.py,sha256=EGRMr1cRgiJ9Q2tkfANbf0c6-zzXf1CD6J3cmCaT_FA,1885
 rb_commons/orm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -16,13 +16,13 @@ rb_commons/orm/exceptions.py,sha256=1aMctiEwrPjyehoXVX1l6ML5ZOhmDkmBISzlTD5ey1Y,
 rb_commons/orm/managers.py,sha256=VMu3v-JzSVZ9pN2d4ZcAF6qZyqmBeXZ62kiHUY73v20,17163
 rb_commons/orm/services.py,sha256=71eRcJ4TxZvzNz-hLXo12X4U7PGK54ZfbLAb27AjZi8,1589
 rb_commons/permissions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-rb_commons/permissions/role_permissions.py,sha256=kDvAUvUPt5iUV6ZrdeVPYNJjv4a_Gau7VR8oC_GaaGU,1050
+rb_commons/permissions/role_permissions.py,sha256=4dV89z6ggzLqCCiFYlMp7kQVJRESu6MHpkT5ZNjLo6A,1096
 rb_commons/schemes/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-rb_commons/schemes/jwt.py,sha256=4MLw3J1-LiU2CXIgm0kP1mlGoDmNfMXmj9iav2s-1Iw,2056
+rb_commons/schemes/jwt.py,sha256=5J-VTAgRWnRrOU6cuumc8eDJQDyTm5y8cn-kLSLan_g,2453
 rb_commons/schemes/pagination.py,sha256=8VZW1wZGJIPR9jEBUgppZUoB4uqP8ORudHkMwvEJSxg,1866
 rb_commons/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rb_commons/utils/media.py,sha256=J2Zi0J28DhcVQVzt-myNNVuzj9Msaetul53VjZtdDdc,820
-rb_commons-0.5.16.dist-info/METADATA,sha256=Qe3eYj1PSMM85qmjtBzpY8TxcbOIAQjqQShsH56p_Lk,6571
-rb_commons-0.5.16.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
-rb_commons-0.5.16.dist-info/top_level.txt,sha256=HPx_WAYo3_fbg1WCeGHsz3wPGio1ucbnrlm2lmqlJog,11
-rb_commons-0.5.16.dist-info/RECORD,,
+rb_commons-0.5.18.dist-info/METADATA,sha256=K4LUgXImE93aU2C4Sl9t0ttSj-WP3TLsTPV1hl9Ziws,6571
+rb_commons-0.5.18.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
+rb_commons-0.5.18.dist-info/top_level.txt,sha256=HPx_WAYo3_fbg1WCeGHsz3wPGio1ucbnrlm2lmqlJog,11
+rb_commons-0.5.18.dist-info/RECORD,,