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

feat: enhance datasource authentication by improving credential handling and updating API parameters

Browse Source
This commit is contained in:
Harry
2025-07-21 18:51:46 +08:00
parent 386d320650
commit ba7f0b3004
3 changed files with 53 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
api/controllers/console/datasets/rag_pipeline/datasource_auth.py
View File

@ -134,7 +134,7 @@ class DatasourceAuth(Resource):
)
except CredentialsValidateFailedError as ex:
raise ValueError(str(ex))
return redirect(f"{dify_config.CONSOLE_WEB_URL}/oauth-callback")
return {"result": "success"}, 200
@setup_required
@login_required
@ -149,8 +149,8 @@ class DatasourceAuth(Resource):
)
return {"result": datasources}, 200
class DatasourceAuthDeleteApi(Resource):
class DatasourceAuthDeleteApi(Resource):
@setup_required
@login_required
@account_initialization_required
@ -172,8 +172,8 @@ class DatasourceAuthDeleteApi(Resource):
)
return {"result": "success"}, 200
class DatasourceAuthUpdateApi(Resource):
class DatasourceAuthUpdateApi(Resource):
@setup_required
@login_required
@account_initialization_required
@ -186,19 +186,15 @@ class DatasourceAuthUpdateApi(Resource):
args = parser.parse_args()
if not current_user.is_editor:
raise Forbidden()
try:
datasource_provider_service = DatasourceProviderService()
datasource_provider_service.update_datasource_credentials(
tenant_id=current_user.current_tenant_id,
auth_id=args["credential_id"],
provider=datasource_provider_id.provider_name,
plugin_id=datasource_provider_id.plugin_id,
credentials=args.get("credentials", {}),
name=args.get("name", None),
)
except CredentialsValidateFailedError as ex:
raise ValueError(str(ex))
datasource_provider_service = DatasourceProviderService()
datasource_provider_service.update_datasource_credentials(
tenant_id=current_user.current_tenant_id,
auth_id=args["credential_id"],
provider=datasource_provider_id.provider_name,
plugin_id=datasource_provider_id.plugin_id,
credentials=args.get("credentials", {}),
name=args.get("name", None),
)
return {"result": "success"}, 201
@ -223,7 +219,7 @@ class DatasourceAuthOauthCustomClient(Resource):
raise Forbidden()
parser = reqparse.RequestParser()
parser.add_argument("client_params", type=dict, required=False, nullable=True, location="json")
parser.add_argument("enabled", type=bool, required=False, nullable=True, location="json")
parser.add_argument("enable_oauth_custom_client", type=bool, required=False, nullable=True, location="json")
args = parser.parse_args()
datasource_provider_id = DatasourceProviderID(provider_id)
datasource_provider_service = DatasourceProviderService()
@ -231,7 +227,7 @@ class DatasourceAuthOauthCustomClient(Resource):
tenant_id=current_user.current_tenant_id,
datasource_provider_id=datasource_provider_id,
client_params=args.get("client_params", {}),
enabled=args.get("enabled", False),
enabled=args.get("enable_oauth_custom_client", False),
)
return {"result": "success"}, 200
@ -247,6 +243,7 @@ class DatasourceAuthOauthCustomClient(Resource):
)
return {"result": "success"}, 200
class DatasourceAuthDefaultApi(Resource):
@setup_required
@login_required
@ -266,6 +263,7 @@ class DatasourceAuthDefaultApi(Resource):
)
return {"result": "success"}, 200
class DatasourceUpdateProviderNameApi(Resource):
@setup_required
@login_required
@ -329,4 +327,4 @@ api.add_resource(
api.add_resource(
DatasourceUpdateProviderNameApi,
"/auth/plugin/datasource/<path:provider_id>/update-name",
)
)