chg: [login/diagnostic] Added catch if a secure cookie can't be set

pull/135/head
mokaddem 2019-10-29 15:42:58 +01:00
parent ad041c5f77
commit f1c5c76ec5
2 changed files with 3 additions and 3 deletions

View File

@ -443,8 +443,8 @@ def check_server_dynamic_enpoint(spinner):
if '/login' in r_login.url:
o = urlparse(r_login.url)
query = parse_qs(o.query)
error_message = query.get('auth_error_message', ['Unknown error'])[0]
return_text = error_message
error_message = query.get('auth_error_message', ['Redirected to `loging` caused by an unknown error'])[0]
return_text = 'Redirected to `loging` caused by: {}'.format(error_message)
return (False, return_text)
# Connection seems to be successful, checking if we receive data from event-stream

View File

@ -177,7 +177,7 @@ def unauthorized():
)))
response.set_cookie('redirectCount', '0', secure=False, httponly=True)
else:
response = make_response(redirect(url_for('login')))
response = make_response(redirect(url_for('login', auth_error=True, auth_error_message='Unauthorized. Review your cookie settings')))
response.set_cookie('redirectCount', str(redirectCount+1), secure=False, httponly=True)
return response