aiteamutils 0.2.21__tar.gz → 0.2.23__tar.gz

{aiteamutils-0.2.21 → aiteamutils-0.2.23}/PKG-INFO

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

{aiteamutils-0.2.21 → aiteamutils-0.2.23}/aiteamutils/dependencies.py

@@ -4,7 +4,7 @@ from fastapi.security import OAuth2PasswordBearer
 from jose import JWTError, jwt
 from sqlalchemy.ext.asyncio import AsyncSession
 
-from .database import DatabaseService, get_database_service
+from .database import DatabaseService, get_database_service, get_db
 from .exceptions import CustomException, ErrorCode
 from .config import get_settings
 

{aiteamutils-0.2.21 → aiteamutils-0.2.23}/aiteamutils/security.py

@@ -268,24 +268,24 @@ async def create_jwt_token(
     """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)}",
@@ -297,12 +297,28 @@ async def create_jwt_token(
         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-0.2.23/aiteamutils/version.py

@@ -0,0 +1,2 @@
+"""버전 정보"""
+__version__ = "0.2.23" 

aiteamutils-0.2.23/app/app/auth/service.py

@@ -0,0 +1,57 @@
+async def login(self, username: str, password: str, request: Request = None) -> Dict[str, str]:
+        """사용자 로그인을 처리합니다.
+        
+        Args:
+            username (str): 사용자명
+            password (str): 비밀번호
+            request (Request, optional): FastAPI 요청 객체
+            
+        Returns:
+            Dict[str, str]: 액세스 토큰과 리프레시 토큰
+            
+        Raises:
+            CustomException: 인증 실패 시 예외
+        """
+        # 사용자 조회
+        user = await self.repository.get_user(username, by="username")
+        if not user:
+            raise CustomException(
+                ErrorCode.INVALID_CREDENTIALS,
+                source_function="AuthService.login"
+            )
+        
+        # 비밀번호 검증
+        if not verify_password(password, user.password):
+            raise CustomException(
+                ErrorCode.INVALID_CREDENTIALS,
+                source_function="AuthService.login"
+            )
+        
+        # 토큰 생성
+        user_data = {
+            "username": user.username,
+            "ulid": user.ulid,
+            "email": user.email
+        }
+        
+        access_token = await create_jwt_token(
+            user_data=user_data,
+            token_type="access",
+            db_service=self.db_service,
+            log_model=self.log_model,
+            request=request
+        )
+        
+        refresh_token = await create_jwt_token(
+            user_data=user_data,
+            token_type="refresh",
+            db_service=self.db_service,
+            log_model=self.log_model,
+            request=request
+        )
+        
+        return {
+            "access_token": access_token,
+            "refresh_token": refresh_token,
+            "token_type": "bearer"
+        } 

aiteamutils-0.2.21/aiteamutils/version.py

@@ -1,2 +0,0 @@
-"""버전 정보"""
-__version__ = "0.2.21"