mirror of https://github.com/jumpserver/jumpserver
perf: 优化登录跳转flash时间间隔可配置;0表示直接跳转
parent
1da187c373
commit
e44c8ae940
|
@ -56,14 +56,19 @@ class UserLoginView(mixins.AuthMixin, FormView):
|
||||||
if not auth_url:
|
if not auth_url:
|
||||||
return None
|
return None
|
||||||
|
|
||||||
|
if settings.LOGIN_REDIRECT_FLASH_MESSAGE_INTERVAL == 0:
|
||||||
|
redirect_url = auth_url
|
||||||
|
else:
|
||||||
message_data = {
|
message_data = {
|
||||||
'title': _('Redirecting'),
|
'title': _('Redirecting'),
|
||||||
'message': _("Redirecting to {} authentication").format(auth_type),
|
'message': _("Redirecting to {} authentication").format(auth_type),
|
||||||
'redirect_url': auth_url,
|
'redirect_url': auth_url,
|
||||||
|
'interval': settings.LOGIN_REDIRECT_FLASH_MESSAGE_INTERVAL,
|
||||||
'has_cancel': True,
|
'has_cancel': True,
|
||||||
'cancel_url': reverse('authentication:login') + '?admin=1'
|
'cancel_url': reverse('authentication:login') + '?admin=1'
|
||||||
}
|
}
|
||||||
redirect_url = FlashMessageUtil.gen_message_url(message_data)
|
redirect_url = FlashMessageUtil.gen_message_url(message_data)
|
||||||
|
|
||||||
query_string = request.GET.urlencode()
|
query_string = request.GET.urlencode()
|
||||||
redirect_url = "{}&{}".format(redirect_url, query_string)
|
redirect_url = "{}&{}".format(redirect_url, query_string)
|
||||||
return redirect_url
|
return redirect_url
|
||||||
|
|
|
@ -306,6 +306,7 @@ class Config(dict):
|
||||||
'SESSION_EXPIRE_AT_BROWSER_CLOSE_FORCE': False,
|
'SESSION_EXPIRE_AT_BROWSER_CLOSE_FORCE': False,
|
||||||
'FORGOT_PASSWORD_URL': '',
|
'FORGOT_PASSWORD_URL': '',
|
||||||
'HEALTH_CHECK_TOKEN': '',
|
'HEALTH_CHECK_TOKEN': '',
|
||||||
|
'LOGIN_REDIRECT_FLASH_MESSAGE_INTERVAL': 3,
|
||||||
|
|
||||||
'TERMINAL_RDP_ADDR': ''
|
'TERMINAL_RDP_ADDR': ''
|
||||||
}
|
}
|
||||||
|
|
|
@ -128,3 +128,5 @@ HEALTH_CHECK_TOKEN = CONFIG.HEALTH_CHECK_TOKEN
|
||||||
|
|
||||||
TERMINAL_RDP_ADDR = CONFIG.TERMINAL_RDP_ADDR
|
TERMINAL_RDP_ADDR = CONFIG.TERMINAL_RDP_ADDR
|
||||||
SECURITY_LUNA_REMEMBER_AUTH = CONFIG.SECURITY_LUNA_REMEMBER_AUTH
|
SECURITY_LUNA_REMEMBER_AUTH = CONFIG.SECURITY_LUNA_REMEMBER_AUTH
|
||||||
|
|
||||||
|
LOGIN_REDIRECT_FLASH_MESSAGE_INTERVAL = CONFIG.LOGIN_REDIRECT_FLASH_MESSAGE_INTERVAL
|
||||||
|
|
Loading…
Reference in New Issue