ref: fix typing for organization_member.requests.invite.details

Author: asottile-sentry

pyproject.toml

@@ -122,7 +122,6 @@ module = [
     "sentry.api.endpoints.organization_events_spans_performance",
     "sentry.api.endpoints.organization_member.details",
     "sentry.api.endpoints.organization_member.index",
-    "sentry.api.endpoints.organization_member.requests.invite.details",
     "sentry.api.endpoints.organization_projects",
     "sentry.api.endpoints.organization_releases",
     "sentry.api.endpoints.organization_request_project_creation",

src/sentry/api/bases/organizationmember.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import Any, NotRequired, TypedDict
+from typing import Any, Literal, NotRequired, TypedDict
 
 from rest_framework import serializers
 from rest_framework.fields import empty
@@ -108,7 +108,7 @@ def _get_member(
         self,
         request: Request,
         organization: Organization,
-        member_id: int | str,
+        member_id: int | Literal["me"],
         invite_status: InviteStatus | None = None,
     ) -> OrganizationMember:
         kwargs: _FilterKwargs = {"organization": organization}

src/sentry/api/endpoints/organization_member/details.py

@@ -1,5 +1,7 @@
 from __future__ import annotations
 
+from typing import Literal
+
 from django.db import router, transaction
 from django.db.models import Q
 from drf_spectacular.utils import extend_schema, inline_serializer
@@ -105,7 +107,7 @@ def _get_member(
         self,
         request: Request,
         organization: Organization,
-        member_id: int | str,
+        member_id: int | Literal["me"],
         invite_status: InviteStatus | None = None,
     ) -> OrganizationMember:
         try:

src/sentry/api/endpoints/organization_member/requests/invite/details.py

@@ -1,5 +1,7 @@
 from __future__ import annotations
 
+from typing import Literal
+
 from rest_framework import serializers, status
 from rest_framework.request import Request
 from rest_framework.response import Response
@@ -57,9 +59,11 @@ def _get_member(
         self,
         request: Request,
         organization: Organization,
-        member_id: int | str,
+        member_id: int | Literal["me"],
         invite_status: InviteStatus | None = None,
     ) -> OrganizationMember:
+        if member_id == "me":
+            member_id = request.user.id
         try:
             return OrganizationMember.objects.get_member_invite_query(member_id).get(
                 organization=organization
@@ -130,7 +134,7 @@ def put(
         if "approve" in request.data:
             allowed_roles = get_allowed_org_roles(request, organization)
 
-            serializer = ApproveInviteRequestSerializer(
+            approve_serializer = ApproveInviteRequestSerializer(
                 data=request.data,
                 context={
                     "request": request,
@@ -140,10 +144,10 @@ def put(
                 },
             )
 
-            if not serializer.is_valid():
-                return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
+            if not approve_serializer.is_valid():
+                return Response(approve_serializer.errors, status=status.HTTP_400_BAD_REQUEST)
 
-            result = serializer.validated_data
+            result = approve_serializer.validated_data
 
             if result.get("approve") and not member.invite_approved:
                 api_key = get_api_key_for_audit_log(request)

tests/sentry/api/endpoints/test_organization_invite_request_details.py

@@ -58,6 +58,13 @@ def test_get_invalid(self):
         resp = self.get_response(self.org.slug, "123")
         assert resp.status_code == 404
 
+    def test_me(self):
+        self.login_as(user=self.user)
+        resp = self.get_response(self.org.slug, "me")
+
+        assert resp.status_code == 200
+        assert resp.data["email"] == self.invite_request.email
+
     def test_get_invite_request(self):
         self.login_as(user=self.user)
         resp = self.get_response(self.org.slug, self.invite_request.id)