Skip to content

Commit 13e0b7b

Browse files
committed
squash!: Check for instance type instead of namespace string, remove trying to parse libv2 keys as its no longer required
1 parent 3327d82 commit 13e0b7b

1 file changed

Lines changed: 7 additions & 8 deletions

File tree

common/djangoapps/student/roles.py

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,10 @@
1313
from django.contrib.auth.models import User # lint-amnesty, pylint: disable=imported-auth-user
1414
from common.djangoapps.student.signals.signals import emit_course_access_role_added, emit_course_access_role_removed
1515
from opaque_keys.edx.django.models import CourseKeyField
16-
from opaque_keys import InvalidKeyError
1716
from opaque_keys.edx.keys import CourseKey
18-
from opaque_keys.edx.locator import CourseLocator, LibraryLocatorV2
17+
from opaque_keys.edx.locator import CourseLocator
1918
from openedx_authz.api import users as authz_api
20-
from openedx_authz.api.data import RoleAssignmentData
19+
from openedx_authz.api.data import RoleAssignmentData, CourseOverviewData
2120
from openedx_authz.constants import roles as authz_roles
2221

2322
from common.djangoapps.student.models import CourseAccessRole
@@ -81,17 +80,17 @@ def authz_get_all_course_assignments_for_user(user: User) -> list[RoleAssignment
8180
"""
8281
assignments = authz_api.get_user_role_assignments(user_external_key=user.username)
8382
# filter courses only
84-
filtered_assignments = [assignment for assignment in assignments if assignment.scope.NAMESPACE == 'course-v1']
83+
filtered_assignments = [
84+
assignment for assignment in assignments
85+
if isinstance(assignment.scope, CourseOverviewData)
86+
]
8587
return filtered_assignments
8688

8789
def get_org_from_key(key: str) -> str:
8890
"""
8991
Get the org from a course or library key.
9092
"""
91-
try:
92-
parsed_key = CourseKey.from_string(key)
93-
except InvalidKeyError:
94-
parsed_key = LibraryLocatorV2.from_string(key)
93+
parsed_key = CourseKey.from_string(key)
9594
return parsed_key.org
9695

9796
def register_access_role(cls):

0 commit comments

Comments
 (0)