Fix request creation when headers are the default

auth0/v3/authentication/base.py

@@ -42,16 +42,15 @@ def __init__(self, domain, telemetry=True):
 
     def post(self, url, data=None, headers=None):
         request_headers = self.base_headers.copy()
-        request_headers.update(headers)
-        response = requests.post(url=url, data=json.dumps(data),
-                                 headers=request_headers)
+        request_headers.update(headers or {})
+        response = requests.post(url=url, json=data, headers=request_headers)
         return self._process_response(response)
 
     def get(self, url, params=None, headers=None):
         request_headers = self.base_headers.copy()
-        request_headers.update(headers)
+        request_headers.update(headers or {})
         response = requests.get(url=url, params=params, headers=request_headers)
-        return response.text
+        return self._process_response(response)
 
     def _process_response(self, response):
         return self._parse(response).content()

auth0/v3/authentication/database.py

@@ -32,8 +32,7 @@ def login(self, client_id, username, password, connection, id_token=None,
                 'device': device,
                 'grant_type': grant_type,
                 'scope': scope,
-            },
-            headers={'Content-Type': 'application/json'}
+            }
         )
 
     def signup(self, client_id, email, password, connection, username=None,
@@ -67,8 +66,7 @@ def signup(self, client_id, email, password, connection, username=None,
 
         return self.post(
             'https://{}/dbconnections/signup'.format(self.domain),
-            data=body,
-            headers={'Content-Type': 'application/json'}
+            data=body
         )
 
     def change_password(self, client_id, email, connection, password=None):
@@ -82,6 +80,5 @@ def change_password(self, client_id, email, connection, password=None):
                 'email': email,
                 'password': password,
                 'connection': connection,
-            },
-            headers={'Content-Type': 'application/json'}
+            }
         )

auth0/v3/authentication/delegated.py

@@ -37,6 +37,5 @@ def get_token(self, client_id, target, api_type, grant_type,
 
         return self.post(
             'https://{}/delegation'.format(self.domain),
-            headers={'Content-Type': 'application/json'},
             data=data
         )

auth0/v3/authentication/get_token.py

@@ -42,8 +42,7 @@ def authorization_code(self, client_id, client_secret, code,
                 'code': code,
                 'grant_type': grant_type,
                 'redirect_uri': redirect_uri,
-            },
-            headers={'Content-Type': 'application/json'}
+            }
         )
 
     def authorization_code_pkce(self, client_id, code_verifier, code,
@@ -79,8 +78,7 @@ def authorization_code_pkce(self, client_id, code_verifier, code,
                 'code': code,
                 'grant_type': grant_type,
                 'redirect_uri': redirect_uri,
-            },
-            headers={'Content-Type': 'application/json'}
+            }
         )
 
     def client_credentials(self, client_id, client_secret, audience,
@@ -113,8 +111,7 @@ def client_credentials(self, client_id, client_secret, audience,
                 'client_secret': client_secret,
                 'audience': audience,
                 'grant_type': grant_type,
-            },
-            headers={'Content-Type': 'application/json'}
+            }
         )
 
     def login(self, client_id, client_secret, username, password, scope, realm,
@@ -164,8 +161,7 @@ def login(self, client_id, client_secret, username, password, scope, realm,
                 'scope': scope,
                 'audience': audience,
                 'grant_type': grant_type
-            },
-            headers={'Content-Type': 'application/json'}
+            }
         )
 
     def refresh_token(self, client_id, client_secret, refresh_token, grant_type='refresh_token'):
@@ -194,6 +190,5 @@ def refresh_token(self, client_id, client_secret, refresh_token, grant_type='ref
                 'client_secret': client_secret,
                 'refresh_token': refresh_token,
                 'grant_type': grant_type
-            },
-            headers={'Content-Type': 'application/json'}
+            }
         )

auth0/v3/authentication/logout.py

