sharedkernel 2.2.3__py3-none-any.whl → 2.2.5__py3-none-any.whl

sharedkernel/database/pagination_response_dto.py

@@ -1,16 +1,15 @@
 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
+    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/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/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.dist-info → sharedkernel-2.2.5.dist-info}/METADATA

@@ -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.dist-info → sharedkernel-2.2.5.dist-info}/RECORD

@@ -2,7 +2,7 @@ sharedkernel/common.py,sha256=HL5vsuJBaIeBcoXA8Hbe6jnYAv4danIszo5Y7G2gGDA,622
 sharedkernel/data_format_converter.py,sha256=GWGbfhKJBifkz-cfnqKAFjJM43WC0qdq9KSELj3xR30,3774
 sharedkernel/date_converter.py,sha256=Cjd4ewm0pIfQzv7nlgAAB_EYrr-VvXxQGehJCNphgXc,4491
 sharedkernel/diff_utils.py,sha256=mtwJmc05GAXUOB0ZLtqAhfBT1kGoSQ7qmP5N44P73ho,2564
-sharedkernel/jwt_service.py,sha256=uEyOEWS5Y7eFIyGMu9fjRWdLEOcJtG-iL8Lk3QB5QYs,1666
+sharedkernel/jwt_service.py,sha256=bYwzwsQ1Wn8UDqMyQM3AVCz7lnGXieiVaAHyGElXPlo,1530
 sharedkernel/regex_masking.py,sha256=zQrgteP8Cuq1EC9B7QUJqAXUxK9ISD9kWMYK2AbRfw0,3288
 sharedkernel/s3_uploader.py,sha256=9Tzi5siceHPKab244tOAmnY_hNOeTn9yvsQevNdz7Gk,3313
 sharedkernel/string_extentions.py,sha256=ld02W06gd0Ql80GQU6nlqPAeUSfOe2Yr8cCzf3lJgQY,98
@@ -10,7 +10,7 @@ sharedkernel/database/__init__.py,sha256=AtIbU7pDKwY6YCg_J8PX62WcYld1lAvBcVFW62M
 sharedkernel/database/audit_model.py,sha256=SMAYrvMb7XvPi4076TDgkOLaxh_3Jg_tfE12qKOy8RA,364
 sharedkernel/database/mongo_generic_audit_repository.py,sha256=F8z_4l7c2wHOeF995AN7TwK-Il7x0opk3_jkaRU4nac,3726
 sharedkernel/database/mongo_generic_repository.py,sha256=KrigWbKXo99GegMjvrlH4BYGPH8kvST9smxcWjdNqEU,5887
-sharedkernel/database/pagination_response_dto.py,sha256=X255spt1IUTEjAK_cyDZ188jdbyFagCpgF11YgAJNJU,347
+sharedkernel/database/pagination_response_dto.py,sha256=91Gkajx4hHmYfypP7EJTiMP1ZrzopjwRuEyMrzQ3SVE,389
 sharedkernel/enum/__init__.py,sha256=9M3H7paIFx-0GRhpod_Jg30nxIYPjskGL9WF9rN9U5I,33
 sharedkernel/enum/error_code.py,sha256=qF_YJrHHDc6ibAClSxBMJ9ktzG2OtvGxb67LX0O-NG0,475
 sharedkernel/enum/sort_order.py,sha256=T_1AknuVg2OSJMlIDkEiCUNHPW0yDnFvbzoNpTgG3-I,97
@@ -26,8 +26,8 @@ sharedkernel/objects/base_document.py,sha256=TERbRaZaW_zExm7Ddpk_3nCwMvSroGC3Kkd
 sharedkernel/objects/json_string_model.py,sha256=j63tnoqiok0EmBP6T-ChYuQYKPw7mLqUOHuaCDUZkmw,1333
 sharedkernel/objects/jwt_model.py,sha256=XQHQhTbg7PT8XiUh5fd9MwRH4ldPsesI_hfbjaSqdKg,134
 sharedkernel/objects/result.py,sha256=I_9hX5TPEO1oStzuFLjFh1rtimXorz7ml-OaW_2BMvc,680
-sharedkernel/objects/user_info.py,sha256=RsOExvd--7CvBibOA-7ZLLmoW3_rh9Hb3tTkH5K3DN8,283
-sharedkernel-2.2.3.dist-info/METADATA,sha256=n5XGEIcuUivkOGikeTky9JAu2HvucGv_eutHXinvE98,3070
-sharedkernel-2.2.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-sharedkernel-2.2.3.dist-info/top_level.txt,sha256=TVTOnV1MItSSlpSjqkiijuHkoVsGHS4CArpsM-lylkE,13
-sharedkernel-2.2.3.dist-info/RECORD,,
+sharedkernel/objects/user_info.py,sha256=51WyspRxlIWzK7Lfxgqg4D6mylXeHe9ZSenf-RhYTdA,286
+sharedkernel-2.2.5.dist-info/METADATA,sha256=EKSoWbqWo1cHbVjDk7IfPsfX-CXH50KI_vU--dXufIU,3192
+sharedkernel-2.2.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+sharedkernel-2.2.5.dist-info/top_level.txt,sha256=TVTOnV1MItSSlpSjqkiijuHkoVsGHS4CArpsM-lylkE,13
+sharedkernel-2.2.5.dist-info/RECORD,,