aiteamutils 0.2.22__py3-none-any.whl → 0.2.24__py3-none-any.whl

aiteamutils/security.py

@@ -1,6 +1,6 @@
 """보안 관련 유틸리티."""
 from datetime import datetime, timedelta, UTC
-from typing import Dict, Any, Optional, Literal, Callable
+from typing import Dict, Any, Optional, Literal, Callable, Type, Base
 from fastapi import Request, HTTPException, status
 from functools import wraps
 from jose import jwt, JWTError
@@ -262,30 +262,30 @@ async def create_jwt_token(
     user_data: Dict[str, Any],
     token_type: Literal["access", "refresh"],
     db_service: DatabaseService,
-    log_model: Any,
+    log_model: Type[Base],
     request: Optional[Request] = None
 ) -> str:
     """JWT 토큰을 생성하고 로그를 기록합니다.
     
     Args:
-        user_data: 사용자 데이터 (username, ulid 등 필수)
+        user_data: 사용자 데이터 딕셔너리 (username, ulid, name, role_ulid, status, organization 정보 등)
         token_type: 토큰 타입 ("access" 또는 "refresh")
         db_service: 데이터베이스 서비스
-        log_model: 로그를 저장할 모델 클래스
+        log_model: 로그 모델 클래스
         request: FastAPI 요청 객체
         
     Returns:
         str: 생성된 JWT 토큰
         
     Raises:
-        TokenCreationError: 토큰 생성 실패 시
-        SecurityError: 기타 보안 관련 오류 발생 시
+        CustomException: 토큰 생성 실패 시
     """
     try:
         settings = get_settings()
+        
         # 필수 필드 검증
         required_fields = {"username", "ulid"}
-        missing_fields = required_fields - user_data.keys()
+        missing_fields = required_fields - set(user_data.keys())
         if missing_fields:
             raise TokenCreationError(
                 detail=f"Missing required fields: {', '.join(missing_fields)}",
@@ -293,16 +293,31 @@ async def create_jwt_token(
                 token_type=token_type
             )
         
-        # 토큰 데이터 생성
         if token_type == "access":
             expires_at = datetime.now(UTC) + timedelta(minutes=settings.ACCESS_TOKEN_EXPIRE_MINUTES)
             token_data = {
+                # 등록 클레임
                 "iss": settings.TOKEN_ISSUER,
                 "sub": user_data["username"],
                 "aud": settings.TOKEN_AUDIENCE,
                 "exp": expires_at,
+                
+                # 공개 클레임
+                "username": user_data["username"],
+                "name": user_data.get("name"),
+                
+                # 비공개 클레임
+                "user_ulid": user_data["ulid"],
+                "role_ulid": user_data.get("role_ulid"),
+                "status": user_data.get("status"),
+                "last_login": datetime.now(UTC).isoformat(),
                 "token_type": token_type,
-                **user_data
+                
+                # 조직 관련 클레임
+                "organization_ulid": user_data.get("organization_ulid"),
+                "organization_id": user_data.get("organization_id"),
+                "organization_name": user_data.get("organization_name"),
+                "company_name": user_data.get("company_name")
             }
         else:  # refresh token
             expires_at = datetime.now(UTC) + timedelta(days=14)

aiteamutils/version.py

@@ -1,2 +1,2 @@
 """버전 정보"""
-__version__ = "0.2.22" 
+__version__ = "0.2.24" 

{aiteamutils-0.2.22.dist-info → aiteamutils-0.2.24.dist-info}/METADATA

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

{aiteamutils-0.2.22.dist-info → aiteamutils-0.2.24.dist-info}/RECORD

@@ -8,9 +8,9 @@ aiteamutils/database.py,sha256=raYKRZjEfefM3SnoPYozPu7OUGm62XWOUqZzN4_cayw,33479
 aiteamutils/dependencies.py,sha256=e5P-DQi5OMMh7FADaAUqU0kLVBcReE7za55EDNZN950,4008
 aiteamutils/enums.py,sha256=ipZi6k_QD5-3QV7Yzv7bnL0MjDz-vqfO9I5L77biMKs,632
 aiteamutils/exceptions.py,sha256=YV-ISya4wQlHk4twvGo16I5r8h22-tXpn9wa-b3WwDM,15231
-aiteamutils/security.py,sha256=2k5j8iV4jkp0IGRmOtEbVyoeuoDHbguzaYju0Wm-mmI,12715
+aiteamutils/security.py,sha256=t1xdvfy2qpggiQGr89AMuRKvWK1UFMxJiJYAE5Lek7o,13453
 aiteamutils/validators.py,sha256=3N245cZFjgwtW_KzjESkizx5BBUDaJLbbxfNO4WOFZ0,7764
-aiteamutils/version.py,sha256=Mm5ouHx7VwulFLfCDKBLTQ-wZ87grFovjSV99Abt3Fc,44
-aiteamutils-0.2.22.dist-info/METADATA,sha256=sil3_P7va6jUaLuUaeEje6zaierWIpsrOUz6CwIRPG4,1718
-aiteamutils-0.2.22.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-aiteamutils-0.2.22.dist-info/RECORD,,
+aiteamutils/version.py,sha256=xu1IgfL2hhBUF2d91PMBax7rAUgopL3RxVIiQol7jAg,44
+aiteamutils-0.2.24.dist-info/METADATA,sha256=CX-Mx2vQIjg5tPPaKKMWfwEYZv9Q-4LuVK6AGuqayqs,1718
+aiteamutils-0.2.24.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+aiteamutils-0.2.24.dist-info/RECORD,,