Merge pull request #25510 from RocketChat/release-4.7.1

Release 4.7.1

.github/history.json

@@ -74398,6 +74398,49 @@
         "5.0"
       ],
       "pull_requests": []
+    },
+    "4.7.1": {
+      "node_version": "14.18.3",
+      "npm_version": "6.14.15",
+      "mongo_versions": [
+        "3.6",
+        "4.0",
+        "4.2",
+        "4.4",
+        "5.0"
+      ],
+      "pull_requests": [
+        {
+          "pr": "25471",
+          "title": "[FIX] Spotlight results showing usernames instead of real names",
+          "userLogin": "pierre-lehnen-rc",
+          "milestone": "4.7.1",
+          "contributors": [
+            "pierre-lehnen-rc"
+          ]
+        },
+        {
+          "pr": "25434",
+          "title": "[FIX] LDAP sync removing users from channels when multiple groups are mapped to it",
+          "userLogin": "pierre-lehnen-rc",
+          "milestone": "4.7.1",
+          "contributors": [
+            "pierre-lehnen-rc"
+          ]
+        },
+        {
+          "pr": "25441",
+          "title": "[NEW] Use setting to determine if initial general channel is needed",
+          "userLogin": "felipe-menelau",
+          "description": "- Adds flag responsible for overwriting #general channel creation",
+          "milestone": "4.7.1",
+          "contributors": [
+            "felipe-menelau",
+            "sampaiodiego",
+            "web-flow"
+          ]
+        }
+      ]
     }
   }
 }

apps/meteor/.docker/Dockerfile.rhel

@@ -1,6 +1,6 @@
 FROM registry.access.redhat.com/ubi8/nodejs-12
 
-ENV RC_VERSION 4.7.0
+ENV RC_VERSION 4.7.1
 
 MAINTAINER [email protected]
 

apps/meteor/.snapcraft/resources/prepareRocketChat

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-curl -SLf "https://releases.rocket.chat/4.7.0/download/" -o rocket.chat.tgz
+curl -SLf "https://releases.rocket.chat/4.7.1/download/" -o rocket.chat.tgz
 
 tar xf rocket.chat.tgz --strip 1
 

apps/meteor/.snapcraft/snap/snapcraft.yaml

@@ -7,7 +7,7 @@
 # 5.  `snapcraft snap`
 
 name: rocketchat-server
-version: 4.7.0
+version: 4.7.1
 summary: Rocket.Chat server
 description: Have your own Slack like online chat, built with Meteor. https://rocket.chat/
 confinement: strict

apps/meteor/app/lib/server/startup/settings.ts

@@ -9,6 +9,11 @@ settingsRegistry.add('uniqueID', process.env.DEPLOYMENT_ID || Random.id(), {
 	public: true,
 });
 
+settingsRegistry.add('Initial_Channel_Created', false, {
+	type: 'boolean',
+	hidden: true,
+});
+
 // When you define a setting and want to add a description, you don't need to automatically define the i18nDescription
 // if you add a node to the i18n.json with the same setting name but with `_Description` it will automatically work.
 

apps/meteor/app/utils/rocketchat.info

@@ -1,3 +1,3 @@
 {
-	"version": "4.7.0"
+	"version": "4.7.1"
 }

apps/meteor/client/sidebar/search/SearchList.js

