REFACTOR API gateway fix 1

services/auth/app/api/users.py

@@ -13,6 +13,8 @@ from app.schemas.users import UserUpdate
 from app.services.user_service import UserService
 from app.models.users import User
 
+from sqlalchemy.ext.asyncio import AsyncSession
+
 # Import unified authentication from shared library
 from shared.auth.decorators import (
     get_current_user_dep,
@@ -30,18 +32,55 @@ async def get_current_user_info(
 ):
     """Get current user information"""
     try:
-        return UserResponse(
-            id=str(current_user.id),
-            email=current_user.email,
-            full_name=current_user.full_name,
-            is_active=current_user.is_active,
-            is_verified=current_user.is_verified,
-            phone=current_user.phone,
-            language=current_user.language,
-            timezone=current_user.timezone,
-            created_at=current_user.created_at,
-            last_login=current_user.last_login
-        )
+        # Handle both User object (direct auth) and dict (from gateway headers)
+        if isinstance(current_user, dict):
+            # Coming from gateway headers - need to fetch user from DB
+            user_id = current_user.get("user_id")
+            if not user_id:
+                raise HTTPException(
+                    status_code=status.HTTP_401_UNAUTHORIZED,
+                    detail="Invalid user context"
+                )
+            
+            # Fetch full user from database
+            from sqlalchemy import select
+            from app.models.users import User
+            
+            result = await db.execute(select(User).where(User.id == user_id))
+            user = result.scalar_one_or_none()
+            
+            if not user:
+                raise HTTPException(
+                    status_code=status.HTTP_404_NOT_FOUND,
+                    detail="User not found"
+                )
+            
+            return UserResponse(
+                id=str(user.id),
+                email=user.email,
+                full_name=user.full_name,
+                is_active=user.is_active,
+                is_verified=user.is_verified,
+                phone=user.phone,
+                language=user.language,
+                timezone=user.timezone,
+                created_at=user.created_at,
+                last_login=user.last_login
+            )
+        else:
+            # Direct User object (when called directly)
+            return UserResponse(
+                id=str(current_user.id),
+                email=current_user.email,
+                full_name=current_user.full_name,
+                is_active=current_user.is_active,
+                is_verified=current_user.is_verified,
+                phone=current_user.phone,
+                language=current_user.language,
+                timezone=current_user.timezone,
+                created_at=current_user.created_at,
+                last_login=current_user.last_login
+            )
     except Exception as e:
         logger.error(f"Get current user error: {e}")
         raise HTTPException(