From 27c7a47c46e384ba7f3cd2690a73658843c75ed3 Mon Sep 17 00:00:00 2001 From: Antonin Reitz Date: Wed, 27 Nov 2019 11:51:29 +0100 Subject: [PATCH] Simplify the code --- kfet/auth/views.py | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/kfet/auth/views.py b/kfet/auth/views.py index 75bf1a5c..8ca02f5e 100644 --- a/kfet/auth/views.py +++ b/kfet/auth/views.py @@ -66,23 +66,13 @@ class GenericLoginView(View): # Issue token. token = GenericTeamToken.objects.create_token() - # Prepare callback of logout. - here_url = reverse(login_generic) - if "next" in self.request.GET: - # Keep given next page. - here_qd = QueryDict(mutable=True) - here_qd["next"] = self.request.GET["next"] - here_url += "?{}".format(here_qd.urlencode()) - # When CAS logs the user out, the generic login has to be called back. # The corresponding callback URL is provided as a GET parameter. # The renaming of the CAS logout "url" parameter to "service" is being forced, # which is why the CAS logout URL with callback is constructed ad hoc, # without relying on Django redirection to Django CAS. - # An HTTP absolute URL as callback seems to be required for the K-Psul link - # to work. - generic_login_url = "http://" + request.get_host() + here_url + generic_login_url = request.build_absolute_uri() # preserves next parameter generic_login_qd = QueryDict(mutable=True) generic_login_qd["service"] = generic_login_url