From d0e6f46f9bcb25df68a99d8ed375f9454a9ffb73 Mon Sep 17 00:00:00 2001
From: Benjamin Dauvergne <bdauvergne@entrouvert.com>
Date: Thu, 22 Mar 2018 18:26:47 +0100
Subject: [PATCH] views: keep next URL on disco requests (fixes #31043)

---
 mellon/views.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mellon/views.py b/mellon/views.py
index 54040ef..babf813 100644
--- a/mellon/views.py
+++ b/mellon/views.py
@@ -348,12 +348,12 @@ class LoginView(ProfileMixin, LogMixin, View):
         return self.sso_failure(request, login, reason=idp_message, status_codes=status_codes)
 
     def request_discovery_service(self, request, is_passive=False):
-        self_url = request.build_absolute_uri(request.path)
+        self_url = request.build_absolute_uri() + '&nodisco=1'
         url = app_settings.DISCOVERY_SERVICE_URL
         params = {
             # prevent redirect loops with the discovery service
             'entityID': request.build_absolute_uri(reverse('mellon_metadata')),
-            'return': self_url + '?nodisco=1',
+            'return': self_url,
         }
         if is_passive:
             params['isPassive'] = 'true'