refac

backend/open_webui/routers/configs.py

@@ -167,59 +167,27 @@ async def set_tool_servers_config(
     form_data: ToolServersConfigForm,
     user=Depends(get_admin_user),
 ):
-    old_connections = copy.deepcopy(
-        request.app.state.config.TOOL_SERVER_CONNECTIONS or []
-    )
+    mcp_server_ids = [
+        conn.get("info", {}).get("id")
+        for conn in form_data.TOOL_SERVER_CONNECTIONS
+        if conn.get("type") == "mcp"
+    ]
 
-    new_connections = [
+    for server_id in mcp_server_ids:
+        # Remove existing OAuth clients for MCP tool servers that are no longer present
+        client_key = f"mcp:{server_id}"
+        try:
+            request.app.state.oauth_client_manager.remove_client(client_key)
+        except:
+            pass
+
+    # Set new tool server connections
+    request.app.state.config.TOOL_SERVER_CONNECTIONS = [
         connection.model_dump() for connection in form_data.TOOL_SERVER_CONNECTIONS
     ]
 
-    old_mcp_connections = {
-        conn.get("info", {}).get("id"): conn
-        for conn in old_connections
-        if conn.get("type") == "mcp"
-    }
-    new_mcp_connections = {
-        conn.get("info", {}).get("id"): conn
-        for conn in new_connections
-        if conn.get("type") == "mcp"
-    }
-
-    purge_oauth_clients = set()
-
-    for server_id, old_conn in old_mcp_connections.items():
-        if not server_id:
-            continue
-
-        old_auth_type = old_conn.get("auth_type", "none")
-        new_conn = new_mcp_connections.get(server_id)
-
-        if new_conn is None:
-            if old_auth_type == "oauth_2.1":
-                purge_oauth_clients.add(server_id)
-            continue
-
-        new_auth_type = new_conn.get("auth_type", "none")
-
-        if old_auth_type == "oauth_2.1":
-            if (
-                new_auth_type != "oauth_2.1"
-                or old_conn.get("url") != new_conn.get("url")
-                or old_conn.get("info", {}).get("oauth_client_info")
-                != new_conn.get("info", {}).get("oauth_client_info")
-            ):
-                purge_oauth_clients.add(server_id)
-
-    request.app.state.config.TOOL_SERVER_CONNECTIONS = new_connections
-
     await set_tool_servers(request)
 
-    for server_id in purge_oauth_clients:
-        client_key = f"mcp:{server_id}"
-        request.app.state.oauth_client_manager.remove_client(client_key)
-        OAuthSessions.delete_sessions_by_provider(client_key)
-
     for connection in request.app.state.config.TOOL_SERVER_CONNECTIONS:
         server_type = connection.get("type", "openapi")
         if server_type == "mcp":