Filter chat history by authenticated user

- Add /api/user endpoint to get current authenticated user from EasyAuth headers
- Update conversation endpoints to use auth headers instead of query params
- Modify Cosmos DB query to filter by user_id (empty for dev mode)
- Update frontend to fetch user info and remove userId prop from ChatHistory
- Fix Dockerfile to use port 8000 and single worker
- Fix f-string syntax error in app.py

Author: hunterjam

content-gen/aci-deployment.yaml

@@ -36,6 +36,10 @@ properties:
             value: conversations
           - name: AZURE_BLOB_ACCOUNT_NAME
             value: storagecontentgenjh
+          - name: PORT
+            value: '8000'
+          - name: WORKERS
+            value: '1'
           - name: RUNNING_IN_PRODUCTION
             value: 'true'
           - name: AUTH_ENABLED

content-gen/src/Dockerfile

@@ -18,14 +18,15 @@ COPY . .
 
 # Set environment variables
 ENV PYTHONPATH=/app
-ENV PORT=5000
+ENV PORT=8000
+ENV PYTHONUNBUFFERED=1
 
 # Expose port
-EXPOSE 5000
+EXPOSE 8000
 
 # Health check
 HEALTHCHECK --interval=30s --timeout=10s --start-period=5s --retries=3 \
-    CMD curl -f http://localhost:5000/health || exit 1
+    CMD curl -f http://localhost:${PORT}/health || exit 1
 
 # Run the application
-CMD ["hypercorn", "app:app", "--config", "hypercorn.conf.py"]
+CMD ["hypercorn", "app:app", "--bind", "0.0.0.0:8000", "--workers", "1"]

content-gen/src/app.py

@@ -32,6 +32,27 @@
 app = cors(app, allow_origin="*")
 
 
+# ==================== Authentication Helper ====================
+
+def get_authenticated_user():
+    """
+    Get the authenticated user from EasyAuth headers.
+    
+    In production (with App Service Auth), the X-Ms-Client-Principal-Id header
+    contains the user's ID. In development mode, returns empty/None values.
+    """
+    user_principal_id = request.headers.get("X-Ms-Client-Principal-Id", "")
+    user_name = request.headers.get("X-Ms-Client-Principal-Name", "")
+    auth_provider = request.headers.get("X-Ms-Client-Principal-Idp", "")
+    
+    return {
+        "user_principal_id": user_principal_id or "",
+        "user_name": user_name or "",
+        "auth_provider": auth_provider or "",
+        "is_authenticated": bool(user_principal_id)
+    }
+
+
 # ==================== Health Check ====================
 
 @app.route("/health", methods=["GET"])
@@ -44,6 +65,19 @@ async def health_check():
     })
 
 
+# ==================== User Info Endpoint ====================
+
+@app.route("/api/user", methods=["GET"])
+async def get_current_user():
+    """
+    Get the current authenticated user info.
+    
+    Returns user details from EasyAuth headers, or empty values if not authenticated.
+    """
+    user = get_authenticated_user()
+    return jsonify(user)
+
+
 # ==================== Chat Endpoints ====================
 
 @app.route("/api/chat", methods=["POST"])
@@ -341,7 +375,7 @@ async def generate():
                     user_id=user_id,
                     message={
                         "role": "assistant",
-                        "content": f"Content generated successfully! {f'Headline: "{headline}"' if headline else ''}",
+                        "content": f"Content generated successfully!{' Headline: ' + headline if headline else ''}",
                         "agent": "ContentAgent",
                         "timestamp": datetime.now(timezone.utc).isoformat()
                     }
@@ -544,15 +578,17 @@ async def list_conversations():
     """
     List conversations for a user.
     
+    Uses authenticated user from EasyAuth headers. In development mode
+    (when not authenticated), returns conversations where user_id is empty/null.
+    
     Query params:
-        user_id: User identifier (required)
         limit: Max number of results (default 20)
     """
