Mirrors/Rocket.Chat
1
0
Fork 0
mirror of https://github.com/RocketChat/Rocket.Chat.git synced 2025-12-28 06:47:25 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

fix: missing external users validation on members tab (#37071)

Browse Source 
Co-authored-by: Douglas Fabris <devfabris@gmail.com>
This commit is contained in:
Júlia Jaeger Foresti 2025-09-26 16:30:01 -03:00 committed by GitHub
parent 10dadee4b3
commit f1fbcdda0e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.changeset/two-owls-flow.md Normal file
View File

@ -0,0 +1,5 @@
---
'@rocket.chat/meteor': patch
---
Prevents adding a external user to a non federated room through Members tab

18
apps/meteor/client/views/room/contextualBar/RoomMembers/AddUsers/AddUsers.tsx
View File

@ -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';
@ -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;
@ -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');
@ -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[] }) => {
@ -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>