Merge pull request #231 from masci/client_credential_contenttype

Wrong Content-Type header returned by client credential grant

oauthlib/oauth2/rfc6749/grant_types/client_credentials.py

@@ -71,7 +71,7 @@ def create_token_response(self, request, token_handler):
             self.validate_token_request(request)
         except errors.OAuth2Error as e:
             log.debug('Client error in token request. %s.', e)
-            return {}, e.json, e.status_code
+            return headers, e.json, e.status_code
 
         token = token_handler.create_token(request, refresh_token=False)
         log.debug('Issuing token to client id %r (%r), %r.',

tests/oauth2/rfc6749/grant_types/test_client_credentials.py

@@ -30,9 +30,19 @@ def test_create_token_response(self):
         self.assertIn('access_token', token)
         self.assertIn('token_type', token)
         self.assertIn('expires_in', token)
+        self.assertIn('Content-Type', headers)
+        self.assertEqual(headers['Content-Type'], 'application/json')
 
     def test_error_response(self):
-        pass
+        bearer = BearerToken(self.mock_validator)
+        self.mock_validator.authenticate_client.return_value = False
+        headers, body, status_code = self.auth.create_token_response(
+            self.request, bearer)
+        error_msg = json.loads(body)
+        self.assertIn('error', error_msg)
+        self.assertEqual(error_msg['error'], 'invalid_client')
+        self.assertIn('Content-Type', headers)
+        self.assertEqual(headers['Content-Type'], 'application/json')
 
     def test_validate_token_response(self):
         # wrong grant type, scope