Skip to content

Commit 2febd83

Browse files
authored
fix: Application apikey call failed (#3629)
1 parent 15cb1f4 commit 2febd83

File tree

1 file changed

+7
-8
lines changed

1 file changed

+7
-8
lines changed

apps/common/auth/handle/impl/application_key.py

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,9 @@
99
from django.db.models import QuerySet
1010
from django.utils.translation import gettext_lazy as _
1111

12-
from application.models import ApplicationApiKey, ChatUserType
12+
from application.models import ApplicationApiKey, ChatUserType, ApplicationAccessToken
1313
from common.auth.handle.auth_base_handle import AuthBaseHandle
1414
from common.constants.permission_constants import Permission, Group, Operate, RoleConstants, ChatAuth
15-
from common.database_model_manage.database_model_manage import DatabaseModelManage
1615
from common.exception.app_exception import AppAuthenticationFailed
1716

1817

@@ -23,12 +22,12 @@ def handle(self, request, token: str, get_token_details):
2322
raise AppAuthenticationFailed(500, _('Secret key is invalid'))
2423
if not application_api_key.is_active:
2524
raise AppAuthenticationFailed(500, _('Secret key is invalid'))
26-
application_setting_model = DatabaseModelManage.get_model("application_setting")
27-
if application_setting_model is not None:
28-
application_setting = QuerySet(application_setting_model).filter(
29-
application_id=application_api_key.application_id).first()
30-
if application_setting.authentication:
31-
if application_setting.authentication != 'password':
25+
application_access_token = QuerySet(ApplicationAccessToken).filter(
26+
application_id=application_api_key.application_id).first()
27+
if application_access_token is not None:
28+
if application_access_token.authentication:
29+
if application_access_token.authentication_value.get('type',
30+
'password') != 'password':
3231
raise AppAuthenticationFailed(1002, _('Authentication information is incorrect'))
3332
return None, ChatAuth(
3433
current_role_list=[RoleConstants.CHAT_ANONYMOUS_USER],

0 commit comments

Comments
 (0)