Merge branch 'fix-issue-340' of https://github.com/dougkeen/django-oauth-toolkit into foo

Author: synasius

oauth2_provider/oauth2_validators.py

@@ -7,6 +7,7 @@
 from datetime import timedelta
 
 from django.utils import timezone
+from django.conf import settings
 from django.contrib.auth import authenticate
 from django.core.exceptions import ObjectDoesNotExist
 from oauthlib.oauth2 import RequestValidator
@@ -57,7 +58,7 @@ def _authenticate_basic_auth(self, request):
             return False
 
         try:
-            encoding = request.encoding
+            encoding = request.encoding or settings.DEFAULT_CHARSET or 'utf-8'
         except AttributeError:
             encoding = 'utf-8'
 

oauth2_provider/tests/test_oauth2_validators.py

@@ -53,6 +53,12 @@ def test_authenticate_basic_auth(self):
         self.request.headers = {'HTTP_AUTHORIZATION': 'Basic Y2xpZW50X2lkOmNsaWVudF9zZWNyZXQ=\n'}
         self.assertTrue(self.validator._authenticate_basic_auth(self.request))
 
+    def test_authenticate_basic_auth_default_encoding(self):
+        self.request.encoding = None
+        # client_id:client_secret
+        self.request.headers = {'HTTP_AUTHORIZATION': 'Basic Y2xpZW50X2lkOmNsaWVudF9zZWNyZXQ=\n'}
+        self.assertTrue(self.validator._authenticate_basic_auth(self.request))
+
     def test_authenticate_basic_auth_wrong_client_id(self):
         self.request.encoding = 'utf-8'
         # wrong_id:client_secret