Merge branch 'develop' into feat/create-contact-endpoint

.changeset/bright-humans-cross.md

@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': minor
+---
+
+Federation actions like sending message in a federated DM, reacting in a federated chat, etc, will no longer work if the configuration is invalid.

.changeset/cool-rocks-remember.md

@@ -0,0 +1,6 @@
+---
+"@rocket.chat/meteor": patch
+"@rocket.chat/model-typings": patch
+---
+
+Fixed login with third-party apps not working without the "Manage OAuth Apps" permission

.changeset/gentle-bugs-think.md

@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+Prevent `processRoomAbandonment` callback from erroring out when a room was inactive during a day Business Hours was not configured for.

.changeset/kind-drinks-joke.md

@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Fixed issue with asterisk-wrapped text not becoming bold when user enters profile custom status.

.changeset/nasty-windows-smile.md

@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+Allow apps to react/unreact to messages via bridge

.changeset/new-mayflies-wait.md

@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Deactivating users who federated will now be permanent.

.changeset/purple-dolls-serve.md

@@ -0,0 +1,7 @@
+---
+'@rocket.chat/web-ui-registration': patch
+'@rocket.chat/i18n': patch
+'@rocket.chat/meteor': patch
+---
+
+Fixes an issue where creating a new user with an invalid username (containing special characters) resulted in an error message, but the user was still created. The user creation process now properly aborts when an invalid username is provided.

.changeset/rich-pillows-hang.md

@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Fixes the `expanded` prop being accidentally forwarded to `ContextualbarHeader`

.changeset/rooms-table-ts.md

@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': minor
+---
+
+Add "Created at" column to admin rooms table

.changeset/rotten-camels-pretend.md

@@ -0,0 +1,6 @@
+---
+"@rocket.chat/meteor": patch
+"@rocket.chat/core-typings": patch
+---
+
+Fixed issue with system messages being counted as agents' first responses in livechat rooms (which caused the "best first response time" and "average first response time" metrics to be unreliable for all agents)

.changeset/six-beers-fry.md

@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': minor
+---
+
+New button added to validate Matrix Federation configuration. A new field inside admin settings will reflect the configuration status being either 'Valid' or 'Invalid'.

.changeset/smart-mice-attack.md

@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+Fixed an issue where teams were being created with no room associated with it.

.changeset/spicy-kings-think.md

@@ -0,0 +1,6 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+Fixes multiple problems with the `processRoomAbandonment` hook. This hook is in charge of calculating the time a room has been abandoned (this means, the time that elapsed since a room was last answered by an agent until it was closed). However, when business hours were enabled and the user didn't open on one day, if an abandoned room happened to be abandoned _over_ the day there was no business hour configuration, then the process will error out.
+Additionally, the values the code was calculating were not right. When business hours are enabled, this code should only count the abandonment time _while a business hour was open_. When rooms were left abandoned for days or weeks, this will also throw an error or output an invalid count.

.changeset/ten-bulldogs-clap.md

@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+fixed an issue with the "follow message" button not changing state after click

.changeset/twelve-windows-train.md

@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Fixed: Custom fields in extraData now correctly added to extraRoomInfo by livechat.beforeRoom callback during livechat room creation.

.changeset/two-bikes-crash.md

@@ -0,0 +1,7 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Fixed an issue related to setting Accounts_ForgetUserSessionOnWindowClose, this setting was not working as expected.
+
+The new meteor 2.16 release introduced a new option to configure the Accounts package and choose between the local storage or session storage. They also changed how Meteor.\_localstorage works internally. Due to these changes in Meteor, our setting to use session storage wasn't working as expected. This PR fixes this issue and configures the Accounts package according to the workspace settings.

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

@@ -29,6 +29,9 @@ inputs:
     required: false
     description: 'Setup node.js'
     default: 'true'
+  NPM_TOKEN:
+    required: false
+    description: 'NPM token'
 
 runs:
   using: composite
@@ -65,6 +68,7 @@ runs:
         node-version: ${{ inputs.node-version }}
         cache-modules: true
         install: true
+        NPM_TOKEN: ${{ inputs.NPM_TOKEN }}
 
     - run: yarn build
       if: inputs.setup == 'true'

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

@@ -13,6 +13,9 @@ inputs:
     required: true
     description: 'Node version'
     type: string
+  NPM_TOKEN:
+    required: false
+    description: 'NPM token'
 
 runs:
   using: composite
@@ -29,6 +32,7 @@ runs:
         node-version: ${{ inputs.node-version }}
         cache-modules: true
         install: true
+        NPM_TOKEN: ${{ inputs.NPM_TOKEN }}
 
     # - name: Free disk space
     #   run: |

.github/actions/setup-node/action.yml

@@ -1,22 +1,27 @@
 name: 'Setup Node'
+description: 'Setup NodeJS'
 
 inputs:
   node-version:
     required: true
-    type: string
+    description: 'Node version'
   cache-modules:
     required: false
