youngkingdom/dify
1
0
Fork 0
mirror of https://github.com/langgenius/dify.git synced 2026-04-28 22:48:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat(oauth): merge tool oauth and remove sequence number branches

Browse Source
This commit is contained in:
Harry
2025-06-25 14:51:55 +08:00
parent 1a2dfd950e
commit ce4cc54cc9
5 changed files with 32 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
api/controllers/console/workspace/tool_providers.py
View File

@ -676,14 +676,9 @@ class ToolPluginOAuthApi(Resource):
if not user.is_admin_or_owner:
raise Forbidden()
# check if user client is configured and enabled then using user client
# if user client is not configured then using system client
tenant_id = user.current_tenant_id
user_id = user.id
plugin_oauth_config = BuiltinToolManageService.get_builtin_tool_provider(
plugin_oauth_config = BuiltinToolManageService.get_builtin_tool_oauth_client(
tenant_id=tenant_id,
user_id=user_id,
provider=provider,
plugin_id=plugin_id,
)
@ -727,9 +722,8 @@ class ToolOAuthCallback(Resource):
context.get("provider"),
)
oauth_handler = OAuthHandler()
plugin_oauth_config = BuiltinToolManageService.get_builtin_tool_provider(
plugin_oauth_config = BuiltinToolManageService.get_builtin_tool_oauth_client(
tenant_id=tenant_id,
user_id=user_id,
provider=provider,
plugin_id=plugin_id,
)