regression: FED-116 allow to invite rc users to fed channels (#30658)

RocketChat · Dec 7, 2023 · a271587 · a271587
1 parent d7905a3
commit a271587
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 5 deletions.
diff --git a/.changeset/nasty-islands-trade.md b/.changeset/nasty-islands-trade.md
@@ -0,0 +1,6 @@
+---
+'@rocket.chat/rest-typings': minor
+'@rocket.chat/meteor': minor
+---
+
+fix Federation Regression, builds service correctly
diff --git a/apps/meteor/app/lib/server/functions/createRoom.ts b/apps/meteor/app/lib/server/functions/createRoom.ts
@@ -39,6 +39,7 @@ async function createUsersSubscriptions({
 		const extra: Partial<ISubscriptionExtraData> = options?.subscriptionExtra || {};
 		extra.open = true;
 		extra.ls = now;
+		extra.roles = ['owner'];
 
 		if (room.prid) {
 			extra.prid = room.prid;

diff --git a/...ient/views/room/contextualBar/RoomMembers/AddUsers/AddMatrixUsers/AddMatrixUsersModal.tsx b/...ient/views/room/contextualBar/RoomMembers/AddUsers/AddMatrixUsers/AddMatrixUsersModal.tsx
@@ -34,6 +34,7 @@ const AddMatrixUsersModal = ({ onClose, matrixIdVerifiedStatus, onSave, complete
 	const usersToInvite = completeUserList.filter(
 		(user) => !(matrixIdVerifiedStatus.has(user) && matrixIdVerifiedStatus.get(user) === 'UNVERIFIED'),
 	);
+	const rocketChatUsers = usersToInvite.filter((user) => !matrixIdVerifiedStatus.has(user));
 
 	const { handleSubmit } = useForm<FormValues>({
 		defaultValues: {
@@ -53,7 +54,7 @@ const AddMatrixUsersModal = ({ onClose, matrixIdVerifiedStatus, onSave, complete
 		<Modal>
 			<Modal.Header>
 				<Modal.HeaderText>
-					<Modal.Title>Sending Invitations</Modal.Title>
+					<Modal.Title>{t('Continue_Adding')}</Modal.Title>
 				</Modal.HeaderText>
 				<Modal.Close title={t('Close')} onClick={onClose} />
 			</Modal.Header>
@@ -65,6 +66,9 @@ const AddMatrixUsersModal = ({ onClose, matrixIdVerifiedStatus, onSave, complete
 								{_matrixId}: <Icon name={verificationStatusAsIcon(_verificationStatus) as ComponentProps<typeof Icon>['name']} size='x20' />
 							</li>
 						))}
+						{rocketChatUsers.map((_user) => (
+							<li key={`rocket-chat-${_user}`}>{_user}</li>
+						))}
 					</Box>
 				</Box>
 			</Modal.Content>

diff --git a/...client/views/room/contextualBar/RoomMembers/AddUsers/AddMatrixUsers/useAddMatrixUsers.tsx b/...client/views/room/contextualBar/RoomMembers/AddUsers/AddMatrixUsers/useAddMatrixUsers.tsx
@@ -20,9 +20,11 @@ export const useAddMatrixUsers = () => {
 		try {
 			let matrixIdVerificationMap = new Map();
 			const matrixIds = users.filter((user) => user.startsWith('@'));
-			const matrixIdsVerificationResponse = await dispatchVerifyEndpoint({ matrixIds });
-			const { results: matrixIdsVerificationResults } = matrixIdsVerificationResponse;
-			matrixIdVerificationMap = new Map(Object.entries(matrixIdsVerificationResults));
+			if (matrixIds.length > 0) {
+				const matrixIdsVerificationResponse = await dispatchVerifyEndpoint({ matrixIds });
+				const { results: matrixIdsVerificationResults } = matrixIdsVerificationResponse;
+				matrixIdVerificationMap = new Map(Object.entries(matrixIdsVerificationResults));
+			}
 
 			setModal(
 				<AddMatrixUsersModal

diff --git a/apps/meteor/ee/server/startup/services.ts b/apps/meteor/ee/server/startup/services.ts
@@ -33,7 +33,7 @@ void (async () => {
 })();
 
 await License.onLicense('federation', async () => {
-	const federationServiceEE = new FederationServiceEE();
+	const federationServiceEE = await FederationServiceEE.createFederationService();
 	if (federationService) {
 		api.destroyService(federationService);
 	}

diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -1143,6 +1143,7 @@
   "Contact_Info": "Contact Information",
   "Content": "Content",
   "Continue": "Continue",
+  "Continue_Adding": "Continue Adding?",
   "Continuous_sound_notifications_for_new_livechat_room": "Continuous sound notifications for new omnichannel room",
   "convert-team": "Convert Team",
   "convert-team_description": "Permission to convert team to channel",

diff --git a/packages/rest-typings/src/v1/federation/FederationVerifyMatrixIdProps.ts b/packages/rest-typings/src/v1/federation/FederationVerifyMatrixIdProps.ts
@@ -13,6 +13,8 @@ const FederationVerifyMatrixIdPropsSchema = {
 			type: 'array',
 			items: { type: 'string' },
 			uniqueItems: true,
+			minItems: 1,
+			maxItems: 15,
 		},
 	},
 	additionalProperties: false,