Merge pull request #12440 from edx/clintonb/jwt-auth-updates

Updated usage of JWT authentication

openedx/core/djangoapps/user_api/accounts/views.py

@@ -5,7 +5,7 @@ For more information, see:
 https://openedx.atlassian.net/wiki/display/TNL/User+API
 """
 from django.db import transaction
-from rest_framework_jwt.authentication import JSONWebTokenAuthentication
+from edx_rest_framework_extensions.authentication import JwtAuthentication
 from rest_framework import permissions
 from rest_framework import status
 from rest_framework.response import Response
@@ -141,7 +141,7 @@ class AccountView(APIView):
             If the update is successful, updated user account data is returned.
     """
     authentication_classes = (
-        OAuth2AuthenticationAllowInactiveUser, SessionAuthenticationAllowInactiveUser, JSONWebTokenAuthentication
+        OAuth2AuthenticationAllowInactiveUser, SessionAuthenticationAllowInactiveUser, JwtAuthentication
     )
     permission_classes = (permissions.IsAuthenticated,)
     parser_classes = (MergePatchParser,)

requirements/edx/base.txt

@@ -39,13 +39,13 @@ django==1.8.13
 djangorestframework-jwt==1.8.0
 djangorestframework-oauth==1.1.0
 edx-ccx-keys==0.1.2
-edx-drf-extensions==0.5.0
+edx-drf-extensions==0.5.1
 edx-lint==0.4.3
 edx-management-commands==0.1.1
 edx-django-oauth2-provider==1.0.3
 edx-oauth2-provider==1.0.1
 edx-opaque-keys==0.2.1
-edx-organizations==0.4.0
+edx-organizations==0.4.1
 edx-rest-api-client==1.2.1
 edx-search==0.1.2
 facebook-sdk==0.4.0