frontends: remove the next parameter to the profile view,

This commit is contained in:
Benjamin Dauvergne 2014-02-25 09:58:39 +01:00
parent f29db4a6e6
commit dc16ce9e81
7 changed files with 12 additions and 13 deletions

View File

@ -38,5 +38,5 @@ class OpenIDFrontend(object):
def template(self):
return 'auth/login_form_openid.html'
def profile(self, request, next=''):
return views.openid_profile(request, next)
def profile(self, request):
return views.profile(request)

View File

@ -363,7 +363,7 @@ def get_associate_openid(user):
nb_associated_openids = len(associated_openids)
return nb_associated_openids, associated_openids
def openid_profile(request, next, template_name='auth/openid_profile.html'):
def profile(request, template_name='auth/openid_profile.html'):
nb, associated_openids = get_associate_openid(request.user)
return render_to_string(template_name,
{ 'idp_openid': getattr(settings, 'IDP_OPENID', False),

View File

@ -36,5 +36,5 @@ class SSLFrontend(object):
def template(self):
return 'auth/login_form_ssl.html'
def profile(self, request, next=None):
def profile(self, request):
return views.profile(request)

View File

@ -39,5 +39,5 @@ class LoginPasswordBackend(object):
def template(self):
return 'auth/login_form.html'
def profile(self, request, next=''):
return views.login_password_profile(request, next)
def profile(self, request):
return views.login_password_profile(request)

View File

@ -8,7 +8,7 @@ from django.http import HttpResponseRedirect
from django.contrib.auth import REDIRECT_FIELD_NAME
from django.utils.translation import ugettext as _
from authentic2.authsaml2.saml2_endpoints import view_profile
from . import saml2_endpoints
class AuthSAML2Form(forms.Form):
def __init__(self, *args, **kwargs):
@ -50,5 +50,5 @@ class AuthSAML2Frontend(object):
def template(self):
return 'auth/saml2/login_form.html'
def profile(self, request, next=''):
return view_profile(request, next)
def profile(self, request):
return saml2_endpoints.profile(request)

View File

@ -1695,7 +1695,7 @@ def setAuthnrequestOptions(provider, login, force_authn, is_passive):
return p
def view_profile(request, next='', template_name='profile.html'):
def profile(request, template_name='profile.html'):
if 'next' in request.session:
next = request.session['next']
else:
@ -1704,7 +1704,6 @@ def view_profile(request, next='', template_name='profile.html'):
or not request.user.is_authenticated() \
or not hasattr(request.user, '_meta'):
return HttpResponseRedirect(next)
logger.info('view_profile: View profile of user %s' % str(request.user))
#Add creation date

View File

@ -355,7 +355,7 @@ def profile(request):
except (SiteProfileNotAvailable, ObjectDoesNotExist):
pass
# Credentials management
blocks = [ frontend.profile(request, next='/profile') for frontend in frontends \
blocks = [ frontend.profile(request) for frontend in frontends \
if hasattr(frontend, 'profile') ]
return render_to_response('idp/account_management.html', {
'frontends_block': blocks,
@ -396,7 +396,7 @@ def redirect_to_logout(request, next_page='/'):
return HttpResponseRedirect('%s?next=%s' % (reverse(logout), urllib.quote(next_page)))
def login_password_profile(request, next):
def login_password_profile(request):
return render_to_string('auth/login_password_profile.html', {},
RequestContext(request))