Disco URL can already contain parameters

If it contains parameters we need to add return_url as another pamametr into URL.

1 files changed, 5 insertions, 1 deletions

diff --git a/src/saml2/client_base.py b/src/saml2/client_base.py
index 93845ff6..ea0c86f9 100644
--- a/src/saml2/client_base.py
+++ b/src/saml2/client_base.py
@@ -925,7 +925,11 @@ class Base(Entity):
         }
 
         params = urlencode({k: v for k, v in args.items() if v})
-        return "%s?%s" % (url, params)
+        # url can already contain some parameters
+        if '?' in url:
+            return "%s&%s" % (url, params)
+        else:
+            return "%s?%s" % (url, params)
 
     @staticmethod
     def parse_discovery_service_response(url="", query="",