add user email to google mcp

Signed-off-by: Michael Clifford <mcliffor@redhat.com>

Author: MichaelClifford

components/backend/handlers/sessions.go

@@ -663,6 +663,19 @@ func CreateSession(c *gin.Context) {
 					displayName = s
 				}
 			}
+
+			// Extract email from authenticated user
+			email := ""
+			if v, ok := c.Get("userEmail"); ok {
+				if s, ok2 := v.(string); ok2 {
+					email = strings.TrimSpace(s)
+				}
+			}
+			// Fallback to userID if no explicit email (userID is often the email)
+			if email == "" {
+				email = uid
+			}
+
 			groups := []string{}
 			if v, ok := c.Get("userGroups"); ok {
 				if gg, ok2 := v.([]string); ok2 {
@@ -679,6 +692,7 @@ func CreateSession(c *gin.Context) {
 			session["spec"].(map[string]interface{})["userContext"] = map[string]interface{}{
 				"userId":      uid,
 				"displayName": displayName,
+				"email":       email,
 				"groups":      groups,
 			}
 		}

components/backend/types/common.go

@@ -12,6 +12,7 @@ type GitRepository struct {
 type UserContext struct {
 	UserID      string   `json:"userId" binding:"required"`
 	DisplayName string   `json:"displayName" binding:"required"`
+	Email       string   `json:"email,omitempty"`
 	Groups      []string `json:"groups" binding:"required"`
 }
 

components/operator/internal/handlers/sessions.go

@@ -982,15 +982,19 @@ func handleAgenticSessionEvent(obj *unstructured.Unstructured) error {
 	// Extract userContext for observability and auditing
 	userID := ""
 	userName := ""
+	userEmail := ""
 	if userContext, found, _ := unstructured.NestedMap(spec, "userContext"); found {
 		if v, ok := userContext["userId"].(string); ok {
 			userID = strings.TrimSpace(v)
 		}
 		if v, ok := userContext["displayName"].(string); ok {
 			userName = strings.TrimSpace(v)
 		}
+		if v, ok := userContext["email"].(string); ok {
+			userEmail = strings.TrimSpace(v)
+		}
 	}
-	log.Printf("Session %s initiated by user: %s (userId: %s)", name, userName, userID)
+	log.Printf("Session %s initiated by user: %s (userId: %s, email: %s)", name, userName, userID, userEmail)
 
 	// Create the Job
 	job := &batchv1.Job{
@@ -1131,6 +1135,10 @@ func handleAgenticSessionEvent(obj *unstructured.Unstructured) error {
 								if userName != "" {
 									base = append(base, corev1.EnvVar{Name: "USER_NAME", Value: userName})
 								}
+								// Pass email for Google Workspace MCP tools
+								if userEmail != "" {
+									base = append(base, corev1.EnvVar{Name: "USER_GOOGLE_EMAIL", Value: userEmail})
+								}
 
 								// Add per-repo environment variables (simplified format)
 								for i, repo := range repos {

components/runners/claude-code-runner/.mcp.json

@@ -22,7 +22,8 @@
         "GOOGLE_MCP_CREDENTIALS_DIR": "${GOOGLE_MCP_CREDENTIALS_DIR}",
         "MCP_SINGLE_USER_MODE": "1",
         "GOOGLE_OAUTH_CLIENT_ID": "${GOOGLE_OAUTH_CLIENT_ID}",
-        "GOOGLE_OAUTH_CLIENT_SECRET": "${GOOGLE_OAUTH_CLIENT_SECRET}"
+        "GOOGLE_OAUTH_CLIENT_SECRET": "${GOOGLE_OAUTH_CLIENT_SECRET}",
+        "USER_GOOGLE_EMAIL": "${USER_GOOGLE_EMAIL}"
       }
     }
   }

components/runners/claude-code-runner/adapter.py

@@ -84,6 +84,13 @@ async def initialize(self, context: RunnerContext):
         self.context = context
         logger.info(f"Initialized Claude Code adapter for session {context.session_id}")
 
+        # Set default USER_GOOGLE_EMAIL if not provided
+        if not os.getenv("USER_GOOGLE_EMAIL"):
+            os.environ["USER_GOOGLE_EMAIL"] = "user@example.com"
+            logger.info("USER_GOOGLE_EMAIL not set, using default: user@example.com")
+        else:
+            logger.info(f"USER_GOOGLE_EMAIL set to: {os.getenv('USER_GOOGLE_EMAIL')}")
+
         # Copy Google OAuth credentials from mounted Secret to writable workspace location
         await self._setup_google_credentials()