-    type: boolean
+    description: 'Cache node_modules'
   install:
     required: false
-    type: boolean
+    description: 'Install dependencies'
   deno-dir:
     required: false
-    type: string
+    description: 'Deno directory'
     default: ~/.deno-cache
+  NPM_TOKEN:
+    required: false
+    description: 'NPM token'
 
 outputs:
   node-version:
+    description: 'Node version'
     value: ${{ steps.node-version.outputs.node-version }}
 
 runs:
@@ -49,6 +54,13 @@ runs:
         node-version: ${{ inputs.node-version }}
         cache: 'yarn'
 
+    - name: yarn login
+      shell: bash
+      if: inputs.NPM_TOKEN
+      run: |
+        echo "//registry.npmjs.org/:_authToken=${{ inputs.NPM_TOKEN }}" > ~/.npmrc
+
     - name: yarn install
+      if: inputs.install
       shell: bash
       run: yarn

.github/workflows/ci-code-check.yml

@@ -35,6 +35,7 @@ jobs:
           node-version: ${{ inputs.node-version }}
           cache-modules: true
           install: true
+          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
 
       # - name: Free disk space
       #   run: |

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

@@ -130,6 +130,8 @@ jobs:
           node-version: ${{ inputs.node-version }}
           cache-modules: true
           install: true
+          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+
       - uses: rharkor/[email protected]
 
       - run: yarn build
@@ -145,6 +147,7 @@ jobs:
           # the same reason we need to rebuild the docker image at this point is the reason we dont want to publish it
           publish-image: false
           setup: false
+          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
 
       - name: Start httpbin container and wait for it to be ready
         if: inputs.type == 'api'

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

@@ -39,6 +39,7 @@ jobs:
           node-version: ${{ inputs.node-version }}
           cache-modules: true
           install: true
+          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
 
       - uses: rharkor/[email protected]
 

.github/workflows/ci.yml

@@ -152,6 +152,7 @@ jobs:
           node-version: ${{ needs.release-versions.outputs.node-version }}
           cache-modules: true
           install: true
+          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
 
       - name: Cache vite
         uses: actions/cache@v3
@@ -253,6 +254,7 @@ jobs:
           node-version: ${{ needs.release-versions.outputs.node-version }}
           platform: ${{ matrix.platform }}
           build-containers: ${{ matrix.platform == 'alpine' && 'authorization-service account-service ddp-streamer-service presence-service stream-hub-service queue-worker-service omnichannel-transcript-service' || '' }}
+          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
 
   build-gh-docker:
     name: 🚢 Build Docker Images for Production
@@ -280,6 +282,7 @@ jobs:
           node-version: ${{ needs.release-versions.outputs.node-version }}
           platform: ${{ matrix.platform }}
           build-containers: ${{ matrix.platform == 'alpine' && 'authorization-service account-service ddp-streamer-service presence-service stream-hub-service queue-worker-service omnichannel-transcript-service' || '' }}
+          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
 
       - name: Rename official Docker tag to GitHub Container Registry
         if: matrix.platform == 'official'
@@ -560,6 +563,7 @@ jobs:
           release: preview
           username: ${{ secrets.CR_USER }}
           password: ${{ secrets.CR_PAT }}
+          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
 
   docker-image-publish:
     name: 🚀 Publish Docker Image (main)

.github/workflows/new-release.yml

@@ -37,6 +37,7 @@ jobs:
           node-version: 14.21.3
           cache-modules: true
           install: true
+          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
 
       - uses: rharkor/[email protected]
 

.github/workflows/pr-update-description.yml

@@ -24,6 +24,7 @@ jobs:
           node-version: 14.21.3
           cache-modules: true
           install: true
+          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
 
       - uses: rharkor/[email protected]
 

.github/workflows/publish-release.yml

@@ -27,6 +27,7 @@ jobs:
           node-version: 14.21.3
           cache-modules: true
           install: true
+          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
 
       - uses: rharkor/[email protected]
 

.gitignore

@@ -50,3 +50,6 @@ yarn-error.log*
 *.sublime-workspace
 
 **/.vim/
+
+data/
+registration.yaml

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

@@ -22,3 +22,21 @@ API.v1.addRoute(
 		},
 	},
 );
+
+API.v1.addRoute(
+	'federation/configuration.verify',
+	{ authRequired: true, permissionsRequired: ['view-privileged-setting'] },
+	{
+		async get() {
+			const service = License.hasValidLicense() ? FederationEE : Federation;
+
+			const status = await service.configurationStatus();
+
+			if (!status.externalReachability.ok || !status.appservice.ok) {
+				return API.v1.failure(status);
+			}
+
+			return API.v1.success(status);
+		},
+	},
+);

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

