fix: show only relevant userInfoActions for mentioned non-members

.changeset/ninety-hounds-exist.md

@@ -0,0 +1,6 @@
+---
+'@rocket.chat/rest-typings': patch
+'@rocket.chat/meteor': patch
+---
+
+Fix: Show correct user info actions for non-members in channels.

apps/meteor/app/api/server/v1/subscriptions.ts

@@ -1,13 +1,17 @@
-import { Subscriptions } from '@rocket.chat/models';
+import { Rooms, Subscriptions, Users } from '@rocket.chat/models';
 import {
 	isSubscriptionsGetProps,
 	isSubscriptionsGetOneProps,
 	isSubscriptionsReadProps,
 	isSubscriptionsUnreadProps,
 } from '@rocket.chat/rest-typings';
+import { isSubscriptionsExistsProps } from '@rocket.chat/rest-typings/src';
 import { Meteor } from 'meteor/meteor';
 
 import { readMessages } from '../../../../server/lib/readMessages';
+import { canAccessRoomAsync } from '../../../authorization/server';
+import { canAccessRoomIdAsync } from '../../../authorization/server/functions/canAccessRoom';
+import { hasPermissionAsync } from '../../../authorization/server/functions/hasPermission';
 import { API } from '../api';
 
 API.v1.addRoute(
@@ -103,3 +107,35 @@ API.v1.addRoute(
 		},
 	},
 );
+
+API.v1.addRoute(
+	'subscriptions.exists',
+	{
+		authRequired: true,
+		validateParams: isSubscriptionsExistsProps,
+	},
+	{
+		async get() {
+			const { username, roomId, userId, roomName } = this.queryParams;
+			const [room, user] = await Promise.all([
+				Rooms.findOneByIdOrName(roomId || roomName),
+				Users.findOneByIdOrUsername(userId || username),
+			]);
+			if (!room?._id) {
+				return API.v1.failure('error-room-not-found');
+			}
+			if (!user?._id) {
+				return API.v1.failure('error-user-not-found');
+			}
+
+			if (room.broadcast && !(await hasPermissionAsync(this.userId, 'view-broadcast-member-list', room._id))) {
+				return API.v1.unauthorized();
+			}
+
+			if ((await canAccessRoomAsync(room, this.user)) || (await canAccessRoomIdAsync(room._id, this.userId))) {
+				return API.v1.success({ exists: !!(await Subscriptions.countByRoomIdAndUserId(room._id, user._id)) });
+			}
+			return API.v1.unauthorized();
+		},
+	},
+);

apps/meteor/client/views/hooks/useMemberExists.ts

@@ -0,0 +1,16 @@
+import { useEndpoint } from '@rocket.chat/ui-contexts';
+import { useQuery } from '@tanstack/react-query';
+
+type MembersExistsOptions = {
+	rid: string;
+	username: string;
+	refresh?: boolean;
+};
+
+export const useMemberExists = (options: MembersExistsOptions) => {
+	const checkMember = useEndpoint('GET', '/v1/subscriptions.exists');
+
+	return useQuery(['roomMembershipCheck', options.rid, options.username], () =>
+		checkMember({ roomId: options.rid, username: options.username }),
+	);
+};

apps/meteor/client/views/room/hooks/useUserInfoActions/actions/useAddUserAction.tsx

@@ -0,0 +1,89 @@
+import type { IRoom, IUser } from '@rocket.chat/core-typings';
+import { isRoomFederated } from '@rocket.chat/core-typings';
+import { useEffectEvent } from '@rocket.chat/fuselage-hooks';
+import {
+	useTranslation,
+	useUser,
+	useUserRoom,
+	useUserSubscription,
+	useMethod,
+	useToastMessageDispatch,
+	useAtLeastOnePermission,
+} from '@rocket.chat/ui-contexts';
+import { useMemo } from 'react';
+
+import * as Federation from '../../../../../lib/federation/Federation';
+import { useAddMatrixUsers } from '../../../contextualBar/RoomMembers/AddUsers/AddMatrixUsers/useAddMatrixUsers';
+import { getRoomDirectives } from '../../../lib/getRoomDirectives';
+import type { UserInfoAction } from '../useUserInfoActions';
+
+export const useAddUserAction = (
+	user: Pick<IUser, '_id' | 'username'>,
+	rid: IRoom['_id'],
+	reload?: () => void,
+): UserInfoAction | undefined => {
+	const t = useTranslation();
+	const room = useUserRoom(rid);
+	const currentUser = useUser();
+	const subscription = useUserSubscription(rid);
+	const dispatchToastMessage = useToastMessageDispatch();
+
+	const { username, _id: uid } = user;
+
+	if (!room) {
+		throw Error('Room not provided');
+	}
+
+	const hasPermissionToAddUsers = useAtLeastOnePermission(
+		useMemo(() => [room?.t === 'p' ? 'add-user-to-any-p-room' : 'add-user-to-any-c-room', 'add-user-to-joined-room'], [room?.t]),
+		rid,
+	);
+
+	const userCanAdd =
+		room && user && isRoomFederated(room)
+			? Federation.isEditableByTheUser(currentUser || undefined, room, subscription)
+			: hasPermissionToAddUsers;
+
+	const { roomCanInvite } = getRoomDirectives({ room, showingUserId: uid, userSubscription: subscription });
+
+	const addUsersToRooms = useMethod('addUsersToRoom');
+
+	const handleAddUser = useEffectEvent(async ({ users }) => {
+		await addUsersToRooms({ rid, users });
+		reload?.();
+	});
+
+	const addClickHandler = useAddMatrixUsers();
+
+	const addUserOptionAction = useEffectEvent(async () => {
+		try {
+			const users = [username as string];
+			if (isRoomFederated(room)) {
+				addClickHandler.mutate({
+					users,
+					handleSave: handleAddUser,
+				});
+			} else {
+				await handleAddUser({ users });
+			}
+			dispatchToastMessage({ type: 'success', message: t('User_added') });
+		} catch (error) {
+			dispatchToastMessage({ type: 'error', message: error as Error });
+		}
+	});
+
+	const addUserOption = useMemo(
+		() =>
+			roomCanInvite && userCanAdd
+				? {
+						content: t('Add_User'),
+						icon: 'user-plus' as const,
+						onClick: addUserOptionAction,
+						type: 'management' as const,
+				  }
+				: undefined,
+		[roomCanInvite, userCanAdd, t, addUserOptionAction],
+	);
+
+	return addUserOption;
+};

