Skip to content

C
course-discovery
Commit ea93ef62 by Bill DeRusha
Options

Merge pull request #76 from edx/bderusha/catalog-admin 

Use edx-drf-extentsions 0.5.0 for JWT authentication support
parents 3628f567 a27d1043
Showing with 3 additions and 2 deletions
course_discovery/settings/base.py
...@@ -261,7 +261,7 @@ REST_FRAMEWORK = { ...@@ -261,7 +261,7 @@ REST_FRAMEWORK = {
'DEFAULT_AUTHENTICATION_CLASSES': ( 'DEFAULT_AUTHENTICATION_CLASSES': (
'rest_framework.authentication.SessionAuthentication', 'rest_framework.authentication.SessionAuthentication',
'edx_rest_framework_extensions.authentication.BearerAuthentication', 'edx_rest_framework_extensions.authentication.BearerAuthentication',
'rest_framework_jwt.authentication.JSONWebTokenAuthentication', 'edx_rest_framework_extensions.authentication.JwtAuthentication',
), ),
'DEFAULT_PAGINATION_CLASS': 'rest_framework.pagination.LimitOffsetPagination', 'DEFAULT_PAGINATION_CLASS': 'rest_framework.pagination.LimitOffsetPagination',
'DEFAULT_PERMISSION_CLASSES': ( 'DEFAULT_PERMISSION_CLASSES': (
......
requirements/base.txt
cryptography==1.3.1
django==1.8.7 django==1.8.7
django-extensions==1.5.9 django-extensions==1.5.9
django-guardian==1.4.2 django-guardian==1.4.2
...@@ -11,7 +12,7 @@ django-rest-swagger[reST]==0.3.5 ...@@ -11,7 +12,7 @@ django-rest-swagger[reST]==0.3.5
dry-rest-permissions==0.1.6 dry-rest-permissions==0.1.6
edx-auth-backends==0.1.3 edx-auth-backends==0.1.3
edx-ccx-keys==0.2.0 edx-ccx-keys==0.2.0
edx-drf-extensions==0.4.1 edx-drf-extensions==0.5.0
edx-opaque-keys==0.3.0 edx-opaque-keys==0.3.0
edx-rest-api-client==1.5.0 edx-rest-api-client==1.5.0
elasticsearch>=1.0.0,<2.0.0 elasticsearch>=1.0.0,<2.0.0
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment