Merge pull request #21 from mtyaka/query-separator

pitbulk · pitbulk · commit 6cfa04c7192d · 2014-06-26T13:32:35.000+02:00
Fix AuthRequest when base URL contains query params.
diff --git a/onelogin/saml/AuthRequest.py b/onelogin/saml/AuthRequest.py
@@ -105,7 +105,13 @@ def create(_clock=None, _uuid=None, _zlib=None, _base64=None,
         [('SAMLRequest', encoded_request)],
     )
 
-    return '{url}?{query}'.format(
+    if '?' in idp_sso_target_url:
+        separator = '&'
+    else:
+        separator = '?'
+
+    return '{url}{sep}{query}'.format(
         url=idp_sso_target_url,
+        sep=separator,
         query=urlencoded_request,
     )

Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,13 @@ def create(_clock=None, _uuid=None, _zlib=None, _base64=None,`
`105`	`105`	`[('SAMLRequest', encoded_request)],`
`106`	`106`	`)`
`107`	`107`
`108`		`- return '{url}?{query}'.format(`
	`108`	`+ if '?' in idp_sso_target_url:`
	`109`	`+ separator = '&'`
	`110`	`+ else:`
	`111`	`+ separator = '?'`
	`112`	`+`
	`113`	`+ return '{url}{sep}{query}'.format(`
`109`	`114`	`url=idp_sso_target_url,`
	`115`	`+ sep=separator,`
`110`	`116`	`query=urlencoded_request,`
`111`	`117`	`)`