Kevin Hu
commited on
Commit
·
342ad40
1
Parent(s):
af9653e
add rm token (#2850)
Browse files### What problem does this PR solve?
#2846
### Type of change
- [x] New Feature (non-breaking change which adds functionality)
- api/apps/system_app.py +16 -1
api/apps/system_app.py
CHANGED
|
@@ -17,13 +17,15 @@ import json
|
|
| 17 |
from datetime import datetime
|
| 18 |
|
| 19 |
from flask_login import login_required, current_user
|
|
|
|
|
|
|
| 20 |
from api.db.services.api_service import APITokenService
|
| 21 |
from api.db.services.knowledgebase_service import KnowledgebaseService
|
| 22 |
from api.db.services.user_service import UserTenantService
|
| 23 |
from api.settings import DATABASE_TYPE
|
| 24 |
from api.utils import current_timestamp, datetime_format
|
| 25 |
from api.utils.api_utils import get_json_result, get_data_error_result, server_error_response, \
|
| 26 |
-
generate_confirmation_token
|
| 27 |
from api.versions import get_rag_version
|
| 28 |
from rag.utils.es_conn import ELASTICSEARCH
|
| 29 |
from rag.utils.storage_factory import STORAGE_IMPL, STORAGE_IMPL_TYPE
|
|
@@ -130,3 +132,16 @@ def token_list():
|
|
| 130 |
except Exception as e:
|
| 131 |
return server_error_response(e)
|
| 132 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 17 |
from datetime import datetime
|
| 18 |
|
| 19 |
from flask_login import login_required, current_user
|
| 20 |
+
|
| 21 |
+
from api.db.db_models import APIToken
|
| 22 |
from api.db.services.api_service import APITokenService
|
| 23 |
from api.db.services.knowledgebase_service import KnowledgebaseService
|
| 24 |
from api.db.services.user_service import UserTenantService
|
| 25 |
from api.settings import DATABASE_TYPE
|
| 26 |
from api.utils import current_timestamp, datetime_format
|
| 27 |
from api.utils.api_utils import get_json_result, get_data_error_result, server_error_response, \
|
| 28 |
+
generate_confirmation_token, request, validate_request
|
| 29 |
from api.versions import get_rag_version
|
| 30 |
from rag.utils.es_conn import ELASTICSEARCH
|
| 31 |
from rag.utils.storage_factory import STORAGE_IMPL, STORAGE_IMPL_TYPE
|
|
|
|
| 132 |
except Exception as e:
|
| 133 |
return server_error_response(e)
|
| 134 |
|
| 135 |
+
|
| 136 |
+
@manager.route('/rm', methods=['POST'])
|
| 137 |
+
@validate_request("tokens", "tenant_id")
|
| 138 |
+
@login_required
|
| 139 |
+
def rm():
|
| 140 |
+
req = request.json
|
| 141 |
+
try:
|
| 142 |
+
for token in req["tokens"]:
|
| 143 |
+
APITokenService.filter_delete(
|
| 144 |
+
[APIToken.tenant_id == req["tenant_id"], APIToken.token == token])
|
| 145 |
+
return get_json_result(data=True)
|
| 146 |
+
except Exception as e:
|
| 147 |
+
return server_error_response(e)
|