Merge branch 'develop' into fix/mentions-duplicate-error-message

.changeset/breezy-starfishes-attack.md

@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+Fixes error `audio.pause() is not a function` and makes the continuous new room notification (livechat) respect the volume set in user preferences.

.changeset/chilly-walls-knock.md

@@ -0,0 +1,13 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Fixed an issue while creating tokens via the special `users.createToken` API was not respecting the maximum login tokens allowed for a user.
+
+The following endpoint was deprecated and will be removed on version `8.0.0`:
+
+- `/api/v1/users.createToken`
+
+The following Meteor method (realtime API) was deprecated and will be removed on version `8.0.0`:
+
+- `createToken`

.changeset/eighty-pans-joke.md

@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Force logout the clients which are actively online, whenever a user resets E2EE keys.

.changeset/eleven-news-stare.md

@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+Fixed issue with login via SAML not redirecting to invite link

.changeset/fifty-cups-sort.md

@@ -0,0 +1,6 @@
+---
+"@rocket.chat/meteor": minor
+"@rocket.chat/rest-typings": minor
+---
+
+Created a new endpoint to get a filtered and paginated list of users.

.changeset/fifty-planets-rhyme.md

@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Deprecate muteUserInRoom and unmuteUserInRoom meteor methods

.changeset/flat-socks-act.md

@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+Fixed wrong `Business hours` validations between different weeks

.changeset/four-eyes-sniff.md

@@ -0,0 +1,7 @@
+---
+"@rocket.chat/meteor": minor
+"@rocket.chat/core-typings": minor
+"@rocket.chat/i18n": minor
+---
+
+Allow Custom Fields in Messages. API-only feature. It can be enabled and configured in Workspace Settings.

.changeset/great-moles-rest.md

@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': minor
+---
+
+Encrypt file descriptions in E2EE rooms

.changeset/heavy-singers-retire.md

@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Fixes an issue where the last threads list item wasn't displaying properly

.changeset/lovely-trainers-kiss.md

@@ -0,0 +1,6 @@
+---
+'@rocket.chat/rest-typings': minor
+'@rocket.chat/meteor': minor
+---
+
+Convert mute/unmute meteor methods to endpoints

.changeset/nervous-elephants-jam.md

@@ -0,0 +1,7 @@
+---
+'@rocket.chat/model-typings': minor
+'@rocket.chat/i18n': minor
+'@rocket.chat/meteor': minor
+---
+
+Added a new setting to automatically disable users from LDAP that can no longer be found by the background sync

.changeset/old-geckos-march.md

@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': minor
+---
+
+Added the ability to serve .well-known paths directly from Rocket.Chat, if using federation, removing the need for special reverse proxy configuration or another component layer for specific types of reverse proxies / loadbalancers.

.changeset/pink-parrots-end.md

@@ -0,0 +1,6 @@
+---
+"@rocket.chat/meteor": minor
+"@rocket.chat/rest-typings": minor
+---
+
+Created a new endpoint to resend the welcome email to a given user

.changeset/popular-fishes-lay.md

@@ -0,0 +1,8 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+**Fixed settings-related statistics not being updated according to the license.**
+
+We've identified an issue where certain statistics were not reflecting recent license changes. This resulted in outdated information being reported for workspaces.
+This change ensures that all reported statistics are current and consider the workspace license.

.changeset/proud-experts-taste.md

@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+Fixed a language priority issue. It should now respect the following order: User Preference -> Browser Language -> Server Language

.changeset/silent-dodos-doubt.md

@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": minor
+---
+
+Added a new notification provider in light of the old FCM API deprecation, now you can choose to use the new provider or the old via the `Push_UseLegacy` setting

.changeset/strange-comics-camp.md

@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+Fixed an issue where an endpoint was called before checking configuration that enables automatic translation when launching the application

.changeset/strange-countries-visit.md

@@ -0,0 +1,6 @@
+---
+"@rocket.chat/meteor": patch
+"@rocket.chat/core-services": patch
+---
+
+Fixed a problem that caused OTR Session messages' to not being transmitted from one peer to another when running Rocket.Chat as microservices. This was caused by a legacy streamer that tried to use the websocket directly, which works on monolith but doesn't on microservices, cause these events are routed through DDP Streamer service.

.changeset/tame-ducks-turn.md

@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+Fixed a problem that caused `afterCreateUser` callback to be called without new user's roles inside. This caused Omnichannel Business Hour manager to ignore these users from assigning open business hours until the manager restarted or the business hour restarted.

.changeset/thirty-hotels-greet.md

@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': minor
+---
+
+Redesign Save E2EE password modal

