pengjunjie/ragflow
1
0
Fork 1
mirror of https://github.com/infiniflow/ragflow.git synced 2026-01-01 01:25:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

api key delete bug - Bug #3045 (#12299)

Browse Source 
Description:
Fixed an issue where deleting an API token would fail because it was
incorrectly using current_user.id as the tenant_id instead of querying
the actual tenant ID from UserTenantService.

Changes:

Updated rm() endpoint to fetch the correct tenant_id from
UserTenantService before deleting the API token
Added proper error handling with try/except block
Code style cleanup: consistent quote usage and formatting
Related Issue: #3045

https://github.com/infiniflow/ragflow/issues/3045

Co-authored-by: Mardani, Ramin <ramin.mardani@sscinc.com>
This commit is contained in:
Ramin M.
2025-12-29 19:27:04 -08:00
committed by GitHub
parent df3cbb9b9e
commit 731e2d5f26
1 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
api/apps/system_app.py
View File

@ -177,7 +177,7 @@ def healthz():
return jsonify(result), (200 if all_ok else 500) return jsonify(result), (200 if all_ok else 500)
@manager.route("/ping", methods=["GET"]) # noqa: F821 @manager.route("/ping", methods=["GET"]) # noqa: F821
def ping(): def ping():
return "pong", 200 return "pong", 200
@ -213,7 +213,7 @@ def new_token():
if not tenants: if not tenants:
return get_data_error_result(message="Tenant not found!") return get_data_error_result(message="Tenant not found!")
tenant_id = [tenant for tenant in tenants if tenant.role == 'owner'][0].tenant_id tenant_id = [tenant for tenant in tenants if tenant.role == "owner"][0].tenant_id
obj = { obj = {
"tenant_id": tenant_id, "tenant_id": tenant_id,
"token": generate_confirmation_token(), "token": generate_confirmation_token(),
@ -268,13 +268,12 @@ def token_list():
if not tenants: if not tenants:
return get_data_error_result(message="Tenant not found!") return get_data_error_result(message="Tenant not found!")
tenant_id = [tenant for tenant in tenants if tenant.role == 'owner'][0].tenant_id tenant_id = [tenant for tenant in tenants if tenant.role == "owner"][0].tenant_id
objs = APITokenService.query(tenant_id=tenant_id) objs = APITokenService.query(tenant_id=tenant_id)
objs = [o.to_dict() for o in objs] objs = [o.to_dict() for o in objs]
for o in objs: for o in objs:
if not o["beta"]: if not o["beta"]:
o["beta"] = generate_confirmation_token().replace( o["beta"] = generate_confirmation_token().replace("ragflow-", "")[:32]
"ragflow-", "")[:32]
APITokenService.filter_update([APIToken.tenant_id == tenant_id, APIToken.token == o["token"]], o) APITokenService.filter_update([APIToken.tenant_id == tenant_id, APIToken.token == o["token"]], o)
return get_json_result(data=objs) return get_json_result(data=objs)
except Exception as e: except Exception as e:
@ -307,13 +306,19 @@ def rm(token):
type: boolean type: boolean
description: Deletion status. description: Deletion status.
""" """
APITokenService.filter_delete( try:
[APIToken.tenant_id == current_user.id, APIToken.token == token] tenants = UserTenantService.query(user_id=current_user.id)
) if not tenants:
return get_json_result(data=True) return get_data_error_result(message="Tenant not found!")
tenant_id = tenants[0].tenant_id
APITokenService.filter_delete([APIToken.tenant_id == tenant_id, APIToken.token == token])
return get_json_result(data=True)
except Exception as e:
return server_error_response(e)
@manager.route('/config', methods=['GET']) # noqa: F821 @manager.route("/config", methods=["GET"]) # noqa: F821
def get_config(): def get_config():
""" """
Get system configuration. Get system configuration.
@ -330,6 +335,4 @@ def get_config():
type: integer 0 means disabled, 1 means enabled type: integer 0 means disabled, 1 means enabled
description: Whether user registration is enabled description: Whether user registration is enabled
""" """
return get_json_result(data={ return get_json_result(data={"registerEnabled": settings.REGISTER_ENABLED})
"registerEnabled": settings.REGISTER_ENABLED
})