aiteamutils 0.2.90__py3-none-any.whl → 0.2.92__py3-none-any.whl

aiteamutils/base_service.py

@@ -44,11 +44,14 @@ 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:
-        await verify_role_permission(request, role_permission)
+        payload = await verify_role_permission(request, role_permission, token_settings)
         
         try:
+            body = await request.json()
+
             async with self.db_session.begin():
                 # 고유 검사 수행
                 if unique_check:
@@ -58,7 +61,15 @@ class BaseService(Generic[ModelType]):
                     await validate_unique_fields(self.db_session, fk_check, find_value=False)
                 
                 if org_ulid_position:
-                    
+                    organization_ulid = body.get(org_ulid_position)
+
+                    if not organization_ulid == payload.get("organization_ulid"):
+                        raise CustomException(
+                            ErrorCode.INVALID_INPUT,
+                            detail="organization_ulid is required",
+                            source_function=f"{self.__class__.__name__}.create"
+                        )
+
                 result = await self.repository.create(
                     entity_data=entity_data,
                     exclude_entities=exclude_entities
@@ -91,7 +102,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():
@@ -143,7 +155,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):
@@ -189,12 +202,15 @@ class BaseService(Generic[ModelType]):
         limit: int = 100,
         filters: List[Dict[str, Any]] | None = None,
         org_ulid_position: str = "organization_ulid",
+        role_permission: str = "list",
         response_model: Any = None,
         explicit_joins: Optional[List[Any]] = None,
         loading_joins: Optional[List[Any]] = None,
         order: Optional[str] = None,
-        role_permission: str = "list"
+        token_settings: Dict[str, Any] = None
     ) -> List[Dict[str, Any]]:
+        payload = await verify_role_permission(request, role_permission, token_settings)
+
         try:
             if order is None:
                 order = "created_at|desc"
@@ -231,7 +247,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

@@ -285,6 +285,7 @@ async def verify_jwt_token(
 async def verify_role_permission(
     request: Request,
     permission: str,
+    token_settings: Dict[str, Any] = None
 ) -> bool:
     token = request.headers.get("Authorization")
 
@@ -297,10 +298,15 @@ 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 permission:  source_function="security.verify_role_permission"
+            )

aiteamutils/version.py

@@ -1,2 +1,2 @@
 """버전 정보"""
-__version__ = "0.2.90"
+__version__ = "0.2.92"

{aiteamutils-0.2.90.dist-info → aiteamutils-0.2.92.dist-info}/METADATA

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

{aiteamutils-0.2.90.dist-info → aiteamutils-0.2.92.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=HYf6kSQjxFoBwfXS5htxU0n7KbU0nYIUCRyDThqeld8,9479
+aiteamutils/base_service.py,sha256=JzmYX8G8b-d12tI561tJ35dhrBYWxl5dkL8_zvFQ4lg,10276
 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=ze793aNCWQ8k3v1PndWakhCJlppxon7VCZgdeX0Uwpg,11084
 aiteamutils/validators.py,sha256=PvI9hbMEAqTawgxPbiWRyx2r9yTUrpNBQs1AD3w4F2U,7726
-aiteamutils/version.py,sha256=R2p2oA6DBwr_lg3fBWD6MttQHYpt14z39WPNnnDRh9o,42
-aiteamutils-0.2.90.dist-info/METADATA,sha256=shpp9midof4oEhK8gVnsHL1ySNwFUZybWhWxoyHfQ8Q,1718
-aiteamutils-0.2.90.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-aiteamutils-0.2.90.dist-info/RECORD,,
+aiteamutils/version.py,sha256=MPB3ChyVHpN8XXyNqq4Qv-O9a45GFX3w2kK20aKOg6c,42
+aiteamutils-0.2.92.dist-info/METADATA,sha256=l3Zpe_M1PswKV7SAyRPuwgsrPfvJCskJKANFR2d5B9s,1718
+aiteamutils-0.2.92.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+aiteamutils-0.2.92.dist-info/RECORD,,