aiteamutils 0.2.87__py3-none-any.whl → 0.2.89__py3-none-any.whl

aiteamutils/base_service.py

@@ -1,6 +1,6 @@
 #기본 라이브러리
 from fastapi import Request
-from typing import TypeVar, Generic, Type, Dict, Any, Union, List, Optional
+from typing import TypeVar, Generic, Type, Dict, Any, Union, List, Optional, Literal
 from sqlalchemy.orm import DeclarativeBase
 from sqlalchemy.ext.asyncio import AsyncSession
 from datetime import datetime
@@ -13,12 +13,12 @@ from .database import (
     process_response,
     validate_unique_fields
 )
-from .security import hash_password
+from .security import hash_password, verify_jwt_token, verify_role_permission
 ModelType = TypeVar("ModelType", bound=DeclarativeBase)
 
 class BaseService(Generic[ModelType]):
     ##################
-    # 1. 초기화 영역 #
+    # 초기화 영역 #
     ##################
     def __init__(
             self,
@@ -37,12 +37,16 @@ class BaseService(Generic[ModelType]):
     #######################
     async def create(
         self,
+        request: Request,
         entity_data: Dict[str, Any],
         response_model: Any = None,
         exclude_entities: List[str] | None = None,
         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"
     ) -> ModelType:
+        await verify_role_permission(request, role_permission)
         
         try:
             async with self.db_session.begin():
@@ -77,12 +81,15 @@ class BaseService(Generic[ModelType]):
         
     async def update(
         self,
+        request: Request,
         ulid: str | None = None,
         update_data: Dict[str, Any] | None = None,
         conditions: Dict[str, Any] | None = None,
         unique_check: List[Dict[str, Any]] | None = None,
         exclude_entities: List[str] | None = None,
-        response_model: Any = None
+        response_model: Any = None,
+        org_ulid_position: str = "organization_ulid",
+        role_permission: str = "update"
     ) -> ModelType:
         try:
             async with self.db_session.begin():
@@ -130,8 +137,11 @@ class BaseService(Generic[ModelType]):
 
     async def delete(
         self,
+        request: Request,
         ulid: str | None = None,
-        conditions: Dict[str, Any] | None = None
+        conditions: Dict[str, Any] | None = None,
+        org_ulid_position: str = "organization_ulid",
+        role_permission: str = "delete"
     ) -> bool:
         try:
             if not ULID.from_str(ulid):
@@ -172,13 +182,16 @@ class BaseService(Generic[ModelType]):
     #########################
     async def list(
         self,
+        request: Request,
         skip: int = 0,
         limit: int = 100,
         filters: List[Dict[str, Any]] | None = None,
+        org_ulid_position: str = "organization_ulid",
         response_model: Any = None,
         explicit_joins: Optional[List[Any]] = None,
         loading_joins: Optional[List[Any]] = None,
-        order: Optional[str] = None
+        order: Optional[str] = None,
+        role_permission: str = "list"
     ) -> List[Dict[str, Any]]:
         try:
             if order is None:
@@ -208,12 +221,15 @@ class BaseService(Generic[ModelType]):
         
     async def get(
         self,
+        request: Request,
         ulid: str,
         model_name: str | None = None,
         response_model: Any = None,
         conditions: Dict[str, Any] | None = None,
         explicit_joins: Optional[List[Any]] = None,
-        loading_joins: Optional[List[Any]] = None
+        loading_joins: Optional[List[Any]] = None,
+        org_ulid_position: str = "organization_ulid",
+        role_permission: str = "get"
     ):
         try:
             if not ulid and not conditions:

aiteamutils/exceptions.py

@@ -25,6 +25,7 @@ class ErrorCode(Enum):
     FORBIDDEN = ErrorResponse(1005, "AUTH_FORBIDDEN", 403, "접근 권한이 없습니다")
     RATE_LIMIT_EXCEEDED = ErrorResponse(1006, "AUTH_RATE_LIMIT_EXCEEDED", 429, "너무 많은 요청이 발생했습니다")
     INVALID_PASSWORD = ErrorResponse(1007, "AUTH_INVALID_PASSWORD", 401, "잘못된 비밀번호입니다")
+    INVALID_ROLE_PERMISSION = ErrorResponse(1008, "AUTH_INVALID_ROLE_PERMISSION", 401, "접근 권한이 없습니다")
     
     # User 관련 에러: 2000번대
     USER_NOT_FOUND = ErrorResponse(2001, "USER_NOT_FOUND", 404, "사용자를 찾을 수 없습니다")

aiteamutils/security.py

@@ -203,7 +203,6 @@ async def create_jwt_token(
             original_error=str(e)
         )
 
-
 async def verify_jwt_token(
     token: str,
     expected_type: Optional[Literal["access", "refresh"]] = None,
@@ -283,22 +282,25 @@ async def verify_jwt_token(
             original_error=e
         )
 
-def validate_token(
-    token: str,
-    token_settings: Dict[str, Any] = None
-) -> Dict[str, Any]:
-    """JWT 토큰을 검증하고 페이로드를 반환합니다."""
-    try:
-        payload = jwt.decode(
-            token, 
-            token_settings["JWT_SECRET"], 
-            algorithms=[token_settings["JWT_ALGORITHM"]]
-        )
-        return payload
-    except JWTError as e:
+async def verify_role_permission(
+    request: Request,
+    permission: str,
+) -> bool:
+    token = request.headers.get("Authorization")
+
+    if not token:
         raise CustomException(
-            ErrorCode.INVALID_TOKEN,
-            detail=token,
-            source_function="security.validate_token",
-            original_error=e
-        ) 
+            ErrorCode.UNAUTHORIZED,
+            detail="Authorization header is missing",
+            source_function="security.verify_role_permission"
+        )
+    
+    token = token.split(" ")[1]
+
+    payload = await verify_jwt_token(token)
+
+    organization_ulid = payload.get("organization_ulid")
+    role_ulid = payload.get("role_ulid")
+    user_ulid = payload.get("user_ulid")
+
+    return True

aiteamutils/version.py

@@ -1,2 +1,2 @@
 """버전 정보"""
-__version__ = "0.2.87"
+__version__ = "0.2.89"

{aiteamutils-0.2.87.dist-info → aiteamutils-0.2.89.dist-info}/METADATA

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

{aiteamutils-0.2.87.dist-info → aiteamutils-0.2.89.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=7DXjEn3e_dve_ZfNwUP1_WD7QnucWRXBq-bYuxVmyXI,8694
+aiteamutils/base_service.py,sha256=TlGIY4mkSmGq7Pqjz5ybGDCwpXicrSrs2LIFfjNKJqo,9404
 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=5yREcEUbJPzq2404pFJ4J9047I9_qx2QG5iBND1PjDI,15901
-aiteamutils/security.py,sha256=tS7gdkCvL0hfgC_FWDSWaCVrzy3zUFpw-PyiFn9yXMM,10839
+aiteamutils/exceptions.py,sha256=wls-R8qbD7fWzEgDDY1Eiy1vXl59R5IsCXTRkZpBiGU,16021
+aiteamutils/security.py,sha256=scyPjVAKXTlu7peGKtUgX-PhcteNWgDt-pDF46PLPy8,10850
 aiteamutils/validators.py,sha256=PvI9hbMEAqTawgxPbiWRyx2r9yTUrpNBQs1AD3w4F2U,7726
-aiteamutils/version.py,sha256=V9nxm2F0tF5ex_r5HRYpS3-KH6vQYMx6bBbIeLl-UfI,42
-aiteamutils-0.2.87.dist-info/METADATA,sha256=j9DXkfNdy_4flnY5CKKTg5t8WcKRHBO5boG5Lo5FAP0,1718
-aiteamutils-0.2.87.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-aiteamutils-0.2.87.dist-info/RECORD,,
+aiteamutils/version.py,sha256=qp3nB-yWKyYCX8Ttv3g_SDaDwxV5ldrepC0S131QqUg,42
+aiteamutils-0.2.89.dist-info/METADATA,sha256=VLvXEYylcdpRHXATtaAFH0DyW5IKLcBHvnwxageKAcU,1718
+aiteamutils-0.2.89.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+aiteamutils-0.2.89.dist-info/RECORD,,