opensource
/
dify
mirror of https://github.com/langgenius/dify.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

feat(oauth): update client parameters handling and improve oauth_params parsing

This commit is contained in:
Harry 2025-07-14 14:41:31 +08:00
parent f68201af0b
commit 37be099442
2 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/models/tools.py
View File

@ -55,7 +55,7 @@ class ToolOAuthTenantClient(Base):
@property
def oauth_params(self) -> dict:
return cast(dict, json.loads(self.encrypted_oauth_params))
return cast(dict, json.loads(self.encrypted_oauth_params or "{}"))
class BuiltinToolProvider(Base):

14
api/services/tools/builtin_tools_manage_service.py
View File

@ -53,12 +53,9 @@ class BuiltinToolManageService:
"schema": provider.get_oauth_client_schema(),
"is_oauth_custom_client_enabled": is_oauth_custom_client_enabled,
"is_system_oauth_params_exists": is_system_oauth_params_exists,
"client_params": BuiltinToolManageService.get_custom_oauth_client_params(tenant_id, provider_name),
"redirect_uri": f"{dify_config.CONSOLE_API_URL}/console/api/oauth/plugin/{provider_name}/tool/callback",
}
if is_oauth_custom_client_enabled:
result["client_params"] = BuiltinToolManageService.get_oauth_client(tenant_id, provider_name)
result["redirect_uri"] = (
f"{dify_config.CONSOLE_API_URL}/console/api/oauth/plugin/{provider_name}/tool/callback"
)
return result
@staticmethod
@ -728,9 +725,4 @@ class BuiltinToolManageService:
cache=NoOpProviderCredentialCache(),
)
return {
"oauth_params": encrypter.mask_tool_credentials(
encrypter.decrypt(custom_oauth_client_params.oauth_params)
),
"enabled": custom_oauth_client_params.enabled,
}
return encrypter.mask_tool_credentials(encrypter.decrypt(custom_oauth_client_params.oauth_params))