-    user_id = request.args.get("user_id")
-    limit = int(request.args.get("limit", 20))
+    # Get authenticated user from headers
+    auth_user = get_authenticated_user()
+    user_id = auth_user["user_principal_id"]  # Empty string if not authenticated
 
-    if not user_id:
-        return jsonify({"error": "user_id is required"}), 400
+    limit = int(request.args.get("limit", 20))
 
     cosmos_service = await get_cosmos_service()
     conversations = await cosmos_service.get_user_conversations(user_id, limit)
@@ -568,13 +604,10 @@ async def get_conversation(conversation_id: str):
     """
     Get a specific conversation.
     
-    Query params:
-        user_id: User identifier (required)
+    Uses authenticated user from EasyAuth headers.
     """
-    user_id = request.args.get("user_id")
-    
-    if not user_id:
-        return jsonify({"error": "user_id is required"}), 400
+    auth_user = get_authenticated_user()
+    user_id = auth_user["user_principal_id"]
 
     cosmos_service = await get_cosmos_service()
     conversation = await cosmos_service.get_conversation(conversation_id, user_id)
@@ -590,13 +623,10 @@ async def delete_conversation(conversation_id: str):
     """
     Delete a specific conversation.
     
-    Query params:
-        user_id: User identifier (required)
+    Uses authenticated user from EasyAuth headers.
     """
-    user_id = request.args.get("user_id")
-    
-    if not user_id:
-        return jsonify({"error": "user_id is required"}), 400
+    auth_user = get_authenticated_user()
+    user_id = auth_user["user_principal_id"]
 
     try:
         cosmos_service = await get_cosmos_service()

content-gen/src/backend/services/cosmos_service.py

