github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

fix: 修复手动登录系统用户连接RemoteApp应用获取不到认证信息的问题

pull/8362/head
Jiangjie.Bai 2022-06-10 18:22:57 +08:00 committed by Jiangjie.Bai
parent a5c6ba6cd6
commit 9d1e94d3c2
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
apps/assets/models/user.py
View File

@ -133,6 +133,15 @@ class AuthMixin:
self.password = password self.password = password
def load_app_more_auth(self, app_id=None, username=None, user_id=None): def load_app_more_auth(self, app_id=None, username=None, user_id=None):
# 清除认证信息
self._clean_auth_info_if_manual_login_mode()
# 先加载临时认证信息
if self.login_mode == self.LOGIN_MANUAL:
self._load_tmp_auth_if_has(app_id, user_id)
return
# Remote app
from applications.models import Application from applications.models import Application
app = get_object_or_none(Application, pk=app_id) app = get_object_or_none(Application, pk=app_id)
if app and app.category_remote_app: if app and app.category_remote_app:
@ -141,11 +150,6 @@ class AuthMixin:
return return
# Other app # Other app
self._clean_auth_info_if_manual_login_mode()
# 加载临时认证信息
if self.login_mode == self.LOGIN_MANUAL:
self._load_tmp_auth_if_has(app_id, user_id)
return
# 更新用户名 # 更新用户名
from users.models import User from users.models import User
user = get_object_or_none(User, pk=user_id) if user_id else None user = get_object_or_none(User, pk=user_id) if user_id else None