Merge branch 'develop' into feat/openapi-chat-postMessage

Author: ahmed-n-abdeltwab

.changeset/fix-blockquote-empty-lines.md

@@ -0,0 +1,5 @@
+---
+'@rocket.chat/message-parser': patch
+---
+
+Fixed blockquotes with empty lines between paragraphs not rendering as a single blockquote. Lines like `> ` or `>` (empty quote lines) are now treated as part of the surrounding blockquote rather than breaking it into separate quotes.

.changeset/fix-register-workspace-i18n.md

@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Fixes wrong i18n key in RegisterWorkspace confirmation step so the text is translated instead of showing a missing key.

.changeset/fix-trailing-punctuation-url.md

@@ -0,0 +1,5 @@
+---
+"@rocket.chat/message-parser": patch
+---
+
+Fixes trailing punctuation (e.g. periods, exclamation marks) being incorrectly included in parsed URLs when they appear at the end of a message. For example, `go to https://www.google.com.` now correctly parses the URL as `https://www.google.com` without the trailing period.

.changeset/olive-hairs-report.md

@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Fixes version update banner showing outdated versions after server upgrade.

.changeset/refactor-ldap-api-chained-pattern.md

@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': minor
+---
+
+Migrates `ldap.testConnection` and `ldap.testSearch` REST API endpoints from legacy `addRoute` pattern to the new chained `.post()` API pattern with typed response schemas and AJV body validation (replacing Meteor `check()`).

.changeset/refactor-presence-api-chained-pattern.md

@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': minor
+---
+
+Migrates `presence.getConnections` and `presence.enableBroadcast` REST API endpoints from legacy `addRoute` pattern to the new chained `.get()`/`.post()` API pattern with typed response schemas.

.github/actions/build-docker/action.yml

@@ -108,6 +108,7 @@ runs:
           --allow=fs.read=/tmp/build \
           --set "*.tags+=${IMAGE}-gha-run-${{ github.run_id }}" \
           --set "*.labels.org.opencontainers.image.description=Build run: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}" \
+          --set "*.labels.org.opencontainers.image.source=${{ github.server_url }}/${{ github.repository }}" \
           --set *.platform=linux/${{ inputs.arch }} \
           --set *.cache-from=type=gha \
           --set *.cache-to=type=gha,mode=max \

apps/meteor/app/api/server/helpers/getUserInfo.spec.ts

@@ -1,6 +1,16 @@
 import { getUserInfo } from './getUserInfo';
 import type { CachedSettings } from '../../../settings/server/CachedSettings';
 
+const mockInfoVersion = jest.fn(() => '7.5.0');
+
+jest.mock('../../../utils/rocketchat.info', () => ({
+	Info: {
+		get version() {
+			return mockInfoVersion();
+		},
+	},
+}));
+
 jest.mock('@rocket.chat/models', () => ({
 	Users: {
 		findOneById: jest.fn().mockResolvedValue({
@@ -198,4 +208,50 @@ describe('getUserInfo', () => {
 			});
 		});
 	});
+
+	describe('version update banner filtering', () => {
+		beforeEach(() => {
+			mockInfoVersion.mockReturnValue('7.5.0');
+		});
+
+		it('should filter out versionUpdate banners for versions <= current installed', async () => {
+			user.banners = {
+				'versionUpdate-6_2_0': {
+					id: 'versionUpdate-6_2_0',
+					priority: 10,
+					title: 'Update',
+					text: 'New version',
+					modifiers: [],
+					link: '',
+					read: false,
+				},
+			};
+			const userInfo = await getUserInfo(user);
+			expect(userInfo.banners).toEqual({});
+		});
+
+		it('should keep versionUpdate banners for versions > current installed', async () => {
+			user.banners = {
+				'versionUpdate-8_0_0': {
+					id: 'versionUpdate-8_0_0',
+					priority: 10,
+					title: 'Update',
+					text: 'New version',
+					modifiers: [],
+					link: '',
+					read: false,
+				},
+			};
+			const userInfo = await getUserInfo(user);
+			expect(userInfo.banners).toHaveProperty('versionUpdate-8_0_0');
+		});
+
+		it('should keep non-versionUpdate banners unchanged', async () => {
+			user.banners = {
+				'other-banner': { id: 'other-banner', priority: 10, title: 'Other', text: 'Other banner', modifiers: [], link: '', read: false },
+			};
+			const userInfo = await getUserInfo(user);
+			expect(userInfo.banners).toHaveProperty('other-banner');
+		});
+	});
 });

apps/meteor/app/api/server/helpers/getUserInfo.ts

@@ -1,6 +1,8 @@
 import { isOAuthUser, type IUser, type IUserEmail, type IUserCalendar } from '@rocket.chat/core-typings';
+import semver from 'semver';
 
 import { settings } from '../../../settings/server';
+import { Info } from '../../../utils/rocketchat.info';
 import { getURL } from '../../../utils/server/getURL';
 import { getUserPreference } from '../../../utils/server/lib/getUserPreference';
 