@@ -367,7 +367,7 @@ async def get_user_conversations(
         Get all conversations for a user with summary data.
         
         Args:
-            user_id: User ID
+            user_id: User ID (empty string for development mode - returns conversations with empty/null user_id)
             limit: Maximum number of conversations
         
         Returns:
@@ -376,16 +376,30 @@ async def get_user_conversations(
         await self.initialize()
 
         # Get conversations with messages to extract title and last message
-        query = """
-            SELECT TOP @limit c.id, c.user_id, c.updated_at, c.messages, c.brief
-            FROM c 
-            WHERE c.user_id = @user_id
-            ORDER BY c.updated_at DESC
-        """
-        params = [
-            {"name": "@user_id", "value": user_id},
-            {"name": "@limit", "value": limit}
-        ]
+        # In development mode (empty user_id), get conversations where user_id is empty, null, or not set
+        if user_id:
+            # Production mode: get conversations for the authenticated user
+            query = """
+                SELECT TOP @limit c.id, c.user_id, c.updated_at, c.messages, c.brief
+                FROM c 
+                WHERE c.user_id = @user_id
+                ORDER BY c.updated_at DESC
+            """
+            params = [
+                {"name": "@user_id", "value": user_id},
+                {"name": "@limit", "value": limit}
+            ]
+        else:
+            # Development mode: get conversations where user_id is empty, null, or not defined
+            query = """
+                SELECT TOP @limit c.id, c.user_id, c.updated_at, c.messages, c.brief
+                FROM c 
+                WHERE (NOT IS_DEFINED(c.user_id) OR c.user_id = null OR c.user_id = "")
+                ORDER BY c.updated_at DESC
+            """
+            params = [
+                {"name": "@limit", "value": limit}
+            ]
 
         conversations = []
         async for item in self._conversations_container.query_items(

content-gen/src/frontend/src/App.tsx

@@ -1,4 +1,4 @@
-import { useState, useCallback } from 'react';
+import { useState, useCallback, useEffect } from 'react';
 import {
   Title1,
   Subtitle1,
@@ -14,9 +14,16 @@ import { ChatPanel } from './components/ChatPanel';
 import { ChatHistory } from './components/ChatHistory';
 import type { ChatMessage, CreativeBrief, Product, GeneratedContent } from './types';
 
+interface UserInfo {
+  user_principal_id: string;
+  user_name: string;
+  auth_provider: string;
+  is_authenticated: boolean;
+}
+
 function App() {
   const [conversationId, setConversationId] = useState<string>(() => uuidv4());
-  const [userId] = useState<string>('demo-user');
+  const [userId, setUserId] = useState<string>('');
   const [messages, setMessages] = useState<ChatMessage[]>([]);
   const [isLoading, setIsLoading] = useState(false);
 
@@ -33,6 +40,25 @@ function App() {
   // Trigger for refreshing chat history
   const [historyRefreshTrigger, setHistoryRefreshTrigger] = useState(0);
 
+  // Fetch current user on mount
+  useEffect(() => {
+    const fetchUser = async () => {
+      try {
+        const response = await fetch('/api/user');
+        if (response.ok) {
+          const user: UserInfo = await response.json();
+          // Use user_principal_id if authenticated, otherwise empty string for dev mode
+          setUserId(user.user_principal_id || '');
+        }
+      } catch (err) {
+        console.error('Error fetching user:', err);
+        // Default to empty string for development mode
+        setUserId('');
+      }
+    };
+    fetchUser();
+  }, []);
+
   // Handle selecting a conversation from history
   const handleSelectConversation = useCallback(async (selectedConversationId: string) => {
     setIsLoading(true);
@@ -350,7 +376,6 @@ function App() {
         <div className="history-panel">
           <ChatHistory
             currentConversationId={conversationId}
-            userId={userId}
             currentMessages={messages}
             onSelectConversation={handleSelectConversation}
             onNewConversation={handleNewConversation}

content-gen/src/frontend/src/components/ChatHistory.tsx

@@ -32,7 +32,6 @@ interface ConversationSummary {
 
 interface ChatHistoryProps {
   currentConversationId: string;
-  userId: string;
   currentMessages?: { role: string; content: string }[]; // Current session messages
   onSelectConversation: (conversationId: string) => void;
   onNewConversation: () => void;
@@ -41,7 +40,6 @@ interface ChatHistoryProps {
 
 export function ChatHistory({ 
   currentConversationId, 
-  userId,
   currentMessages = [],
   onSelectConversation,
   onNewConversation,
@@ -57,7 +55,8 @@ export function ChatHistory({
     setIsLoading(true);
     setError(null);
     try {
-      const response = await fetch(`/api/conversations?user_id=${encodeURIComponent(userId)}`);
+      // Backend gets user from auth headers, no need to pass user_id
+      const response = await fetch('/api/conversations');
       if (response.ok) {
         const data = await response.json();
         setConversations(data.conversations || []);
@@ -72,7 +71,7 @@ export function ChatHistory({
     } finally {
       setIsLoading(false);
     }
-  }, [userId]);
+  }, []);
 
   useEffect(() => {
     loadConversations();
@@ -116,7 +115,8 @@ export function ChatHistory({
   const handleDeleteConversation = async (conversationId: string, e: React.MouseEvent) => {
     e.stopPropagation();
     try {
-      const response = await fetch(`/api/conversations/${conversationId}?user_id=${encodeURIComponent(userId)}`, {
+      // Backend gets user from auth headers
+      const response = await fetch(`/api/conversations/${conversationId}`, {
         method: 'DELETE',
       });
       if (response.ok) {

…-gen/src/static/assets/index-uIwqAuu8.js …-gen/src/static/assets/index-Ds2DWner.jscontent-gen/src/static/assets/index-uIwqAuu8.js renamed to content-gen/src/static/assets/index-Ds2DWner.js content-gen/src/static/assets/index-uIwqAuu8.js renamed to content-gen/src/static/assets/index-Ds2DWner.js

@@ -5,7 +5,7 @@
     <link rel="icon" type="image/svg+xml" href="/vite.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>Content Generation Accelerator</title>
-    <script type="module" crossorigin src="/assets/index-uIwqAuu8.js"></script>
+    <script type="module" crossorigin src="/assets/index-Ds2DWner.js"></script>
     <link rel="stylesheet" crossorigin href="/assets/index-C6xB6aWi.css">
   </head>
   <body>