Commit ced3f67a by Adam Palay

fix authentication check in auth

parent 9d2b85d3
...@@ -72,7 +72,7 @@ def _check_caller_authority(caller, role): ...@@ -72,7 +72,7 @@ def _check_caller_authority(caller, role):
:param caller: a user :param caller: a user
:param role: an AccessRole :param role: an AccessRole
""" """
if not (caller.is_authenticated and caller.is_active): if not (caller.is_authenticated() and caller.is_active):
raise PermissionDenied raise PermissionDenied
# superuser # superuser
if GlobalStaff().has_user(caller): if GlobalStaff().has_user(caller):
......
...@@ -76,8 +76,10 @@ class CreatorGroupTest(TestCase): ...@@ -76,8 +76,10 @@ class CreatorGroupTest(TestCase):
""" """
Tests that adding to creator group fails if user is not authenticated Tests that adding to creator group fails if user is not authenticated
""" """
with mock.patch.dict('django.conf.settings.FEATURES', with mock.patch.dict(
{'DISABLE_COURSE_CREATION': False, "ENABLE_CREATOR_GROUP": True}): 'django.conf.settings.FEATURES',
{'DISABLE_COURSE_CREATION': False, "ENABLE_CREATOR_GROUP": True}
):
anonymous_user = AnonymousUser() anonymous_user = AnonymousUser()
role = CourseCreatorRole() role = CourseCreatorRole()
add_users(self.admin, role, anonymous_user) add_users(self.admin, role, anonymous_user)
...@@ -87,8 +89,10 @@ class CreatorGroupTest(TestCase): ...@@ -87,8 +89,10 @@ class CreatorGroupTest(TestCase):
""" """
Tests that adding to creator group fails if user is not active Tests that adding to creator group fails if user is not active
""" """
with mock.patch.dict('django.conf.settings.FEATURES', with mock.patch.dict(
{'DISABLE_COURSE_CREATION': False, "ENABLE_CREATOR_GROUP": True}): 'django.conf.settings.FEATURES',
{'DISABLE_COURSE_CREATION': False, "ENABLE_CREATOR_GROUP": True}
):
self.user.is_active = False self.user.is_active = False
add_users(self.admin, CourseCreatorRole(), self.user) add_users(self.admin, CourseCreatorRole(), self.user)
self.assertFalse(has_access(self.user, CourseCreatorRole())) self.assertFalse(has_access(self.user, CourseCreatorRole()))
...@@ -108,7 +112,7 @@ class CreatorGroupTest(TestCase): ...@@ -108,7 +112,7 @@ class CreatorGroupTest(TestCase):
def test_add_user_to_group_requires_authenticated(self): def test_add_user_to_group_requires_authenticated(self):
with self.assertRaises(PermissionDenied): with self.assertRaises(PermissionDenied):
self.admin.is_authenticated = False self.admin.is_authenticated = mock.Mock(return_value=False)
add_users(self.admin, CourseCreatorRole(), self.user) add_users(self.admin, CourseCreatorRole(), self.user)
def test_remove_user_from_group_requires_staff_access(self): def test_remove_user_from_group_requires_staff_access(self):
...@@ -123,7 +127,7 @@ class CreatorGroupTest(TestCase): ...@@ -123,7 +127,7 @@ class CreatorGroupTest(TestCase):
def test_remove_user_from_group_requires_authenticated(self): def test_remove_user_from_group_requires_authenticated(self):
with self.assertRaises(PermissionDenied): with self.assertRaises(PermissionDenied):
self.admin.is_authenticated = False self.admin.is_authenticated = mock.Mock(return_value=False)
remove_users(self.admin, CourseCreatorRole(), self.user) remove_users(self.admin, CourseCreatorRole(), self.user)
......
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