Skip to content

[Ficus] make custom redirect URL microsite aware #147

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
melvinsoft merged 1 commit into from
Aug 4, 2017
Merged

[Ficus] make custom redirect URL microsite aware #147

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 11 additions & 8 deletions common/djangoapps/student/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2596,13 +2596,16 @@ class LogoutView(TemplateView):
oauth_client_ids = []
template_name = 'logout.html'

# Keep track of the page to which the user should ultimately be redirected.
if settings.FEATURES.get('AUTH_USE_CAS'):
target = reverse_lazy('cas-logout')
elif hasattr(settings, 'CUSTOM_LOGOUT_REDIRECT_URL'):
target = settings.CUSTOM_LOGOUT_REDIRECT_URL
else:
target = '/'
def get_target(self):
# Keep track of the page to which the user should ultimately be redirected.
if settings.FEATURES.get('AUTH_USE_CAS'):
target = reverse_lazy('cas-logout')
elif configuration_helpers.get_value('CUSTOM_LOGOUT_REDIRECT_URL', settings.CUSTOM_LOGOUT_REDIRECT_URL):
target = configuration_helpers.get_value('CUSTOM_LOGOUT_REDIRECT_URL', settings.CUSTOM_LOGOUT_REDIRECT_URL)
else:
target = '/'

return target

def dispatch(self, request, *args, **kwargs): # pylint: disable=missing-docstring
# We do not log here, because we have a handler registered to perform logging on successful logouts.
Expand All @@ -2617,7 +2620,7 @@ def dispatch(self, request, *args, **kwargs): # pylint: disable=missing-docstri
if LogoutViewConfiguration.current().enabled and self.oauth_client_ids:
response = super(LogoutView, self).dispatch(request, *args, **kwargs)
else:
response = redirect(self.target)
response = redirect(self.get_target())

# Clear the cookie used by the edx.org marketing site
delete_logged_in_cookies(response)
Expand Down