feat: support organization-level scopes for course list

Author: MaferMazu

cms/djangoapps/contentstore/tests/test_course_listing.py

@@ -10,6 +10,7 @@
 from ccx_keys.locator import CCXLocator
 from django.test import RequestFactory
 from opaque_keys.edx.locations import CourseLocator
+from openedx_authz.api.data import OrgCourseOverviewGlobData
 from openedx_authz.api.users import assign_role_to_user_in_scope
 from openedx_authz.constants.roles import COURSE_DATA_RESEARCHER, COURSE_EDITOR, COURSE_STAFF
 
@@ -20,6 +21,7 @@
     _accessible_courses_iter_for_tests,
     _accessible_courses_list_from_groups,
     _accessible_courses_summary_iter,
+    _get_authz_accessible_courses_list,
     get_courses_accessible_to_user,
 )
 from common.djangoapps.course_action_state.models import CourseRerunState
@@ -715,3 +717,58 @@ def test_superuser_gets_all_courses(self):
             }
 
             self.assertEqual(result_ids, expected_ids)
+
+    def test_get_authz_accessible_courses_list_with_org_scope(self):
+        """
+        When the scope is an OrgCourseOverviewGlobData, all course keys
+        returned by `_get_course_keys_for_org_scope` should be included in
+        the resulting authz keys when the authz toggle is enabled.
+        """
+        authz_keys, _, authz_courses, _ = self._create_courses()
+        org_scope = OrgCourseOverviewGlobData(external_key='course-v1:Org1+*')
+
+        request = self._make_request(self.authorized_user)
+
+        with patch(
+            "cms.djangoapps.contentstore.views.course.get_scopes_for_user_and_permission",
+            return_value=[org_scope],
+        ), patch(
+            "cms.djangoapps.contentstore.views.course._get_course_keys_for_org_scope",
+            return_value=authz_keys,
+        ) as mock_get_keys, patch.object(
+            core_toggles.AUTHZ_COURSE_AUTHORING_FLAG,
+            "is_enabled",
+            return_value=True,
+        ):
+            result = _get_authz_accessible_courses_list(request)
+
+            mock_get_keys.assert_called_once_with(org_scope)
+            self.assertEqual(result, set(authz_keys))
+
+    def test_get_authz_accessible_courses_list_org_scope_respects_toggle(self):
+        """
+        If the authz toggle is enabled only for a subset of org courses, only
+        those course keys should appear in the resulting authz keys.
+        """
+        authz_keys, _, authz_courses, _ = self._create_courses()
+        # enable only the first and third course keys
+        enabled_keys = {str(authz_keys[0]), str(authz_keys[2])}
+        org_scope = OrgCourseOverviewGlobData(external_key='course-v1:Org1+*')
+
+        request = self._make_request(self.authorized_user)
+
+        with patch(
+            "cms.djangoapps.contentstore.views.course.get_scopes_for_user_and_permission",
+            return_value=[org_scope],
+        ), patch(
+            "cms.djangoapps.contentstore.views.course._get_course_keys_for_org_scope",
+            return_value=authz_keys,
+        ), patch.object(
+            core_toggles.AUTHZ_COURSE_AUTHORING_FLAG,
+            "is_enabled",
+            side_effect=self._mock_authz_toggle(enabled_keys),
+        ):
+            result = _get_authz_accessible_courses_list(request)
+
+            expected = {authz_keys[0], authz_keys[2]}
+            self.assertEqual(result, expected)

cms/djangoapps/contentstore/views/course.py

@@ -29,7 +29,7 @@
 from opaque_keys.edx.keys import CourseKey
 from opaque_keys.edx.locator import BlockUsageLocator
 from openedx_authz.api import get_scopes_for_user_and_permission
-from openedx_authz.api.data import CourseOverviewData
+from openedx_authz.api.data import CourseOverviewData, OrgCourseOverviewGlobData
 from openedx_authz.constants.permissions import (
     COURSES_MANAGE_COURSE_UPDATES,
     COURSES_MANAGE_GROUP_CONFIGURATIONS,
@@ -817,6 +817,14 @@ def filter_course(course):
     return filter(filter_course, filtered_courses)
 
 
+def _get_course_keys_for_org_scope(access):
+    """
+    Function to convert an OrgCourseOverviewGlobData scope
+    into specific course keys.
+    """
+    return CourseOverview.get_all_courses(orgs=[access.org]).values_list('id', flat=True)
+
+
 def _get_authz_accessible_courses_list(request):
     """
     List all courses available to the logged in user by
@@ -828,12 +836,17 @@ def _get_authz_accessible_courses_list(request):
         COURSES_VIEW_COURSE.identifier
     )
 
-    authz_keys = {
-        access.course_key
-        for access in authz_scopes
-        if isinstance(access, CourseOverviewData) and access.course_key
-        and core_toggles.enable_authz_course_authoring(access.course_key)
-    }
+    authz_keys = set()
+    for access in authz_scopes:
+        if isinstance(access, CourseOverviewData) and access.course_key:
+            if core_toggles.enable_authz_course_authoring(access.course_key):
+                authz_keys.add(access.course_key)
+        elif isinstance(access, OrgCourseOverviewGlobData) and access.org:
+            authz_keys.update(
+                key for key in _get_course_keys_for_org_scope(access)
+                if core_toggles.enable_authz_course_authoring(key)
+            )
+
     return authz_keys