sharedkernel 2.2.3__tar.gz → 2.2.5__tar.gz

{sharedkernel-2.2.3 → sharedkernel-2.2.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sharedkernel
-Version: 2.2.3
+Version: 2.2.5
 Summary: sharekernel is a shared package between all python projects
 Author: Smilinno
 Description-Content-Type: text/markdown
@@ -29,6 +29,10 @@ Dynamic: summary
 this is a shared kernel package
 
 # Change Log
+### Version 2.2.5
+- add org_token to user_info Object
+### Version 2.2.4
+- make pagination response default values to None
 ### Version 2.2.3
 - add paginate to mongo repository
 ### Version 2.2.2

{sharedkernel-2.2.3 → sharedkernel-2.2.5}/README.md

@@ -2,6 +2,10 @@
 this is a shared kernel package
 
 # Change Log
+### Version 2.2.5
+- add org_token to user_info Object
+### Version 2.2.4
+- make pagination response default values to None
 ### Version 2.2.3
 - add paginate to mongo repository
 ### Version 2.2.2

{sharedkernel-2.2.3 → sharedkernel-2.2.5}/setup.py

@@ -37,7 +37,7 @@ setup(
         "deepdiff",
     ],
     # *strongly* suggested for sharing
-    version="2.2.3",
+    version="2.2.5",
     description="sharekernel is a shared package between all python projects",
     long_description=long_description,
     long_description_content_type="text/markdown",

sharedkernel-2.2.5/sharedkernel/database/pagination_response_dto.py

@@ -0,0 +1,15 @@
+from typing import List, TypeVar, Generic
+
+from pydantic import BaseModel
+
+T = TypeVar("T", bound=BaseModel)
+
+class PaginationResponseDto(BaseModel, Generic[T]):
+    data: List[T] | None = [] 
+    total_items: int | None = 0
+    page_size: int | None = 0
+    current_page: int | None = 0
+    total_pages: int | None = 0
+    has_next: bool | None = False
+    has_prev: bool | None = False
+

{sharedkernel-2.2.3 → sharedkernel-2.2.5}/sharedkernel/jwt_service.py

@@ -6,10 +6,11 @@ from sharedkernel.exception.exception import UnAuthorizedException
 from sharedkernel.objects import JwtModel
 from sharedkernel.objects.user_info import current_user_info, UserInfo
 
+
 class JWTBearer(HTTPBearer):
 
-    def __init__(self,jwt_config:JwtModel, auto_error: bool = True):
-        self.jwt_config=jwt_config
+    def __init__(self, jwt_config: JwtModel, auto_error: bool = True):
+        self.jwt_config = jwt_config
         super(JWTBearer, self).__init__(auto_error=auto_error)
 
     async def __call__(self, request: Request):
@@ -22,26 +23,23 @@ class JWTBearer(HTTPBearer):
 
             nameid = decoded_token.get("nameid") or decoded_token.get("id")
 
-            user_info = UserInfo(
-                nameid=nameid, email=decoded_token.get("email"), unique_name=decoded_token.get("unique_name")
-            )
+            user_info = UserInfo(nameid=nameid, role=decoded_token.get("role"))
 
             current_user_info.set(user_info)
 
         except:
-            raise UnAuthorizedException()       
-
+            raise UnAuthorizedException()
 
     def verify(self, token: str) -> dict:
-            decoded_token = jwt.decode(
-                jwt= token.replace("Bearer","").strip(),
-                key= self.jwt_config.secret_key,
-                algorithms= self.jwt_config.algorithms,
-                audience= self.jwt_config.audience,
-                issuer= self.jwt_config.issuer
-            )
-
-            if decoded_token["exp"] < time.time():
-                raise UnAuthorizedException()
-            
-            return decoded_token
+        decoded_token = jwt.decode(
+            jwt=token.replace("Bearer", "").strip(),
+            key=self.jwt_config.secret_key,
+            algorithms=self.jwt_config.algorithms,
+            audience=self.jwt_config.audience,
+            issuer=self.jwt_config.issuer,
+        )
+
+        if decoded_token["exp"] < time.time():
+            raise UnAuthorizedException()
+
+        return decoded_token

{sharedkernel-2.2.3 → sharedkernel-2.2.5}/sharedkernel/objects/user_info.py

@@ -4,10 +4,9 @@ from contextvars import ContextVar
 
 class UserInfo(BaseModel):
     nameid: str
-    unique_name: str | None = None
-    email: str | None = None
     role: str | None = None
-
+    org_token: str | None = None
+    org_user_id: str | None = None
 
 current_user_info: ContextVar[UserInfo] = ContextVar("current_user_info")
 

{sharedkernel-2.2.3 → sharedkernel-2.2.5}/sharedkernel.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sharedkernel
-Version: 2.2.3
+Version: 2.2.5
 Summary: sharekernel is a shared package between all python projects
 Author: Smilinno
 Description-Content-Type: text/markdown
@@ -29,6 +29,10 @@ Dynamic: summary
 this is a shared kernel package
 
 # Change Log
+### Version 2.2.5
+- add org_token to user_info Object
+### Version 2.2.4
+- make pagination response default values to None
 ### Version 2.2.3
 - add paginate to mongo repository
 ### Version 2.2.2

sharedkernel-2.2.3/sharedkernel/database/pagination_response_dto.py

@@ -1,16 +0,0 @@
-from typing import List, TypeVar, Generic
-
-from pydantic import BaseModel
-# from pydantic.generics import GenericModel
-
-T = TypeVar("T", bound=BaseModel)
-
-class PaginationResponseDto(BaseModel, Generic[T]):
-    data: List[T]
-    total_items: int
-    page_size: int
-    current_page: int
-    total_pages: int
-    has_next: bool
-    has_prev: bool
-