@@ -32,12 +32,10 @@ def logout(self, client_id, return_to, federated=False):
         if federated is True:
             return self.get(
                 'https://{}/v2/logout?federated&client_id={}&returnTo={}'.format(
-                    self.domain, client_id, return_to),
-                headers={'Content-Type': 'application/json'}
+                    self.domain, client_id, return_to)
             )
         return self.get(
             'https://{}/v2/logout?client_id={}&returnTo={}'.format(self.domain,
                                                                    client_id,
-                                                                   return_to),
-            headers={'Content-Type': 'application/json'}
+                                                                   return_to)
         )

auth0/v3/authentication/passwordless.py

@@ -41,8 +41,7 @@ def email(self, client_id, email, send='link', auth_params=None):
                 'email': email,
                 'send': send,
                 'authParams': auth_params
-            },
-            headers={'Content-Type': 'application/json'}
+            }
         )
 
     def sms(self, client_id, phone_number):
@@ -55,8 +54,7 @@ def sms(self, client_id, phone_number):
                 'client_id': client_id,
                 'connection': 'sms',
                 'phone_number': phone_number,
-            },
-            headers={'Content-Type': 'application/json'}
+            }
         )
 
     def sms_login(self, client_id, phone_number, code, scope='openid'):
@@ -72,6 +70,5 @@ def sms_login(self, client_id, phone_number, code, scope='openid'):
                 'username': phone_number,
                 'password': code,
                 'scope': scope,
-            },
-            headers={'Content-Type': 'application/json'}
+            }
         )

auth0/v3/authentication/social.py

@@ -35,6 +35,5 @@ def login(self, client_id, access_token, connection, scope='openid'):
                 'access_token': access_token,
                 'connection': connection,
                 'scope': scope,
-            },
-            headers={'Content-Type': 'application/json'}
+            }
         )

auth0/v3/authentication/users.py

@@ -44,6 +44,5 @@ def tokeninfo(self, jwt):
         warnings.warn("/tokeninfo will be deprecated in future releases", DeprecationWarning)
         return self.post(
             url='https://{}/tokeninfo'.format(self.domain),
-            data={'id_token': jwt},
-            headers={'Content-Type': 'application/json'}
+            data={'id_token': jwt}
         )

auth0/v3/management/rest.py

@@ -46,7 +46,7 @@ def get(self, url, params=None):
     def post(self, url, data=None):
         headers = self.base_headers.copy()
 
-        response = requests.post(url, data=json.dumps(data or {}), headers=headers)
+        response = requests.post(url, json=data, headers=headers)
         return self._process_response(response)
 
     def file_post(self, url, data=None, files=None):
@@ -59,13 +59,13 @@ def file_post(self, url, data=None, files=None):
     def patch(self, url, data=None):
         headers = self.base_headers.copy()
 
-        response = requests.patch(url, data=json.dumps(data or {}), headers=headers)
+        response = requests.patch(url, json=data, headers=headers)
         return self._process_response(response)
 
     def put(self, url, data=None):
         headers = self.base_headers.copy()
 
-        response = requests.put(url, data=json.dumps(data or {}), headers=headers)
+        response = requests.put(url, json=data, headers=headers)
         return self._process_response(response)
 
     def delete(self, url, params=None):

auth0/v3/test/authentication/test_base.py

@@ -50,10 +50,25 @@ def test_post(self, mock_post):
 
         data = ab.post('the-url', data={'a': 'b'}, headers={'c': 'd'})
 
