ref(users): move user & user_identity_config & auth serializers to new abode

pyproject.toml

@@ -202,7 +202,6 @@ module = [
     "sentry.api.serializers.models.sentry_app",
     "sentry.api.serializers.models.team",
     "sentry.api.serializers.models.user",
-    "sentry.api.serializers.models.user_identity_config",
     "sentry.api.serializers.rest_framework.mentions",
     "sentry.api.serializers.rest_framework.notification_action",
     "sentry.api.serializers.rest_framework.rule",

src/sentry/api/endpoints/auth_index.py

@@ -14,14 +14,15 @@
 from sentry.api.authentication import QuietBasicAuthentication
 from sentry.api.base import Endpoint, control_silo_endpoint
 from sentry.api.exceptions import SsoRequired
-from sentry.api.serializers import DetailedSelfUserSerializer, serialize
+from sentry.api.serializers import serialize
 from sentry.api.validators import AuthVerifyValidator
 from sentry.api.validators.auth import MISSING_PASSWORD_OR_U2F_CODE
 from sentry.auth.authenticators.u2f import U2fInterface
 from sentry.auth.providers.saml2.provider import handle_saml_single_logout
 from sentry.auth.services.auth.impl import promote_request_rpc_user
 from sentry.auth.superuser import SUPERUSER_ORG_ID
 from sentry.organizations.services.organization import organization_service
+from sentry.users.api.serializers.user import DetailedSelfUserSerializer
 from sentry.users.models.authenticator import Authenticator
 from sentry.utils import auth, json, metrics
 from sentry.utils.auth import DISABLE_SSO_CHECK_FOR_LOCAL_DEV, has_completed_sso, initiate_login

src/sentry/api/endpoints/auth_login.py

@@ -6,8 +6,8 @@
 from sentry.api.api_publish_status import ApiPublishStatus
 from sentry.api.base import Endpoint, control_silo_endpoint
 from sentry.api.serializers.base import serialize
-from sentry.api.serializers.models.user import DetailedSelfUserSerializer
 from sentry.models.organization import Organization
+from sentry.users.api.serializers.user import DetailedSelfUserSerializer
 from sentry.utils import auth, metrics
 from sentry.utils.hashlib import md5_text
 from sentry.web.forms.accounts import AuthenticationForm

src/sentry/api/endpoints/team_members.py

@@ -10,13 +10,13 @@
 from sentry.api.paginator import OffsetPaginator
 from sentry.api.serializers import Serializer, register, serialize
 from sentry.api.serializers.models.organization_member.response import OrganizationMemberResponse
-from sentry.api.serializers.models.user import UserSerializerResponse
 from sentry.apidocs.constants import RESPONSE_FORBIDDEN, RESPONSE_NOT_FOUND
 from sentry.apidocs.examples.team_examples import TeamExamples
 from sentry.apidocs.parameters import CursorQueryParam, GlobalParams
 from sentry.apidocs.utils import inline_sentry_response_serializer
 from sentry.models.organizationmember import InviteStatus
 from sentry.models.organizationmemberteam import OrganizationMemberTeam
+from sentry.users.api.serializers.user import UserSerializerResponse
 
 
 class OrganizationMemberOnTeamResponse(OrganizationMemberResponse):

src/sentry/api/serializers/models/__init__.py

@@ -67,8 +67,6 @@
 from .servicehook import *  # noqa: F401,F403
 from .tagvalue import *  # noqa: F401,F403
 from .team import *  # noqa: F401,F403
-from .user import *  # noqa: F401,F403
-from .user_identity_config import *  # noqa: F401,F403
 from .user_social_auth import *  # noqa: F401,F403
 from .useremail import *  # noqa: F401,F403
 from .userip import *  # noqa: F401,F403

src/sentry/api/serializers/models/dashboard.py

@@ -5,7 +5,6 @@
 
 from sentry import features
 from sentry.api.serializers import Serializer, register, serialize
-from sentry.api.serializers.models.user import UserSerializerResponse
 from sentry.constants import ALL_ACCESS_PROJECTS
 from sentry.discover.models import DatasetSourcesTypes
 from sentry.models.dashboard import Dashboard
@@ -17,6 +16,7 @@
     DashboardWidgetTypes,
 )
 from sentry.snuba.metrics.extraction import OnDemandMetricSpecVersioning