.changeset/tough-boats-beg.md

@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": minor
+---
+
+Support Message Custom Fields on upload API via field `customField` and JSON value

.changeset/yellow-lies-judge.md

@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+fixed Engagement Dashboard and Device Management admin pages loading indefinitely

.changeset/young-candles-explode.md

@@ -0,0 +1,6 @@
+---
+'@rocket.chat/ui-contexts': minor
+'@rocket.chat/meteor': minor
+---
+
+Fixed an issue affecting the update modal/contextual bar by apps when it comes to error handling and regular surface update

.github/workflows/ci-test-e2e.yml

@@ -83,7 +83,7 @@ jobs:
         mongodb-version: ${{ fromJSON(inputs.mongodb-version) }}
         shard: ${{ fromJSON(inputs.shard) }}
 
-    name: MongoDB ${{ matrix.mongodb-version }} (${{ matrix.shard }}/${{ inputs.total-shard }})
+    name: MongoDB ${{ matrix.mongodb-version }} (${{ matrix.shard }}/${{ inputs.total-shard }})${{ matrix.mongodb-version == '6.0' && ' - Alpine' || '' }}
 
     steps:
       - name: Login to GitHub Container Registry

apps/meteor/.meteorMocks/index.ts

@@ -0,0 +1,5 @@
+import sinon from 'sinon';
+
+export const Meteor = {
+	loginWithSamlToken: sinon.stub(),
+};

apps/meteor/CHANGELOG.md

@@ -1,5 +1,51 @@
 # @rocket.chat/meteor
 
