Skip to content

fix: missing external users validation on members tab #37071

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
ggazzo merged 3 commits into from
Sep 26, 2025
Merged

fix: missing external users validation on members tab #37071

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c9c23b5
fix: validate if adding external user to a non federated room
juliajforesti Sep 25, 2025
b727e66
chore: changeset
juliajforesti Sep 25, 2025
f26895c
review
juliajforesti Sep 26, 2025
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
5 changes: 5 additions & 0 deletions .changeset/two-owls-flow.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rocket.chat/meteor': patch
---

Prevents adding a external user to a non federated room through Members tab
18 changes: 15 additions & 3 deletions apps/meteor/client/views/room/contextualBar/RoomMembers/AddUsers/AddUsers.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import type { IRoom } from '@rocket.chat/core-typings';
import { isRoomFederated, isRoomNativeFederated } from '@rocket.chat/core-typings';
import { Field, FieldLabel, Button, ButtonGroup, FieldGroup } from '@rocket.chat/fuselage';
import { Field, FieldError, FieldLabel, Button, ButtonGroup, FieldGroup } from '@rocket.chat/fuselage';
import { useEffectEvent } from '@rocket.chat/fuselage-hooks';
import { useToastMessageDispatch, useMethod } from '@rocket.chat/ui-contexts';
import { useId } from 'react';
import type { ReactElement } from 'react';
import { Controller, useForm } from 'react-hook-form';
import { useTranslation } from 'react-i18next';
Expand All @@ -22,6 +23,8 @@ import UserAutoCompleteMultipleFederated from '../../../../../components/UserAut
import { useRoom } from '../../../contexts/RoomContext';
import { useRoomToolbox } from '../../../contexts/RoomToolboxContext';

const hasExternalUsers = (users: string[]): boolean => users.some((user) => user.startsWith('@'));

type AddUsersProps = {
rid: IRoom['_id'];
onClickBack: () => void;
Expand All @@ -32,6 +35,7 @@ const AddUsers = ({ rid, onClickBack, reload }: AddUsersProps): ReactElement =>
const { t } = useTranslation();
const dispatchToastMessage = useToastMessageDispatch();
const room = useRoom();
const usersFieldId = useId();

const { closeTab } = useRoomToolbox();
const saveAction = useMethod('addUsersToRoom');
Expand All @@ -40,7 +44,7 @@ const AddUsers = ({ rid, onClickBack, reload }: AddUsersProps): ReactElement =>
handleSubmit,
control,
getValues,
formState: { isDirty, isSubmitting },
formState: { isDirty, isSubmitting, errors },
} = useForm({ defaultValues: { users: [] } });

const handleSave = useEffectEvent(async ({ users }: { users: string[] }) => {
Expand Down Expand Up @@ -83,9 +87,17 @@ const AddUsers = ({ rid, onClickBack, reload }: AddUsersProps): ReactElement =>
<Controller
name='users'
control={control}
render={({ field }) => <UserAutoCompleteMultiple {...field} placeholder={t('Choose_users')} />}
rules={{ validate: (users) => !hasExternalUsers(users) || t('You_cannot_add_external_users_to_non_federated_room') }}
render={({ field }) => (
<UserAutoCompleteMultiple {...field} placeholder={t('Choose_users')} aria-describedby={`${usersFieldId}-error`} />
)}
/>
)}
{errors.users && (
<FieldError role='alert' id={`${usersFieldId}-error`}>
{errors.users.message}
</FieldError>
)}
</Field>
</FieldGroup>
</ContextualbarScrollableContent>
Expand Down
Loading