+from sentry.users.api.serializers.user import UserSerializerResponse
 from sentry.users.services.user.service import user_service
 from sentry.utils.dates import outside_retention_with_modified_start, parse_timestamp
 

src/sentry/api/serializers/models/discoversavedquery.py

@@ -2,9 +2,9 @@
 from typing import DefaultDict, TypedDict
 
 from sentry.api.serializers import Serializer, register
-from sentry.api.serializers.models.user import UserSerializerResponse
 from sentry.constants import ALL_ACCESS_PROJECTS
 from sentry.discover.models import DatasetSourcesTypes, DiscoverSavedQuery, DiscoverSavedQueryTypes
+from sentry.users.api.serializers.user import UserSerializerResponse
 from sentry.users.services.user.service import user_service
 from sentry.utils.dates import outside_retention_with_modified_start, parse_timestamp
 

src/sentry/api/serializers/models/group.py

@@ -16,7 +16,6 @@
 from sentry.api.serializers import Serializer, register, serialize
 from sentry.api.serializers.models.actor import ActorSerializer
 from sentry.api.serializers.models.plugin import is_plugin_deprecated
-from sentry.api.serializers.models.user import UserSerializerResponse
 from sentry.app import env
 from sentry.auth.services.auth import AuthenticatedToken
 from sentry.auth.superuser import is_active_superuser
@@ -51,6 +50,7 @@
 from sentry.tagstore.types import GroupTagValue
 from sentry.tsdb.snuba import SnubaTSDB
 from sentry.types.group import SUBSTATUS_TO_STR, PriorityLevel
+from sentry.users.api.serializers.user import UserSerializerResponse
 from sentry.users.models.user import User
 from sentry.users.services.user.serial import serialize_generic_user
 from sentry.users.services.user.service import user_service

src/sentry/api/serializers/models/notification_action.py

@@ -4,14 +4,14 @@
 from django.contrib.auth.models import AnonymousUser
 
 from sentry.api.serializers import Serializer, register
-from sentry.api.serializers.models.user import manytoone_to_dict
 from sentry.models.notificationaction import (
     ActionService,
     ActionTarget,
     ActionTrigger,
     NotificationAction,
     NotificationActionProject,
 )
+from sentry.users.api.serializers.user import manytoone_to_dict
 
 
 @register(NotificationAction)

src/sentry/api/serializers/models/organization.py

@@ -72,7 +72,7 @@
 logger = logging.getLogger(__name__)
 
 if TYPE_CHECKING:
-    from sentry.api.serializers import UserSerializerResponse, UserSerializerResponseSelf
+    from sentry.users.api.serializers.user import UserSerializerResponse, UserSerializerResponseSelf
 
 # A mapping of OrganizationOption keys to a list of frontend features, and functions to apply the feature.
 # Enabling feature-flagging frontend components without an extra API call/endpoint to verify

src/sentry/api/serializers/models/organization_member/response.py

@@ -7,8 +7,8 @@
     OrganizationRoleSerializerResponse,
     TeamRoleSerializerResponse,
 )
-from sentry.api.serializers.models.user import UserSerializerResponse
 from sentry.integrations.api.serializers.models.external_actor import ExternalActorResponse
+from sentry.users.api.serializers.user import UserSerializerResponse
 
 
 class SCIMName(TypedDict):

src/sentry/api/serializers/models/release.py

@@ -11,7 +11,6 @@
 
 from sentry import release_health, tagstore
 from sentry.api.serializers import Serializer, register, serialize
-from sentry.api.serializers.models.user import UserSerializerResponse
 from sentry.api.serializers.types import ReleaseSerializerResponse
 from sentry.models.commit import Commit
 from sentry.models.commitauthor import CommitAuthor
@@ -21,6 +20,7 @@
 from sentry.models.releaseprojectenvironment import ReleaseProjectEnvironment
 from sentry.models.releases.release_project import ReleaseProject
 from sentry.release_health.base import ReleaseHealthOverview
+from sentry.users.api.serializers.user import UserSerializerResponse
 from sentry.users.services.user.serial import serialize_generic_user
 from sentry.users.services.user.service import user_service
 from sentry.utils import metrics