Skip to content

fix(cells): Invalid invitation token or context always 404s #112633

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lynnagara merged 2 commits into from
Apr 10, 2026
Merged

fix(cells): Invalid invitation token or context always 404s #112633

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c26e560
fix(cells): Invalid invitation token or context always 404s
lynnagara Apr 9, 2026
c0bcca1
.
lynnagara Apr 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/sentry/web/frontend/accept_organization_invite_redirect.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from __future__ import annotations

from django.http import HttpRequest, HttpResponse, HttpResponseRedirect
from django.http import HttpRequest, HttpResponse, HttpResponseNotFound, HttpResponseRedirect
from django.urls import reverse

from sentry.api.endpoints.accept_organization_invite import get_invite_state
Expand Down Expand Up @@ -29,11 +29,11 @@ def handle(self, request: HttpRequest, **kwargs) -> HttpResponse:
request=request,
)
if invite_context is None:
return self.handle_react(request, **kwargs)
return HttpResponseNotFound()

helper = ApiInviteHelper(request=request, token=token, invite_context=invite_context)
if not helper.valid_token:
return self.handle_react(request, **kwargs)
return HttpResponseNotFound()

redirect_url = reverse(
"sentry-organization-accept-invite",
Expand Down
8 changes: 3 additions & 5 deletions tests/sentry/web/frontend/test_accept_organization_invite_redirect.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,9 @@ def test_invalid_token_does_not_leak_org_slug(self) -> None:
reverse("sentry-accept-invite", args=[member.id, "invalidtoken"])
)

assert response.status_code == 200
self.assertTemplateUsed(response, "sentry/base-react.html")
assert response.status_code == 404

def test_unresolved_legacy_invite_falls_back_to_react_page(self) -> None:
def test_unresolved_legacy_invite_returns_404(self) -> None:
response = self.client.get(reverse("sentry-accept-invite", args=[123456, "invalidtoken"]))

assert response.status_code == 200
self.assertTemplateUsed(response, "sentry/base-react.html")
assert response.status_code == 404
Loading