Regression: Federated users not showing as federated in Room Members

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

@@ -305,7 +305,7 @@ API.v1.addRoute(
 
 			const options = {
 				sort: { username: sort?.username ? sort.username : 1 },
-				projection: { _id: 1, username: 1, name: 1, status: 1, statusText: 1, utcOffset: 1 },
+				projection: { _id: 1, username: 1, name: 1, status: 1, statusText: 1, utcOffset: 1, federated: 1 },
 				skip: offset,
 				limit: count,
 			};

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

@@ -366,6 +366,7 @@ API.v1.addRoute(
 								t: 1,
 								roles: 1,
 								unread: 1,
+								federated: 1,
 							},
 							sort: {
 								t: 1,

apps/meteor/app/federation-v2/server/application/RoomServiceReceiver.ts

@@ -90,7 +90,7 @@ export class FederationRoomServiceReceiver {
 
 		if (!(await this.rocketUserAdapter.getFederatedUserByExternalId(externalInviterId))) {
 			const externalUserProfileInformation = await this.bridge.getUserProfileInformation(externalInviterId);
-			const name = externalUserProfileInformation.displayname || normalizedInviterId;
+			const name = externalUserProfileInformation?.displayname || normalizedInviterId;
 			const username = isInviterFromTheSameHomeServer ? inviterUsernameOnly : normalizedInviterId;
 			const federatedInviterUser = FederatedUser.createInstance(externalInviterId, {
 				name,
@@ -103,7 +103,7 @@ export class FederationRoomServiceReceiver {
 
 		if (!(await this.rocketUserAdapter.getFederatedUserByExternalId(externalInviteeId))) {
 			const externalUserProfileInformation = await this.bridge.getUserProfileInformation(externalInviteeId);
-			const name = externalUserProfileInformation.displayname || normalizedInviteeId;
+			const name = externalUserProfileInformation?.displayname || normalizedInviteeId;
 			const username = isInviteeFromTheSameHomeServer ? inviteeUsernameOnly : normalizedInviteeId;
 			const federatedInviteeUser = FederatedUser.createInstance(externalInviteeId, {
 				name,

apps/meteor/app/federation-v2/server/infrastructure/rocket-chat/adapters/User.ts

@@ -52,7 +52,6 @@ export class RocketChatUserAdapter {
 	public async createFederatedUser(federatedUser: FederatedUser): Promise<void> {
 		const existingLocalUser = await Users.findOneByUsername(federatedUser.internalReference.username || '');
 		if (existingLocalUser) {
-			await Users.setAsFederated(existingLocalUser._id);
 			return MatrixBridgedUser.upsert(
 				{ uid: existingLocalUser._id },
 				{

apps/meteor/client/views/room/contextualBar/RoomMembers/List/DefaultRow.tsx

@@ -0,0 +1,37 @@
+import { IUser, IRoom } from '@rocket.chat/core-typings';
+import React, { memo, MouseEvent, ReactElement } from 'react';
+
+import { MemberItem } from './components/MemberItem';
+
+type DefaultRowProps = {
+	user: Pick<IUser, 'federated' | 'username' | 'name' | '_id'>;
+	data: {
+		onClickView: (e: MouseEvent<HTMLDivElement>) => void;
+		rid: IRoom['_id'];
+	};
+	index: number;
+	reload: () => void;
+};
+
+const DefaultRow = ({ user, data, index, reload }: DefaultRowProps): ReactElement => {
+	const { onClickView, rid } = data;
+
+	if (!user || !user._id) {
+		return <MemberItem.Skeleton />;
+	}
+
+	return (
+		<MemberItem
+			key={index}
+			username={user.username}
+			_id={user._id}
+			rid={rid}
+			name={user.name}
+			federated={user.federated}
+			onClickView={onClickView}
+			reload={reload}
+		/>
+	);
+};
+
+export default memo(DefaultRow);

apps/meteor/client/views/room/contextualBar/RoomMembers/List/components/MemberItem.tsx

@@ -12,7 +12,7 @@ type MemberItemProps = {
 	onClickView: (e: MouseEvent<HTMLDivElement>) => void;
 	rid: IRoom['_id'];
 	reload: () => void;
-} & IUser;
+} & Pick<IUser, 'federated' | 'username' | 'name' | '_id'>;
 
 export const MemberItem = ({ _id, name, username, federated, onClickView, rid, reload }: MemberItemProps): ReactElement => {
 	const [showButton, setShowButton] = useState();

apps/meteor/server/lib/findUsersOfRoom.ts

@@ -30,6 +30,7 @@ export function findUsersOfRoom({
 			status: 1,
 			avatarETag: 1,
 			_updatedAt: 1,
+			federated: 1,
 		},
 		sort: {
 			statusConnection: -1,