@@ -25,6 +27,23 @@ const getUserPreferences = async (me: IUser): Promise<Record<string, unknown>> =
 	return accumulator;
 };
 
+const filterOutdatedVersionUpdateBanners = (banners: NonNullable<IUser['banners']>): IUser['banners'] => {
+	return Object.fromEntries(
+		Object.entries(banners).filter(([id]) => {
+			if (!id.startsWith('versionUpdate-')) {
+				return true;
+			}
+
+			const version = id.replace('versionUpdate-', '').replace(/_/g, '.');
+			if (!semver.valid(version) || semver.lte(version, Info.version)) {
+				return false;
+			}
+
+			return true;
+		}),
+	);
+};
+
 /**
  * Returns the user's calendar settings based on their email domain and the configured mapping.
  * If the email is not provided or the domain is not found in the mapping,
@@ -80,6 +99,7 @@ export async function getUserInfo(
 
 	return {
 		...me,
+		...(me.banners && { banners: filterOutdatedVersionUpdateBanners(me.banners) }),
 		email: verifiedEmail ? verifiedEmail.address : undefined,
 		settings: {
 			profile: {},

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

@@ -1,62 +1,86 @@
 import { LDAP } from '@rocket.chat/core-services';
-import { Match, check } from 'meteor/check';
+import { ajv, isLdapTestSearch, validateUnauthorizedErrorResponse, validateForbiddenErrorResponse } from '@rocket.chat/rest-typings';
 
 import { SystemLogger } from '../../../../server/lib/logger/system';
 import { settings } from '../../../settings/server';
 import { API } from '../api';
 
-API.v1.addRoute(
+const messageResponseSchema = {
+	type: 'object' as const,
+	properties: {
+		message: { type: 'string' as const },
+		success: {
+			type: 'boolean' as const,
+			enum: [true] as const,
+		},
+	},
+	required: ['message', 'success'] as const,
+	additionalProperties: false,
+};
+
+API.v1.post(
 	'ldap.testConnection',
-	{ authRequired: true, permissionsRequired: ['test-admin-options'] },
 	{
-		async post() {
-			if (!this.userId) {
-				throw new Error('error-invalid-user');
-			}
-
-			if (settings.get<boolean>('LDAP_Enable') !== true) {
-				throw new Error('LDAP_disabled');
-			}
-
-			try {
-				await LDAP.testConnection();
-			} catch (err) {
-				SystemLogger.error({ err });
-				throw new Error('Connection_failed');
-			}
-
-			return API.v1.success({
-				message: 'LDAP_Connection_successful' as const,
-			});
+		authRequired: true,
+		permissionsRequired: ['test-admin-options'],
+		response: {
+			200: ajv.compile<{ message: string; success: true }>(messageResponseSchema),
+			401: validateUnauthorizedErrorResponse,
+			403: validateForbiddenErrorResponse,
 		},
 	},
+	async function action() {
+		if (!this.userId) {
+			throw new Error('error-invalid-user');
+		}
+
+		if (settings.get<boolean>('LDAP_Enable') !== true) {
+			throw new Error('LDAP_disabled');
+		}
+
+		try {
+			await LDAP.testConnection();
+		} catch (err) {
+			SystemLogger.error({ err });
+			throw new Error('Connection_failed');
+		}
+
+		return API.v1.success({
+			message: 'LDAP_Connection_successful' as const,
+		});
+	},
 );
 
-API.v1.addRoute(
+API.v1.post(
 	'ldap.testSearch',
-	{ authRequired: true, permissionsRequired: ['test-admin-options'] },
 	{
-		async post() {
-			check(
-				this.bodyParams,
-				Match.ObjectIncluding({
-					username: String,
-				}),
-			);
-
-			if (!this.userId) {
-				throw new Error('error-invalid-user');
-			}
-
-			if (settings.get('LDAP_Enable') !== true) {
-				throw new Error('LDAP_disabled');
-			}
+		authRequired: true,
+		permissionsRequired: ['test-admin-options'],
+		body: isLdapTestSearch,
+		response: {
+			200: ajv.compile<{ message: string; success: true }>(messageResponseSchema),
+			401: validateUnauthorizedErrorResponse,
+			403: validateForbiddenErrorResponse,
+		},
+	},
+	async function action() {
+		if (!this.userId) {
+			throw new Error('error-invalid-user');
+		}
 
+		if (settings.get<boolean>('LDAP_Enable') !== true) {
+			throw new Error('LDAP_disabled');
+		}
+
+		try {
 			await LDAP.testSearch(this.bodyParams.username);
+		} catch (err) {
+			SystemLogger.error({ err });
+			throw new Error('LDAP_search_failed');
+		}
 
-			return API.v1.success({
-				message: 'LDAP_User_Found' as const,
-			});
-		},
+		return API.v1.success({
+			message: 'LDAP_User_Found' as const,
+		});
 	},
 );