added JSONOAuthLibCore to parse correctly application/json requests

Author: palazzem

oauth2_provider/oauth2_backends.py

@@ -1,5 +1,7 @@
 from __future__ import unicode_literals
 
+import json
+
 from oauthlib import oauth2
 from oauthlib.common import urlencode, urlencoded, quote
 
@@ -154,6 +156,24 @@ def verify_request(self, request, scopes):
         return valid, r
 
 
+class JSONOAuthLibCore(OAuthLibCore):
+    """
+    Extends the default OAuthLibCore to parse correctly requests with application/json Content-Type
+    """
+    def _extract_body(self, request):
+        """
+        Extracts the JSON body from the Django request object
+        :param request: The current django.http.HttpRequest object
+        :return: provided POST parameters "urlencodable"
+        """
+        try:
+            body = json.loads(request.body.decode('utf-8')).items()
+        except ValueError:
+            body = ""
+
+        return body
+
+
 def get_oauthlib_core():
     """
     Utility function that take a request and returns an instance of

oauth2_provider/tests/test_oauth2_backends.py

@@ -1,14 +1,15 @@
+import json
+
 from django.test import TestCase, RequestFactory
-from django.test.utils import override_settings
 
 from ..backends import get_oauthlib_core
+from ..oauth2_backends import OAuthLibCore, JSONOAuthLibCore
 
 
-@override_settings(OAUTH2_BACKEND_CLASS='oauth2_provider.oauth2_backends.OAuthLibCore')
 class TestOAuthLibCoreBackend(TestCase):
     def setUp(self):
         self.factory = RequestFactory()
-        self.oauthlib_core = get_oauthlib_core()
+        self.oauthlib_core = OAuthLibCore()
 
     def test_form_urlencoded_extract_params(self):
         payload = "grant_type=password&username=john&password=123456"
@@ -33,6 +34,25 @@ def test_application_json_extract_params(self):
         self.assertNotIn("password=123456", body)
 
 
+class TestJSONOAuthLibCoreBackend(TestCase):
+    def setUp(self):
+        self.factory = RequestFactory()
+        self.oauthlib_core = JSONOAuthLibCore()
+
+    def test_application_json_extract_params(self):
+        payload = json.dumps({
+            "grant_type": "password",
+            "username": "john",
+            "password": "123456",
+        })
+        request = self.factory.post("/o/token/", payload, content_type="application/json")
+
+        uri, http_method, body, headers = self.oauthlib_core._extract_params(request)
+        self.assertIn("grant_type=password", body)
+        self.assertIn("username=john", body)
+        self.assertIn("password=123456", body)
+
+
 class TestOAuthLibCore(TestCase):
     def setUp(self):
         self.factory = RequestFactory()