aiteamutils 0.2.91__py3-none-any.whl → 0.2.93__py3-none-any.whl

aiteamutils/base_service.py

@@ -44,9 +44,9 @@ class BaseService(Generic[ModelType]):
         unique_check: List[Dict[str, Any]] | None = None,
         fk_check: List[Dict[str, Any]] | None = None,
         org_ulid_position: str = "organization_ulid",
-        role_permission: str = "create"
+        role_permission: str = "create",
+        token_settings: Dict[str, Any] = None
     ) -> ModelType:
-        payload = await verify_role_permission(request, role_permission)
         
         try:
             body = await request.json()
@@ -101,7 +101,8 @@ class BaseService(Generic[ModelType]):
         exclude_entities: List[str] | None = None,
         response_model: Any = None,
         org_ulid_position: str = "organization_ulid",
-        role_permission: str = "update"
+        role_permission: str = "update",
+        token_settings: Dict[str, Any] = None
     ) -> ModelType:
         try:
             async with self.db_session.begin():
@@ -153,7 +154,8 @@ class BaseService(Generic[ModelType]):
         ulid: str | None = None,
         conditions: Dict[str, Any] | None = None,
         org_ulid_position: str = "organization_ulid",
-        role_permission: str = "delete"
+        role_permission: str = "delete",
+        token_settings: Dict[str, Any] = None
     ) -> bool:
         try:
             if not ULID.from_str(ulid):
@@ -204,9 +206,18 @@ class BaseService(Generic[ModelType]):
         explicit_joins: Optional[List[Any]] = None,
         loading_joins: Optional[List[Any]] = None,
         order: Optional[str] = None,
+        token_settings: Dict[str, Any] = None
     ) -> List[Dict[str, Any]]:
-        payload = await verify_role_permission(request, role_permission)
-        
+        permission_result = await verify_role_permission(
+            request=request,
+            role_permission=role_permission,
+            token_settings=token_settings,
+            org_ulid_position=org_ulid_position
+        )
+
+        if permission_result and isinstance(permission_result, dict):
+            filters.append(permission_result)
+
         try:
             if order is None:
                 order = "created_at|desc"
@@ -243,7 +254,8 @@ class BaseService(Generic[ModelType]):
         explicit_joins: Optional[List[Any]] = None,
         loading_joins: Optional[List[Any]] = None,
         org_ulid_position: str = "organization_ulid",
-        role_permission: str = "get"
+        role_permission: str = "get",
+        token_settings: Dict[str, Any] = None
     ):
         try:
             if not ulid and not conditions:

aiteamutils/security.py

@@ -284,8 +284,10 @@ async def verify_jwt_token(
 
 async def verify_role_permission(
     request: Request,
-    permission: str,
-) -> bool:
+    role_permission: str,
+    token_settings: Dict[str, Any] = None,
+    org_ulid_position: str = "organization_ulid"
+) -> bool | Dict[str, Any]:
     token = request.headers.get("Authorization")
 
     if not token:
@@ -297,10 +299,21 @@ async def verify_role_permission(
     
     token = token.split(" ")[1]
 
-    payload = await verify_jwt_token(token)
+    payload = await verify_jwt_token(
+        token=token,
+        token_settings=token_settings
+    )
 
     organization_ulid = payload.get("organization_ulid")
+    organization_id = payload.get("organization_id")
     role_ulid = payload.get("role_ulid")
     user_ulid = payload.get("user_ulid")
 
-    return payload
+    if "list" in role_permission:
+        return {
+            "value": organization_ulid,
+            "operator": "eq",
+            "fields": [org_ulid_position]
+        }
+
+    return False

aiteamutils/version.py

@@ -1,2 +1,2 @@
 """버전 정보"""
-__version__ = "0.2.91"
+__version__ = "0.2.93"

{aiteamutils-0.2.91.dist-info → aiteamutils-0.2.93.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aiteamutils
-Version: 0.2.91
+Version: 0.2.93
 Summary: AI Team Utilities
 Project-URL: Homepage, https://github.com/yourusername/aiteamutils
 Project-URL: Issues, https://github.com/yourusername/aiteamutils/issues

{aiteamutils-0.2.91.dist-info → aiteamutils-0.2.93.dist-info}/RECORD

@@ -1,15 +1,15 @@
 aiteamutils/__init__.py,sha256=kRBpRjark0M8ZwFfmKiMFol6CbIILN3WE4f6_P6iIq0,1089
 aiteamutils/base_model.py,sha256=bnRJJaGXGS3TKxfCWWV3arFjdG0qLsPFDXuguYsDyVM,3008
 aiteamutils/base_repository.py,sha256=HKcgYyEb0JypojoXBFcIT39hPC5CqnjBkHT__GV-lfQ,4615
-aiteamutils/base_service.py,sha256=QPehqL8yuShoRr6T7EwlgRln04iOWCd8rWnm4CVJK0w,10018
+aiteamutils/base_service.py,sha256=-WWjgfH9hXT5ptuG6GiN1ge19e2W1-9Ig6drjrR0cJA,10448
 aiteamutils/cache.py,sha256=07xBGlgAwOTAdY5mnMOQJ5EBxVwe8glVD7DkGEkxCtw,1373
 aiteamutils/config.py,sha256=YdalpJb70-txhGJAS4aaKglEZAFVWgfzw5BXSWpkUz4,3232
 aiteamutils/database.py,sha256=b4fN0XHNWxMJeS5M95JcJ7tujAJ1x3SPTAfDvJdB4sE,19696
 aiteamutils/enums.py,sha256=Z9wzR3H4XLpA4U3urR5e4eDnEY3Qhne34nLXsKXiL64,2177
 aiteamutils/exceptions.py,sha256=wls-R8qbD7fWzEgDDY1Eiy1vXl59R5IsCXTRkZpBiGU,16021
-aiteamutils/security.py,sha256=HFMaGnvLp_JR2D9AEKpGRMQF2aAjiPdIOF0ysMS1dWk,10853
+aiteamutils/security.py,sha256=QVZFh0bOJX7Kz07dPJe6Tcs_UQmFOHPKp5yW3NlW1yE,11251
 aiteamutils/validators.py,sha256=PvI9hbMEAqTawgxPbiWRyx2r9yTUrpNBQs1AD3w4F2U,7726
-aiteamutils/version.py,sha256=PJ1UnX24vSCQ_oIDO0VfRRLdxDepWeHiu724PJ96z5g,42
-aiteamutils-0.2.91.dist-info/METADATA,sha256=neRTid2ZSl9g5jUO8KUJ2qbvDTMhfcz6FyYc-P48o30,1718
-aiteamutils-0.2.91.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-aiteamutils-0.2.91.dist-info/RECORD,,
+aiteamutils/version.py,sha256=On40GVmxltaTiv-ZooqdVZ6J84eToi0PLHliBs6p7f4,42
+aiteamutils-0.2.93.dist-info/METADATA,sha256=i3HoWMMB0pJmyx1bMqPKeYcdPFGyOqB0D06XcSg8PRQ,1718
+aiteamutils-0.2.93.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+aiteamutils-0.2.93.dist-info/RECORD,,