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
4 changes: 0 additions & 4 deletions static/app/router/routes.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -157,10 +157,6 @@ function buildRoutes(): RouteObject[] {
path: '/accept/:orgId/:memberId/:token/',
component: make(() => import('sentry/views/acceptOrganizationInvite')),
},
{
path: '/accept/:memberId/:token/',
component: make(() => import('sentry/views/acceptOrganizationInvite')),
},
{
path: '/accept-transfer/',
component: make(() => import('sentry/views/acceptProjectTransfer')),
Expand Down
6 changes: 3 additions & 3 deletions static/app/views/acceptOrganizationInvite/index.spec.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ describe('AcceptOrganizationInvite', () => {

it('renders error message', async () => {
MockApiClient.addMockResponse({
url: '/accept-invite/1/abc/',
url: '/accept-invite/org-slug/1/abc/',
method: 'GET',
statusCode: 400,
body: {detail: 'uh oh'},
Expand All @@ -115,9 +115,9 @@ describe('AcceptOrganizationInvite', () => {
render(<AcceptOrganizationInvite />, {
initialRouterConfig: {
location: {
pathname: '/accept-invite/1/abc/',
pathname: '/accept-invite/org-slug/1/abc/',
},
route: '/accept-invite/:memberId/:token/',
route: '/accept-invite/:orgId/:memberId/:token/',
},
});

Expand Down
37 changes: 15 additions & 22 deletions static/app/views/acceptOrganizationInvite/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -204,30 +204,22 @@ function AuthenticationActions({inviteDetails}: {inviteDetails: InviteDetails})

function AcceptOrganizationInvite() {
const api = useApi({persistInFlight: true});
const params = useParams<{memberId: string; token: string; orgId?: string}>();

const orgSlug = params.orgId || ConfigStore.get('customerDomain')?.subdomain || null;
const params = useParams<{memberId: string; orgId: string; token: string}>();

const {
data: inviteDetails,
isPending,
isError,
} = useApiQuery<InviteDetails>(
orgSlug
? [
getApiUrl('/accept-invite/$organizationIdOrSlug/$memberId/$token/', {
path: {
organizationIdOrSlug: orgSlug,
memberId: params.memberId,
token: params.token,
},
}),
]
: [
getApiUrl('/accept-invite/$memberId/$token/', {
path: {memberId: params.memberId, token: params.token},
}),
],
[
getApiUrl('/accept-invite/$organizationIdOrSlug/$memberId/$token/', {
path: {
organizationIdOrSlug: params.orgId,
memberId: params.memberId,
token: params.token,
},
}),
],
{
staleTime: Infinity,
retry: false,
Expand All @@ -241,9 +233,7 @@ function AcceptOrganizationInvite() {
} = useMutation({
mutationFn: () =>
api.requestPromise(
orgSlug
? `/accept-invite/${orgSlug}/${params.memberId}/${params.token}/`
: `/accept-invite/${params.memberId}/${params.token}/`,
`/accept-invite/${params.orgId}/${params.memberId}/${params.token}/`,
{
method: 'POST',
}
Expand Down Expand Up @@ -273,7 +263,10 @@ function AcceptOrganizationInvite() {
data-test-id="existing-member-link"
onClick={e => {
e.preventDefault();
logout(api, `/accept/${params.memberId}/${params.token}/`);
logout(
api,
`/accept/${params.orgId}/${params.memberId}/${params.token}/`
);
}}
/>
),
Expand Down
Loading