ref: fix types for api.invite_helper (#88831)

<!-- Describe your PR here. -->

Author: asottile-sentry

pyproject.toml

@@ -119,7 +119,6 @@ module = [
     "sentry.api.endpoints.organization_releases",
     "sentry.api.endpoints.project_repo_path_parsing",
     "sentry.api.endpoints.project_rules_configuration",
-    "sentry.api.invite_helper",
     "sentry.api.paginator",
     "sentry.auth.helper",
     "sentry.auth.provider",

src/sentry/api/endpoints/accept_organization_invite.py

@@ -233,19 +233,24 @@ def post(
 
         helper = self.get_helper(request, token, invite_context)
 
-        if helper.member_already_exists:
+        if not request.user.is_authenticated:
+            return Response(
+                status=status.HTTP_400_BAD_REQUEST,
+                data={"details": "unable to accept organization invite"},
+            )
+        elif helper.member_already_exists:
             response = Response(
                 status=status.HTTP_400_BAD_REQUEST, data={"details": "member already exists"}
             )
-        elif not helper.valid_request:
+        elif not request.user.is_authenticated or not helper.valid_request:
             return Response(
                 status=status.HTTP_400_BAD_REQUEST,
                 data={"details": "unable to accept organization invite"},
             )
         else:
             response = Response(status=status.HTTP_204_NO_CONTENT)
 
-        helper.accept_invite()
+        helper.accept_invite(request.user)
         remove_invite_details_from_session(request)
 
         return response

src/sentry/api/invite_helper.py

@@ -210,13 +210,10 @@ def valid_request(self) -> bool:
             and not any(self.get_onboarding_steps().values())
         )
 
-    def accept_invite(self, user: User | None = None) -> RpcOrganizationMember | None:
+    def accept_invite(self, user: User) -> RpcOrganizationMember | None:
         member = self.invite_context.member
         assert member
 
-        if user is None:
-            user = self.request.user
-
         if self.member_already_exists:
             self.handle_member_already_exists()
             if self.invite_context.invite_organization_member_id is not None:

src/sentry/users/api/endpoints/user_authenticator_enroll.py

@@ -329,7 +329,7 @@ def post(self, request: Request, user: User, interface_id: str) -> HttpResponse:
                 )
                 remove_invite_details_from_session(request)
             elif invite_helper.valid_request:
-                invite_helper.accept_invite()
+                invite_helper.accept_invite(user)
                 remove_invite_details_from_session(request)
 
         return response

src/sentry/web/frontend/auth_login.py

@@ -368,7 +368,7 @@ def accept_invite_and_redirect_to_org(
         """
         Accepts an invite on behalf of a user and redirects them to their org login
         """
-        invite_helper.accept_invite()
+        invite_helper.accept_invite(request.user)
         org_slug = invite_helper.invite_context.organization.slug
         self.active_organization = determine_active_organization(
             request=request, organization_slug=org_slug
@@ -640,7 +640,7 @@ def handle_basic_auth(self, request: HttpRequest, **kwargs) -> HttpResponseBase:
                 )
 
             if invite_helper and invite_helper.valid_request:
-                invite_helper.accept_invite()
+                invite_helper.accept_invite(user)
                 organization_slug = invite_helper.invite_context.organization.slug
                 self.active_organization = determine_active_organization(request, organization_slug)
                 response = self.redirect_to_org(request)

tests/sentry/api/test_invite_helper.py

@@ -42,7 +42,7 @@ def _get_om_from_accepting_invite(self) -> OrganizationMember:
 
         helper = ApiInviteHelper(self.request, invite_context, None)
         with assume_test_silo_mode(SiloMode.CONTROL):
-            helper.accept_invite()
+            helper.accept_invite(self.user)
 
         om.refresh_from_db()
         return om
@@ -67,7 +67,7 @@ def test_invite_already_accepted_without_SSO(self):
         invite_context.invite_organization_member_id = None
         helper = ApiInviteHelper(self.request, invite_context, None)
         with assume_test_silo_mode(SiloMode.CONTROL):
-            helper.accept_invite()
+            helper.accept_invite(self.user)
         om.refresh_from_db()
         assert om.email is None
         assert om.user_id == self.user.id
@@ -76,7 +76,7 @@ def test_invite_already_accepted_without_SSO(self):
         invite_context.invite_organization_member_id = member_id
         helper = ApiInviteHelper(self.request, invite_context, None)
         with assume_test_silo_mode(SiloMode.CONTROL):
-            helper.accept_invite()
+            helper.accept_invite(self.user)
         with pytest.raises(OrganizationMember.DoesNotExist):
             OrganizationMember.objects.get(id=self.member.id)