openstack
/
horizon
Code Issues Proposed changes

Merge "django22: The 'login' functional-based view is gone (pt. 2)"

This commit is contained in:
Zuul 2019-09-10 13:58:28 +00:00 committed by Gerrit Code Review
parent e6aea7bacf 7938f36016
commit 1ad86bfa14
1 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
openstack_auth/views.py
View File

@ -53,7 +53,7 @@ LOG = logging.getLogger(__name__)
@sensitive_post_parameters() @sensitive_post_parameters()
@csrf_protect @csrf_protect
@never_cache @never_cache
def login(request, template_name=None, extra_context=None, **kwargs): def login(request):
"""Logs a user in using the :class:`~openstack_auth.forms.Login` form.""" """Logs a user in using the :class:`~openstack_auth.forms.Login` form."""
# If the user enabled websso and the default redirect # If the user enabled websso and the default redirect
@ -101,27 +101,26 @@ def login(request, template_name=None, extra_context=None, **kwargs):
else: else:
form = functional.curry(forms.Login, initial=initial) form = functional.curry(forms.Login, initial=initial)
if extra_context is None:
extra_context = {'redirect_field_name': auth.REDIRECT_FIELD_NAME}
extra_context['csrf_failure'] = request.GET.get('csrf_failure')
choices = getattr(settings, 'WEBSSO_CHOICES', ()) choices = getattr(settings, 'WEBSSO_CHOICES', ())
extra_context['show_sso_opts'] = (utils.is_websso_enabled() and extra_context = {
len(choices) > 1) 'redirect_field_name': auth.REDIRECT_FIELD_NAME,
'csrf_failure': request.GET.get('csrf_failure'),
'show_sso_opts': utils.is_websso_enabled() and len(choices) > 1,
}
if not template_name: if request.is_ajax():
if request.is_ajax(): template_name = 'auth/_login.html'
template_name = 'auth/_login.html' extra_context['hide'] = True
extra_context['hide'] = True else:
else: template_name = 'auth/login.html'
template_name = 'auth/login.html'
res = django_auth_views.LoginView.as_view(
template_name=template_name,
redirect_field_name=auth.REDIRECT_FIELD_NAME,
form_class=form,
extra_context=extra_context,
redirect_authenticated_user=False)(request)
res = django_auth_views.login(request,
template_name=template_name,
authentication_form=form,
extra_context=extra_context,
**kwargs)
# Save the region in the cookie, this is used as the default # Save the region in the cookie, this is used as the default
# selected region next time the Login form loads. # selected region next time the Login form loads.
if request.method == "POST": if request.method == "POST":