Fix MCP auth header failure signaling

Author: DavidJBianco

peak_assistant/utils/mcp_config.py

@@ -1003,7 +1003,7 @@ async def _connect_http_server(self, server_name: str, config: MCPServerConfig,
 
         # Create HTTP client with authentication
         headers = await self._get_auth_headers(config, user_id)
-        if headers is False:
+        if headers is None:
             return False
 
         # Store the connection (user-specific or system-level)
@@ -1018,19 +1018,19 @@ async def _connect_http_server(self, server_name: str, config: MCPServerConfig,
         logger.info(f"Connected to HTTP server: {server_name}" + (f" for user {user_id}" if user_id else ""))
         return True
 
-    async def _get_auth_headers(self, config: MCPServerConfig, user_id: Optional[str] = None) -> Dict[str, str]:
+    async def _get_auth_headers(self, config: MCPServerConfig, user_id: Optional[str] = None) -> Optional[Dict[str, str]]:
         """Get authentication headers for a server"""
         headers = {}
         if config.auth:
             if config.auth.type == AuthType.BEARER:
                 if not config.auth.token:
                     logger.error(f"No token specified for bearer auth on {config.name}")
-                    return {}
+                    return None
                 headers["Authorization"] = f"Bearer {config.auth.token}"
             elif config.auth.type == AuthType.API_KEY:
                 if not config.auth.api_key or not config.auth.header_name:
                     logger.error(f"API key or header name not specified for {config.name}")
-                    return {}
+                    return None
                 headers[config.auth.header_name] = config.auth.api_key
             elif config.auth.type in [AuthType.OAUTH2_CLIENT_CREDENTIALS, AuthType.OAUTH2_AUTHORIZATION_CODE]:
                 # Priority 1: Check Streamlit session state (for web UI)
@@ -1067,19 +1067,19 @@ async def _get_auth_headers(self, config: MCPServerConfig, user_id: Optional[str
                                         # Check if user ID is required
                                         if config.auth.requires_user_auth:
                                             logger.error(f"User ID is required for user-based OAuth on {config.name}")
-                                            return {}
+                                            return None
                                 else:
                                     logger.error(f"No access token in Streamlit session state for {config.name}")
-                                    return {}
+                                    return None
                             else:
                                 logger.error(f"No OAuth data found in Streamlit session state for {config.name}")
-                                return {}
+                                return None
                         else:
                             logger.error(f"Streamlit session state not available")
-                            return {}
+                            return None
                     except Exception as e:
                         logger.error(f"Failed to get Streamlit OAuth headers for {config.name}: {e}")
-                        return {}
+                        return None
                 else:
                     # Priority 2: Check environment variables (for CLI/automation)
                     # Only used when NOT running in Streamlit
@@ -1111,7 +1111,7 @@ async def _get_auth_headers(self, config: MCPServerConfig, user_id: Optional[str
                                     f"  Alternatively, authenticate via Streamlit web interface.\n"
                                     f"  Server will be skipped."
                                 )
-                                return {}
+                                return None
 
                         return headers
 
@@ -1137,7 +1137,7 @@ async def _get_auth_headers(self, config: MCPServerConfig, user_id: Optional[str
                         f"  Alternatively, authenticate via Streamlit web interface.\n"
                         f"  Server will be skipped."
                     )
-                    return {}
+                    return None
 
         return headers
 

tests/unit_tests/test_mcp_oauth_env_vars.py

@@ -96,7 +96,7 @@ async def test_oauth_with_token_and_user_id_env_vars(monkeypatch, client_manager
 
 @pytest.mark.asyncio
 async def test_oauth_missing_required_user_id(monkeypatch, client_manager):
-    """Test that missing user ID returns empty headers with warning"""
+    """Test that missing user ID fails auth header generation"""
     monkeypatch.setenv("PEAK_MCP_TEST_SERVER_TOKEN", "test_token_123")
     # Don't set USER_ID
 
@@ -112,8 +112,8 @@ async def test_oauth_missing_required_user_id(monkeypatch, client_manager):
 
     headers = await client_manager._get_auth_headers(config)
 
-    # Should return empty when user ID required but missing
-    assert headers == {}
+    # Should fail when user ID required but missing
+    assert headers is None
 
 
 @pytest.mark.asyncio
@@ -133,7 +133,7 @@ async def test_oauth_no_env_vars_no_streamlit(client_manager):
 
     headers = await client_manager._get_auth_headers(config)
 
-    assert headers == {}
+    assert headers is None
 
 
 @pytest.mark.asyncio