-        mock_post.assert_called_with(url='the-url', data='{"a": "b"}',
+        mock_post.assert_called_with(url='the-url', json={'a': 'b'},
                 headers={'c': 'd', 'Content-Type': 'application/json'})
 
         self.assertEqual(data, {'x': 'y'})
+
+    @mock.patch('requests.post')
+    def test_post_with_defaults(self, mock_post):
+        ab = AuthenticationBase('auth0.com', telemetry=False)
+
+        mock_post.return_value.status_code = 200
+        mock_post.return_value.text = '{"x": "y"}'
+
+        # Only required params are passed
+        data = ab.post('the-url')
+
+        mock_post.assert_called_with(url='the-url', json=None,
+                headers={'Content-Type': 'application/json'})
+
+        self.assertEqual(data, {'x': 'y'})
 
     @mock.patch('requests.post')
     def test_post_includes_telemetry(self, mock_post):
@@ -67,7 +82,7 @@ def test_post_includes_telemetry(self, mock_post):
         self.assertEqual(mock_post.call_count, 1)
         call_kwargs = mock_post.call_args[1]
         self.assertEqual(call_kwargs['url'], 'the-url')
-        self.assertEqual(call_kwargs['data'], '{"a": "b"}')
+        self.assertEqual(call_kwargs['json'], {'a': 'b'})
         headers = call_kwargs['headers']
         self.assertEqual(headers['c'], 'd')
         self.assertEqual(headers['Content-Type'], 'application/json')
@@ -157,6 +172,35 @@ def test_post_error_with_no_response_text(self, mock_post):
                              'a0.sdk.internal.unknown')
             self.assertEqual(context.exception.message, '')
 
+    @mock.patch('requests.get')
+    def test_get(self, mock_get):
+        ab = AuthenticationBase('auth0.com', telemetry=False)
+
+        mock_get.return_value.status_code = 200
+        mock_get.return_value.text = '{"x": "y"}'
+
+        data = ab.get('the-url', params={'a': 'b'}, headers={'c': 'd'})
+
+        mock_get.assert_called_with(url='the-url', params={'a': 'b'},
+                headers={'c': 'd', 'Content-Type': 'application/json'})
+
+        self.assertEqual(data, {'x': 'y'})
+
+    @mock.patch('requests.get')
+    def test_get_with_defaults(self, mock_get):
+        ab = AuthenticationBase('auth0.com', telemetry=False)
+
+        mock_get.return_value.status_code = 200
+        mock_get.return_value.text = '{"x": "y"}'
+
+        # Only required params are passed
+        data = ab.get('the-url')
+
+        mock_get.assert_called_with(url='the-url', params=None,
+                headers={'Content-Type': 'application/json'})
+
+        self.assertEqual(data, {'x': 'y'})
+
     @mock.patch('requests.get')
     def test_get_includes_telemetry(self, mock_get):
         ab = AuthenticationBase('auth0.com')
@@ -176,4 +220,4 @@ def test_get_includes_telemetry(self, mock_get):
         self.assertIn('User-Agent', headers)
         self.assertIn('Auth0-Client', headers)
 
-        self.assertEqual(data, '{"x": "y"}')
+        self.assertEqual(data, {"x": "y"})

auth0/v3/test/authentication/test_database.py

@@ -32,9 +32,6 @@ def test_login(self, mock_post):
             'grant_type': 'gt',
             'scope': 'openid profile',
         })
-        self.assertEqual(kwargs['headers'], {
-            'Content-Type': 'application/json'
-        })
 
     @mock.patch('auth0.v3.authentication.database.Database.post')
     def test_signup(self, mock_post):
@@ -58,9 +55,6 @@ def test_signup(self, mock_post):
                          'username': None,
                          'user_metadata': None
                         })
-        self.assertEqual(kwargs['headers'], {
-            'Content-Type': 'application/json'
-        })
 
 
         # Using also username and metadata
@@ -88,9 +82,6 @@ def test_signup(self, mock_post):
                          'username': 'usr',
                          'user_metadata': sample_meta
                         })
-        self.assertEqual(kwargs['headers'], {
-            'Content-Type': 'application/json'
-        })
 
     @mock.patch('auth0.v3.authentication.database.Database.post')
     def test_change_password(self, mock_post):
