Fixing first batch of test failures

Author: AlanCoding

ansible_base/authentication/utils/claims.py

@@ -8,14 +8,14 @@
 from django.conf import settings
 from django.contrib.auth import get_user_model
 from django.contrib.auth.models import AbstractUser
-from django.contrib.contenttypes.models import ContentType
 from django.core.exceptions import ObjectDoesNotExist
 from django.db import IntegrityError, models
 from django.utils.timezone import now
 from django.utils.translation import gettext_lazy as _
 from rest_framework.serializers import DateTimeField
 
 from ansible_base.authentication.models import Authenticator, AuthenticatorMap, AuthenticatorUser
+from ansible_base.rbac.models import DABContentType
 from ansible_base.lib.abstract_models import AbstractOrganization, AbstractTeam, CommonModel
 from ansible_base.lib.utils.auth import get_organization_model, get_team_model
 from ansible_base.lib.utils.string import is_empty
@@ -582,7 +582,7 @@ class RoleUserAssignmentsCache:
     def __init__(self):
         self.cache = {}
         # NOTE(cutwater): We may probably execute this query once and cache the query results.
-        self.content_types = {content_type.model: content_type for content_type in ContentType.objects.get_for_models(Organization, Team).values()}
+        self.content_types = {content_type.model: content_type for content_type in DABContentType.objects.get_for_models(Organization, Team).values()}
         self.role_definitions = {}
 
     def items(self):

ansible_base/rbac/migrations/0005_remote_permissions_migration.py

@@ -1,6 +1,6 @@
 # Generated by Django 4.2.23 on 2025-06-30 18:45
 
-from django.db import migrations, models
+from django.db import migrations
 
 
 class Migration(migrations.Migration):

test_app/tests/authentication/utils/test_claims_reconcile_user.py

@@ -4,9 +4,9 @@
 
 import pytest
 from django.contrib.auth import get_user_model
-from django.contrib.contenttypes.models import ContentType
 
 from ansible_base.authentication.utils.claims import ReconcileUser, create_organizations_and_teams
+from ansible_base.rbac.models import DABContentType
 from ansible_base.lib.utils.auth import get_organization_model, get_team_model
 
 Organization = get_organization_model()
@@ -259,10 +259,10 @@ def test_remove_users_setting_set(org_member_rd, org_admin_rd, member_rd, admin_
     assert user.has_obj_perm(teams[1], 'change')
 
     # Nothing was specified in orgs[2], teams[2]
-    org_content_type = ContentType.objects.get_for_model(Organization)
+    org_content_type = DABContentType.objects.get_for_model(Organization)
     user_role_assignments_for_org_2 = user.role_assignments.filter(content_type=org_content_type, object_id=str(orgs[2].id))
     assert (
         not user_role_assignments_for_org_2.exists()
     ), f"Expected no assignments for org2 but got {', '.join([r.role_definition.name for r in user_role_assignments_for_org_2])}"
-    team_content_type = ContentType.objects.get_for_model(Team)
+    team_content_type = DABContentType.objects.get_for_model(Team)
     assert not user.role_assignments.filter(content_type=team_content_type, object_id=str(teams[2].id)).exists()

test_app/tests/jwt_consumer/hub/test_auth.py

@@ -2,11 +2,10 @@
 from uuid import uuid4
 
 import pytest
-from django.contrib.contenttypes.models import ContentType
 
 from ansible_base.jwt_consumer.common.exceptions import InvalidService
 from ansible_base.jwt_consumer.hub.auth import HubJWTAuth
-from ansible_base.rbac.models import RoleDefinition, RoleUserAssignment
+from ansible_base.rbac.models import RoleDefinition, RoleUserAssignment, DABContentType
 from test_app.models import Organization, Team, User
 
 
@@ -61,9 +60,9 @@ def test_hub_jwt_orgs_teams_groups_memberships(mock_contenttype, mock_resource):
     # The rbac hooks will attempt to assign these roledefs
     # when users are added/removed from orgs+teams, so they
     # must exist before claims are processed ...
-    org_content_type = ContentType.objects.get_for_model(Organization)
+    org_content_type = DABContentType.objects.get_for_model(Organization)
     org_member_role, _ = RoleDefinition.objects.get_or_create(name="Organization Member", content_type=org_content_type)
-    team_content_type = ContentType.objects.get_for_model(Team)
+    team_content_type = DABContentType.objects.get_for_model(Team)
     team_member_role, _ = RoleDefinition.objects.get_or_create(name="Team Member", content_type=team_content_type)
     team_admin_role, _ = RoleDefinition.objects.get_or_create(name="Team Admin", content_type=team_content_type)