Add auth_handler_name parameter to Authorization.exchange_token call

Author: Johan Broberg

libraries/microsoft-agents-a365-tooling-extensions-agentframework/microsoft_agents_a365/tooling/extensions/agentframework/services/mcp_tool_registration_service.py

@@ -47,6 +47,7 @@ async def add_tool_servers_to_agent(
         initial_tools: List[Any],
         agentic_app_id: str,
         auth: Authorization,
+        auth_handler_name: str,
         turn_context: TurnContext,
         auth_token: Optional[str] = None,
     ) -> Optional[ChatAgent]:
@@ -59,6 +60,7 @@ async def add_tool_servers_to_agent(
             initial_tools: List of initial tools to add to the agent
             agentic_app_id: Agentic app identifier for the agent
             auth: Authorization context for token exchange
+            auth_handler_name: Name of the authorization handler.
             turn_context: Turn context for the operation
             auth_token: Optional bearer token for authentication
 
@@ -69,7 +71,7 @@ async def add_tool_servers_to_agent(
             # Exchange token if not provided
             if not auth_token:
                 scopes = get_mcp_platform_authentication_scope()
-                authToken = await auth.exchange_token(turn_context, scopes, "AGENTIC")
+                authToken = await auth.exchange_token(turn_context, scopes, auth_handler_name)
                 auth_token = authToken.token
 
             self._logger.info(f"Listing MCP tool servers for agent {agentic_app_id}")

libraries/microsoft-agents-a365-tooling-extensions-azureaifoundry/microsoft_agents_a365/tooling/extensions/azureaifoundry/services/mcp_tool_registration_service.py

@@ -71,6 +71,7 @@ async def add_tool_servers_to_agent(
         project_client: "AIProjectClient",
         agentic_app_id: str,
         auth: Authorization,
+        auth_handler_name: str,
         context: TurnContext,
         auth_token: Optional[str] = None,
     ) -> None:
@@ -80,6 +81,9 @@ async def add_tool_servers_to_agent(
         Args:
             project_client: The Azure Foundry AIProjectClient instance.
             agentic_app_id: Agentic App ID for the agent.
+            auth: Authorization handler for token exchange.
+            auth_handler_name: Name of the authorization handler.
+            context: Turn context for the current operation.
             auth_token: Authentication token to access the MCP servers.
 
         Raises:
@@ -91,7 +95,7 @@ async def add_tool_servers_to_agent(
 
         if not auth_token:
             scopes = get_mcp_platform_authentication_scope()
-            authToken = await auth.exchange_token(context, scopes, "AGENTIC")
+            authToken = await auth.exchange_token(context, scopes, auth_handler_name)
             auth_token = authToken.token
 
         try:

libraries/microsoft-agents-a365-tooling-extensions-openai/microsoft_agents_a365/tooling/extensions/openai/mcp_tool_registration_service.py

@@ -52,6 +52,7 @@ async def add_tool_servers_to_agent(
         agent: Agent,
         agentic_app_id: str,
         auth: Authorization,
+        auth_handler_name: str,
         context: TurnContext,
         auth_token: Optional[str] = None,
     ):
@@ -65,15 +66,18 @@ async def add_tool_servers_to_agent(
         Args:
             agent: The existing agent to add servers to
             agentic_app_id: Agentic App ID for the agent
-            auth_token: Authentication token to access the MCP servers
+            auth: Authorization handler for token exchange.
+            auth_handler_name: Name of the authorization handler.
+            context: Turn context for the current operation.
+            auth_token: Authentication token to access the MCP servers.
 
         Returns:
             New Agent instance with all MCP servers, or original agent if no new servers
         """
 
         if not auth_token:
             scopes = get_mcp_platform_authentication_scope()
-            authToken = await auth.exchange_token(context, scopes, "AGENTIC")
+            authToken = await auth.exchange_token(context, scopes, auth_handler_name)
             auth_token = authToken.token
 
         # Get MCP server configurations from the configuration service

libraries/microsoft-agents-a365-tooling-extensions-semantickernel/microsoft_agents_a365/tooling/extensions/semantickernel/services/mcp_tool_registration_service.py

@@ -79,6 +79,7 @@ async def add_tool_servers_to_agent(
         kernel: sk.Kernel,
         agentic_app_id: str,
         auth: Authorization,
+        auth_handler_name: str,
         context: TurnContext,
         auth_token: Optional[str] = None,
     ) -> None:
@@ -88,6 +89,9 @@ async def add_tool_servers_to_agent(
         Args:
             kernel: The Semantic Kernel instance to which the tools will be added.
             agentic_app_id: Agentic App ID for the agent.
+            auth: Authorization handler for token exchange.
+            auth_handler_name: Name of the authorization handler.
+            context: Turn context for the current operation.
             auth_token: Authentication token to access the MCP servers.
 
         Raises:
@@ -97,7 +101,7 @@ async def add_tool_servers_to_agent(
 
         if not auth_token:
             scopes = get_mcp_platform_authentication_scope()
-            authToken = await auth.exchange_token(context, scopes, "AGENTIC")
+            authToken = await auth.exchange_token(context, scopes, auth_handler_name)
             auth_token = authToken.token
 
         self._validate_inputs(kernel, agentic_app_id, auth_token)