From 727e51411f7e096c92745c3deb630bd77b2f119c Mon Sep 17 00:00:00 2001 From: ichuang Date: Thu, 2 Aug 2012 08:59:02 -0400 Subject: [PATCH] small change so that ssl authenticated user can logout to see main screen --- common/djangoapps/external_auth/views.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/common/djangoapps/external_auth/views.py b/common/djangoapps/external_auth/views.py index 41062735d4..55ff4b4194 100644 --- a/common/djangoapps/external_auth/views.py +++ b/common/djangoapps/external_auth/views.py @@ -80,7 +80,8 @@ def edXauth_openid_login_complete(request, redirect_field_name=REDIRECT_FIELD_N #----------------------------------------------------------------------------- # generic external auth login or signup -def edXauth_external_login_or_signup(request, external_id, external_domain, credentials, email, fullname): +def edXauth_external_login_or_signup(request, external_id, external_domain, credentials, email, fullname, + retfun=None): # see if we have a map from this external_id to an edX username try: eamap = ExternalAuthMap.objects.get(external_id=external_id) @@ -118,7 +119,10 @@ def edXauth_external_login_or_signup(request, external_id, external_domain, cred request.session.set_expiry(0) student_views.try_change_enrollment(request) log.info("Login success - {0} ({1})".format(user.username, user.email)) - return redirect('/') + if retfun is None: + return redirect('/') + return retfun() + #----------------------------------------------------------------------------- # generic external auth signup @@ -209,4 +213,5 @@ def edXauth_ssl_login(request): external_domain="ssl:MIT", credentials=cert, email=email, - fullname=fullname) + fullname=fullname, + retfun = student_views.main_index)