rb-commons 0.5.10__py3-none-any.whl → 0.5.11__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. rb_commons/schemes/jwt.py +9 -1
  2. {rb_commons-0.5.10.dist-info → rb_commons-0.5.11.dist-info}/METADATA +1 -1
  3. {rb_commons-0.5.10.dist-info → rb_commons-0.5.11.dist-info}/RECORD +5 -5
  4. {rb_commons-0.5.10.dist-info → rb_commons-0.5.11.dist-info}/WHEEL +0 -0
  5. {rb_commons-0.5.10.dist-info → rb_commons-0.5.11.dist-info}/top_level.txt +0 -0
rb_commons/schemes/jwt.py CHANGED
@@ -16,13 +16,15 @@ class Claims(BaseModel):
16
16
  user_id: Optional[int] = Field(None, alias="x-user-id")
17
17
  user_role: UserRole = Field(UserRole.GUEST, alias="x-user-role")
18
18
  shop_id: Optional[uuid.UUID] = Field(None, alias="x-shop-id")
19
+ jwt_token: Optional[str] = Field(None, alias="x-jwt-token")
19
20
 
20
21
  @classmethod
21
22
  def from_headers(cls, headers: dict) -> 'Claims':
22
23
  raw_claims = {
23
24
  "x-user-id": headers.get("x-user-id"),
24
25
  "x-user-role": headers.get("x-user-role", "admin"),
25
- "x-shop-id": headers.get("x-shop-id")
26
+ "x-shop-id": headers.get("x-shop-id"),
27
+ "x-jwt-token": headers.get("x-jwt-token")
26
28
  }
27
29
 
28
30
  try:
@@ -44,6 +46,12 @@ class Claims(BaseModel):
44
46
  except ValueError as e:
45
47
  raise ValueError(f"Invalid user_role: {e}")
46
48
 
49
+ if raw_claims["x-jwt-token"]:
50
+ try:
51
+ raw_claims["x-jwt-token"] = str(raw_claims["x-jwt-token"])
52
+ except ValueError as e:
53
+ raise ValueError(f"Invalid jwt token format: {e}")
54
+
47
55
  return cls(**raw_claims)
48
56
 
49
57
  except Exception as e:
{rb_commons-0.5.10.dist-info → rb_commons-0.5.11.dist-info}/METADATA RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: rb-commons
3
- Version: 0.5.10
3
+ Version: 0.5.11
4
4
  Summary: Commons of project and simplified orm based on sqlalchemy.
5
5
  Home-page: https://github.com/RoboSell-organization/rb-commons
6
6
  Author: Abdulvoris
{rb_commons-0.5.10.dist-info → rb_commons-0.5.11.dist-info}/RECORD RENAMED
@@ -16,11 +16,11 @@ rb_commons/orm/services.py,sha256=71eRcJ4TxZvzNz-hLXo12X4U7PGK54ZfbLAb27AjZi8,15
16
16
  rb_commons/permissions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
17
17
  rb_commons/permissions/role_permissions.py,sha256=kDvAUvUPt5iUV6ZrdeVPYNJjv4a_Gau7VR8oC_GaaGU,1050
18
18
  rb_commons/schemes/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
19
- rb_commons/schemes/jwt.py,sha256=F66JJDhholuOPPzlKeoC6f1TL4gXg4oRUrV5yheNpyo,1675
19
+ rb_commons/schemes/jwt.py,sha256=4MLw3J1-LiU2CXIgm0kP1mlGoDmNfMXmj9iav2s-1Iw,2056
20
20
  rb_commons/schemes/pagination.py,sha256=8VZW1wZGJIPR9jEBUgppZUoB4uqP8ORudHkMwvEJSxg,1866
21
21
  rb_commons/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
22
22
  rb_commons/utils/media.py,sha256=KNY_9SdRa3Rp7d3B1tZaXkhmzVa65RcS62BYwZP1bVM,332
23
- rb_commons-0.5.10.dist-info/METADATA,sha256=KTmX6qkOEs2PK8HWOtv4qDQw7ucdwQQmV9HX7Y1tEZs,6571
24
- rb_commons-0.5.10.dist-info/WHEEL,sha256=DnLRTWE75wApRYVsjgc6wsVswC54sMSJhAEd4xhDpBk,91
25
- rb_commons-0.5.10.dist-info/top_level.txt,sha256=HPx_WAYo3_fbg1WCeGHsz3wPGio1ucbnrlm2lmqlJog,11
26
- rb_commons-0.5.10.dist-info/RECORD,,
23
+ rb_commons-0.5.11.dist-info/METADATA,sha256=Yl-S6Ih-r3-p-Fb32QRZNQfMK5uWXv_ssAZcVvI_7LM,6571
24
+ rb_commons-0.5.11.dist-info/WHEEL,sha256=DnLRTWE75wApRYVsjgc6wsVswC54sMSJhAEd4xhDpBk,91
25
+ rb_commons-0.5.11.dist-info/top_level.txt,sha256=HPx_WAYo3_fbg1WCeGHsz3wPGio1ucbnrlm2lmqlJog,11
26
+ rb_commons-0.5.11.dist-info/RECORD,,