@@ -112,6 +103,3 @@ def test_change_password(self, mock_post):
             'password': 'pswd',
             'connection': 'conn',
         })
-        self.assertEqual(kwargs['headers'], {
-            'Content-Type': 'application/json'
-        })

auth0/v3/test/authentication/test_delegated.py

@@ -28,9 +28,6 @@ def test_get_token_id_token(self, mock_post):
             'scope': 'openid profile',
             'api_type': 'apt',
         })
-        self.assertEqual(kwargs['headers'], {
-            'Content-Type': 'application/json'
-        })
 
     @mock.patch('auth0.v3.authentication.delegated.Delegated.post')
     def test_get_token_refresh_token(self, mock_post):
@@ -54,9 +51,6 @@ def test_get_token_refresh_token(self, mock_post):
             'scope': 'openid',
             'api_type': 'apt',
         })
-        self.assertEqual(kwargs['headers'], {
-            'Content-Type': 'application/json'
-        })
 
     @mock.patch('auth0.v3.authentication.delegated.Delegated.post')
     def test_get_token_value_error(self, mock_post):

auth0/v3/test/authentication/test_get_token.py

@@ -26,9 +26,6 @@ def test_authorization_code(self, mock_post):
             'grant_type': 'gt',
             'redirect_uri': 'idt'
         })
-        self.assertEqual(kwargs['headers'], {
-            'Content-Type': 'application/json'
-        })
 
     @mock.patch('auth0.v3.authentication.get_token.GetToken.post')
     def test_authorization_code_pkce(self, mock_post):
@@ -51,9 +48,6 @@ def test_authorization_code_pkce(self, mock_post):
             'grant_type': 'gt',
             'redirect_uri': 'idt'
         })
-        self.assertEqual(kwargs['headers'], {
-            'Content-Type': 'application/json'
-        })
 
     @mock.patch('auth0.v3.authentication.get_token.GetToken.post')
     def test_client_credentials(self, mock_post):
@@ -74,9 +68,6 @@ def test_client_credentials(self, mock_post):
             'audience': 'aud',
             'grant_type': 'gt'
         })
-        self.assertEqual(kwargs['headers'], {
-            'Content-Type': 'application/json'
-        })
 
     @mock.patch('auth0.v3.authentication.get_token.GetToken.post')
     def test_login(self, mock_post):
@@ -105,9 +96,6 @@ def test_login(self, mock_post):
             'audience': 'aud',
             'grant_type': 'gt'
         })
-        self.assertEqual(kwargs['headers'], {
-            'Content-Type': 'application/json'
-        })
 
     @mock.patch('auth0.v3.authentication.get_token.GetToken.post')
     def test_refresh_token(self, mock_post):
@@ -126,7 +114,4 @@ def test_refresh_token(self, mock_post):
             'client_secret': 'clsec',
             'refresh_token': 'rt',
             'grant_type': 'gt'
-        })
-        self.assertEqual(kwargs['headers'], {
-            'Content-Type': 'application/json'
-        })
+        })

auth0/v3/test/authentication/test_logout.py

@@ -14,11 +14,7 @@ def test_logout(self, mock_get):
                  return_to='rto')
 
         args, kwargs = mock_get.call_args
-
         self.assertEqual(args[0], 'https://my.domain.com/v2/logout?client_id=cid&returnTo=rto')
-        self.assertEqual(kwargs['headers'], {
-            'Content-Type': 'application/json'
-        })
 
     @mock.patch('auth0.v3.authentication.logout.Logout.get')
     def test_federated_logout(self, mock_get):
@@ -30,8 +26,4 @@ def test_federated_logout(self, mock_get):
                  federated=True)
 
         args, kwargs = mock_get.call_args
-
         self.assertEqual(args[0], 'https://my.domain.com/v2/logout?federated&client_id=cid&returnTo=rto')
-        self.assertEqual(kwargs['headers'], {
-            'Content-Type': 'application/json'
-        })