From bcdb3d8b0b69301f49a4878c3dac60aed3daf8fc Mon Sep 17 00:00:00 2001
From: Ragini-Microsoft <v-raginich@microsoft.com>
Date: Tue, 3 Feb 2026 14:12:05 +0530
Subject: [PATCH] fix: correct user initials display when authentication is
 enabled

---
 content-gen/src/app/frontend/src/App.tsx | 44 +++++++++++-------------
 content-gen/src/backend/app.py           | 13 -------
 2 files changed, 20 insertions(+), 37 deletions(-)

diff --git a/content-gen/src/app/frontend/src/App.tsx b/content-gen/src/app/frontend/src/App.tsx
index a0556a17..fd1de0de 100644
--- a/content-gen/src/app/frontend/src/App.tsx
+++ b/content-gen/src/app/frontend/src/App.tsx
@@ -17,17 +17,11 @@ import { ChatHistory } from './components/ChatHistory';
 import type { ChatMessage, CreativeBrief, Product, GeneratedContent } from './types';
 import ContosoLogo from './styles/images/contoso.svg';
 
-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, setUserId] = useState<string>('');
+  const [userName, setUserName] = useState<string>('');
   const [messages, setMessages] = useState<ChatMessage[]>([]);
   const [isLoading, setIsLoading] = useState(false);
   const [generationStatus, setGenerationStatus] = useState<string>('');
@@ -72,18 +66,32 @@ function App() {
     fetchConfig();
   }, []);
 
-  // Fetch current user on mount
+  // Fetch current user on mount - using /.auth/me (Azure App Service built-in auth endpoint)
   useEffect(() => {
     const fetchUser = async () => {
       try {
-        const response = await fetch('/api/user');
+        const response = await fetch('/.auth/me');
         if (response.ok) {
-          const user: UserInfo = await response.json();
-          setUserId(user.user_principal_id || 'anonymous');
+          const payload = await response.json();
+          
+          // Extract user ID from objectidentifier claim
+          const userClaims = payload[0]?.user_claims || [];
+          const objectIdClaim = userClaims.find(
+            (claim: { typ: string; val: string }) =>
+              claim.typ === 'http://schemas.microsoft.com/identity/claims/objectidentifier'
+          );
+          setUserId(objectIdClaim?.val || 'anonymous');
+          
+          // Extract display name from 'name' claim
+          const nameClaim = userClaims.find(
+            (claim: { typ: string; val: string }) => claim.typ === 'name'
+          );
+          setUserName(nameClaim?.val || '');
         }
       } catch (err) {
         console.error('Error fetching user:', err);
         setUserId('anonymous');
+        setUserName('');
       }
     };
     fetchUser();
@@ -725,17 +733,6 @@ function App() {
     }
   }, [confirmedBrief, selectedProducts, conversationId]);
 
-  // Get user initials for avatar
-  const getUserInitials = () => {
-    if (!userId) return 'U';
-    // If we have a name, use first letter of first and last name
-    const parts = userId.split('@')[0].split('.');
-    if (parts.length >= 2) {
-      return (parts[0][0] + parts[parts.length - 1][0]).toUpperCase();
-    }
-    return userId[0].toUpperCase();
-  };
-
   return (
     <div className="app-container">
       {/* Header */}
@@ -764,8 +761,7 @@ function App() {
             />
           </Tooltip>
           <Avatar 
-            name={userId || 'User'}
-            initials={getUserInitials()}
+            name={userName || undefined}
             color="colorful"
             size={36}
           />
diff --git a/content-gen/src/backend/app.py b/content-gen/src/backend/app.py
index aecdf7f8..3fe4ffc6 100644
--- a/content-gen/src/backend/app.py
+++ b/content-gen/src/backend/app.py
@@ -76,19 +76,6 @@ 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"])