Merge pull request auth0#18 from rdowinton/logout-fixes

Annyv2 · web-flow · commit 27a2e7fe96dc · 2017-06-12T12:23:44.000+02:00
Fixes to logout feature and tests
diff --git a/.gitignore b/.gitignore
@@ -46,3 +46,7 @@ coverage.xml
 
 # Sphinx documentation
 docs/_build/
+
+# IDEA
+.idea/
+*.iml 
diff --git a/auth0/v3/authentication/logout.py b/auth0/v3/authentication/logout.py
@@ -1,4 +1,5 @@
 from .base import AuthenticationBase
+from urllib.parse import quote_plus
 
 
 class Logout(AuthenticationBase):
@@ -26,12 +27,14 @@ def logout(self, client_id, return_to, federated=False):
 
             federated (bool): Querystring parameter to log the user out of the IdP
         """
+        return_to = quote_plus(return_to)
+
         if federated is True:
             return self.get(
-                'https://%s/v2/logout?federated&%s&%s' % (self.domain, client_id, return_to),
+                'https://%s/v2/logout?federated&client_id=%s&returnTo=%s' % (self.domain, client_id, return_to),
                 headers={'Content-Type': 'application/json'}
             )
         return self.get(
-            'https://%s/v2/logout?%s&%s' % (self.domain, client_id, return_to),
+            'https://%s/v2/logout?client_id=%s&returnTo=%s' % (self.domain, client_id, return_to),
             headers={'Content-Type': 'application/json'}
         )
diff --git a/auth0/v3/test/authentication/test_logout.py b/auth0/v3/test/authentication/test_logout.py
@@ -15,7 +15,7 @@ def test_logout(self, mock_get):
 
         args, kwargs = mock_get.call_args
 
-        self.assertEqual(args[0], 'https://my.domain.com/v2/logout&cid&rto')
+        self.assertEqual(args[0], 'https://my.domain.com/v2/logout?cid&rto')
         self.assertEqual(kwargs['headers'], {
             'Content-Type': 'application/json'
         })
@@ -31,7 +31,7 @@ def test_federated_logout(self, mock_get):
 
         args, kwargs = mock_get.call_args
 
-        self.assertEqual(args[0], 'https://my.domain.com/v2/logout?federated&cid%rto')
+        self.assertEqual(args[0], 'https://my.domain.com/v2/logout?federated&cid&rto')
         self.assertEqual(kwargs['headers'], {
             'Content-Type': 'application/json'
         })
