Revert "ref(hybrid-cloud): use organization_slug in org invite link url" (#42790)

fixtures/emails/invitation.txt

@@ -4,6 +4,6 @@ Your teammates at Example are using Sentry to track and debug software errors.
 
 Join your team by visiting the following url:
 
-    http://testserver/accept/example/1/None/
+    http://testserver/accept/1/None/
 
 Check out the Sentry website (https://sentry.io) if you'd like to learn more before diving in.

src/sentry/api/endpoints/accept_organization_invite.py

@@ -83,7 +83,7 @@ class AcceptOrganizationInvite(Endpoint):
             # 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-with-org", args=[organization_slug, member_id, token])
+                reverse("sentry-accept-invite", args=[member_id, token])
                 if not auth_provider
                 else "/"
             )

src/sentry/models/organizationmember.py

@@ -245,9 +245,8 @@ class OrganizationMember(Model):
             return None
         return absolute_uri(
             reverse(
-                "sentry-accept-invite-with-org",
+                "sentry-accept-invite",
                 kwargs={
-                    "organization_slug": self.organization.slug,
                     "member_id": self.id,
                     "token": self.token or self.legacy_token,
                 },

src/sentry/web/frontend/debug/mail.py

@@ -638,8 +638,8 @@ def invitation(request):
             "organization": org,
             "url": absolute_uri(
                 reverse(
-                    "sentry-accept-invite-with-org",
-                    kwargs={"organization_slug": org.slug, "member_id": om.id, "token": om.token},
+                    "sentry-accept-invite",
+                    kwargs={"member_id": om.id, "token": om.token},
                 )
             ),
         },