Skip to content

regression: Federated room entering an invalid state after accepting invitation #38093

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
kodiakhq merged 5 commits into from
Jan 8, 2026
Merged

regression: Federated room entering an invalid state after accepting invitation #38093

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b413b74
fix: race condition when room invite is accepted
aleksandernsilva Jan 8, 2026
5f1dfdd
test: removed outdated redirect tests
aleksandernsilva Jan 8, 2026
4b2ce6e
test: added user
aleksandernsilva Jan 8, 2026
7edfe59
refactor: improve code clarity
aleksandernsilva Jan 8, 2026
153f551
refactor: remove stream in favor of unmount
aleksandernsilva Jan 8, 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
18 changes: 17 additions & 1 deletion apps/meteor/client/views/room/RoomInvite.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import { isRoomFederated } from '@rocket.chat/core-typings';
import type { IUser, IInviteSubscription } from '@rocket.chat/core-typings';
import type { ComponentProps } from 'react';
import { useEffectEvent } from '@rocket.chat/fuselage-hooks';
import { useQueryClient } from '@tanstack/react-query';
import { useEffect, type ComponentProps } from 'react';
import { useTranslation } from 'react-i18next';

import Header from './Header';
Expand All @@ -10,6 +12,7 @@ import type { IRoomWithFederationOriginalName } from './contexts/RoomContext';
import { useRoomInvitation } from './hooks/useRoomInvitation';
import RoomLayout from './layout/RoomLayout';
import { links } from '../../lib/links';
import { roomsQueryKeys, subscriptionsQueryKeys } from '../../lib/queryKeys';

type RoomInviteProps = Omit<ComponentProps<typeof RoomLayout>, 'header' | 'body' | 'aside'> & {
userId?: IUser['_id'];
Expand All @@ -19,12 +22,25 @@ type RoomInviteProps = Omit<ComponentProps<typeof RoomLayout>, 'header' | 'body'

const RoomInvite = ({ room, subscription, userId, ...props }: RoomInviteProps) => {
const { t } = useTranslation();
const queryClient = useQueryClient();
const { acceptInvite, rejectInvite, isPending } = useRoomInvitation(room);

const infoLink = isRoomFederated(room) ? { label: t('Learn_more_about_Federation'), href: links.go.matrixFederation } : undefined;

useGoToHomeOnRemoved(room, userId);

const invalidateQueries = useEffectEvent(() => {
const reference = room.federationOriginalName ?? room.name ?? room._id;
void queryClient.invalidateQueries({ queryKey: roomsQueryKeys.room(room._id) });
void queryClient.invalidateQueries({ queryKey: subscriptionsQueryKeys.subscription(room._id) });
void queryClient.invalidateQueries({ queryKey: roomsQueryKeys.roomReference(reference, room.t, userId) });
});

useEffect(() => {
// Invalidate room and subscription queries when unmounting (invite accepted or rejected)
return () => invalidateQueries();
}, [invalidateQueries]);

return (
<RoomLayout
{...props}
Expand Down
16 changes: 0 additions & 16 deletions apps/meteor/client/views/room/hooks/useRoomInvitation.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,20 +81,4 @@ describe('useRoomInvitation', () => {

await waitFor(() => expect(mockInviteEndpoint).not.toHaveBeenCalled());
});

it('should redirect to /home after rejecting an invite', async () => {
const { result } = renderHook(() => useRoomInvitation(mockedRoom), { wrapper: appRoot });

act(() => void result.current.rejectInvite());

await waitFor(() => expect(mockedNavigate).toHaveBeenCalledWith('/home'));
});

it('should not redirect to /home after accepting an invite', async () => {
const { result } = renderHook(() => useRoomInvitation(mockedRoom), { wrapper: appRoot });

act(() => void result.current.acceptInvite());

await waitFor(() => expect(mockedNavigate).not.toHaveBeenCalled());
});
});
28 changes: 1 addition & 27 deletions apps/meteor/client/views/room/hooks/useRoomInvitation.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,36 +1,10 @@
import { useRouter, useUser } from '@rocket.chat/ui-contexts';
import { useQueryClient } from '@tanstack/react-query';

import { useRoomRejectInvitationModal } from './useRoomRejectInvitationModal';
import { useEndpointMutation } from '../../../hooks/useEndpointMutation';
import { roomsQueryKeys, subscriptionsQueryKeys } from '../../../lib/queryKeys';
import type { IRoomWithFederationOriginalName } from '../contexts/RoomContext';

export const useRoomInvitation = (room: IRoomWithFederationOriginalName) => {
const queryClient = useQueryClient();
const user = useUser();
const router = useRouter();

const { open: openConfirmationModal } = useRoomRejectInvitationModal(room);

const replyInvite = useEndpointMutation('POST', '/v1/rooms.invite', {
onSuccess: async (_, { action }) => {
const reference = room.federationOriginalName ?? room.name;

if (reference) {
await queryClient.refetchQueries({
queryKey: roomsQueryKeys.roomReference(reference, room.t, user?._id, user?.username),
});
}

await queryClient.invalidateQueries({ queryKey: roomsQueryKeys.room(room._id) });
await queryClient.invalidateQueries({ queryKey: subscriptionsQueryKeys.subscription(room._id) });

if (action === 'reject') {
router.navigate('/home');
}
},
});
const replyInvite = useEndpointMutation('POST', '/v1/rooms.invite');

return {
...replyInvite,
Expand Down
Loading