+## 6.7.1
+
+### Patch Changes
+
+- Bump @rocket.chat/meteor version.
+
+- Bump @rocket.chat/meteor version.
+
+- ([#32253](https://github.com/RocketChat/Rocket.Chat/pull/32253)) Increased the timeout between calls for the three remaining Omnichannel Agenda Jobs. This should make them happen less often and reduce the load on MongoDB
+
+- ([#32252](https://github.com/RocketChat/Rocket.Chat/pull/32252)) Fixes an issue that forces the focus on the last message when interacting by mouse on message list
+
+- ([#32256](https://github.com/RocketChat/Rocket.Chat/pull/32256)) Fixed open expanded view (galery mode) for image attachments sent by livechat widget
+
+- ([#32254](https://github.com/RocketChat/Rocket.Chat/pull/32254)) Fixed an issue where Rocket.Chat would ask admins to confirm fingerprint change (new workspace vs configuration update), even when `AUTO_ACCEPT_FINGERPRINT` environment variable set to `"true"`.
+
+- ([#32265](https://github.com/RocketChat/Rocket.Chat/pull/32265)) Fixed supported versions not being updated in airgapped environments
+
+- ([#32251](https://github.com/RocketChat/Rocket.Chat/pull/32251)) Fixes an issue where message reactions are vertically misaligned when zooming out
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  </details>
+
 ## 6.7.0
 
 ### Minor Changes

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

@@ -1,6 +1,7 @@
 import type { IUser } from '@rocket.chat/core-typings';
 
 import { hasAllPermissionAsync, hasAtLeastOnePermissionAsync } from '../../authorization/server/functions/hasPermission';
+import { apiDeprecationLogger } from '../../lib/server/lib/deprecationWarningLogger';
 
 type RequestMethod = 'GET' | 'POST' | 'PUT' | 'DELETE' | '*';
 export type PermissionsPayload = {
@@ -101,3 +102,8 @@ export function checkPermissions(options: { permissionsRequired?: PermissionsReq
 	// If reached here, options.permissionsRequired contained an invalid payload
 	return false;
 }
+
+export function parseDeprecation(methodThis: any, { alternatives, version }: { version: string; alternatives?: string[] }): void {
+	const infoMessage = alternatives?.length ? ` Please use the alternative(s): ${alternatives.join(',')}` : '';
+	apiDeprecationLogger.endpoint(methodThis.request.route, version, methodThis.response, infoMessage);
+}

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

@@ -17,12 +17,11 @@ import { isObject } from '../../../lib/utils/isObject';
 import { getRestPayload } from '../../../server/lib/logger/logPayloads';
 import { checkCodeForUser } from '../../2fa/server/code';
 import { hasPermissionAsync } from '../../authorization/server/functions/hasPermission';
-import { apiDeprecationLogger } from '../../lib/server/lib/deprecationWarningLogger';
 import { metrics } from '../../metrics/server';
 import { settings } from '../../settings/server';
 import { getDefaultUserFields } from '../../utils/server/functions/getDefaultUserFields';
 import type { PermissionsPayload } from './api.helpers';
-import { checkPermissionsForInvocation, checkPermissions } from './api.helpers';
+import { checkPermissionsForInvocation, checkPermissions, parseDeprecation } from './api.helpers';
 import type {
 	FailureResult,
 	InternalError,
@@ -588,8 +587,8 @@ export class APIClass<TBasePath extends string = ''> extends Restivus {
 						const connection = { ...generateConnection(this.requestIp, this.request.headers), token: this.token };
 
 						try {
-							if (options.deprecationVersion) {
-								apiDeprecationLogger.endpoint(this.request.route, options.deprecationVersion, this.response, options.deprecationInfo || '');
+							if (options.deprecation) {
+								parseDeprecation(this, options.deprecation);
 							}
 
 							await api.enforceRateLimit(objectForRateLimitMatch, this.request, this.response, this.userId);

apps/meteor/app/api/server/definition.ts

@@ -95,8 +95,10 @@ export type Options = (
 ) & {
 	validateParams?: ValidateFunction | { [key in Method]?: ValidateFunction };
 	authOrAnonRequired?: true;
-	deprecationVersion?: string;
-	deprecationInfo?: string;
+	deprecation?: {
+		version: string;
+		alternatives?: string[];
+	};
 };
 
 export type PartialThis = {

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

@@ -2,7 +2,7 @@ import type { IUser } from '@rocket.chat/core-typings';
 import { Users, Subscriptions } from '@rocket.chat/models';
 import { escapeRegExp } from '@rocket.chat/string-helpers';
 import type { Mongo } from 'meteor/mongo';
-import type { Filter } from 'mongodb';
+import type { Filter, RootFilterOperators } from 'mongodb';
 
 import { hasPermissionAsync } from '../../../authorization/server/functions/hasPermission';
 import { settings } from '../../../settings/server';
@@ -119,3 +119,98 @@ export function getNonEmptyQuery<T extends IUser>(query: Mongo.Query<T> | undefi
 
 	return { ...defaultQuery, ...query };
 }
+
+type FindPaginatedUsersByStatusProps = {
+	uid: string;
+	offset: number;
+	count: number;
+	sort: Record<string, 1 | -1>;
+	status: 'active' | 'deactivated';
+	roles: string[] | null;
+	searchTerm: string;
+	hasLoggedIn: boolean;
+	type: string;
+};
+
+export async function findPaginatedUsersByStatus({
+	uid,
+	offset,
+	count,
+	sort,
+	status,
+	roles,
+	searchTerm,
+	hasLoggedIn,
+	type,
+}: FindPaginatedUsersByStatusProps) {
+	const projection = {
+		name: 1,
+		username: 1,
+		emails: 1,
+		roles: 1,
+		status: 1,
+		active: 1,
+		avatarETag: 1,
+		lastLogin: 1,
+		type: 1,
+		reason: 1,
+	};
+
+	const actualSort: Record<string, 1 | -1> = sort || { username: 1 };
+	if (sort?.status) {
+		actualSort.active = sort.status;
+	}
+	if (sort?.name) {
+		actualSort.nameInsensitive = sort.name;
+	}
+	const match: Filter<IUser & RootFilterOperators<IUser>> = {};
+	switch (status) {
+		case 'active':
+			match.active = true;
+			break;
+		case 'deactivated':
+			match.active = false;
+			break;
+	}
+
+	if (hasLoggedIn !== undefined) {
+		match.lastLogin = { $exists: hasLoggedIn };
+	}
+
+	if (type) {
+		match.type = type;
+	}
+
+	const canSeeAllUserInfo = await hasPermissionAsync(uid, 'view-full-other-user-info');
+
+	match.$or = [
+		...(canSeeAllUserInfo ? [{ 'emails.address': { $regex: escapeRegExp(searchTerm || ''), $options: 'i' } }] : []),
+		{
+			username: { $regex: escapeRegExp(searchTerm || ''), $options: 'i' },
+		},
+		{
+			name: { $regex: escapeRegExp(searchTerm || ''), $options: 'i' },
+		},
+	];
+	if (roles?.length && !roles.includes('all')) {
+		match.roles = { $in: roles };
+	}
+	const { cursor, totalCount } = await Users.findPaginated(
+		{
+			...match,
+		},
+		{
+			sort: actualSort,
+			skip: offset,
+			limit: count,
+			projection,
+		},
+	);
+	const [users, total] = await Promise.all([cursor.toArray(), totalCount]);
+	return {
+		users,
+		count: users.length,
+		offset,
+		total,
+	};
+}