@@ -27,11 +27,12 @@ API.v1.addRoute(
 	{ authRequired: true, validateParams: isOauthAppsGetParams },
 	{
 		async get() {
-			if (!(await hasPermissionAsync(this.userId, 'manage-oauth-apps'))) {
-				return API.v1.unauthorized();
-			}
+			const isOAuthAppsManager = await hasPermissionAsync(this.userId, 'manage-oauth-apps');
 
-			const oauthApp = await OAuthApps.findOneAuthAppByIdOrClientId(this.queryParams);
+			const oauthApp = await OAuthApps.findOneAuthAppByIdOrClientId(
+				this.queryParams,
+				!isOAuthAppsManager ? { projection: { clientSecret: 0 } } : {},
+			);
 
 			if (!oauthApp) {
 				return API.v1.failure('OAuth app not found.');

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

@@ -82,6 +82,7 @@ API.v1.addRoute(
 		async post() {
 			const { readThreads = false } = this.bodyParams;
 			const roomId = 'rid' in this.bodyParams ? this.bodyParams.rid : this.bodyParams.roomId;
+
 			await readMessages(roomId, this.userId, readThreads);
 
 			return API.v1.success();

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

@@ -45,6 +45,7 @@ import { setUserAvatar } from '../../../lib/server/functions/setUserAvatar';
 import { setUsernameWithValidation } from '../../../lib/server/functions/setUsername';
 import { validateCustomFields } from '../../../lib/server/functions/validateCustomFields';
 import { validateNameChars } from '../../../lib/server/functions/validateNameChars';
+import { validateUsername } from '../../../lib/server/functions/validateUsername';
 import { notifyOnUserChange, notifyOnUserChangeAsync } from '../../../lib/server/lib/notifyListener';
 import { generateAccessToken } from '../../../lib/server/methods/createToken';
 import { settings } from '../../../settings/server';
@@ -651,6 +652,10 @@ API.v1.addRoute(
 				return API.v1.failure('Name contains invalid characters');
 			}
 
+			if (!validateUsername(this.bodyParams.username)) {
+				return API.v1.failure(`The username provided is not valid`);
+			}
+
 			if (!(await checkUsernameAvailability(this.bodyParams.username))) {
 				return API.v1.failure('Username is already in use');
 			}

apps/meteor/app/apps/server/bridges/livechat.ts

@@ -1,7 +1,7 @@
-import type { IAppServerOrchestrator, IAppsLivechatMessage } from '@rocket.chat/apps';
+import type { IAppServerOrchestrator, IAppsLivechatMessage, IAppsMessage } from '@rocket.chat/apps';
 import type { IExtraRoomParams } from '@rocket.chat/apps-engine/definition/accessors/ILivechatCreator';
 import type { IVisitor, ILivechatRoom, ILivechatTransferData, IDepartment } from '@rocket.chat/apps-engine/definition/livechat';
-import type { IMessage as IAppsEngineMesage } from '@rocket.chat/apps-engine/definition/messages';
+import type { IMessage as IAppsEngineMessage } from '@rocket.chat/apps-engine/definition/messages';
 import type { IUser } from '@rocket.chat/apps-engine/definition/users';
 import { LivechatBridge } from '@rocket.chat/apps-engine/server/bridges/LivechatBridge';
 import type { ILivechatDepartment, IOmnichannelRoom, SelectedAgent, IMessage, ILivechatVisitor } from '@rocket.chat/core-typings';
@@ -13,6 +13,12 @@ import { deasyncPromise } from '../../../../server/deasync/deasync';
 import { type ILivechatMessage, Livechat as LivechatTyped } from '../../../livechat/server/lib/LivechatTyped';
 import { settings } from '../../../settings/server';
 
+declare module '@rocket.chat/apps/dist/converters/IAppMessagesConverter' {
+	export interface IAppMessagesConverter {
+		convertMessage(message: IMessage, cacheObj?: object): Promise<IAppsMessage>;
+	}
+}
+
 declare module '@rocket.chat/apps-engine/definition/accessors/ILivechatCreator' {
 	interface IExtraRoomParams {
 		customFields?: Record<string, unknown>;
@@ -337,7 +343,7 @@ export class AppLivechatBridge extends LivechatBridge {
 		return Promise.all((await LivechatDepartment.findEnabledWithAgents().toArray()).map(boundConverter));
 	}
 
-	protected async _fetchLivechatRoomMessages(appId: string, roomId: string): Promise<Array<IAppsEngineMesage>> {
+	protected async _fetchLivechatRoomMessages(appId: string, roomId: string): Promise<Array<IAppsEngineMessage>> {
 		this.orch.debugLog(`The App ${appId} is getting the transcript for livechat room ${roomId}.`);
 		const messageConverter = this.orch.getConverters()?.get('messages');
 
@@ -346,8 +352,7 @@ export class AppLivechatBridge extends LivechatBridge {
 		}
 
 		const livechatMessages = await LivechatTyped.getRoomMessages({ rid: roomId });
-
-		return Promise.all(livechatMessages.map((message) => messageConverter.convertMessage(message) as Promise<IAppsEngineMesage>));
+		return Promise.all(await livechatMessages.map((message) => messageConverter.convertMessage(message, livechatMessages)).toArray());
 	}
 
 	protected async setCustomFields(