apps/meteor/client/views/room/hooks/useUserInfoActions/useUserInfoActions.ts

@@ -2,10 +2,12 @@ import type { IRoom, IUser } from '@rocket.chat/core-typings';
 import type { Icon } from '@rocket.chat/fuselage';
 import { useLayoutHiddenActions } from '@rocket.chat/ui-contexts';
 import type { ComponentProps } from 'react';
-import { useMemo } from 'react';
+import { useCallback, useMemo } from 'react';
 
 import type { GenericMenuItemProps } from '../../../../components/GenericMenu/GenericMenuItem';
 import { useEmbeddedLayout } from '../../../../hooks/useEmbeddedLayout';
+import { useMemberExists } from '../../../hooks/useMemberExists';
+import { useAddUserAction } from './actions/useAddUserAction';
 import { useBlockUserAction } from './actions/useBlockUserAction';
 import { useCallAction } from './actions/useCallAction';
 import { useChangeLeaderAction } from './actions/useChangeLeaderAction';
@@ -40,6 +42,14 @@ export const useUserInfoActions = (
 	reload?: () => void,
 	size = 2,
 ): { actions: [string, UserInfoAction][]; menuActions: any | undefined } => {
+	const { data, refetch } = useMemberExists(useMemo(() => ({ rid, username: user.username || '' }), [rid, user.username]));
+	const memberChangeReload = useCallback(async () => {
+		await reload?.();
+		await refetch();
+	}, [reload, refetch]);
+	const isMember = !!useMemo(() => data?.exists, [data?.exists]);
+
+	const addUser = useAddUserAction(user, rid, memberChangeReload);
 	const blockUser = useBlockUserAction(user, rid);
 	const changeLeader = useChangeLeaderAction(user, rid);
 	const changeModerator = useChangeModeratorAction(user, rid);
@@ -48,7 +58,7 @@ export const useUserInfoActions = (
 	const openDirectMessage = useDirectMessageAction(user, rid);
 	const ignoreUser = useIgnoreUserAction(user, rid);
 	const muteUser = useMuteUserAction(user, rid);
-	const removeUser = useRemoveUserAction(user, rid, reload);
+	const removeUser = useRemoveUserAction(user, rid, memberChangeReload);
 	const call = useCallAction(user);
 	const reportUserOption = useReportUser(user);
 	const isLayoutEmbedded = useEmbeddedLayout();
@@ -58,15 +68,16 @@ export const useUserInfoActions = (
 		() => ({
 			...(openDirectMessage && !isLayoutEmbedded && { openDirectMessage }),
 			...(call && { call }),
-			...(changeOwner && { changeOwner }),
-			...(changeLeader && { changeLeader }),
-			...(changeModerator && { changeModerator }),
-			...(openModerationConsole && { openModerationConsole }),
-			...(ignoreUser && { ignoreUser }),
-			...(muteUser && { muteUser }),
+			...(!isMember && addUser && { addUser }),
+			...(isMember && changeOwner && { changeOwner }),
+			...(isMember && changeLeader && { changeLeader }),
+			...(isMember && changeModerator && { changeModerator }),
+			...(isMember && openModerationConsole && { openModerationConsole }),
+			...(isMember && ignoreUser && { ignoreUser }),
+			...(isMember && muteUser && { muteUser }),
 			...(blockUser && { toggleBlock: blockUser }),
 			...(reportUserOption && { reportUser: reportUserOption }),
-			...(removeUser && { removeUser }),
+			...(isMember && removeUser && { removeUser }),
 		}),
 		[
 			openDirectMessage,
@@ -81,6 +92,8 @@ export const useUserInfoActions = (
 			removeUser,
 			reportUserOption,
 			openModerationConsole,
+			addUser,
+			isMember,
 		],
 	);
 

apps/meteor/client/views/room/lib/getRoomDirectives.ts

@@ -11,6 +11,7 @@ type getRoomDirectiesType = {
 	roomCanBlock: boolean;
 	roomCanMute: boolean;
 	roomCanRemove: boolean;
+	roomCanInvite: boolean;
 };
 
 export const getRoomDirectives = ({
@@ -24,7 +25,7 @@ export const getRoomDirectives = ({
 }): getRoomDirectiesType => {
 	const roomDirectives = room?.t && roomCoordinator.getRoomDirectives(room.t);
 
-	const [roomCanSetOwner, roomCanSetLeader, roomCanSetModerator, roomCanIgnore, roomCanBlock, roomCanMute, roomCanRemove] = [
+	const [roomCanSetOwner, roomCanSetLeader, roomCanSetModerator, roomCanIgnore, roomCanBlock, roomCanMute, roomCanRemove, roomCanInvite] = [
 		...((roomDirectives && [
 			roomDirectives.allowMemberAction(room, RoomMemberActions.SET_AS_OWNER, showingUserId, userSubscription),
 			roomDirectives.allowMemberAction(room, RoomMemberActions.SET_AS_LEADER, showingUserId, userSubscription),
@@ -33,9 +34,10 @@ export const getRoomDirectives = ({
 			roomDirectives.allowMemberAction(room, RoomMemberActions.BLOCK, showingUserId, userSubscription),
 			roomDirectives.allowMemberAction(room, RoomMemberActions.MUTE, showingUserId, userSubscription),
 			roomDirectives.allowMemberAction(room, RoomMemberActions.REMOVE_USER, showingUserId, userSubscription),
+			roomDirectives.allowMemberAction(room, RoomMemberActions.INVITE, showingUserId, userSubscription),
 		]) ??
 			[]),
 	];
 
-	return { roomCanSetOwner, roomCanSetLeader, roomCanSetModerator, roomCanIgnore, roomCanBlock, roomCanMute, roomCanRemove };
+	return { roomCanSetOwner, roomCanSetLeader, roomCanSetModerator, roomCanIgnore, roomCanBlock, roomCanMute, roomCanRemove, roomCanInvite };
 };

packages/rest-typings/src/v1/dm/im.ts

@@ -56,6 +56,7 @@ export type ImEndpoints = {
 			members: Pick<IUser, '_id' | 'status' | 'name' | 'username' | 'utcOffset'>[];
 		}>;
 	};
+
 	'/v1/im.messages': {
 		GET: (params: DmMessagesProps) => PaginatedResult<{
 			messages: IMessage[];

packages/rest-typings/src/v1/subscriptionsEndpoints.ts

@@ -9,6 +9,8 @@ type SubscriptionsRead = { rid: IRoom['_id']; readThreads?: boolean } | { roomId
 
 type SubscriptionsUnread = { roomId: IRoom['_id'] } | { firstUnreadMessage: Pick<IMessage, '_id'> };
 
+type SubscriptionsExistsProps = { roomId: string; username: string };
+
 const ajv = new Ajv({
 	coerceTypes: true,
 });
@@ -109,6 +111,49 @@ const SubscriptionsUnreadSchema = {
 
 export const isSubscriptionsUnreadProps = ajv.compile<SubscriptionsUnread>(SubscriptionsUnreadSchema);
 
+const SubscriptionsExistsPropsSchema = {
+	oneOf: [
+		{
+			type: 'object',
+			properties: {
+				roomId: { type: 'string' },
+				userId: { type: 'string' },
+			},
+			required: ['roomId', 'userId'],
+			additionalProperties: false,
+		},
+		{
+			type: 'object',
+			properties: {
+				roomId: { type: 'string' },
+				username: { type: 'string' },
+			},
+			required: ['roomId', 'username'],
+			additionalProperties: false,
+		},
+		{
+			type: 'object',
+			properties: {
+				roomName: { type: 'string' },
+				userId: { type: 'string' },
+			},
+			required: ['roomName', 'userId'],
+			additionalProperties: false,
+		},
+		{
+			type: 'object',
+			properties: {
+				roomName: { type: 'string' },
+				username: { type: 'string' },
+			},
+			required: ['roomName', 'username'],
+			additionalProperties: false,
+		},
+	],
+};
+
+export const isSubscriptionsExistsProps = ajv.compile<SubscriptionsExistsProps>(SubscriptionsExistsPropsSchema);
+
 export type SubscriptionsEndpoints = {
 	'/v1/subscriptions.get': {
 		GET: (params: SubscriptionsGet) => {
@@ -130,4 +175,7 @@ export type SubscriptionsEndpoints = {
 	'/v1/subscriptions.unread': {
 		POST: (params: SubscriptionsUnread) => void;
 	};
+	'/v1/subscriptions.exists': {
+		GET: (params: SubscriptionsExistsProps) => { exists: boolean };
+	};
 };