test and rebase update

common/djangoapps/entitlements/api/v1/tests/test_views.py

@@ -4,12 +4,11 @@ import uuid
 
 from django.conf import settings
 from django.core.urlresolvers import reverse
+from mock import patch
 from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
 from xmodule.modulestore.tests.factories import CourseFactory
 
-from entitlements.tests.factories import CourseEntitlementFactory
-from entitlements.models import CourseEntitlement
-from entitlements.api.v1.serializers import CourseEntitlementSerializer
+from student.models import CourseEnrollment
 from student.tests.factories import CourseEnrollmentFactory, UserFactory, TEST_PASSWORD
 
 # Entitlements is not in CMS' INSTALLED_APPS so these imports will error during test collection

common/djangoapps/entitlements/api/v1/views.py

@@ -7,9 +7,7 @@ from opaque_keys.edx.keys import CourseKey
 from rest_framework import permissions, viewsets, status
 from rest_framework.response import Response
 from rest_framework.authentication import SessionAuthentication
-from student.models import CourseEnrollmentException
-# from enrollment.errors import CourseEnrollmentError, CourseEnrollmentExistsError, CourseModeNotFoundError
-# from openedx.core.lib.exceptions import CourseNotFoundError
+from student.models import CourseEnrollmentException, AlreadyEnrolledError
 
 from openedx.core.djangoapps.catalog.utils import get_course_runs_for_course
 from entitlements.api.v1.filters import CourseEntitlementFilter
@@ -26,8 +24,8 @@ log = logging.getLogger(__name__)
 
 
 class EntitlementViewSet(viewsets.ModelViewSet):
-    authentication_classes = (JwtAuthentication, SessionAuthentication,)
-    permission_classes = (permissions.IsAuthenticated, permissions.IsAdminUser,)
+    authentication_classes = (JwtAuthentication, SessionAuthenticationCrossDomainCsrf,)
+    permission_classes = (permissions.IsAuthenticated, IsAdminOrAuthenticatedReadOnly,)
     queryset = CourseEntitlement.objects.all().select_related('user')
     lookup_value_regex = '[0-9a-f-]+'
     lookup_field = 'uuid'