Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion fixtures/emails/invitation.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Your teammates at Example are using Sentry to catch errors, crush latency issues

Looks like they need your help. You've been invited to join them:

http://testserver/accept/1/None/
http://testserver/accept/example/1/None/

Heads up: this invite link is just for you. Don't share it unless you want random strangers fixing your bugs.

Expand Down
9 changes: 8 additions & 1 deletion src/sentry/api/endpoints/accept_organization_invite.py
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,14 @@ def get(
# When SSO is required do *not* set a next_url to return to accept
# invite. The invite will be accepted after SSO is completed.
url = (
reverse("sentry-accept-invite", args=[member_id, token])
reverse(
"sentry-organization-accept-invite",
kwargs={
"organization_slug": invite_context.organization.slug,
"member_id": member_id,
"token": token,
},
)
if not auth_provider
else "/"
)
Expand Down
3 changes: 2 additions & 1 deletion src/sentry/models/organizationmember.py
Original file line number Diff line number Diff line change
Expand Up @@ -334,8 +334,9 @@ def get_invite_link(self, referrer: str | None = None):
if not self.is_pending or not self.invite_approved:
return None
path = reverse(
"sentry-accept-invite",
"sentry-organization-accept-invite",
kwargs={
"organization_slug": self.organization.slug,
"member_id": self.id,
"token": self.token or self.legacy_token,
},
Comment thread
sentry[bot] marked this conversation as resolved.
Expand Down
8 changes: 6 additions & 2 deletions src/sentry/web/frontend/debug/mail.py
Original file line number Diff line number Diff line change
Expand Up @@ -672,8 +672,12 @@ def invitation(request):
"organization": org,
"url": absolute_uri(
reverse(
"sentry-accept-invite",
kwargs={"member_id": om.id, "token": om.token},
"sentry-organization-accept-invite",
kwargs={
"organization_slug": org.slug,
"member_id": om.id,
"token": om.token,
},
)
),
},
Expand Down
2 changes: 1 addition & 1 deletion tests/sentry/core/endpoints/test_organization_details.py
Original file line number Diff line number Diff line change
Expand Up @@ -2234,7 +2234,7 @@ def setUp(self) -> None:
assert self.has_2fa.has_2fa()

def assert_2fa_email_equal(self, outbox, expected):
invite_url_regex = re.compile(r"http://.*/accept/[0-9]+/[a-f0-9]+/")
invite_url_regex = re.compile(r"http://.*/accept/[^/]+/[0-9]+/[a-f0-9]+/")
assert len(outbox) == len(expected)
assert sorted(email.to[0] for email in outbox) == sorted(expected)
for email in outbox:
Expand Down
Loading