From 5f6f02350e3c886ef9e0566122ae0ffbd0021f7c Mon Sep 17 00:00:00 2001 From: Novice Date: Mon, 23 Jun 2025 14:10:18 +0800 Subject: [PATCH] chore: change the redirect url --- api/controllers/console/workspace/tool_providers.py | 4 ++-- ...058-9e4b39294dc8_add_mcp_server_tool_and_app_server.py} | 2 +- api/services/tools/mcp_tools_mange_service.py | 7 ++++++- 3 files changed, 9 insertions(+), 4 deletions(-) rename api/migrations/versions/{2025_06_12_1058-9e4b39294dc8_add_mcp_server_tool_and_app_server.py => 2025_06_20_1058-9e4b39294dc8_add_mcp_server_tool_and_app_server.py} (98%) diff --git a/api/controllers/console/workspace/tool_providers.py b/api/controllers/console/workspace/tool_providers.py index 194b01fc6a..a74e2fdb30 100644 --- a/api/controllers/console/workspace/tool_providers.py +++ b/api/controllers/console/workspace/tool_providers.py @@ -767,8 +767,8 @@ class ToolMCPCallbackApi(Resource): args = parser.parse_args() state_key = args["state"] authorization_code = args["code"] - full_state_data = handle_callback(state_key, authorization_code) - return redirect(f"{dify_config.CONSOLE_WEB_URL}/tools?mcp_provider_id={full_state_data.provider_id}") + handle_callback(state_key, authorization_code) + return redirect(f"{dify_config.CONSOLE_WEB_URL}/oauth-callback") # tool provider diff --git a/api/migrations/versions/2025_06_12_1058-9e4b39294dc8_add_mcp_server_tool_and_app_server.py b/api/migrations/versions/2025_06_20_1058-9e4b39294dc8_add_mcp_server_tool_and_app_server.py similarity index 98% rename from api/migrations/versions/2025_06_12_1058-9e4b39294dc8_add_mcp_server_tool_and_app_server.py rename to api/migrations/versions/2025_06_20_1058-9e4b39294dc8_add_mcp_server_tool_and_app_server.py index 0ca93f4edc..64bb076218 100644 --- a/api/migrations/versions/2025_06_12_1058-9e4b39294dc8_add_mcp_server_tool_and_app_server.py +++ b/api/migrations/versions/2025_06_20_1058-9e4b39294dc8_add_mcp_server_tool_and_app_server.py @@ -12,7 +12,7 @@ import sqlalchemy as sa # revision identifiers, used by Alembic. revision = '9e4b39294dc8' -down_revision = '4474872b0ee6' +down_revision = '0ab65e1cc7fa' branch_labels = None depends_on = None diff --git a/api/services/tools/mcp_tools_mange_service.py b/api/services/tools/mcp_tools_mange_service.py index 7c4362913d..fd5f8f0d0c 100644 --- a/api/services/tools/mcp_tools_mange_service.py +++ b/api/services/tools/mcp_tools_mange_service.py @@ -87,7 +87,12 @@ class MCPToolManageService: @staticmethod def retrieve_mcp_tools(tenant_id: str) -> list[ToolProviderApiEntity]: - mcp_providers = db.session.query(MCPToolProvider).filter(MCPToolProvider.tenant_id == tenant_id).all() + mcp_providers = ( + db.session.query(MCPToolProvider) + .filter(MCPToolProvider.tenant_id == tenant_id) + .order_by(MCPToolProvider.name) + .all() + ) return [ToolTransformService.mcp_provider_to_user_provider(mcp_provider) for mcp_provider in mcp_providers] @classmethod