#199 Proposed API changes for endpoints.

4 files changed, 28 insertions, 26 deletions

diff --git a/tests/oauth1/rfc5849/endpoints/test_access_token.py b/tests/oauth1/rfc5849/endpoints/test_access_token.py
index 0596eba..8245f61 100644
--- a/tests/oauth1/rfc5849/endpoints/test_access_token.py
+++ b/tests/oauth1/rfc5849/endpoints/test_access_token.py
@@ -39,33 +39,33 @@ class AccessTokenEndpointTest(TestCase):
 
     def test_check_request_token(self):
         self.validator.check_request_token.return_value = False
-        u, h, b, s = self.endpoint.create_access_token_response(
+        h, b, s = self.endpoint.create_access_token_response(
                 self.uri, headers=self.headers)
         self.assertEqual(s, 400)
         self.assertIn('invalid_request', b)
 
     def test_check_verifier(self):
         self.validator.check_verifier.return_value = False
-        u, h, b, s = self.endpoint.create_access_token_response(
+        h, b, s = self.endpoint.create_access_token_response(
                 self.uri, headers=self.headers)
         self.assertEqual(s, 400)
         self.assertIn('invalid_request', b)
 
     def test_validate_client_key(self):
         self.validator.validate_client_key.return_value = False
-        u, h, b, s = self.endpoint.create_access_token_response(
+        h, b, s = self.endpoint.create_access_token_response(
                 self.uri, headers=self.headers)
         self.assertEqual(s, 401)
 
     def test_validate_request_token(self):
         self.validator.validate_request_token.return_value = False
-        u, h, b, s = self.endpoint.create_access_token_response(
+        h, b, s = self.endpoint.create_access_token_response(
                 self.uri, headers=self.headers)
         self.assertEqual(s, 401)
 
     def test_validate_verifier(self):
         self.validator.validate_verifier.return_value = False
-        u, h, b, s = self.endpoint.create_access_token_response(
+        h, b, s = self.endpoint.create_access_token_response(
                 self.uri, headers=self.headers)
         self.assertEqual(s, 401)
 
@@ -75,12 +75,12 @@ class AccessTokenEndpointTest(TestCase):
                 resource_owner_secret='secret',
                 verifier='verfier')
         _, headers, _ = client.sign(self.uri + '/extra')
-        u, h, b, s = self.endpoint.create_access_token_response(
+        h, b, s = self.endpoint.create_access_token_response(
                 self.uri, headers=headers)
         self.assertEqual(s, 401)
 
     def test_valid_request(self):
-        u, h, b, s = self.endpoint.create_access_token_response(
+        h, b, s = self.endpoint.create_access_token_response(
                 self.uri, headers=self.headers)
         self.assertEqual(s, 200)
         self.assertIn('oauth_token', b)
diff --git a/tests/oauth1/rfc5849/endpoints/test_authorization.py b/tests/oauth1/rfc5849/endpoints/test_authorization.py
index 5c603e7..d6b1a05 100644
--- a/tests/oauth1/rfc5849/endpoints/test_authorization.py
+++ b/tests/oauth1/rfc5849/endpoints/test_authorization.py
@@ -39,14 +39,16 @@ class ResourceEndpointTest(TestCase):
 
     def test_create_authorization_response(self):
         self.validator.get_redirect_uri.return_value = 'https://c.b/cb'
-        u, h, b, s = self.endpoint.create_authorization_response(self.uri)
+        h, b, s = self.endpoint.create_authorization_response(self.uri)
         self.assertEqual(s, 302)
-        self.assertTrue(u.startswith('https://c.b/cb'))
-        self.assertIn('oauth_verifier', u)
+        self.assertIn('Location', h)
+        self.assertTrue(location.startswith('https://c.b/cb'))
+        self.assertIn('oauth_verifier', location)
 
     def test_create_authorization_response(self):
         self.validator.get_redirect_uri.return_value = 'oob'
-        u, h, b, s = self.endpoint.create_authorization_response(self.uri)
+        h, b, s = self.endpoint.create_authorization_response(self.uri)
         self.assertEqual(s, 200)
+        self.assertNotIn('Location', h)
         self.assertIn('oauth_verifier', b)
         self.assertIn('oauth_token', b)
diff --git a/tests/oauth1/rfc5849/endpoints/test_base.py b/tests/oauth1/rfc5849/endpoints/test_base.py
index f175e6d..1c6bd33 100644
--- a/tests/oauth1/rfc5849/endpoints/test_base.py
+++ b/tests/oauth1/rfc5849/endpoints/test_base.py
@@ -27,13 +27,13 @@ class BaseEndpointTest(TestCase):
 
     def test_ssl_enforcement(self):
         uri, headers, _ = self.client.sign('http://i.b/request_token')
-        u, h, b, s = self.endpoint.create_request_token_response(
+        h, b, s = self.endpoint.create_request_token_response(
                 uri, headers=headers)
         self.assertEqual(s, 400)
         self.assertIn('insecure_transport_protocol', b)
 
     def test_missing_parameters(self):
-        u, h, b, s = self.endpoint.create_request_token_response(self.uri)
+        h, b, s = self.endpoint.create_request_token_response(self.uri)
         self.assertEqual(s, 400)
         self.assertIn('invalid_request', b)
 
@@ -41,7 +41,7 @@ class BaseEndpointTest(TestCase):
         headers = {}
         headers['Authorization'] = self.headers['Authorization'].replace(
                 'HMAC', 'RSA')
-        u, h, b, s = self.endpoint.create_request_token_response(
+        h, b, s = self.endpoint.create_request_token_response(
                 self.uri, headers=headers)
         self.assertEqual(s, 400)
         self.assertIn('invalid_signature_method', b)
@@ -50,7 +50,7 @@ class BaseEndpointTest(TestCase):
         headers = {}
         headers['Authorization'] = self.headers['Authorization'].replace(
                 '1.0', '2.0')
-        u, h, b, s = self.endpoint.create_request_token_response(
+        h, b, s = self.endpoint.create_request_token_response(
                 self.uri, headers=headers)
         self.assertEqual(s, 400)
         self.assertIn('invalid_request', b)
@@ -61,21 +61,21 @@ class BaseEndpointTest(TestCase):
             headers['Authorization'] = sub('timestamp="\d*k?"',
                     'timestamp="%s"' % pattern,
                      self.headers['Authorization'])
-            u, h, b, s = self.endpoint.create_request_token_response(
+            h, b, s = self.endpoint.create_request_token_response(
                     self.uri, headers=headers)
             self.assertEqual(s, 400)
             self.assertIn('invalid_request', b)
 
     def test_client_key_check(self):
         self.validator.check_client_key.return_value = False
-        u, h, b, s = self.endpoint.create_request_token_response(
+        h, b, s = self.endpoint.create_request_token_response(
                 self.uri, headers=self.headers)
         self.assertEqual(s, 400)
         self.assertIn('invalid_request', b)
 
     def test_noncecheck(self):
         self.validator.check_nonce.return_value = False
-        u, h, b, s = self.endpoint.create_request_token_response(
+        h, b, s = self.endpoint.create_request_token_response(
                 self.uri, headers=self.headers)
         self.assertEqual(s, 400)
         self.assertIn('invalid_request', b)
diff --git a/tests/oauth1/rfc5849/endpoints/test_request_token.py b/tests/oauth1/rfc5849/endpoints/test_request_token.py
index 47e2c10..773dedf 100644
--- a/tests/oauth1/rfc5849/endpoints/test_request_token.py
+++ b/tests/oauth1/rfc5849/endpoints/test_request_token.py
@@ -34,45 +34,45 @@ class RequestTokenEndpointTest(TestCase):
     def test_check_redirect_uri(self):
         client = Client('foo')
         uri, headers, _ = client.sign(self.uri)
-        u, h, b, s = self.endpoint.create_request_token_response(
+        h, b, s = self.endpoint.create_request_token_response(
                 uri, headers=headers)
         self.assertEqual(s, 400)
         self.assertIn('invalid_request', b)
 
     def test_check_realms(self):
         self.validator.check_realms.return_value = False
-        u, h, b, s = self.endpoint.create_request_token_response(
+        h, b, s = self.endpoint.create_request_token_response(
                 self.uri, headers=self.headers)
         self.assertEqual(s, 400)
         self.assertIn('invalid_request', b)
 
     def test_validate_client_key(self):
         self.validator.validate_client_key.return_value = False
-        u, h, b, s = self.endpoint.create_request_token_response(
+        h, b, s = self.endpoint.create_request_token_response(
                 self.uri, headers=self.headers)
         self.assertEqual(s, 401)
 
     def test_validate_realms(self):
         self.validator.validate_requested_realms.return_value = False
-        u, h, b, s = self.endpoint.create_request_token_response(
+        h, b, s = self.endpoint.create_request_token_response(
                 self.uri, headers=self.headers)
         self.assertEqual(s, 401)
 
     def test_validate_redirect_uri(self):
         self.validator.validate_redirect_uri.return_value = False
-        u, h, b, s = self.endpoint.create_request_token_response(
+        h, b, s = self.endpoint.create_request_token_response(
                 self.uri, headers=self.headers)
         self.assertEqual(s, 401)
 
     def test_validate_signature(self):
         client = Client('foo', callback_uri='https://c.b/cb')
         _, headers, _ = client.sign(self.uri + '/extra')
-        u, h, b, s = self.endpoint.create_request_token_response(
+        h, b, s = self.endpoint.create_request_token_response(
                 self.uri, headers=headers)
         self.assertEqual(s, 401)
 
     def test_valid_request(self):
-        u, h, b, s = self.endpoint.create_request_token_response(
+        h, b, s = self.endpoint.create_request_token_response(
                 self.uri, headers=self.headers)
         self.assertEqual(s, 200)
         self.assertIn('oauth_token', b)
@@ -85,7 +85,7 @@ class RequestTokenEndpointTest(TestCase):
                 client_secret='bar')
         uri = self.uri + '?realm=foo'
         _, headers, _ = client.sign(uri)
-        u, h, b, s = self.endpoint.create_request_token_response(
+        h, b, s = self.endpoint.create_request_token_response(
                 uri, headers=headers)
         self.assertEqual(s, 200)
         self.assertIn('oauth_token', b)