refactor: address rebase failure

Author: mariajgrimaldi

openedx_authz/api/roles.py

@@ -115,7 +115,9 @@ def get_permissions_for_active_roles_in_scope(
         dict[str, list[PermissionData]]: A dictionary mapping the role external_key to its
         permissions and scopes.
     """
-    filtered_policy = AuthzEnforcer.get_enforcer().get_filtered_grouping_policy(
+    enforcer = AuthzEnforcer.get_enforcer()
+    enforcer.load_policy()
+    filtered_policy = enforcer.get_filtered_grouping_policy(
         GroupingPolicyIndex.SCOPE.value, scope.namespaced_key
     )
 
@@ -146,7 +148,9 @@ def get_role_definitions_in_scope(scope: ScopeData) -> list[RoleData]:
     Returns:
         list[Role]: A list of roles.
     """
-    policy_filtered = AuthzEnforcer.get_enforcer().get_filtered_policy(
+    enforcer = AuthzEnforcer.get_enforcer()
+    enforcer.load_policy()
+    policy_filtered = enforcer.get_filtered_policy(
         PolicyIndex.SCOPE.value, scope.namespaced_key
     )
 
@@ -191,7 +195,9 @@ def get_all_roles_in_scope(scope: ScopeData) -> list[list[str]]:
     Returns:
         list[list[str]]: A list of policies in the specified scope.
     """
-    return AuthzEnforcer.get_enforcer().get_filtered_grouping_policy(
+    enforcer = AuthzEnforcer.get_enforcer()
+    enforcer.load_policy()
+    return enforcer.get_filtered_grouping_policy(
         GroupingPolicyIndex.SCOPE.value, scope.namespaced_key
     )
 
@@ -209,7 +215,9 @@ def assign_role_to_subject_in_scope(
     Returns:
         bool: True if the role was assigned successfully, False otherwise.
     """
-    AuthzEnforcer.get_enforcer().add_role_for_user_in_domain(
+    enforcer = AuthzEnforcer.get_enforcer()
+    enforcer.load_policy()
+    return enforcer.add_role_for_user_in_domain(
         subject.namespaced_key,
         role.namespaced_key,
         scope.namespaced_key,
@@ -242,7 +250,9 @@ def unassign_role_from_subject_in_scope(
     Returns:
         bool: True if the role was unassigned successfully, False otherwise.
     """
-    AuthzEnforcer.get_enforcer().delete_roles_for_user_in_domain(
+    enforcer = AuthzEnforcer.get_enforcer()
+    enforcer.load_policy()
+    return enforcer.delete_roles_for_user_in_domain(
         subject.namespaced_key, role.namespaced_key, scope.namespaced_key
     )
 
@@ -299,10 +309,11 @@ def get_subject_role_assignments_in_scope(
     Returns:
         list[RoleAssignmentData]: A list of role assignments for the subject in the scope.
     """
-    AuthzEnforcer.get_enforcer().load_policy()
+    enforcer = AuthzEnforcer.get_enforcer()
+    enforcer.load_policy()
     # TODO: we still need to get the remaining data for the role like email, etc
     role_assignments = []
-    for namespaced_key in AuthzEnforcer.get_enforcer().get_roles_for_user_in_domain(
+    for namespaced_key in enforcer.get_roles_for_user_in_domain(
         subject.namespaced_key, scope.namespaced_key
     ):
         role = RoleData(namespaced_key=namespaced_key)
@@ -398,8 +409,7 @@ def get_subjects_for_role(role: RoleData) -> list[SubjectData]:
     Returns:
         list[SubjectData]: A list of subjects assigned to the specified role.
     """
-    policies = AuthzEnforcer.get_enforcer().get_filtered_grouping_policy(
-        GroupingPolicyIndex.ROLE.value,
-        role.namespaced_key
-    )
+    enforcer = AuthzEnforcer.get_enforcer()
+    enforcer.load_policy()
+    policies = enforcer.get_filtered_grouping_policy(GroupingPolicyIndex.ROLE.value, role.namespaced_key)
     return [SubjectData(namespaced_key=policy[GroupingPolicyIndex.SUBJECT.value]) for policy in policies]

openedx_authz/tests/api/test_roles.py

@@ -98,16 +98,6 @@ def setUpClass(cls):
         super().setUpClass()
         cls._seed_database_with_policies()
 
-    def setUp(self):
-        """Set up test environment."""
-        super().setUp()
-        global_enforcer.load_policy()  # Load policies before each test to simulate fresh start
-
-    def tearDown(self):
-        """Clean up after each test to ensure isolation."""
-        super().tearDown()
-        global_enforcer.clear_policy()  # Clear policies after each test to ensure isolation
-
 
 class RolesTestSetupMixin(BaseRolesTestCase):
     """Test case with comprehensive role assignments for general roles testing."""