@@ -147,7 +147,7 @@ const SearchList = forwardRef(function SearchList({ onClose }, ref) {
 	const itemIndexRef = useRef(0);
 
 	const sidebarViewMode = useUserPreference('sidebarViewMode');
-	const showRealName = useSetting('UI_Use_Real_Name');
+	const useRealName = useSetting('UI_Use_Real_Name');
 
 	const sideBarItemTemplate = useTemplateByViewMode();
 	const avatarTemplate = useAvatarTemplate();
@@ -166,11 +166,11 @@ const SearchList = forwardRef(function SearchList({ onClose }, ref) {
 			t,
 			SideBarItemTemplate: sideBarItemTemplate,
 			avatarTemplate,
-			showRealName,
+			useRealName,
 			extended,
 			sidebarViewMode,
 		}),
-		[avatarTemplate, extended, items, showRealName, sideBarItemTemplate, sidebarViewMode, t],
+		[avatarTemplate, extended, items, useRealName, sideBarItemTemplate, sidebarViewMode, t],
 	);
 
 	const changeSelection = useMutableCallback((dir) => {

apps/meteor/ee/server/lib/ldap/Manager.ts

@@ -279,6 +279,8 @@ export class LDAPEEManager extends LDAPManager {
 
 		logger.debug('syncing user channels');
 		const ldapFields = Object.keys(fieldMap);
+		const channelsToAdd = new Set<string>();
+		const channelsToRemove = new Set<string>();
 
 		for await (const ldapField of ldapFields) {
 			if (!fieldMap[ldapField]) {
@@ -299,21 +301,34 @@ export class LDAPEEManager extends LDAPManager {
 						if (room.teamMain) {
 							logger.error(`Can't add user to channel ${channel} because it is a team.`);
 						} else {
-							addUserToRoom(room._id, user);
-							logger.debug(`Synced user channel ${room._id} from LDAP for ${username}`);
+							channelsToAdd.add(room._id);
 						}
 					} else if (syncUserChannelsRemove && !room.teamMain) {
-						const subscription = await SubscriptionsRaw.findOneByRoomIdAndUserId(room._id, user._id);
-						if (subscription) {
-							await removeUserFromRoom(room._id, user);
-						}
+						channelsToRemove.add(room._id);
 					}
 				} catch (e) {
 					logger.debug(`Failed to sync user room, user = ${username}, channel = ${channel}`);
 					logger.error(e);
 				}
 			}
 		}
+
+		for (const rid of channelsToAdd) {
+			addUserToRoom(rid, user);
+			logger.debug(`Synced user channel ${rid} from LDAP for ${username}`);
+		}
+
+		for await (const rid of channelsToRemove) {
+			if (channelsToAdd.has(rid)) {
+				return;
+			}
+
+			const subscription = await SubscriptionsRaw.findOneByRoomIdAndUserId(rid, user._id);
+			if (subscription) {
+				await removeUserFromRoom(rid, user);
+				logger.debug(`Removed user ${username} from channel ${rid}`);
+			}
+		}
 	}
 
 	private static async syncUserTeams(ldap: LDAPConnection, user: IUser, dn: string, isNewRecord: boolean): Promise<void> {

apps/meteor/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@rocket.chat/meteor",
 	"description": "The Ultimate Open Source WebChat Platform",
-	"version": "4.7.0",
+	"version": "4.7.1",
 	"private": true,
 	"author": {
 		"name": "Rocket.Chat",

apps/meteor/server/startup/initialData.js

@@ -12,10 +12,15 @@ import { Settings } from '../../app/models/server/raw';
 import { validateEmail } from '../../lib/emailValidator';
 
 Meteor.startup(async function () {
-	if (settings.get('Show_Setup_Wizard') === 'pending' && !Rooms.findOneById('GENERAL')) {
-		Rooms.createWithIdTypeAndName('GENERAL', 'c', 'general', {
-			default: true,
-		});
+	if (!settings.get('Initial_Channel_Created')) {
+		const exists = Rooms.findOneById('GENERAL', { fields: { _id: 1 } });
+		if (!exists) {
+			Rooms.createWithIdTypeAndName('GENERAL', 'c', 'general', {
+				default: true,
+			});
+		}
+
+		Settings.updateValueById('Initial_Channel_Created', true);
 	}
 
 	if (!Users.findOneById('rocket.cat')) {

apps/meteor/server/startup/migrations/index.ts

@@ -85,4 +85,5 @@ import './v258';
 import './v259';
 import './v260';
 import './v261';
+import './v262';
 import './xrun';

apps/meteor/server/startup/migrations/v262.ts

@@ -0,0 +1,16 @@
+import { addMigration } from '../../lib/migrations';
+import { Settings } from '../../../app/models/server/raw';
+
+addMigration({
+	version: 262,
+	async up() {
+		// in case server is being updated, we check setup wizard status to determine if should still create the initial channel
+		const setupWizard = await Settings.getValueById('Show_Setup_Wizard');
+		if (setupWizard === 'pending') {
+			// if still pending for some reason, we need to create the initial channel, so keep the setting as false
+			return;
+		}
+		// if the setup wizard is not pending anymore, we assume initial channel was already created once
+		await Settings.updateValueById('Initial_Channel_Created', true);
+	},
+});

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "rocket.chat",
-	"version": "4.7.0",
+	"version": "4.7.1",
 	"description": "Rocket.Chat Monorepo",
 	"main": "index.js",
 	"private": true,