-# ☁️ Cloud Hosted Rocket.Chat
+# ☁️ Cloud-hosted Rocket.Chat
-Send your first message in minutes.
-
-Free for 30 days. Afterward, choose between continuing to host on our secure cloud or migrating to your private cloud, data center, or even air-gapped environment.
-
-[Start your cloud hosted trial now](https://rocket.chat/trial-saas)
+Rocket.Chat has flexible hosting options that adapt to your infrastructure needs.
+For more information please [follow this link](https://www.rocket.chat/hosting)
# 📖 Docs for Developers, Admins and Users
-Please make sure to visit our [Docs](https://docs.rocket.chat/) and [Developer Docs](https://developer.rocket.chat/docs) before sending questions.
-
-# 🛠️ Local development
-
-## Prerequisites
-
-You can follow these instructions to setup a dev environment:
-
-- Install **Node 22.x (LTS)** either [manually](https://nodejs.org/dist/latest-v22.x/) or using a tool like [nvm](https://github.com/creationix/nvm) or [volta](https://volta.sh/) (recommended)
-- Install **Meteor** ([version here](apps/meteor/.meteor/release)): https://docs.meteor.com/about/install.html
-- Install **yarn**: https://yarnpkg.com/getting-started/install
-- Install **Deno 1.x**: https://docs.deno.com/runtime/fundamentals/installation/
-- Clone this repo: `git clone https://github.com/RocketChat/Rocket.Chat.git`
-- Run `yarn` to install dependencies
-
-**Starting Rocket.Chat:**
-
-```bash
-yarn dev # run all packages
-```
-OR
-```bash
-yarn dsv # run only meteor (front and back) with pre-built packages
-```
-
-After initialized, you can access the server at http://localhost:3000
-More details at: [Developer Docs](https://developer.rocket.chat/v1/docs/server-environment-setup)
-PS: For Windows you MUST use WSL2 and have +12Gb RAM
+Visit our official [User Documentation](https://docs.rocket.chat/) and [Developer Docs](https://developer.rocket.chat/docs) before sending questions.
+# 🛠️ Local Development
-# Gitpod Setup
+You can set up a Rocket.Chat server development environment by following the guide below for your operating system:
-1. Click the button below to open this project in Gitpod.
-2. This will open a fully configured workspace in your browser with all the necessary dependencies already installed.
+- [Linux](https://developer.rocket.chat/docs/linux): See how to set up a Rocket.Chat server development environment on any Linux distribution.
-[](https://gitpod.io/#https://github.com/RocketChat/Rocket.Chat)
+- [Mac OSX](https://developer.rocket.chat/docs/mac-osx): Learn how to set up a Rocket.Chat server development environment on Mac.
-**Starting Rocket.Chat in microservices mode:**
+- [Windows 10](https://developer.rocket.chat/docs/windows-10): Set up a Rocket.Chat server development environment on Windows.
-```bash
-yarn turbo run ms
-```
+- [Gitpod](https://developer.rocket.chat/docs/gitpod): Use the online development environment pre-configuration to develop Rocket.Chat server.
-After initialized, you can access the server at http://localhost:4000
+> Visit the [Rocket.Chat Environment Setup guide](https://developer.rocket.chat/docs/server-environment-setup) to learn more.
-> ⚠️ Check more detailed information in the [Rocket.Chat Environment Setup](https://developer.rocket.chat/docs/server-environment-setup) guide
-# 💻 Installation
+# 💻 Deploy Rocket.Chat
-Please see the [requirements documentation](https://docs.rocket.chat/deploy/installing-client-apps/minimum-requirements-for-using-rocket.chat) for system requirements and more information about supported operating systems.
-Please refer to [Install Rocket.Chat](https://rocket.chat/install) to install your Rocket.Chat instance.
+Refer to the [System requirements documentation](https://docs.rocket.chat/docs/system-requirements) for required hardware and software specifications. For detailed instructions on deploying your Rocket.Chat workspace, visit [Deploy Rocket.Chat](https://rocket.chat/install).
-# 📱 Mobile Apps
+# 📱 Mobile apps
-In addition to the web interface, you can also download Rocket.Chat clients for:
+In addition to the web app, you can also download Rocket.Chat clients for:
[](https://itunes.apple.com/us/app/rocket-chat/id1148741252?mt=8) [](https://play.google.com/store/apps/details?id=chat.rocket.android) [](https://f-droid.org/en/packages/chat.rocket.android)
-You can also contribute to the Mobile open source code in [Rocket.Chat.ReactNative](https://github.com/RocketChat/Rocket.Chat.ReactNative) and check it out its [documentation](https://developer.rocket.chat/mobile-app/mobile-app-environment-setup)
+You can also contribute to the mobile open source code in [Rocket.Chat.ReactNative](https://github.com/RocketChat/Rocket.Chat.ReactNative) and check it out its [documentation](https://developer.rocket.chat/docs/mobile-app).
# 🧩 Apps Engine for Rocket.Chat
-You can develop your own app that can be integrated with Rocket.Chat. We provide an [Open Source Apps Engine framework](https://developer.rocket.chat/apps-engine/getting-started) increasing the world of possibilities of integrations around the Rocket.Chat ecosystem
+You can develop your own app that can be integrated with Rocket.Chat. We provide an [Open Source Apps-Engine framework](https://developer.rocket.chat/apps-engine/getting-started) which expands the integration possibilities within the Rocket.Chat ecosystem.
# 📚 Learn More
-- [Product Documentation](https://docs.rocket.chat)
-- [Developer Documentation](https://developer.rocket.chat)
-- [API Documentation](https://developer.rocket.chat/reference/api)
-- [Apps Engine Development](https://developer.rocket.chat/apps-engine/rocket.chat-apps-and-apps-engine)
+- [User documentation](https://docs.rocket.chat)
+- [Developer documentation](https://developer.rocket.chat)
+- [API documentation](https://developer.rocket.chat/reference/api)
+- [Apps-Engine development](https://developer.rocket.chat/apps-engine/rocket.chat-apps-and-apps-engine)
- [See who's using Rocket.Chat](https://www.rocket.chat/customers)
# 🆕 Feature Request
@@ -131,14 +97,14 @@ Join [#support](https://open.rocket.chat/channel/support) and [#general](https:/
# 👥 Contributions
-Rocket.Chat is an open source project and we are very happy to accept community contributions. Please refer to the [How can I help?](https://developer.rocket.chat/contribute-to-rocket.chat/ways-to-contribute) page for more details.
+Rocket.Chat is an open source project and we are very happy to accept community contributions. Refer to the [Modes of contribution guide](https://developer.rocket.chat/contribute-to-rocket.chat/ways-to-contribute) for more details.
-## 💼 Become a Rocketeer
+# 💼 Become a Rocketeer
-We're hiring developers, support people, and product managers all the time. Please check our [jobs page](https://rocket.chat/jobs).
+We're hiring developers, support people, and product managers all the time. Check out our [jobs page](https://rocket.chat/jobs).
-## 🗞️ Get the Latest News
+# 🗞️ Get the Latest News
- [Blog](https://rocket.chat/blog)
- [Twitter](https://twitter.com/RocketChat)
@@ -146,6 +112,6 @@ We're hiring developers, support people, and product managers all the time. Plea
- [LinkedIn](https://www.linkedin.com/company/rocket-chat)
- [Youtube](https://www.youtube.com/channel/UCin9nv7mUjoqrRiwrzS5UVQ)
-## 🗒️ Credits
+# 🗒️ Credits
- Emoji provided graciously by [JoyPixels](https://www.joypixels.com).
diff --git a/_templates/service/new/service.ejs.t b/_templates/service/new/service.ejs.t
index b0880bd475392..ec307ecdce7d8 100644
--- a/_templates/service/new/service.ejs.t
+++ b/_templates/service/new/service.ejs.t
@@ -3,7 +3,7 @@ to: ee/apps/<%= name %>/src/service.ts
---
import { api, getConnection, getTrashCollection } from '@rocket.chat/core-services';
import { registerServiceModels } from '@rocket.chat/models';
-import { broker } from '@rocket.chat/network-broker';
+import { startBroker } from '@rocket.chat/network-broker';
import { startTracing } from '@rocket.chat/tracing';
import polka from 'polka';
@@ -16,7 +16,7 @@ const PORT = process.env.PORT || <%= h.random() %>;
registerServiceModels(db, await getTrashCollection());
- api.setBroker(broker);
+ api.setBroker(startBroker());
// need to import service after models are registered
const { <%= h.changeCase.pascalCase(name) %> } = await import('./<%= h.changeCase.pascalCase(name) %>');
diff --git a/apps/meteor/.docker-mongo/Dockerfile b/apps/meteor/.docker-mongo/Dockerfile
index faa3c6138ca90..2d85a15eca878 100644
--- a/apps/meteor/.docker-mongo/Dockerfile
+++ b/apps/meteor/.docker-mongo/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:22.11.0-bullseye-slim
+FROM node:22.13.1-bullseye-slim
LABEL maintainer="buildmaster@rocket.chat"
diff --git a/apps/meteor/.docker/Dockerfile.alpine b/apps/meteor/.docker/Dockerfile.alpine
index e4f8b11cb96b1..e098d21722a5d 100644
--- a/apps/meteor/.docker/Dockerfile.alpine
+++ b/apps/meteor/.docker/Dockerfile.alpine
@@ -1,4 +1,4 @@
-FROM node:22.11.0-alpine3.20
+FROM node:22.13.1-alpine3.20
LABEL maintainer="buildmaster@rocket.chat"
diff --git a/apps/meteor/.docker/Dockerfile.debian b/apps/meteor/.docker/Dockerfile.debian
index 7b1094b46508e..9a4012d1e5b39 100644
--- a/apps/meteor/.docker/Dockerfile.debian
+++ b/apps/meteor/.docker/Dockerfile.debian
@@ -2,7 +2,7 @@ ARG DENO_VERSION="1.37.1"
FROM denoland/deno:bin-${DENO_VERSION} as deno
-FROM node:22.11.0-bullseye-slim
+FROM node:22.13.1-bullseye-slim
LABEL maintainer="buildmaster@rocket.chat"
diff --git a/apps/meteor/.meteor/packages b/apps/meteor/.meteor/packages
index efc4541f666d9..f7b92d4cf9a85 100644
--- a/apps/meteor/.meteor/packages
+++ b/apps/meteor/.meteor/packages
@@ -13,29 +13,29 @@ rocketchat:streamer
rocketchat:version
rocketchat:user-presence
-accounts-base@3.0.3
+accounts-base@3.0.4
accounts-facebook@1.3.4
accounts-github@1.5.1
accounts-google@1.4.1
accounts-meteor-developer@1.5.1
-accounts-oauth@1.4.5
+accounts-oauth@1.4.6
accounts-password@3.0.3
accounts-twitter@1.5.2
google-oauth@1.4.5
-oauth@3.0.0
+oauth@3.0.1
oauth2@1.3.3
check@1.4.4
ddp-rate-limiter@1.2.2
rate-limit@1.1.2
-email@3.1.1
+email@3.1.2
meteor-base@1.5.2
ddp-common@1.4.4
-webapp@2.0.4
+webapp@2.0.5
-mongo@2.0.3
+mongo@2.1.0
reload@1.3.2
service-configuration@1.3.5
@@ -45,7 +45,6 @@ shell-server@0.6.1
dispatch:run-as-user
ostrio:cookies
-kadira:flow-router
meteorhacks:inject-initial
@@ -58,7 +57,7 @@ tracker@1.3.4
reactive-dict@1.3.2
reactive-var@1.0.13
-babel-compiler@7.11.2
+babel-compiler@7.11.3
standard-minifier-css@1.9.3
dynamic-import@0.7.4
ecmascript@0.16.10
@@ -70,3 +69,4 @@ autoupdate@2.0.0
zodern:types
zodern:standard-minifier-js
+ostrio:flow-router-extra
diff --git a/apps/meteor/.meteor/release b/apps/meteor/.meteor/release
index 8d20e1a2d3a87..5f22892744ba2 100644
--- a/apps/meteor/.meteor/release
+++ b/apps/meteor/.meteor/release
@@ -1 +1 @@
-METEOR@3.1
+METEOR@3.1.2
diff --git a/apps/meteor/.meteor/versions b/apps/meteor/.meteor/versions
index e3d5dd574f1e3..979496429ffe3 100644
--- a/apps/meteor/.meteor/versions
+++ b/apps/meteor/.meteor/versions
@@ -1,14 +1,14 @@
-accounts-base@3.0.3
+accounts-base@3.0.4
accounts-facebook@1.3.4
accounts-github@1.5.1
accounts-google@1.4.1
accounts-meteor-developer@1.5.1
-accounts-oauth@1.4.5
+accounts-oauth@1.4.6
accounts-password@3.0.3
accounts-twitter@1.5.2
-allow-deny@2.0.0
+allow-deny@2.1.0
autoupdate@2.0.0
-babel-compiler@7.11.2
+babel-compiler@7.11.3
babel-runtime@1.5.2
base64@1.0.13
binary-heap@1.0.12
@@ -17,10 +17,10 @@ callback-hook@1.6.0
check@1.4.4
core-runtime@1.0.0
ddp@1.4.2
-ddp-client@3.0.3
+ddp-client@3.1.0
ddp-common@1.4.4
ddp-rate-limiter@1.2.2
-ddp-server@3.0.3
+ddp-server@3.1.0
diff-sequence@1.1.3
dispatch:run-as-user@1.1.1
dynamic-import@0.7.4
@@ -29,9 +29,9 @@ ecmascript-runtime@0.8.3
ecmascript-runtime-client@0.12.2
ecmascript-runtime-server@0.11.1
ejson@1.1.4
-email@3.1.1
+email@3.1.2
es5-shim@4.8.1
-facebook-oauth@1.11.4
+facebook-oauth@1.11.5
facts-base@1.0.2
fetch@0.1.5
geojson-utils@1.0.12
@@ -41,28 +41,28 @@ hot-code-push@1.0.5
http@3.0.0
id-map@1.2.0
inter-process-messaging@0.1.2
-kadira:flow-router@2.12.1
localstorage@1.2.1
logging@1.3.5
-meteor@2.0.2
+meteor@2.1.0
meteor-base@1.5.2
meteor-developer-oauth@1.3.3
meteorhacks:inject-initial@1.0.5
minifier-css@2.0.0
minimongo@2.0.2
-modern-browsers@0.1.11
+modern-browsers@0.2.0
modules@0.20.3
modules-runtime@0.13.2
-mongo@2.0.3
+mongo@2.1.0
mongo-decimal@0.2.0
mongo-dev-server@1.1.1
mongo-id@1.0.9
-npm-mongo@6.10.0
-oauth@3.0.0
+npm-mongo@6.10.2
+oauth@3.0.1
oauth1@1.5.2
oauth2@1.3.3
ordered-dict@1.2.0
ostrio:cookies@2.7.2
+ostrio:flow-router-extra@3.11.0
promise@1.0.0
random@1.2.2
rate-limit@1.1.2
@@ -82,15 +82,15 @@ service-configuration@1.3.5
session@1.2.2
sha@1.0.10
shell-server@0.6.1
-socket-stream-client@0.5.3
+socket-stream-client@0.6.0
standard-minifier-css@1.9.3
tracker@1.3.4
twitter-oauth@1.3.4
typescript@5.6.3
underscore@1.6.4
url@1.3.5
-webapp@2.0.4
+webapp@2.0.5
webapp-hashing@1.1.2
zodern:caching-minifier@0.5.0
-zodern:standard-minifier-js@5.2.0
-zodern:types@1.0.10
+zodern:standard-minifier-js@5.3.1
+zodern:types@1.0.13
diff --git a/apps/meteor/CHANGELOG.md b/apps/meteor/CHANGELOG.md
index 94543501416c6..f08e87353e48f 100644
--- a/apps/meteor/CHANGELOG.md
+++ b/apps/meteor/CHANGELOG.md
@@ -1,5 +1,227 @@
# @rocket.chat/meteor
+## 7.4.0-rc.0
+
+### Minor Changes
+
+- ([#34208](https://github.com/RocketChat/Rocket.Chat/pull/34208)) Adds a new endpoint `rooms.hide` to hide rooms of any type when provided with the room's ID
+
+- ([#35147](https://github.com/RocketChat/Rocket.Chat/pull/35147)) Allows users to filter by multiple departments & by livechat units on `livechat/rooms` endpoint.
+
+- ([#34274](https://github.com/RocketChat/Rocket.Chat/pull/34274)) Adds a new setting that if enabled, will not count bot messages in the average response time metrics
+
+- ([#35177](https://github.com/RocketChat/Rocket.Chat/pull/35177)) Adds a new IPostSystemMessageSent event, that is triggered whenever a new System Message is sent
+
+- ([#34957](https://github.com/RocketChat/Rocket.Chat/pull/34957)) Implements a modal to let users know about VoIP calls in direct messages and missing configurations.
+
+- ([#34958](https://github.com/RocketChat/Rocket.Chat/pull/34958)) Makes Omnichannel converstion start process transactional.
+
+- ([#34926](https://github.com/RocketChat/Rocket.Chat/pull/34926)) Enables control of video conference ringing and dialing sounds through the call ringer volume user preference, preventing video conf calls from always playing at maximum volume.
+
+- ([#35260](https://github.com/RocketChat/Rocket.Chat/pull/35260)) Enhances message sorting in the `im.messages` and `dm.messages` endpoints by enabling support for multi-parameter sorting.
+
+- ([#34939](https://github.com/RocketChat/Rocket.Chat/pull/34939)) Improves the search of permissions
+
+- ([#35113](https://github.com/RocketChat/Rocket.Chat/pull/35113)) Includes attachments metadata in JSON export if type is file when exporting messages
+
+- ([#33885](https://github.com/RocketChat/Rocket.Chat/pull/33885)) Fixes an issue where tokens generated while using the legacy notification provider would never be removed from the database.
+
+- ([#33816](https://github.com/RocketChat/Rocket.Chat/pull/33816) by [@matheusbsilva137](https://github.com/matheusbsilva137)) Replaces Livechat Visitors by Contacts on workspaces' MAC count.
+ This allows a more accurate and potentially smaller MAC count in case Contact Identification is enabled, since multiple visitors may be associated to the same contact.
+- ([#35038](https://github.com/RocketChat/Rocket.Chat/pull/35038)) Adds "DOMPurify" and "he" to sanitize ECDH and Livechat errors
+
+- ([#35013](https://github.com/RocketChat/Rocket.Chat/pull/35013)) Adds a filter option to include or exclude threads in the Apps Engine room read/unread messages bridge, enhancing flexibility in message retrieval.
+
+- ([#35199](https://github.com/RocketChat/Rocket.Chat/pull/35199)) Enables specifying hidden settings that are enabled to be accessed through the apps-engine in the permission list.
+
+- ([#35089](https://github.com/RocketChat/Rocket.Chat/pull/35089)) Adds wrapExceptions to handle an unhandled promise rejection when adding and/or updating OAuth apps
+
+- ([#35208](https://github.com/RocketChat/Rocket.Chat/pull/35208)) Adds the Leader group to rooms' members list for better role visibility and consistency.
+
+### Patch Changes
+
+- ([#35189](https://github.com/RocketChat/Rocket.Chat/pull/35189)) fixes toast with empty error messages when a private app installation fails
+
+- ([#34980](https://github.com/RocketChat/Rocket.Chat/pull/34980)) Implements removal of OTR (off-the-record) conversation messsages just after OTR session ends.
+
+- ([#35029](https://github.com/RocketChat/Rocket.Chat/pull/35029)) Fixes a bug that caused routing algorithms to ignore the `Livechat_enabled_when_agent_idle` setting, effectively ignoring idle users from being assigned to inquiries.
+
+- ([#35079](https://github.com/RocketChat/Rocket.Chat/pull/35079)) Fixes unused `i18nTitle` provided by the app in message composer popup previewer
+
+- ([#35044](https://github.com/RocketChat/Rocket.Chat/pull/35044)) Fixes an issue that allowed departments to be removed via API even with setting `Omnichannel_enable_department_removal` disabled
+
+- ([#35132](https://github.com/RocketChat/Rocket.Chat/pull/35132)) Fixes broken link and improves messaging for invalid apps banner.
+
+- ([#35120](https://github.com/RocketChat/Rocket.Chat/pull/35120)) Fixes behavior of app updates that would save undesired field changes to documents
+
+- ([#35188](https://github.com/RocketChat/Rocket.Chat/pull/35188)) Fixes a UI issue where enabling/disabling TOTP two factor authentication didn't update in real-time.
+
+- ([#35082](https://github.com/RocketChat/Rocket.Chat/pull/35082)) Fixes a rerender on each sidebar item click
+
+- ([#35233](https://github.com/RocketChat/Rocket.Chat/pull/35233)) Improves color contrast in image gallery icon buttons to meet WCAG compliance.
+
+- ([#35261](https://github.com/RocketChat/Rocket.Chat/pull/35261)) Security Hotfix (https://docs.rocket.chat/docs/security-fixes-and-updates)
+
+- ([#35100](https://github.com/RocketChat/Rocket.Chat/pull/35100)) Fixes incorrect start date on omnichannel reports
+
+- ([#35265](https://github.com/RocketChat/Rocket.Chat/pull/35265)) Fixes app event `IPostLivechatAgentAssigned` receiving a room object previous to the assignment of agent, causing `room.servedBy` to be undefined on apps
+
+- ([#35194](https://github.com/RocketChat/Rocket.Chat/pull/35194)) fixes the possibility of see new messages without being subscribed to a public channel.
+
+- ([#35121](https://github.com/RocketChat/Rocket.Chat/pull/35121)) Fixes an issue which caused some weird scrolling in rooms when using secondary sidepanel navigation.
+
+- ([#35170](https://github.com/RocketChat/Rocket.Chat/pull/35170)) Fixes an issue that would cause marketplace apps to become invalid installations after an update
+
+- ([#35140](https://github.com/RocketChat/Rocket.Chat/pull/35140)) Fixes a UI issue where enabling/disabling email two factor authentication didn't update in real-time.
+
+- ([#35181](https://github.com/RocketChat/Rocket.Chat/pull/35181)) Bump meteor to 3.1.2 and Node version to 20.13.1
+
+- ([#35107](https://github.com/RocketChat/Rocket.Chat/pull/35107)) Fixes an issue where the room converter would throw if the room was an omnichannel room that had been closed by the visitor
+
+- ([#35124](https://github.com/RocketChat/Rocket.Chat/pull/35124)) Fixes an issue where non-Latin highlights were inconsistently applied, ensuring non-Latin characters are reliably detected and highlighted.
+
+- ([#35208](https://github.com/RocketChat/Rocket.Chat/pull/35208)) Removes the Leader role from the room header. Leaders are now displayed in their respective group within the room's members list.
+
+- ([#34857](https://github.com/RocketChat/Rocket.Chat/pull/34857) by [@AyushKumar123456789](https://github.com/AyushKumar123456789)) Fixes an issue where custom status' values in the custom status page table were not being properly translated
+
+- ([#34987](https://github.com/RocketChat/Rocket.Chat/pull/34987)) Fixes a behavior in Omnichannel that was causing bot agents to be waiting in the queue, when they should always skip it.
+
+- ([#34988](https://github.com/RocketChat/Rocket.Chat/pull/34988)) Fixes `channels.list` endpoint from rejecting pagination parameters
+
+- ([#35204](https://github.com/RocketChat/Rocket.Chat/pull/35204)) fixes an issue with embedded layout rooms displaying as if the user is not part of the room
+
+- ([#35032](https://github.com/RocketChat/Rocket.Chat/pull/35032)) Validates duplicated email and phone number when creating or editing omnichannel contacts.
+
+- ([#35143](https://github.com/RocketChat/Rocket.Chat/pull/35143)) Switches from GCM (unsupported) to FCM as the default push notification service for custom mobile apps
+
+- ([#35167](https://github.com/RocketChat/Rocket.Chat/pull/35167)) Fixes an issue where assign extension button were missing the proper margin
+
+- ([#35028](https://github.com/RocketChat/Rocket.Chat/pull/35028)) Fixes a missconception about `/v1/livechat/tags/:tagId` returning 404 if tag is not found
+
+- ([#34975](https://github.com/RocketChat/Rocket.Chat/pull/34975)) Fixes issue where a invalid `Accounts_CustomFieldsToShowInUserInfo` value would break the ui
+
+- ([#33141](https://github.com/RocketChat/Rocket.Chat/pull/33141)) Fixes an issue where video conf message block wasn't considering display avatars preference
+
+- ([#35046](https://github.com/RocketChat/Rocket.Chat/pull/35046)) Fixes an issue which was preventing admins in enterprise workspaces from updating some premium layout settings.
+
+-
-
- {zoomScale !== 1 && (
-
+
+
+
+ ,
document.body,
);
};
diff --git a/apps/meteor/client/components/Omnichannel/hooks/useAgentsList.ts b/apps/meteor/client/components/Omnichannel/hooks/useAgentsList.ts
index 41dd4a485d924..d81f1b1f3e5a7 100644
--- a/apps/meteor/client/components/Omnichannel/hooks/useAgentsList.ts
+++ b/apps/meteor/client/components/Omnichannel/hooks/useAgentsList.ts
@@ -8,8 +8,8 @@ import { RecordList } from '../../../lib/lists/RecordList';
type AgentsListOptions = {
text: string;
- haveAll: boolean;
- haveNoAgentsSelectedOption: boolean;
+ haveAll?: boolean;
+ haveNoAgentsSelectedOption?: boolean;
excludeId?: string;
showIdleAgents?: boolean;
onlyAvailable?: boolean;
diff --git a/apps/meteor/client/components/Omnichannel/hooks/useUnitsList.ts b/apps/meteor/client/components/Omnichannel/hooks/useUnitsList.ts
new file mode 100644
index 0000000000000..146a377d3f51a
--- /dev/null
+++ b/apps/meteor/client/components/Omnichannel/hooks/useUnitsList.ts
@@ -0,0 +1,63 @@
+import { useEndpoint } from '@rocket.chat/ui-contexts';
+import { useCallback, useState } from 'react';
+
+import { useScrollableRecordList } from '../../../hooks/lists/useScrollableRecordList';
+import { useComponentDidUpdate } from '../../../hooks/useComponentDidUpdate';
+import { RecordList } from '../../../lib/lists/RecordList';
+
+type UnitsListOptions = {
+ text: string;
+};
+
+type UnitOption = { value: string; label: string; _id: string };
+
+export const useUnitsList = (
+ options: UnitsListOptions,
+): {
+ itemsList: RecordList;
+ initialItemCount: number;
+ reload: () => void;
+ loadMoreItems: (start: number, end: number) => void;
+} => {
+ const [itemsList, setItemsList] = useState(() => new RecordList());
+ const reload = useCallback(() => setItemsList(new RecordList()), []);
+
+ const getUnits = useEndpoint('GET', '/v1/livechat/units');
+ const { text } = options;
+
+ useComponentDidUpdate(() => {
+ options && reload();
+ }, [options, reload]);
+
+ const fetchData = useCallback(
+ async (start: number, end: number) => {
+ const { units, total } = await getUnits({
+ ...(text && { text }),
+ offset: start,
+ count: end + start,
+ sort: `{ "name": 1 }`,
+ });
+
+ const items = units.map((u) => ({
+ _id: u._id,
+ label: u.name,
+ value: u._id,
+ }));
+
+ return {
+ items,
+ itemCount: total,
+ };
+ },
+ [getUnits, text],
+ );
+
+ const { loadMoreItems, initialItemCount } = useScrollableRecordList(itemsList, fetchData, 25);
+
+ return {
+ reload,
+ itemsList,
+ loadMoreItems,
+ initialItemCount,
+ };
+};
diff --git a/apps/meteor/client/components/TwoFactorModal/TwoFactorTotpModal.tsx b/apps/meteor/client/components/TwoFactorModal/TwoFactorTotpModal.tsx
index cf398f4ac9154..d9a3dac000399 100644
--- a/apps/meteor/client/components/TwoFactorModal/TwoFactorTotpModal.tsx
+++ b/apps/meteor/client/components/TwoFactorModal/TwoFactorTotpModal.tsx
@@ -11,10 +11,11 @@ import { Method } from './TwoFactorModal';
type TwoFactorTotpModalProps = {
onConfirm: OnConfirm;
onClose: () => void;
+ onDismiss?: () => void;
invalidAttempt?: boolean;
};
-const TwoFactorTotpModal = ({ onConfirm, onClose, invalidAttempt }: TwoFactorTotpModalProps): ReactElement => {
+const TwoFactorTotpModal = ({ onConfirm, onClose, onDismiss, invalidAttempt }: TwoFactorTotpModalProps): ReactElement => {
const { t } = useTranslation();
const [code, setCode] = useState('');
const ref = useAutoFocus();
@@ -36,6 +37,7 @@ const TwoFactorTotpModal = ({ onConfirm, onClose, invalidAttempt }: TwoFactorTot
confirmText={t('Verify')}
title={t('Enter_TOTP_password')}
onClose={onClose}
+ onDismiss={onDismiss}
variant='warning'
confirmDisabled={!code}
tagline={t('Two-factor_authentication')}
diff --git a/apps/meteor/client/components/UserInfo/UserInfo.tsx b/apps/meteor/client/components/UserInfo/UserInfo.tsx
index cbd5fb3b90e47..4a0413d912870 100644
--- a/apps/meteor/client/components/UserInfo/UserInfo.tsx
+++ b/apps/meteor/client/components/UserInfo/UserInfo.tsx
@@ -1,5 +1,6 @@
import type { IUser, Serialized } from '@rocket.chat/core-typings';
import { Box, Margins, Tag } from '@rocket.chat/fuselage';
+import { useUserDisplayName } from '@rocket.chat/ui-client';
import type { TranslationKey } from '@rocket.chat/ui-contexts';
import type { ReactElement, ReactNode } from 'react';
import { memo } from 'react';
@@ -7,7 +8,6 @@ import { useTranslation } from 'react-i18next';
import { useTimeAgo } from '../../hooks/useTimeAgo';
import { useUserCustomFields } from '../../hooks/useUserCustomFields';
-import { useUserDisplayName } from '../../hooks/useUserDisplayName';
import { ContextualbarScrollableContent } from '../Contextualbar';
import {
InfoPanel,
diff --git a/apps/meteor/client/components/message/MessageHeader.tsx b/apps/meteor/client/components/message/MessageHeader.tsx
index 1a2109f2c676c..8a259a8817865 100644
--- a/apps/meteor/client/components/message/MessageHeader.tsx
+++ b/apps/meteor/client/components/message/MessageHeader.tsx
@@ -7,6 +7,7 @@ import {
MessageStatusPrivateIndicator,
MessageNameContainer,
} from '@rocket.chat/fuselage';
+import { useUserDisplayName } from '@rocket.chat/ui-client';
import type { KeyboardEvent, ReactElement } from 'react';
import { memo } from 'react';
import { useTranslation } from 'react-i18next';
@@ -14,7 +15,6 @@ import { useTranslation } from 'react-i18next';
import StatusIndicators from './StatusIndicators';
import MessageRoles from './header/MessageRoles';
import { useMessageListShowUsername, useMessageListShowRealName, useMessageListShowRoles } from './list/MessageListContext';
-import { getUserDisplayName } from '../../../lib/getUserDisplayName';
import { useFormatDateAndTime } from '../../hooks/useFormatDateAndTime';
import { useFormatTime } from '../../hooks/useFormatTime';
import { useUserData } from '../../hooks/useUserData';
@@ -37,6 +37,7 @@ const MessageHeader = ({ message }: MessageHeaderProps): ReactElement => {
const user: UserPresence = { ...message.u, roles: [], ...useUserData(message.u._id) };
const usernameAndRealNameAreSame = !user.name || user.username === user.name;
const showUsername = useMessageListShowUsername() && showRealName && !usernameAndRealNameAreSame;
+ const displayName = useUserDisplayName(user);
const showRoles = useMessageListShowRoles();
const roles = useMessageRoles(message.u._id, message.rid, showRoles);
@@ -48,7 +49,7 @@ const MessageHeader = ({ message }: MessageHeaderProps): ReactElement => {
tabIndex={0}
role='button'
id={`${message._id}-displayName`}
- aria-label={getUserDisplayName(user.name, user.username, showRealName)}
+ aria-label={displayName}
onClick={(e) => openUserCard(e, message.u.username)}
onKeyDown={(e: KeyboardEvent) => {
(e.code === 'Enter' || e.code === 'Space') && openUserCard(e, message.u.username);
@@ -61,7 +62,7 @@ const MessageHeader = ({ message }: MessageHeaderProps): ReactElement => {
title={!showUsername && !usernameAndRealNameAreSame ? `@${user.username}` : undefined}
data-username={user.username}
>
- {message.alias || getUserDisplayName(user.name, user.username, showRealName)}
+ {message.alias || displayName}
{showUsername && (
<>
diff --git a/apps/meteor/client/components/message/variants/SystemMessage.tsx b/apps/meteor/client/components/message/variants/SystemMessage.tsx
index 7824ad7bec947..34e8b48ee2756 100644
--- a/apps/meteor/client/components/message/variants/SystemMessage.tsx
+++ b/apps/meteor/client/components/message/variants/SystemMessage.tsx
@@ -12,13 +12,13 @@ import {
MessageNameContainer,
} from '@rocket.chat/fuselage';
import { UserAvatar } from '@rocket.chat/ui-avatar';
+import { useUserDisplayName } from '@rocket.chat/ui-client';
import type { TranslationKey } from '@rocket.chat/ui-contexts';
import type { ComponentProps, ReactElement, KeyboardEvent } from 'react';
import { memo } from 'react';
import { useTranslation } from 'react-i18next';
import { MessageTypes } from '../../../../app/ui-utils/client';
-import { getUserDisplayName } from '../../../../lib/getUserDisplayName';
import { useFormatDateAndTime } from '../../../hooks/useFormatDateAndTime';
import { useFormatTime } from '../../../hooks/useFormatTime';
import { useUserData } from '../../../hooks/useUserData';
@@ -49,6 +49,7 @@ const SystemMessage = ({ message, showUserAvatar, ...props }: SystemMessageProps
const user: UserPresence = { ...message.u, roles: [], ...useUserData(message.u._id) };
const usernameAndRealNameAreSame = !user.name || user.username === user.name;
const showUsername = useMessageListShowUsername() && showRealName && !usernameAndRealNameAreSame;
+ const displayName = useUserDisplayName(user);
const messageType = MessageTypes.getType(message);
@@ -85,7 +86,7 @@ const SystemMessage = ({ message, showUserAvatar, ...props }: SystemMessageProps
style={{ cursor: 'pointer' }}
{...triggerProps}
>
- {getUserDisplayName(user.name, user.username, showRealName)}
+ {displayName}
{showUsername && (
<>
{' '}
diff --git a/apps/meteor/client/hooks/roomActions/useStartCallRoomAction/useStartCallRoomAction.tsx b/apps/meteor/client/hooks/roomActions/useStartCallRoomAction/useStartCallRoomAction.tsx
index 6538ff524feac..a4db8c7eddd6c 100644
--- a/apps/meteor/client/hooks/roomActions/useStartCallRoomAction/useStartCallRoomAction.tsx
+++ b/apps/meteor/client/hooks/roomActions/useStartCallRoomAction/useStartCallRoomAction.tsx
@@ -11,7 +11,7 @@ export const useStartCallRoomAction = () => {
const voipCall = useVoipMenuOptions();
return useMemo((): RoomToolboxActionConfig | undefined => {
- if (!videoCall.allowed && !voipCall.allowed) {
+ if (!videoCall.allowed && !voipCall?.allowed) {
return undefined;
}
@@ -19,10 +19,10 @@ export const useStartCallRoomAction = () => {
id: 'start-call',
title: 'Call',
icon: 'phone',
- groups: [...videoCall.groups, ...voipCall.groups],
- disabled: videoCall.disabled && voipCall.disabled,
+ groups: [...videoCall.groups, ...(voipCall?.groups ?? [])],
+ disabled: videoCall.disabled && (voipCall?.disabled ?? true),
full: true,
- order: Math.max(voipCall.order, videoCall.order),
+ order: Math.max(voipCall?.order ?? Number.NEGATIVE_INFINITY, videoCall.order),
featured: true,
renderToolboxItem: ({ id, icon, title, disabled, className }) => (
{
key={id}
title={title}
disabled={disabled}
- items={[...voipCall.items, ...videoCall.items]}
+ items={[...(voipCall?.allowed ? voipCall.items : []), ...videoCall.items]}
className={className}
placement='bottom-start'
icon={icon}
diff --git a/apps/meteor/client/hooks/roomActions/useStartCallRoomAction/useVoipMenuOptions.tsx b/apps/meteor/client/hooks/roomActions/useStartCallRoomAction/useVoipMenuOptions.tsx
index 28b955765c49d..b6f31ff5cedf2 100644
--- a/apps/meteor/client/hooks/roomActions/useStartCallRoomAction/useVoipMenuOptions.tsx
+++ b/apps/meteor/client/hooks/roomActions/useStartCallRoomAction/useVoipMenuOptions.tsx
@@ -1,6 +1,7 @@
import { Box } from '@rocket.chat/fuselage';
+import { useEffectEvent } from '@rocket.chat/fuselage-hooks';
import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
-import { useUserId } from '@rocket.chat/ui-contexts';
+import { usePermission, useUserId } from '@rocket.chat/ui-contexts';
import { useVoipAPI, useVoipState } from '@rocket.chat/ui-voip';
import { useMemo } from 'react';
import { useTranslation } from 'react-i18next';
@@ -8,11 +9,14 @@ import { useTranslation } from 'react-i18next';
import { useMediaPermissions } from '../../../views/room/composer/messageBox/hooks/useMediaPermissions';
import { useRoom } from '../../../views/room/contexts/RoomContext';
import { useUserInfoQuery } from '../../useUserInfoQuery';
+import { useVoipWarningModal } from '../../useVoipWarningModal';
const useVoipMenuOptions = () => {
const { t } = useTranslation();
const { uids = [] } = useRoom();
const ownUserId = useUserId();
+ const canStartVoiceCall = usePermission('view-user-voip-extension');
+ const dispatchWarning = useVoipWarningModal();
const [isMicPermissionDenied] = useMediaPermissions('microphone');
@@ -27,7 +31,9 @@ const useVoipMenuOptions = () => {
const isRemoteRegistered = !!remoteUser?.freeSwitchExtension;
const isDM = members.length === 1;
- const disabled = isMicPermissionDenied || !isDM || !isRemoteRegistered || !isRegistered || isInCall || isPending;
+ const disabled = isMicPermissionDenied || !isDM || isInCall || isPending;
+ const allowed = isDM && !isInCall && !isPending;
+ const canMakeVoipCall = allowed && isRemoteRegistered && isRegistered && isEnabled && !isMicPermissionDenied;
const title = useMemo(() => {
if (isMicPermissionDenied) {
@@ -41,13 +47,24 @@ const useVoipMenuOptions = () => {
return disabled ? t('Voice_calling_disabled') : '';
}, [disabled, isInCall, isMicPermissionDenied, t]);
+ const handleOnClick = useEffectEvent(() => {
+ if (canMakeVoipCall) {
+ return makeCall(remoteUser?.freeSwitchExtension as string);
+ }
+ dispatchWarning();
+ });
+
return useMemo(() => {
+ if (!canStartVoiceCall) {
+ return undefined;
+ }
+
const items: GenericMenuItemProps[] = [
{
id: 'start-voip-call',
icon: 'phone',
disabled,
- onClick: () => makeCall(remoteUser?.freeSwitchExtension as string),
+ onClick: handleOnClick,
content: (
{t('Voice_call')}
@@ -57,13 +74,13 @@ const useVoipMenuOptions = () => {
];
return {
- items: isEnabled ? items : [],
+ items,
groups: ['direct'] as const,
disabled,
- allowed: isEnabled,
order: 4,
+ allowed,
};
- }, [disabled, title, t, isEnabled, makeCall, remoteUser?.freeSwitchExtension]);
+ }, [disabled, title, t, handleOnClick, allowed, canStartVoiceCall]);
};
export default useVoipMenuOptions;
diff --git a/apps/meteor/client/hooks/useRoomName.ts b/apps/meteor/client/hooks/useRoomName.ts
index 62cfd45568fea..e0f4c2dbdd267 100644
--- a/apps/meteor/client/hooks/useRoomName.ts
+++ b/apps/meteor/client/hooks/useRoomName.ts
@@ -1,9 +1,8 @@
import type { IRoom } from '@rocket.chat/core-typings';
import { isDirectMessageRoom } from '@rocket.chat/core-typings';
+import { useUserDisplayName } from '@rocket.chat/ui-client';
import { useUserSubscription } from '@rocket.chat/ui-contexts';
-import { useUserDisplayName } from './useUserDisplayName';
-
/**
*
* Hook to get the name of the room
diff --git a/apps/meteor/client/hooks/useUserSoundPreferences.ts b/apps/meteor/client/hooks/useUserSoundPreferences.ts
index e59a55648f550..d2f1f50ebd8a0 100644
--- a/apps/meteor/client/hooks/useUserSoundPreferences.ts
+++ b/apps/meteor/client/hooks/useUserSoundPreferences.ts
@@ -1,13 +1,11 @@
import { useUserPreference } from '@rocket.chat/ui-contexts';
-const relativeVolume = (volume: number, masterVolume: number) => {
- return (volume * masterVolume) / 100;
-};
+const relativeVolume = (volume: number, masterVolume: number) => (volume * masterVolume) / 100;
export const useUserSoundPreferences = () => {
- const masterVolume = useUserPreference('masterVolume', 100) || 100;
- const notificationsSoundVolume = useUserPreference('notificationsSoundVolume', 100) || 100;
- const voipRingerVolume = useUserPreference('voipRingerVolume', 100) || 100;
+ const masterVolume = useUserPreference('masterVolume', 100) ?? 100;
+ const notificationsSoundVolume = useUserPreference('notificationsSoundVolume', 100) ?? 100;
+ const voipRingerVolume = useUserPreference('voipRingerVolume', 100) ?? 100;
return {
masterVolume,
diff --git a/apps/meteor/client/hooks/useVoipWarningModal.tsx b/apps/meteor/client/hooks/useVoipWarningModal.tsx
new file mode 100644
index 0000000000000..4e6cedbd5977d
--- /dev/null
+++ b/apps/meteor/client/hooks/useVoipWarningModal.tsx
@@ -0,0 +1,30 @@
+import { useEffectEvent } from '@rocket.chat/fuselage-hooks';
+import { useRole, useRoute, useSetModal } from '@rocket.chat/ui-contexts';
+import { useMemo } from 'react';
+
+import { useHasLicenseModule } from './useHasLicenseModule';
+import TeamsVoipConfigModal from '../views/room/contextualBar/TeamsVoipConfigModal';
+
+export const useVoipWarningModal = (): (() => void) => {
+ const setModal = useSetModal();
+ const isAdmin = useRole('admin');
+ const hasModule = useHasLicenseModule('teams-voip') === true;
+ const teamsVoipSettingsRoute = useRoute('admin-settings');
+
+ const handleClose = useEffectEvent(() => setModal(null));
+
+ const handleRedirectToConfiguration = useEffectEvent(() => {
+ handleClose();
+ teamsVoipSettingsRoute.push({
+ group: 'VoIP_TeamCollab',
+ });
+ });
+
+ return useMemo(
+ () => (): void =>
+ setModal(
+
- ,
),
},
diff --git a/apps/meteor/client/lib/utils/mapSubscriptionFromApi.ts b/apps/meteor/client/lib/utils/mapSubscriptionFromApi.ts
new file mode 100644
index 0000000000000..d0f75a389ab8f
--- /dev/null
+++ b/apps/meteor/client/lib/utils/mapSubscriptionFromApi.ts
@@ -0,0 +1,19 @@
+import type { ISubscription, Serialized } from '@rocket.chat/core-typings';
+
+export const mapSubscriptionFromApi = ({
+ ts,
+ lr,
+ ls,
+ _updatedAt,
+ oldRoomKeys,
+ suggestedOldRoomKeys,
+ ...subscription
+}: Serialized): ISubscription => ({
+ ...subscription,
+ ts: new Date(ts),
+ ls: new Date(ls),
+ lr: new Date(lr),
+ _updatedAt: new Date(_updatedAt),
+ ...(oldRoomKeys && { oldRoomKeys: oldRoomKeys.map(({ ts, ...key }) => ({ ...key, ts: new Date(ts) })) }),
+ ...(suggestedOldRoomKeys && { suggestedOldRoomKeys: suggestedOldRoomKeys.map(({ ts, ...key }) => ({ ...key, ts: new Date(ts) })) }),
+});
diff --git a/apps/meteor/client/main.ts b/apps/meteor/client/main.ts
index 62da42ae41983..52e9831864ee0 100644
--- a/apps/meteor/client/main.ts
+++ b/apps/meteor/client/main.ts
@@ -1,7 +1,7 @@
import './serviceWorker';
import './startup/accounts';
-import { FlowRouter } from 'meteor/kadira:flow-router';
+import { FlowRouter } from 'meteor/ostrio:flow-router-extra';
FlowRouter.wait();
diff --git a/apps/meteor/client/meteorOverrides/ddpOverREST.ts b/apps/meteor/client/meteorOverrides/ddpOverREST.ts
index 5ddfb7ba5085c..c0abc244cc476 100644
--- a/apps/meteor/client/meteorOverrides/ddpOverREST.ts
+++ b/apps/meteor/client/meteorOverrides/ddpOverREST.ts
@@ -49,7 +49,8 @@ const withDDPOverREST = (_send: (this: Meteor.IMeteorConnection, message: Meteor
msg: 'updated',
methods: [message.id],
});
- this.onMessage(_message);
+
+ this._streamHandlers.onMessage(_message);
};
const method = encodeURIComponent(message.method.replace(/\//g, ':'));
diff --git a/apps/meteor/client/omnichannel/additionalForms/AutoCompleteUnits.tsx b/apps/meteor/client/omnichannel/additionalForms/AutoCompleteUnits.tsx
new file mode 100644
index 0000000000000..ab13d0a284d3e
--- /dev/null
+++ b/apps/meteor/client/omnichannel/additionalForms/AutoCompleteUnits.tsx
@@ -0,0 +1,51 @@
+import type { PaginatedMultiSelectOption } from '@rocket.chat/fuselage';
+import { PaginatedMultiSelectFiltered } from '@rocket.chat/fuselage';
+import { useDebouncedValue } from '@rocket.chat/fuselage-hooks';
+import type { ReactElement } from 'react';
+import { memo, useMemo, useState } from 'react';
+import { useTranslation } from 'react-i18next';
+
+import { useUnitsList } from '../../components/Omnichannel/hooks/useUnitsList';
+import { useRecordList } from '../../hooks/lists/useRecordList';
+import { AsyncStatePhase } from '../../lib/asyncState';
+
+type AutoCompleteUnitsProps = {
+ value?: PaginatedMultiSelectOption[];
+ error?: boolean;
+ placeholder?: string;
+ onChange: (value: PaginatedMultiSelectOption[]) => void;
+};
+
+const AutoCompleteUnits = ({ value, error, placeholder, onChange }: AutoCompleteUnitsProps): ReactElement => {
+ const { t } = useTranslation();
+ const [unitsFilter, setUnitsFilter] = useState('');
+
+ const debouncedUnitFilter = useDebouncedValue(unitsFilter, 500);
+
+ const { itemsList: unitsList, loadMoreItems: loadMoreUnits } = useUnitsList(
+ useMemo(() => ({ text: debouncedUnitFilter }), [debouncedUnitFilter]),
+ );
+
+ const { phase: unitsPhase, itemCount: unitsTotal, items: unitItems } = useRecordList(unitsList);
+
+ return (
+ void}
+ options={unitItems}
+ data-qa='autocomplete-multiple-unit'
+ endReached={
+ unitsPhase === AsyncStatePhase.LOADING ? (): void => undefined : (start): void => loadMoreUnits(start!, Math.min(50, unitsTotal))
+ }
+ />
+ );
+};
+
+export default memo(AutoCompleteUnits);
diff --git a/apps/meteor/client/providers/RouterProvider.tsx b/apps/meteor/client/providers/RouterProvider.tsx
index cad11b2266a6f..0d6e05b52b3ec 100644
--- a/apps/meteor/client/providers/RouterProvider.tsx
+++ b/apps/meteor/client/providers/RouterProvider.tsx
@@ -10,7 +10,7 @@ import type {
RouteObject,
LocationSearch,
} from '@rocket.chat/ui-contexts';
-import { FlowRouter } from 'meteor/kadira:flow-router';
+import { FlowRouter } from 'meteor/ostrio:flow-router-extra';
import { Tracker } from 'meteor/tracker';
import type { ReactNode } from 'react';
@@ -125,7 +125,12 @@ const updateFlowRouter = () => {
return;
}
- FlowRouter.initialize();
+ FlowRouter.initialize({
+ hashbang: false,
+ page: {
+ click: true,
+ },
+ });
};
const defineRoutes = (routes: RouteObject[]) => {
diff --git a/apps/meteor/client/sidebar/header/UserMenu.tsx b/apps/meteor/client/sidebar/header/UserMenu.tsx
index b4aa8b1ba2892..1f2239baa20e2 100644
--- a/apps/meteor/client/sidebar/header/UserMenu.tsx
+++ b/apps/meteor/client/sidebar/header/UserMenu.tsx
@@ -7,6 +7,7 @@ import {
useHandleMenuAction,
type GenericMenuItemProps,
} from '@rocket.chat/ui-client';
+import { useLayout } from '@rocket.chat/ui-contexts';
import { useState, memo } from 'react';
import { useTranslation } from 'react-i18next';
@@ -17,7 +18,7 @@ import { useUserMenu } from './hooks/useUserMenu';
const UserMenu = ({ user }: { user: IUser }) => {
const { t } = useTranslation();
const [isOpen, setIsOpen] = useState(false);
-
+ const { sidebar } = useLayout();
const sections = useUserMenu(user);
const items = sections.reduce((acc, { items }) => [...acc, ...items], [] as GenericMenuItemProps[]);
@@ -36,6 +37,7 @@ const UserMenu = ({ user }: { user: IUser }) => {
onAction={handleAction}
isOpen={isOpen}
onOpenChange={setIsOpen}
+ disabled={sidebar.isCollapsed}
/>
@@ -50,6 +52,7 @@ const UserMenu = ({ user }: { user: IUser }) => {
onAction={handleAction}
isOpen={isOpen}
onOpenChange={setIsOpen}
+ disabled={sidebar.isCollapsed}
/>
diff --git a/apps/meteor/client/sidebar/header/UserMenuHeader.tsx b/apps/meteor/client/sidebar/header/UserMenuHeader.tsx
index 05a0a79e7cfed..16e7b094bf8cd 100644
--- a/apps/meteor/client/sidebar/header/UserMenuHeader.tsx
+++ b/apps/meteor/client/sidebar/header/UserMenuHeader.tsx
@@ -1,12 +1,12 @@
import type { IUser } from '@rocket.chat/core-typings';
import { Box, Margins } from '@rocket.chat/fuselage';
import { UserAvatar } from '@rocket.chat/ui-avatar';
+import { useUserDisplayName } from '@rocket.chat/ui-client';
import { useSetting } from '@rocket.chat/ui-contexts';
import { useTranslation } from 'react-i18next';
import MarkdownText from '../../components/MarkdownText';
import { UserStatus } from '../../components/UserStatus';
-import { useUserDisplayName } from '../../hooks/useUserDisplayName';
const UserMenuHeader = ({ user }: { user: IUser }) => {
const { t } = useTranslation();
diff --git a/apps/meteor/client/sidebar/header/actions/Administration.tsx b/apps/meteor/client/sidebar/header/actions/Administration.tsx
index 15650d17c08ae..9305359141af2 100644
--- a/apps/meteor/client/sidebar/header/actions/Administration.tsx
+++ b/apps/meteor/client/sidebar/header/actions/Administration.tsx
@@ -1,5 +1,6 @@
import { Sidebar } from '@rocket.chat/fuselage';
import { GenericMenu } from '@rocket.chat/ui-client';
+import { useLayout } from '@rocket.chat/ui-contexts';
import type { HTMLAttributes } from 'react';
import { useTranslation } from 'react-i18next';
@@ -9,10 +10,12 @@ type AdministrationProps = Omit, 'is'>;
const Administration = (props: AdministrationProps) => {
const { t } = useTranslation();
-
+ const { sidebar } = useLayout();
const sections = useAdministrationMenu();
- return , 'is'>;
const CreateRoom = (props: CreateRoomProps) => {
const { t } = useTranslation();
-
+ const { sidebar } = useLayout();
const sections = useCreateRoom();
- return , 'is'>;
const Sort = (props: SortProps) => {
const { t } = useTranslation();
-
+ const { sidebar } = useLayout();
const sections = useSortMenu();
return (
- {
control={control}
render={({ field: { onChange, value } }) => (
{
control={control}
render={({ field: { onChange, value } }) => (
void;
};
-const BackupCodesModal = ({ codes, onClose, ...props }: BackupCodesModalProps) => {
+const BackupCodesModal = ({ codes, onClose }: BackupCodesModalProps) => {
const { t } = useTranslation();
const codesText = useMemo(() => codes.join(' '), [codes]);
+ const { copy, hasCopied } = useClipboard(codesText);
return (
-
-
- {t('Backup_codes')}
-
-
-
- {t('Make_sure_you_have_a_copy_of_your_codes_1')}
-
-
- {t('Make_sure_you_have_a_copy_of_your_codes_2')}
-
-
-
-
-
-
-
-
+
+
+ {t('Make_sure_you_have_a_copy_of_your_codes_1')}
+
+ copy()} mbs={8}>
+ {codesText}
+
+
+ {t('Make_sure_you_have_a_copy_of_your_codes_2')}
+
+
);
};
diff --git a/apps/meteor/client/views/account/security/TwoFactorTOTP.tsx b/apps/meteor/client/views/account/security/TwoFactorTOTP.tsx
index cc282c2ba64eb..a8d2230eec62e 100644
--- a/apps/meteor/client/views/account/security/TwoFactorTOTP.tsx
+++ b/apps/meteor/client/views/account/security/TwoFactorTOTP.tsx
@@ -92,12 +92,13 @@ const TwoFactorTOTP = (props: TwoFactorTOTPProps): ReactElement => {
return dispatchToastMessage({ type: 'error', message: t('Invalid_two_factor_code') });
}
+ setRegisteringTotp(false);
setModal( undefined} onConfirm={onRegenerate} onClose={closeModal} />);
+ }, [closeModal, dispatchToastMessage, setModal, regenerateCodesFn, t]);
return (
diff --git a/apps/meteor/client/views/admin/moderation/helpers/ContextMessage.tsx b/apps/meteor/client/views/admin/moderation/helpers/ContextMessage.tsx
index 94a6e37ba87ba..2d5081c2f6931 100644
--- a/apps/meteor/client/views/admin/moderation/helpers/ContextMessage.tsx
+++ b/apps/meteor/client/views/admin/moderation/helpers/ContextMessage.tsx
@@ -2,6 +2,7 @@ import type { IMessage, MessageReport, MessageAttachment } from '@rocket.chat/co
import { isE2EEMessage, isQuoteAttachment } from '@rocket.chat/core-typings';
import { Message, MessageName, MessageToolbarItem, MessageToolbarWrapper, MessageUsername } from '@rocket.chat/fuselage';
import { UserAvatar } from '@rocket.chat/ui-avatar';
+import { useUserDisplayName } from '@rocket.chat/ui-client';
import { useSetting } from '@rocket.chat/ui-contexts';
import { useTranslation } from 'react-i18next';
@@ -12,7 +13,6 @@ import UiKitMessageBlock from '../../../../components/message/uikit/UiKitMessage
import { useFormatDate } from '../../../../hooks/useFormatDate';
import { useFormatDateAndTime } from '../../../../hooks/useFormatDateAndTime';
import { useFormatTime } from '../../../../hooks/useFormatTime';
-import { useUserDisplayName } from '../../../../hooks/useUserDisplayName';
import MessageReportInfo from '../MessageReportInfo';
import useDeleteMessage from '../hooks/useDeleteMessage';
import { useDismissMessageAction } from '../hooks/useDismissMessageAction';
diff --git a/apps/meteor/client/views/conference/ConferencePage.tsx b/apps/meteor/client/views/conference/ConferencePage.tsx
index 6131218c52a63..5717f4d823c74 100644
--- a/apps/meteor/client/views/conference/ConferencePage.tsx
+++ b/apps/meteor/client/views/conference/ConferencePage.tsx
@@ -1,9 +1,9 @@
+import { useUserDisplayName } from '@rocket.chat/ui-client';
import { useRoute, useSetModal, useUser } from '@rocket.chat/ui-contexts';
import type { ReactElement } from 'react';
import { useEffect } from 'react';
import ConferencePageError from './ConferencePageError';
-import { useUserDisplayName } from '../../hooks/useUserDisplayName';
import { useVideoConfOpenCall } from '../room/contextualBar/VideoConference/hooks/useVideoConfOpenCall';
import PageLoading from '../root/PageLoading';
diff --git a/apps/meteor/client/views/hooks/useMemberList.spec.tsx b/apps/meteor/client/views/hooks/useMemberList.spec.tsx
index f0dbbb17e5058..88aa47c076056 100644
--- a/apps/meteor/client/views/hooks/useMemberList.spec.tsx
+++ b/apps/meteor/client/views/hooks/useMemberList.spec.tsx
@@ -53,21 +53,22 @@ describe('useMembersList', () => {
fakeMembersPage1 = {
offset: 0,
- count: 2,
- total: 4,
+ count: 3,
+ total: 5,
members: [
{ _id: 'user1', username: 'alex', roles: ['owner'], status: UserStatus.ONLINE },
- { _id: 'user2', username: 'john', roles: ['moderator'], status: UserStatus.OFFLINE },
+ { _id: 'user2', username: 'bob', roles: ['leader'], status: UserStatus.OFFLINE },
+ { _id: 'user3', username: 'john', roles: ['moderator'], status: UserStatus.OFFLINE },
],
};
fakeMembersPage2 = {
- offset: 2,
+ offset: 3,
count: 2,
- total: 4,
+ total: 5,
members: [
- { _id: 'user3', username: 'chris', roles: [], status: UserStatus.ONLINE },
- { _id: 'user4', username: 'zoe', roles: [], status: UserStatus.OFFLINE },
+ { _id: 'user4', username: 'chris', roles: [], status: UserStatus.ONLINE },
+ { _id: 'user5', username: 'zoe', roles: [], status: UserStatus.OFFLINE },
],
};
@@ -80,7 +81,7 @@ describe('useMembersList', () => {
useMembersList({
rid: 'room123',
type: 'all',
- limit: 2,
+ limit: 3,
debouncedText: '',
roomType: 'c',
}),
@@ -102,7 +103,7 @@ describe('useMembersList', () => {
useMembersList({
rid: 'room123',
type: 'all',
- limit: 2,
+ limit: 3,
debouncedText: '',
roomType: 'p',
}),
@@ -125,7 +126,7 @@ describe('useMembersList', () => {
useMembersList({
rid: 'directRoomId',
type: 'all',
- limit: 2,
+ limit: 3,
debouncedText: '',
roomType: 'd',
}),
@@ -146,7 +147,7 @@ describe('useMembersList', () => {
useMembersList({
rid: 'room123',
type: 'all',
- limit: 2,
+ limit: 3,
debouncedText: '',
roomType: 'c',
}),
@@ -157,14 +158,14 @@ describe('useMembersList', () => {
if (offset === 0) {
return fakeMembersPage1 as any;
}
- if (offset === 2) {
+ if (offset === 3) {
return fakeMembersPage2 as any;
}
return {
members: [],
offset,
- count: 2,
- total: 4,
+ count: 0,
+ total: 5,
};
})
.build(),
@@ -172,7 +173,7 @@ describe('useMembersList', () => {
);
await waitFor(() => expect(result.current.isLoading).toBe(false));
- expect(result.current.data?.pages[0].members).toHaveLength(2);
+ expect(result.current.data?.pages[0].members).toHaveLength(3);
await act(async () => {
await result.current.fetchNextPage();
@@ -194,7 +195,7 @@ describe('useMembersList', () => {
useMembersList({
rid: 'room123',
type: 'all',
- limit: 2,
+ limit: 3,
debouncedText: '',
roomType: 'c',
}),
@@ -224,7 +225,7 @@ describe('useMembersList', () => {
useMembersList({
rid: 'room123',
type: 'all',
- limit: 2,
+ limit: 3,
debouncedText: '',
roomType: 'c',
}),
@@ -233,7 +234,7 @@ describe('useMembersList', () => {
await waitFor(() => expect(result.current.isLoading).toBe(false));
let user2 = result.current.data?.pages[0].members.find((m) => m._id === 'user2') as RoomMember;
- expect(user2?.roles).toEqual(['moderator']);
+ expect(user2?.roles).toEqual(['leader']);
// Simulate a roles-change event "added" for user2 -> 'owner'
await act(async () => {
@@ -248,20 +249,21 @@ describe('useMembersList', () => {
user2 = result.current.data?.pages[0].members.find((m) => m._id === 'user2') as RoomMember;
await waitFor(() => expect(user2?.roles).toContain('owner'));
- await waitFor(() => expect(user2?.roles).toContain('moderator'));
+ await waitFor(() => expect(user2?.roles).toContain('leader'));
});
it('sorts members list cache by "roles > status > username/name" logic on roles-change', async () => {
const customPage = {
offset: 0,
- count: 5,
- total: 5,
+ count: 6,
+ total: 6,
members: [
- { _id: 'u1', username: 'michael', roles: ['owner'], status: UserStatus.OFFLINE },
- { _id: 'u2', username: 'karl', roles: ['moderator'], status: UserStatus.ONLINE },
- { _id: 'u3', username: 'bob', roles: ['moderator'], status: UserStatus.OFFLINE },
- { _id: 'u4', username: 'alex', roles: [], status: UserStatus.OFFLINE },
- { _id: 'u5', username: 'john', roles: [], status: UserStatus.ONLINE },
+ { _id: 'u1', username: 'mark', roles: ['owner'], status: UserStatus.OFFLINE },
+ { _id: 'u2', username: 'michael', roles: ['leader'], status: UserStatus.OFFLINE },
+ { _id: 'u3', username: 'karl', roles: ['moderator'], status: UserStatus.ONLINE },
+ { _id: 'u4', username: 'bob', roles: ['moderator'], status: UserStatus.OFFLINE },
+ { _id: 'u5', username: 'alex', roles: [], status: UserStatus.OFFLINE },
+ { _id: 'u6', username: 'john', roles: [], status: UserStatus.ONLINE },
],
};
@@ -291,23 +293,23 @@ describe('useMembersList', () => {
await waitFor(() => expect(result.current.isLoading).toBe(false));
let memberIds = result.current.data?.pages[0].members.map((m) => m._id);
- expect(memberIds).toEqual(['u1', 'u2', 'u3', 'u4', 'u5']);
+ expect(memberIds).toEqual(['u1', 'u2', 'u3', 'u4', 'u5', 'u6']);
- // Simulate giving user 'alex/u4' the "moderator" role.
- // That should push 'alex/u4' to the third of the sorted list -
- // after michael/u1 (since owner), after karl/u2 (since online) and before bob/u3 (since sort by username).
+ // Simulate giving user 'alex/u5' the "moderator" role.
+ // That should push 'alex/u5' to the third of the sorted list -
+ // after mark/u1 and michael/u2 (since owner), after karl/u3 (since online) and before bob/u4 (since sort by username).
act(() => {
rolesChangeCallback?.({
type: 'added',
scope: 'room123',
- u: { _id: 'u4' },
+ u: { _id: 'u5' },
_id: 'moderator',
});
});
await waitFor(() => {
memberIds = result.current.data?.pages[0].members.map((m) => m._id);
- expect(memberIds).toEqual(['u1', 'u2', 'u4', 'u3', 'u5']);
+ expect(memberIds).toEqual(['u1', 'u2', 'u3', 'u5', 'u4', 'u6']);
});
});
diff --git a/apps/meteor/client/views/hooks/useMembersList.ts b/apps/meteor/client/views/hooks/useMembersList.ts
index 4879729a1701d..c1a2c3daec3c4 100644
--- a/apps/meteor/client/views/hooks/useMembersList.ts
+++ b/apps/meteor/client/views/hooks/useMembersList.ts
@@ -4,6 +4,8 @@ import type { InfiniteData, QueryClient } from '@tanstack/react-query';
import { useInfiniteQuery, useQueryClient } from '@tanstack/react-query';
import { useEffect } from 'react';
+import { calculateRoomRolePriorityFromRoles } from '../../../lib/roles/calculateRoomRolePriorityFromRoles';
+
type MembersListOptions = {
rid: string;
type: 'all' | 'online';
@@ -23,20 +25,14 @@ export type RoomMember = Pick {
- return members.sort((a, b) => {
- const aRoles = a.roles ?? [];
- const bRoles = b.roles ?? [];
- const isOwnerA = aRoles.includes('owner');
- const isOwnerB = bRoles.includes('owner');
- const isModeratorA = aRoles.includes('moderator');
- const isModeratorB = bRoles.includes('moderator');
-
- if (isOwnerA !== isOwnerB) {
- return isOwnerA ? -1 : 1;
- }
-
- if (isModeratorA !== isModeratorB && !isOwnerA) {
- return isModeratorA ? -1 : 1;
+ const membersWithRolePriority: (RoomMember & { rolePriority: number })[] = members.map((member) => ({
+ ...member,
+ rolePriority: calculateRoomRolePriorityFromRoles(member.roles ?? []),
+ }));
+
+ return membersWithRolePriority.sort((a, b) => {
+ if (a.rolePriority !== b.rolePriority) {
+ return a.rolePriority - b.rolePriority;
}
if (a.status !== b.status) {
diff --git a/apps/meteor/client/views/omnichannel/contactHistory/MessageList/ContactHistoryMessage.tsx b/apps/meteor/client/views/omnichannel/contactHistory/MessageList/ContactHistoryMessage.tsx
index f7631134ece30..901b97ed2c721 100644
--- a/apps/meteor/client/views/omnichannel/contactHistory/MessageList/ContactHistoryMessage.tsx
+++ b/apps/meteor/client/views/omnichannel/contactHistory/MessageList/ContactHistoryMessage.tsx
@@ -19,10 +19,10 @@ import {
Bubble,
} from '@rocket.chat/fuselage';
import { UserAvatar } from '@rocket.chat/ui-avatar';
+import { useUserDisplayName } from '@rocket.chat/ui-client';
import { memo } from 'react';
import { useTranslation } from 'react-i18next';
-import { getUserDisplayName } from '../../../../../lib/getUserDisplayName';
import MessageContentBody from '../../../../components/message/MessageContentBody';
import StatusIndicators from '../../../../components/message/StatusIndicators';
import Attachments from '../../../../components/message/content/Attachments';
@@ -44,6 +44,7 @@ const ContactHistoryMessage = ({ message, sequential, isNewDay, showUserAvatar }
const format = useFormatDate();
const formatTime = useFormatTime();
+ const displayName = useUserDisplayName(message.u);
const quotes = message?.attachments?.filter(isQuoteAttachment) || [];
@@ -106,7 +107,7 @@ const ContactHistoryMessage = ({ message, sequential, isNewDay, showUserAvatar }
{!sequential && (
- {message.alias || getUserDisplayName(message.u.name, message.u.username, false)}
+ {message.alias || displayName}
@{message.u.username}
diff --git a/apps/meteor/client/views/omnichannel/contactInfo/EditContactInfo.tsx b/apps/meteor/client/views/omnichannel/contactInfo/EditContactInfo.tsx
index a9f59e2011457..e4a432d357ea0 100644
--- a/apps/meteor/client/views/omnichannel/contactInfo/EditContactInfo.tsx
+++ b/apps/meteor/client/views/omnichannel/contactInfo/EditContactInfo.tsx
@@ -1,7 +1,7 @@
import type { ILivechatContact, Serialized } from '@rocket.chat/core-typings';
import { Field, FieldLabel, FieldRow, FieldError, TextInput, ButtonGroup, Button, IconButton, Divider } from '@rocket.chat/fuselage';
import { CustomFieldsForm } from '@rocket.chat/ui-client';
-import { useSetModal } from '@rocket.chat/ui-contexts';
+import { useEndpoint, useSetModal } from '@rocket.chat/ui-contexts';
import type { ReactElement } from 'react';
import { Fragment, useId } from 'react';
import { Controller, useFieldArray, useForm } from 'react-hook-form';
@@ -75,6 +75,7 @@ const EditContactInfo = ({ contactData, onClose, onCancel }: ContactNewEditProps
const editContact = useEditContact(['current-contacts']);
const createContact = useCreateContact(['current-contacts']);
+ const checkExistenceEndpoint = useEndpoint('GET', '/v1/omnichannel/contacts.checkExistence');
const handleOpenUpSellModal = () => setModal( setModal(null)} />);
@@ -117,21 +118,47 @@ const EditContactInfo = ({ contactData, onClose, onCancel }: ContactNewEditProps
const { emails, phones } = watch();
const validateEmailFormat = async (emailValue: string) => {
+ if (!emails) {
+ return true;
+ }
+
const currentEmails = emails.map(({ address }) => address);
- const isDuplicated = currentEmails.filter((email) => email === emailValue).length > 1;
if (!validateEmail(emailValue)) {
return t('error-invalid-email-address');
}
- return !isDuplicated ? true : t('Email_already_exists');
+ if (currentEmails.filter((email) => email === emailValue).length > 1) {
+ return t('Email_already_exists');
+ }
+
+ const initialEmails = initialValue.emails.map(({ address }) => address);
+
+ if (!initialEmails.includes(emailValue) && (await checkExistenceEndpoint({ email: emailValue })).exists) {
+ return t('Email_already_exists');
+ }
+
+ return true;
};
const validatePhone = async (phoneValue: string) => {
+ if (!phones) {
+ return true;
+ }
+
const currentPhones = phones.map(({ phoneNumber }) => phoneNumber);
- const isDuplicated = currentPhones.filter((phone) => phone === phoneValue).length > 1;
- return !isDuplicated ? true : t('Phone_already_exists');
+ if (currentPhones.filter((phone) => phone === phoneValue).length > 1) {
+ return t('Phone_already_exists');
+ }
+
+ const initialPhones = initialValue.phones.map(({ phoneNumber }) => phoneNumber);
+
+ if (!initialPhones.includes(phoneValue) && (await checkExistenceEndpoint({ phone: phoneValue })).exists) {
+ return t('Phone_already_exists');
+ }
+
+ return true;
};
const validateName = (v: string): string | boolean => (!v.trim() ? t('Required_field', { field: t('Name') }) : true);
diff --git a/apps/meteor/client/views/omnichannel/directory/chats/ChatsFiltersContextualBar.tsx b/apps/meteor/client/views/omnichannel/directory/chats/ChatsFiltersContextualBar.tsx
index d3070e5fa8c49..e332c55f0fd5b 100644
--- a/apps/meteor/client/views/omnichannel/directory/chats/ChatsFiltersContextualBar.tsx
+++ b/apps/meteor/client/views/omnichannel/directory/chats/ChatsFiltersContextualBar.tsx
@@ -6,8 +6,8 @@ import { format } from 'date-fns';
import { Controller, useForm } from 'react-hook-form';
import { useTranslation } from 'react-i18next';
-import AutoCompleteAgent from '../../../../components/AutoCompleteAgent';
-import AutoCompleteDepartment from '../../../../components/AutoCompleteDepartment';
+import AutoCompleteDepartmentMultiple from '../../../../components/AutoCompleteDepartmentMultiple';
+import AutoCompleteMultipleAgent from '../../../../components/AutoCompleteMultipleAgent';
import {
ContextualbarHeader,
ContextualbarIcon,
@@ -16,6 +16,8 @@ import {
ContextualbarScrollableContent,
ContextualbarFooter,
} from '../../../../components/Contextualbar';
+import { useHasLicenseModule } from '../../../../hooks/useHasLicenseModule';
+import AutoCompleteUnits from '../../../../omnichannel/additionalForms/AutoCompleteUnits';
import { CurrentChatTags } from '../../additionalForms';
import type { ChatsFiltersQuery } from '../contexts/ChatsContext';
import { useChatsContext } from '../contexts/ChatsContext';
@@ -28,6 +30,7 @@ const ChatsFiltersContextualBar = ({ onClose }: ChatsFiltersContextualBarProps)
const { t } = useTranslation();
const canViewLivechatRooms = usePermission('view-livechat-rooms');
const canViewCustomFields = usePermission('view-livechat-room-customfields');
+ const isEnterprise = useHasLicenseModule('livechat-enterprise');
const allCustomFields = useEndpoint('GET', '/v1/livechat/custom-fields');
const { data } = useQuery({ queryKey: ['livechat/custom-fields'], queryFn: async () => allCustomFields() });
@@ -91,7 +94,7 @@ const ChatsFiltersContextualBar = ({ onClose }: ChatsFiltersContextualBarProps)
+ {t('Units')}
+
+
+
+ )}
{canViewCustomFields &&
contactCustomFields?.map((customField) => {
if (customField.type === 'select') {
diff --git a/apps/meteor/client/views/omnichannel/directory/chats/ChatsTable/useChatsQuery.ts b/apps/meteor/client/views/omnichannel/directory/chats/ChatsTable/useChatsQuery.ts
index 5294f9903ee84..e1cfab9d36659 100644
--- a/apps/meteor/client/views/omnichannel/directory/chats/ChatsTable/useChatsQuery.ts
+++ b/apps/meteor/client/views/omnichannel/directory/chats/ChatsTable/useChatsQuery.ts
@@ -8,7 +8,7 @@ type CurrentChatQuery = {
agents?: string[];
offset?: number;
roomName?: string;
- departmentId?: string;
+ departmentId?: string[];
open?: boolean;
createdAt?: string;
closedAt?: string;
@@ -18,6 +18,7 @@ type CurrentChatQuery = {
sort: string;
count?: number;
queued?: boolean;
+ units?: string[];
};
const sortDir = (sortDir: 'asc' | 'desc'): 1 | -1 => (sortDir === 'asc' ? 1 : -1);
@@ -28,7 +29,7 @@ export const useChatsQuery = () => {
return useCallback(
(
- { guest, servedBy, department, status, from, to, tags, ...customFields }: ChatsFiltersQuery,
+ { guest, servedBy, department, status, from, to, tags, units, ...customFields }: ChatsFiltersQuery,
[column, direction]: [string, 'asc' | 'desc'],
current: number,
itemsPerPage: 25 | 50 | 100,
@@ -64,18 +65,22 @@ export const useChatsQuery = () => {
query.agents = userIdLoggedIn ? [userIdLoggedIn] : [];
}
- if (canViewLivechatRooms && servedBy && servedBy !== 'all') {
- query.agents = [servedBy];
+ if (canViewLivechatRooms && servedBy?.length) {
+ query.agents = servedBy.map((s) => s.value as string);
}
- if (department && department !== 'all') {
- query.departmentId = department;
+ if (department?.length) {
+ query.departmentId = department.map((d) => d.value as string);
}
if (tags && tags.length > 0) {
query.tags = tags.map((tag) => tag.value);
}
+ if (units?.length) {
+ query.units = units.map((u) => u.value as string);
+ }
+
if (customFields && Object.keys(customFields).length > 0) {
const customFieldsQuery = Object.fromEntries(
Object.entries(customFields).filter((item) => item[1] !== undefined && item[1] !== ''),
diff --git a/apps/meteor/client/views/omnichannel/directory/contexts/ChatsContext.ts b/apps/meteor/client/views/omnichannel/directory/contexts/ChatsContext.ts
index 95630877a7e8a..c2ff7508b9840 100644
--- a/apps/meteor/client/views/omnichannel/directory/contexts/ChatsContext.ts
+++ b/apps/meteor/client/views/omnichannel/directory/contexts/ChatsContext.ts
@@ -1,25 +1,28 @@
+import type { PaginatedMultiSelectOption } from '@rocket.chat/fuselage';
import type { RefObject, SetStateAction } from 'react';
import { createContext, useContext } from 'react';
export type ChatsFiltersQuery = {
guest: string;
- servedBy: string;
+ servedBy: PaginatedMultiSelectOption[];
status: string;
- department: string;
+ department: PaginatedMultiSelectOption[];
from: string;
to: string;
tags: { _id: string; label: string; value: string }[];
+ units?: PaginatedMultiSelectOption[];
[key: string]: unknown;
};
export const initialValues: ChatsFiltersQuery = {
guest: '',
- servedBy: 'all',
+ servedBy: [],
status: 'all',
- department: 'all',
+ department: [],
from: '',
to: '',
tags: [],
+ units: [],
};
export type ChatsContextValue = {
diff --git a/apps/meteor/client/views/omnichannel/directory/hooks/useDisplayFilters.ts b/apps/meteor/client/views/omnichannel/directory/hooks/useDisplayFilters.ts
index e789d50cb5c5d..8a7b38b50ed64 100644
--- a/apps/meteor/client/views/omnichannel/directory/hooks/useDisplayFilters.ts
+++ b/apps/meteor/client/views/omnichannel/directory/hooks/useDisplayFilters.ts
@@ -1,6 +1,5 @@
+import type { PaginatedMultiSelectOption } from '@rocket.chat/fuselage';
import type { TranslationKey } from '@rocket.chat/ui-contexts';
-import { useEndpoint } from '@rocket.chat/ui-contexts';
-import { useQuery } from '@tanstack/react-query';
import { useTranslation } from 'react-i18next';
import { useFormatDate } from '../../../../hooks/useFormatDate';
@@ -18,13 +17,7 @@ export const useDisplayFilters = (filtersQuery: ChatsFiltersQuery) => {
const { t } = useTranslation();
const formatDate = useFormatDate();
- const { guest, servedBy, status, department, from, to, tags, ...customFields } = filtersQuery;
-
- const getDepartment = useEndpoint('GET', '/v1/livechat/department/:_id', { _id: department });
- const getAgent = useEndpoint('GET', '/v1/livechat/users/agent/:_id', { _id: servedBy });
-
- const { data: departmentData } = useQuery({ queryKey: ['getDepartmentDataForFilter', department], queryFn: () => getDepartment({}) });
- const { data: agentData } = useQuery({ queryKey: ['getAgentDataForFilter', servedBy], queryFn: () => getAgent() });
+ const { guest, servedBy, status, department, from, to, tags, units, ...customFields } = filtersQuery;
const displayCustomFields = Object.entries(customFields).reduce(
(acc, [key, value]) => {
@@ -38,10 +31,15 @@ export const useDisplayFilters = (filtersQuery: ChatsFiltersQuery) => {
from: from !== '' ? `${t('From')}: ${formatDate(from)}` : undefined,
to: to !== '' ? `${t('To')}: ${formatDate(to)}` : undefined,
guest: guest !== '' ? `${t('Text')}: ${guest}` : undefined,
- servedBy: servedBy !== 'all' ? `${t('Served_By')}: ${agentData?.user.name}` : undefined,
- department: department !== 'all' ? `${t('Department')}: ${departmentData?.department.name}` : undefined,
+ servedBy: servedBy.length ? `${t('Served_By')}: ${parseMultiSelect(servedBy)}` : undefined,
+ department: department.length ? `${t('Department')}: ${parseMultiSelect(department)}` : undefined,
status: status !== 'all' ? `${t('Status')}: ${t(statusTextMap[status])}` : undefined,
tags: tags.length > 0 ? `${t('Tags')}: ${tags.map((tag) => tag.label).join(', ')}` : undefined,
+ units: units?.length ? `${t('Units')}: ${parseMultiSelect(units)}` : undefined,
...displayCustomFields,
};
};
+
+const parseMultiSelect = (data: PaginatedMultiSelectOption[]) => {
+ return data.map((a) => (a.label as string).split(' (')[0]).join(', ');
+};
diff --git a/apps/meteor/client/views/omnichannel/directory/providers/ChatsProvider.tsx b/apps/meteor/client/views/omnichannel/directory/providers/ChatsProvider.tsx
index e782eb78874d1..545c0bcfc08e1 100644
--- a/apps/meteor/client/views/omnichannel/directory/providers/ChatsProvider.tsx
+++ b/apps/meteor/client/views/omnichannel/directory/providers/ChatsProvider.tsx
@@ -11,7 +11,7 @@ type ChatsProviderProps = {
const ChatsProvider = ({ children }: ChatsProviderProps) => {
const textInputRef = useRef(null);
- const [filtersQuery, setFiltersQuery] = useLocalStorage('conversationsQuery', initialValues);
+ const [filtersQuery, setFiltersQuery] = useLocalStorage('newConversationsQuery', initialValues);
const displayFilters = useDisplayFilters(filtersQuery);
const contextValue = useMemo(
diff --git a/apps/meteor/client/views/outlookCalendar/hooks/useOutlookOpenCall.ts b/apps/meteor/client/views/outlookCalendar/hooks/useOutlookOpenCall.ts
index 80269ec04b5dd..acde6ebfe63bc 100644
--- a/apps/meteor/client/views/outlookCalendar/hooks/useOutlookOpenCall.ts
+++ b/apps/meteor/client/views/outlookCalendar/hooks/useOutlookOpenCall.ts
@@ -1,6 +1,6 @@
+import { useUserDisplayName } from '@rocket.chat/ui-client';
import { useUser } from '@rocket.chat/ui-contexts';
-import { useUserDisplayName } from '../../../hooks/useUserDisplayName';
import { useVideoConfOpenCall } from '../../room/contextualBar/VideoConference/hooks/useVideoConfOpenCall';
export const useOutlookOpenCall = (meetingUrl?: string) => {
diff --git a/apps/meteor/client/views/room/RoomOpenerEmbedded.tsx b/apps/meteor/client/views/room/RoomOpenerEmbedded.tsx
index d3ba7ef64e367..bced2d4c7dbf1 100644
--- a/apps/meteor/client/views/room/RoomOpenerEmbedded.tsx
+++ b/apps/meteor/client/views/room/RoomOpenerEmbedded.tsx
@@ -1,4 +1,4 @@
-import type { ISubscription, RoomType } from '@rocket.chat/core-typings';
+import type { RoomType } from '@rocket.chat/core-typings';
import { Box, States, StatesIcon, StatesSubtitle, StatesTitle } from '@rocket.chat/fuselage';
import { FeaturePreviewOff, FeaturePreviewOn } from '@rocket.chat/ui-client';
import { useEndpoint, useStream, useUserId } from '@rocket.chat/ui-contexts';
@@ -20,6 +20,7 @@ import { NotAuthorizedError } from '../../lib/errors/NotAuthorizedError';
import { NotSubscribedToRoomError } from '../../lib/errors/NotSubscribedToRoomError';
import { OldUrlRoomError } from '../../lib/errors/OldUrlRoomError';
import { RoomNotFoundError } from '../../lib/errors/RoomNotFoundError';
+import { mapSubscriptionFromApi } from '../../lib/utils/mapSubscriptionFromApi';
const RoomProvider = lazy(() => import('./providers/RoomProvider'));
const RoomNotFound = lazy(() => import('./RoomNotFound'));
@@ -43,7 +44,7 @@ const RoomOpenerEmbedded = ({ type, reference }: RoomOpenerProps): ReactElement
const subscribeToNotifyUser = useStream('notify-user');
const rid = data?.rid;
- const { data: subscription, refetch } = useQuery({
+ const { data: subscriptionData, refetch } = useQuery({
queryKey: ['subscriptions', rid] as const,
queryFn: () => {
if (!rid) {
@@ -55,13 +56,14 @@ const RoomOpenerEmbedded = ({ type, reference }: RoomOpenerProps): ReactElement
});
useEffect(() => {
- if (!subscription) {
+ if (!subscriptionData?.subscription) {
return;
}
- CachedChatSubscription.upsertSubscription(subscription as unknown as ISubscription);
+ CachedChatSubscription.upsertSubscription(mapSubscriptionFromApi(subscriptionData.subscription));
+
LegacyRoomManager.computation.invalidate();
- }, [subscription]);
+ }, [subscriptionData]);
useEffect(() => {
if (!uid) {
diff --git a/apps/meteor/client/views/room/UserCard/UserCardWithData.tsx b/apps/meteor/client/views/room/UserCard/UserCardWithData.tsx
index cb514a70d515e..c9b3e722965f8 100644
--- a/apps/meteor/client/views/room/UserCard/UserCardWithData.tsx
+++ b/apps/meteor/client/views/room/UserCard/UserCardWithData.tsx
@@ -1,3 +1,4 @@
+import { getUserDisplayName } from '@rocket.chat/core-typings';
import type { IRoom } from '@rocket.chat/core-typings';
import { useEffectEvent } from '@rocket.chat/fuselage-hooks';
import { GenericMenu } from '@rocket.chat/ui-client';
@@ -6,7 +7,6 @@ import type { ReactElement } from 'react';
import { useMemo } from 'react';
import { useTranslation } from 'react-i18next';
-import { getUserDisplayName } from '../../../../lib/getUserDisplayName';
import LocalTime from '../../../components/LocalTime';
import { UserCard, UserCardAction, UserCardRole, UserCardSkeleton } from '../../../components/UserCard';
import { ReactiveUserStatus } from '../../../components/UserStatus';
diff --git a/apps/meteor/client/views/room/body/LeaderBar.tsx b/apps/meteor/client/views/room/body/LeaderBar.tsx
deleted file mode 100644
index 8fceaf3efa7c9..0000000000000
--- a/apps/meteor/client/views/room/body/LeaderBar.tsx
+++ /dev/null
@@ -1,82 +0,0 @@
-import type { IUser } from '@rocket.chat/core-typings';
-import { css } from '@rocket.chat/css-in-js';
-import { Box, Button } from '@rocket.chat/fuselage';
-import { UserAvatar } from '@rocket.chat/ui-avatar';
-import type { ReactElement, UIEvent } from 'react';
-import { memo, useCallback, useMemo } from 'react';
-import type { AriaButtonProps } from 'react-aria';
-import { useTranslation } from 'react-i18next';
-
-import { isTruthy } from '../../../../lib/isTruthy';
-import { ReactiveUserStatus } from '../../../components/UserStatus';
-import { roomCoordinator } from '../../../lib/rooms/roomCoordinator';
-
-type LeaderBarProps = {
- _id: IUser['_id'];
- name: IUser['name'];
- username: IUser['username'];
- visible: boolean;
- onAvatarClick?: (event: UIEvent, username: IUser['username']) => void;
- triggerProps: AriaButtonProps<'button'>;
-};
-/**
- * @deprecated on newNavigation feature. Remove after full migration.
- */
-const LeaderBar = ({ _id, name, username, visible, onAvatarClick, triggerProps }: LeaderBarProps): ReactElement => {
- const { t } = useTranslation();
-
- const chatNowLink = useMemo(() => roomCoordinator.getRouteLink('d', { name: username }) || undefined, [username]);
-
- const handleAvatarClick = useCallback(
- (event: UIEvent) => {
- onAvatarClick?.(event, username);
- },
- [onAvatarClick, username],
- );
-
- if (!username) {
- throw new Error('username is required');
- }
-
- const roomLeaderStyle = css`
- position: relative;
- z-index: 9;
- right: 0;
- left: 0;
- display: flex;
-
- &.animated-hidden {
- display: none !important;
- }
- `;
-
- return (
-
-
-
-
-
-
- {name}
-
-
-
-
-
- );
-};
-
-export default memo(LeaderBar);
diff --git a/apps/meteor/client/views/room/body/RoomBody.tsx b/apps/meteor/client/views/room/body/RoomBody.tsx
index fea824e3537d2..02e3726176ac4 100644
--- a/apps/meteor/client/views/room/body/RoomBody.tsx
+++ b/apps/meteor/client/views/room/body/RoomBody.tsx
@@ -1,13 +1,11 @@
-import type { IUser } from '@rocket.chat/core-typings';
import { Box } from '@rocket.chat/fuselage';
import { useMergedRefs } from '@rocket.chat/fuselage-hooks';
import { usePermission, useRole, useSetting, useTranslation, useUser, useUserPreference } from '@rocket.chat/ui-contexts';
-import type { MouseEvent, ReactElement, UIEvent } from 'react';
+import type { MouseEvent, ReactElement } from 'react';
import { memo, useCallback, useMemo, useRef } from 'react';
import DropTargetOverlay from './DropTargetOverlay';
import JumpToRecentMessageButton from './JumpToRecentMessageButton';
-import LeaderBar from './LeaderBar';
import { RoomRoles } from '../../../../app/models/client';
import { isTruthy } from '../../../../lib/isTruthy';
import { CustomScrollbars } from '../../../components/CustomScrollbars';
@@ -24,7 +22,6 @@ import RoomComposer from '../composer/RoomComposer/RoomComposer';
import { useChat } from '../contexts/ChatContext';
import { useRoom, useRoomSubscription, useRoomMessages } from '../contexts/RoomContext';
import { useRoomToolbox } from '../contexts/RoomToolboxContext';
-import { useUserCard } from '../contexts/UserCardContext';
import { useDateScroll } from '../hooks/useDateScroll';
import { useMessageListNavigation } from '../hooks/useMessageListNavigation';
import { useRetentionPolicy } from '../hooks/useRetentionPolicy';
@@ -114,7 +111,7 @@ const RoomBody = (): ReactElement => {
targeDrop: [fileUploadTriggerProps, fileUploadOverlayProps],
} = useFileUpload();
- const { innerRef: restoreScrollPositionInnerRef } = useRestoreScrollPosition(room._id);
+ const { innerRef: restoreScrollPositionInnerRef } = useRestoreScrollPosition();
const { messageListRef } = useMessageListNavigation();
const { innerRef: selectAndScrollRef, selectAllAndScrollToTop } = useSelectAllAndScrollToTop();
@@ -181,19 +178,6 @@ const RoomBody = (): ReactElement => {
[toolbox],
);
- const { openUserCard, triggerProps } = useUserCard();
-
- const handleOpenUserCard = useCallback(
- (event: UIEvent, username: IUser['username']) => {
- if (!username) {
- return;
- }
-
- openUserCard(event, username);
- },
- [openUserCard],
- );
-
useGoToHomeOnRemoved(room, user?._id);
useReadMessageWindowEvents();
useQuoteMessageByUrl();
@@ -229,16 +213,6 @@ const RoomBody = (): ReactElement => {
- {roomLeader ? (
-
{uploads.map((upload) => (
diff --git a/apps/meteor/client/views/room/body/RoomBodyV2.tsx b/apps/meteor/client/views/room/body/RoomBodyV2.tsx
index 273151a76ef3e..6212f96ec6bca 100644
--- a/apps/meteor/client/views/room/body/RoomBodyV2.tsx
+++ b/apps/meteor/client/views/room/body/RoomBodyV2.tsx
@@ -109,7 +109,7 @@ const RoomBody = (): ReactElement => {
targeDrop: [fileUploadTriggerProps, fileUploadOverlayProps],
} = useFileUpload();
- const { innerRef: restoreScrollPositionInnerRef } = useRestoreScrollPosition(room._id);
+ const { innerRef: restoreScrollPositionInnerRef } = useRestoreScrollPosition();
const { messageListRef } = useMessageListNavigation();
const { innerRef: selectAndScrollRef, selectAllAndScrollToTop } = useSelectAllAndScrollToTop();
diff --git a/apps/meteor/client/views/room/body/RoomForeword/RoomForewordUsernameList.tsx b/apps/meteor/client/views/room/body/RoomForeword/RoomForewordUsernameList.tsx
index 6e62ab42a55ce..015cc59169368 100644
--- a/apps/meteor/client/views/room/body/RoomForeword/RoomForewordUsernameList.tsx
+++ b/apps/meteor/client/views/room/body/RoomForeword/RoomForewordUsernameList.tsx
@@ -1,6 +1,5 @@
import type { IUser } from '@rocket.chat/core-typings';
import { Margins } from '@rocket.chat/fuselage';
-import { useSetting } from '@rocket.chat/ui-contexts';
import RoomForewordUsernameListItem from './RoomForewordUsernameListItem';
import { roomCoordinator } from '../../../../lib/rooms/roomCoordinator';
@@ -8,7 +7,6 @@ import { roomCoordinator } from '../../../../lib/rooms/roomCoordinator';
type RoomForewordUsernameListProps = { usernames: Array> };
const RoomForewordUsernameList = ({ usernames }: RoomForewordUsernameListProps) => {
- const useRealName = useSetting('UI_Use_Real_Name', false);
return (
{usernames.map((username) => (
@@ -16,7 +14,6 @@ const RoomForewordUsernameList = ({ usernames }: RoomForewordUsernameListProps)
username={username}
key={username}
href={roomCoordinator.getRouteLink('d', { name: username }) || undefined}
- useRealName={useRealName}
/>
))}
diff --git a/apps/meteor/client/views/room/body/RoomForeword/RoomForewordUsernameListItem.tsx b/apps/meteor/client/views/room/body/RoomForeword/RoomForewordUsernameListItem.tsx
index 48c0cd36a703b..83fdce994b620 100644
--- a/apps/meteor/client/views/room/body/RoomForeword/RoomForewordUsernameListItem.tsx
+++ b/apps/meteor/client/views/room/body/RoomForeword/RoomForewordUsernameListItem.tsx
@@ -1,23 +1,23 @@
import type { IUser } from '@rocket.chat/core-typings';
import { Icon, Tag, Skeleton } from '@rocket.chat/fuselage';
+import { useUserDisplayName } from '@rocket.chat/ui-client';
-import { getUserDisplayName } from '../../../../../lib/getUserDisplayName';
import { useUserInfoQuery } from '../../../../hooks/useUserInfoQuery';
type RoomForewordUsernameListItemProps = {
href: string | undefined;
username: NonNullable;
- useRealName: boolean;
};
-const RoomForewordUsernameListItem = ({ username, href, useRealName }: RoomForewordUsernameListItemProps) => {
+const RoomForewordUsernameListItem = ({ username, href }: RoomForewordUsernameListItemProps) => {
const { data, isLoading, isError, isSuccess } = useUserInfoQuery({ username });
+ const displayName = useUserDisplayName({ name: data?.user?.name, username });
return (
(null);
+ const parentRoomId = useOpenedRoom();
+ const roomId = useSecondLevelOpenedRoom() ?? parentRoomId;
const handleRestoreScroll = useCallback(() => {
- if (!ref.current) {
+ if (!ref.current || !roomId) {
return;
}
@@ -24,7 +25,7 @@ export function useRestoreScrollPosition(roomId: IRoom['_id']) {
}, [roomId]);
useEffect(() => {
- if (!ref.current) {
+ if (!ref.current || !roomId) {
return;
}
diff --git a/apps/meteor/client/views/room/composer/messageBox/MessageBoxReplies.tsx b/apps/meteor/client/views/room/composer/messageBox/MessageBoxReplies.tsx
index 6428426c8cfd1..1a4b6d48a5622 100644
--- a/apps/meteor/client/views/room/composer/messageBox/MessageBoxReplies.tsx
+++ b/apps/meteor/client/views/room/composer/messageBox/MessageBoxReplies.tsx
@@ -1,13 +1,8 @@
-import type { MessageQuoteAttachment } from '@rocket.chat/core-typings';
-import { css } from '@rocket.chat/css-in-js';
-import { IconButton, Box, Margins } from '@rocket.chat/fuselage';
-import { useSetting } from '@rocket.chat/ui-contexts';
+import { Box } from '@rocket.chat/fuselage';
import type { ReactElement } from 'react';
import { memo, useSyncExternalStore } from 'react';
-import { getUserDisplayName } from '../../../../../lib/getUserDisplayName';
-import { QuoteAttachment } from '../../../../components/message/content/attachments/QuoteAttachment';
-import AttachmentProvider from '../../../../providers/AttachmentProvider';
+import MessageBoxReply from './MessageBoxReply';
import { useChat } from '../../contexts/ChatContext';
const MessageBoxReplies = (): ReactElement | null => {
@@ -19,49 +14,14 @@ const MessageBoxReplies = (): ReactElement | null => {
const replies = useSyncExternalStore(chat.composer.quotedMessages.subscribe, chat.composer.quotedMessages.get);
- const useRealName = useSetting('UI_Use_Real_Name', false);
-
if (!replies.length) {
return null;
}
- const closeWrapperStyle = css`
- position: absolute;
- right: 0.5rem;
- top: 0.75rem;
- `;
-
return (
- {replies.map((reply, key) => (
-
-
-
- ({ ...obj, collapsed: true })),
- collapsed: true,
- } as MessageQuoteAttachment
- }
- />
-
- {
- chat.composer?.dismissQuotedMessage(reply._id);
- }}
- >
-
-
-
+ {replies.map((reply) => (
+
);
diff --git a/apps/meteor/client/views/room/composer/messageBox/MessageBoxReply.tsx b/apps/meteor/client/views/room/composer/messageBox/MessageBoxReply.tsx
new file mode 100644
index 0000000000000..321a196308fe5
--- /dev/null
+++ b/apps/meteor/client/views/room/composer/messageBox/MessageBoxReply.tsx
@@ -0,0 +1,55 @@
+import type { IMessage, MessageQuoteAttachment } from '@rocket.chat/core-typings';
+import { css } from '@rocket.chat/css-in-js';
+import { IconButton, Box, Margins } from '@rocket.chat/fuselage';
+import { useUserDisplayName } from '@rocket.chat/ui-client';
+import type { ReactElement } from 'react';
+import { memo } from 'react';
+
+import { QuoteAttachment } from '../../../../components/message/content/attachments/QuoteAttachment';
+import AttachmentProvider from '../../../../providers/AttachmentProvider';
+import { useChat } from '../../contexts/ChatContext';
+
+const MessageBoxReply = ({ reply }: { reply: IMessage }): ReactElement | null => {
+ const chat = useChat();
+
+ const displayName = useUserDisplayName(reply?.u);
+
+ const closeWrapperStyle = css`
+ position: absolute;
+ right: 0.5rem;
+ top: 0.75rem;
+ `;
+
+ return (
+
+
+
+ ({ ...obj, collapsed: true })),
+ collapsed: true,
+ } as MessageQuoteAttachment
+ }
+ />
+
+ {
+ chat?.composer?.dismissQuotedMessage(reply._id);
+ }}
+ >
+
+
+
+ );
+};
+
+export default memo(MessageBoxReply);
diff --git a/apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembers.tsx b/apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembers.tsx
index 7e612b42017d9..07b72c9ad4e44 100644
--- a/apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembers.tsx
+++ b/apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembers.tsx
@@ -88,9 +88,22 @@ const RoomMembers = ({
const useRealName = useSetting('UI_Use_Real_Name', false);
const { counts, titles } = useMemo(() => {
- const owners = members.filter((member) => member.roles?.includes('owner'));
- const moderators = members.filter((member) => !member.roles?.includes('owner') && member.roles?.includes('moderator'));
- const normalMembers = members.filter((member) => !member.roles?.includes('owner') && !member.roles?.includes('moderator'));
+ const owners: RoomMemberUser[] = [];
+ const leaders: RoomMemberUser[] = [];
+ const moderators: RoomMemberUser[] = [];
+ const normalMembers: RoomMemberUser[] = [];
+
+ members.forEach((member) => {
+ if (member.roles?.includes('owner')) {
+ owners.push(member);
+ } else if (member.roles?.includes('leader')) {
+ leaders.push(member);
+ } else if (member.roles?.includes('moderator')) {
+ moderators.push(member);
+ } else {
+ normalMembers.push(member);
+ }
+ });
const counts = [];
const titles = [];
@@ -100,6 +113,11 @@ const RoomMembers = ({
titles.push(
+
+
+ {t('VoIP')}
+ {t('Team_voice_call')}
+
+
+
+
+ {t('Fully_integrated_voip_receive_internal_external_calls_without_switching_between_apps_external_systems')}
+
+ {t('Features')}
+
+
+
+
+
+ Direct calling: Instantly start or receive calls with team members within your Rocket.Chat workspace.
+
+
+
+
+ Extension management: Admins can assign unique extensions to users, enabling quick, direct dialing both
+ from inside and outside your organization.
+
+
+
+
+ Call transfers: Seamlessly transfer active calls to ensure users reach the right team member.
+
+
+
+
+ Availability settings: Users can control their availability to receive calls, enhancing flexibility.
+
+
+
+
+
+
+ {t('Required_action')}
+
+
+ {getCalloutWarning()}
+
+
+
+ {!isAdmin && hasModule && {t('Only_admins_can_perform_this_setup')} }
+
+
+ {onConfirm && isAdmin && hasModule && (
+
+ )}
+ {isAdmin && !hasModule && (
+
+ )}
+
+
+
+ );
+};
+
+export default TeamsVoipConfigModal;
diff --git a/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfList/VideoConfListItem.tsx b/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfList/VideoConfListItem.tsx
index 9f3e04fd4de0b..a131208998b76 100644
--- a/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfList/VideoConfListItem.tsx
+++ b/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfList/VideoConfListItem.tsx
@@ -3,7 +3,8 @@ import { css } from '@rocket.chat/css-in-js';
import { Button, Message, Box, Avatar, Palette, IconButton, ButtonGroup } from '@rocket.chat/fuselage';
import { useEffectEvent } from '@rocket.chat/fuselage-hooks';
import { UserAvatar } from '@rocket.chat/ui-avatar';
-import { useTranslation, useSetting } from '@rocket.chat/ui-contexts';
+import { useUserDisplayName } from '@rocket.chat/ui-client';
+import { useTranslation } from '@rocket.chat/ui-contexts';
import { useVideoConfJoinCall } from '@rocket.chat/ui-video-conf';
import type { ReactElement } from 'react';
@@ -24,7 +25,6 @@ const VideoConfListItem = ({
const t = useTranslation();
const formatDate = useTimeAgo();
const joinCall = useVideoConfJoinCall();
- const showRealName = useSetting('UI_Use_Real_Name', false);
const {
_id: callId,
@@ -35,6 +35,7 @@ const VideoConfListItem = ({
discussionRid,
} = videoConfData;
+ const displayName = useUserDisplayName({ name, username });
const joinedUsers = users.filter((user) => user._id !== _id);
const hovered = css`
@@ -67,7 +68,7 @@ const VideoConfListItem = ({
{username &&
- {showRealName ? name : username}
+ {displayName}
{formatDate(createdAt)}
+
;
diff --git a/apps/meteor/client/views/room/modals/ReadReceiptsModal/ReadReceiptRow.tsx b/apps/meteor/client/views/room/modals/ReadReceiptsModal/ReadReceiptRow.tsx
index d6e870992da23..6b10cc602804c 100644
--- a/apps/meteor/client/views/room/modals/ReadReceiptsModal/ReadReceiptRow.tsx
+++ b/apps/meteor/client/views/room/modals/ReadReceiptsModal/ReadReceiptRow.tsx
@@ -1,10 +1,10 @@
import type { ReadReceipt } from '@rocket.chat/core-typings';
import { Box } from '@rocket.chat/fuselage';
import { UserAvatar } from '@rocket.chat/ui-avatar';
+import { useUserDisplayName } from '@rocket.chat/ui-client';
import type { ReactElement } from 'react';
import { useFormatDateAndTime } from '../../../../hooks/useFormatDateAndTime';
-import { useUserDisplayName } from '../../../../hooks/useUserDisplayName';
const ReadReceiptRow = ({ user, ts }: ReadReceipt): ReactElement => {
const displayName = useUserDisplayName(user || {});
diff --git a/apps/meteor/client/views/root/AppLayout.tsx b/apps/meteor/client/views/root/AppLayout.tsx
index dbe0fa49a56aa..fcf8419eca9f5 100644
--- a/apps/meteor/client/views/root/AppLayout.tsx
+++ b/apps/meteor/client/views/root/AppLayout.tsx
@@ -7,6 +7,10 @@ import { useGoogleTagManager } from './hooks/useGoogleTagManager';
import { useMessageLinkClicks } from './hooks/useMessageLinkClicks';
import { useSettingsOnLoadSiteUrl } from './hooks/useSettingsOnLoadSiteUrl';
import { useAnalytics } from '../../../app/analytics/client/loadScript';
+import { useDolphin } from '../../../app/dolphin/client/hooks/useDolphin';
+import { useDrupal } from '../../../app/drupal/client/hooks/useDrupal';
+import { useEmojiOne } from '../../../app/emoji-emojione/client/hooks/useEmojiOne';
+import { useGitHubEnterpriseAuth } from '../../../app/github-enterprise/client/hooks/useGitHubEnterpriseAuth';
import { useGitLabAuth } from '../../../app/gitlab/client/hooks/useGitLabAuth';
import { useLivechatEnterprise } from '../../../app/livechat-enterprise/hooks/useLivechatEnterprise';
import { useNextcloud } from '../../../app/nextcloud/client/useNextcloud';
@@ -32,12 +36,15 @@ const AppLayout = () => {
useAnalyticsEventTracking();
useLoadRoomForAllowedAnonymousRead();
useNotifyUser();
+ useEmojiOne();
useRedirectToSetupWizard();
useSettingsOnLoadSiteUrl();
useLivechatEnterprise();
useNextcloud();
-
useGitLabAuth();
+ useGitHubEnterpriseAuth();
+ useDrupal();
+ useDolphin();
const layout = useSyncExternalStore(appLayout.subscribe, appLayout.getSnapshot);
diff --git a/apps/meteor/definition/externals/meteor/meteor.d.ts b/apps/meteor/definition/externals/meteor/meteor.d.ts
index b7220937213f9..91cefa7c1b408 100644
--- a/apps/meteor/definition/externals/meteor/meteor.d.ts
+++ b/apps/meteor/definition/externals/meteor/meteor.d.ts
@@ -85,7 +85,11 @@ declare module 'meteor/meteor' {
_outstandingMethodBlocks: unknown[];
- onMessage(message: string): void;
+ // Updated: onMessage is now inside _streamHandlers
+ _streamHandlers: {
+ onMessage(message: string): void;
+ onReset(): void;
+ };
status(): {
connected: boolean;
@@ -94,6 +98,7 @@ declare module 'meteor/meteor' {
status: 'connected' | 'connecting' | 'failed' | 'waiting' | 'offline';
reconnect: () => void;
};
+
subscribe(
id: string,
name: string,
diff --git a/apps/meteor/definition/externals/meteor/kadira-flow-router.d.ts b/apps/meteor/definition/externals/meteor/ostrio-flow-router.d.ts
similarity index 96%
rename from apps/meteor/definition/externals/meteor/kadira-flow-router.d.ts
rename to apps/meteor/definition/externals/meteor/ostrio-flow-router.d.ts
index 946d3d074e262..76ca34333c301 100644
--- a/apps/meteor/definition/externals/meteor/kadira-flow-router.d.ts
+++ b/apps/meteor/definition/externals/meteor/ostrio-flow-router.d.ts
@@ -1,4 +1,4 @@
-declare module 'meteor/kadira:flow-router' {
+declare module 'meteor/ostrio:flow-router-extra' {
import type { Subscription } from 'meteor/meteor';
type Context = {
@@ -100,12 +100,15 @@ declare module 'meteor/kadira:flow-router' {
};
type RouterOptions = {
- hashbang?: boolean;
+ hashbang: boolean;
+ page: { click: boolean };
};
class Router {
constructor();
+ _page: typeof page;
+
route(pathDef: string, options: RouteOptions): Route;
route>(
@@ -139,7 +142,7 @@ declare module 'meteor/kadira:flow-router' {
withTrailingSlash(fn: () => void): Router;
- initialize(options?: RouterOptions): void;
+ initialize: (options: RouterOptions) => void;
wait(): void;
@@ -178,6 +181,5 @@ declare module 'meteor/kadira:flow-router' {
const FlowRouter: Router & {
Route: typeof Route;
Router: typeof Router;
- _page: typeof page;
};
}
diff --git a/apps/meteor/ee/app/livechat-enterprise/server/api/lib/contacts.ts b/apps/meteor/ee/app/livechat-enterprise/server/api/lib/contacts.ts
index 587a1704eee08..14a2c9be8e5b2 100644
--- a/apps/meteor/ee/app/livechat-enterprise/server/api/lib/contacts.ts
+++ b/apps/meteor/ee/app/livechat-enterprise/server/api/lib/contacts.ts
@@ -2,7 +2,7 @@ import type { IUser, ILivechatContactVisitorAssociation } from '@rocket.chat/cor
import { License } from '@rocket.chat/license';
import { LivechatContacts, LivechatRooms, LivechatVisitors } from '@rocket.chat/models';
-import { Livechat } from '../../../../../../app/livechat/server/lib/LivechatTyped';
+import { closeRoom } from '../../../../../../app/livechat/server/lib/closeRoom';
import { i18n } from '../../../../../../server/lib/i18n';
export async function changeContactBlockStatus({ block, visitor }: { visitor: ILivechatContactVisitorAssociation; block: boolean }) {
@@ -32,5 +32,5 @@ export async function closeBlockedRoom(association: ILivechatContactVisitorAssoc
return;
}
- return Livechat.closeRoom({ room, visitor, comment: i18n.t('close-blocked-room-comment'), user });
+ return closeRoom({ room, visitor, comment: i18n.t('close-blocked-room-comment'), user });
}
diff --git a/apps/meteor/ee/app/livechat-enterprise/server/api/lib/units.ts b/apps/meteor/ee/app/livechat-enterprise/server/api/lib/units.ts
index d80137d7c4ecf..fd2cad2a93561 100644
--- a/apps/meteor/ee/app/livechat-enterprise/server/api/lib/units.ts
+++ b/apps/meteor/ee/app/livechat-enterprise/server/api/lib/units.ts
@@ -3,6 +3,48 @@ import { LivechatUnitMonitors, LivechatUnit } from '@rocket.chat/models';
import { escapeRegExp } from '@rocket.chat/string-helpers';
import type { FindOptions } from 'mongodb';
+export async function findUnitsOfUser({
+ text,
+ userId,
+ pagination: { offset, count, sort },
+}: {
+ text?: string;
+ userId: string;
+ pagination: {
+ offset: number;
+ count: number;
+ sort: FindOptions['sort'];
+ };
+}): Promise<{
+ units: IOmnichannelBusinessUnit[];
+ count: number;
+ offset: number;
+ total: number;
+}> {
+ const filter = text && new RegExp(escapeRegExp(text), 'i');
+
+ // TODO: an aggregation woudl be faster? or nah?
+ const myUnits = await LivechatUnitMonitors.findByMonitorId(userId)
+ .map((u) => u.unitId)
+ .toArray();
+ const query = { _id: { $in: myUnits }, ...(text && { $or: [{ name: filter }] }) };
+
+ const { cursor, totalCount } = LivechatUnit.findPaginatedUnits(query, {
+ sort: sort || { name: 1 },
+ skip: offset,
+ limit: count,
+ });
+
+ const [units, total] = await Promise.all([cursor.toArray(), totalCount]);
+
+ return {
+ units,
+ count: units.length,
+ offset,
+ total,
+ };
+}
+
export async function findUnits({
text,
pagination: { offset, count, sort },
diff --git a/apps/meteor/ee/app/livechat-enterprise/server/api/units.ts b/apps/meteor/ee/app/livechat-enterprise/server/api/units.ts
index af20aa22d6958..347eeaf187616 100644
--- a/apps/meteor/ee/app/livechat-enterprise/server/api/units.ts
+++ b/apps/meteor/ee/app/livechat-enterprise/server/api/units.ts
@@ -1,11 +1,12 @@
import type { ILivechatUnitMonitor, IOmnichannelBusinessUnit } from '@rocket.chat/core-typings';
-import type { PaginatedResult } from '@rocket.chat/rest-typings';
+import type { PaginatedResult, PaginatedRequest } from '@rocket.chat/rest-typings';
import { API } from '../../../../../app/api/server';
import { getPaginationItems } from '../../../../../app/api/server/helpers/getPaginationItems';
import { findAllDepartmentsAvailable, findAllDepartmentsByUnit } from '../lib/Department';
import { LivechatEnterprise } from '../lib/LivechatEnterprise';
-import { findUnits, findUnitById, findUnitMonitors } from './lib/units';
+import { findUnits, findUnitById, findUnitMonitors, findUnitsOfUser } from './lib/units';
+import { hasPermissionAsync } from '../../../../../app/authorization/server/functions/hasPermission';
declare module '@rocket.chat/rest-typings' {
// eslint-disable-next-line @typescript-eslint/naming-convention
@@ -14,7 +15,7 @@ declare module '@rocket.chat/rest-typings' {
GET: (params: { unitId: string }) => { monitors: ILivechatUnitMonitor[] };
};
'/v1/livechat/units': {
- GET: (params: { text: string }) => PaginatedResult & { units: IOmnichannelBusinessUnit[] };
+ GET: (params: PaginatedRequest<{ text?: string }>) => PaginatedResult & { units: IOmnichannelBusinessUnit[] };
POST: (params: { unitData: string; unitMonitors: string; unitDepartments: string }) => Omit;
};
'/v1/livechat/units/:id': {
@@ -46,7 +47,7 @@ API.v1.addRoute(
API.v1.addRoute(
'livechat/units',
- { authRequired: true, permissionsRequired: ['manage-livechat-units'] },
+ { authRequired: true, permissionsRequired: { POST: ['manage-livechat-units'], GET: [] } },
{
async get() {
const params = this.queryParams;
@@ -54,6 +55,10 @@ API.v1.addRoute(
const { sort } = await this.parseJsonQuery();
const { text } = this.queryParams;
+ if (!(await hasPermissionAsync(this.userId, 'manage-livechat-units'))) {
+ return API.v1.success(await findUnitsOfUser({ text, userId: this.userId, pagination: { offset, count, sort } }));
+ }
+
return API.v1.success(
await findUnits({
text,
diff --git a/apps/meteor/ee/app/livechat-enterprise/server/hooks/applyRoomRestrictions.ts b/apps/meteor/ee/app/livechat-enterprise/server/hooks/applyRoomRestrictions.ts
index 597a7546e99aa..8e1ceb6581083 100644
--- a/apps/meteor/ee/app/livechat-enterprise/server/hooks/applyRoomRestrictions.ts
+++ b/apps/meteor/ee/app/livechat-enterprise/server/hooks/applyRoomRestrictions.ts
@@ -6,29 +6,42 @@ import { callbacks } from '../../../../../lib/callbacks';
import { cbLogger } from '../lib/logger';
import { getUnitsFromUser } from '../lib/units';
-export const restrictQuery = async (originalQuery: FilterOperators = {}) => {
+export const restrictQuery = async (originalQuery: FilterOperators = {}, unitsFilter?: string[]) => {
const query = { ...originalQuery };
- const units = await getUnitsFromUser();
- if (!Array.isArray(units)) {
+ let userUnits = await getUnitsFromUser();
+ if (!Array.isArray(userUnits)) {
+ if (Array.isArray(unitsFilter) && unitsFilter.length) {
+ return { ...query, departmentAncestors: { $in: unitsFilter } };
+ }
return query;
}
- const departments = await LivechatDepartment.find({ ancestors: { $in: units } }, { projection: { _id: 1 } }).toArray();
+
+ if (Array.isArray(unitsFilter) && unitsFilter.length) {
+ const userUnit = new Set([...userUnits]);
+ const filteredUnits = new Set(unitsFilter);
+
+ // IF user is trying to filter by a unit he doens't have access to, apply empty filter (no matches)
+ userUnits = [...userUnit.intersection(filteredUnits)];
+ }
+ // TODO: units is meant to include units and departments, however, here were only using them as units
+ // We have to change the filter to something like { $or: [{ ancestors: {$in: units }}, {_id: {$in: units}}] }
+ const departments = await LivechatDepartment.find({ ancestors: { $in: userUnits } }, { projection: { _id: 1 } }).toArray();
const expressions = query.$and || [];
const condition = {
- $or: [{ departmentAncestors: { $in: units } }, { departmentId: { $in: departments.map(({ _id }) => _id) } }],
+ $or: [{ departmentAncestors: { $in: userUnits } }, { departmentId: { $in: departments.map(({ _id }) => _id) } }],
};
query.$and = [condition, ...expressions];
- cbLogger.debug({ msg: 'Applying room query restrictions', units });
+ cbLogger.debug({ msg: 'Applying room query restrictions', userUnits });
return query;
};
callbacks.add(
'livechat.applyRoomRestrictions',
- async (originalQuery: FilterOperators = {}) => {
- return restrictQuery(originalQuery);
+ async (originalQuery: FilterOperators = {}, unitsFilter?: string[]) => {
+ return restrictQuery(originalQuery, unitsFilter);
},
callbacks.priority.HIGH,
'livechat-apply-room-restrictions',
diff --git a/apps/meteor/ee/app/livechat-enterprise/server/lib/AutoCloseOnHoldScheduler.ts b/apps/meteor/ee/app/livechat-enterprise/server/lib/AutoCloseOnHoldScheduler.ts
index eb7d1003ff154..b90d139e8d3b6 100644
--- a/apps/meteor/ee/app/livechat-enterprise/server/lib/AutoCloseOnHoldScheduler.ts
+++ b/apps/meteor/ee/app/livechat-enterprise/server/lib/AutoCloseOnHoldScheduler.ts
@@ -7,7 +7,7 @@ import { MongoInternals } from 'meteor/mongo';
import moment from 'moment';
import { schedulerLogger } from './logger';
-import { Livechat } from '../../../../../app/livechat/server/lib/LivechatTyped';
+import { closeRoom } from '../../../../../app/livechat/server/lib/closeRoom';
const SCHEDULER_NAME = 'omnichannel_auto_close_on_hold_scheduler';
@@ -82,7 +82,7 @@ export class AutoCloseOnHoldSchedulerClass {
comment,
};
- await Livechat.closeRoom(payload);
+ await closeRoom(payload);
}
private async getSchedulerUser(): Promise {
diff --git a/apps/meteor/ee/app/livechat-enterprise/server/lib/QueueInactivityMonitor.ts b/apps/meteor/ee/app/livechat-enterprise/server/lib/QueueInactivityMonitor.ts
index 83dd905e715da..7b6996978e5a6 100644
--- a/apps/meteor/ee/app/livechat-enterprise/server/lib/QueueInactivityMonitor.ts
+++ b/apps/meteor/ee/app/livechat-enterprise/server/lib/QueueInactivityMonitor.ts
@@ -7,7 +7,7 @@ import { MongoInternals } from 'meteor/mongo';
import type { Db } from 'mongodb';
import { schedulerLogger } from './logger';
-import { Livechat } from '../../../../../app/livechat/server/lib/LivechatTyped';
+import { closeRoom } from '../../../../../app/livechat/server/lib/closeRoom';
import { settings } from '../../../../../app/settings/server';
import { i18n } from '../../../../../server/lib/i18n';
@@ -101,7 +101,7 @@ export class OmnichannelQueueInactivityMonitorClass {
async closeRoomAction(room: IOmnichannelRoom): Promise {
const comment = this.message;
- return Livechat.closeRoom({
+ return closeRoom({
comment,
room,
user: await this.getRocketCatUser(),
diff --git a/apps/meteor/ee/app/livechat-enterprise/server/lib/VisitorInactivityMonitor.ts b/apps/meteor/ee/app/livechat-enterprise/server/lib/VisitorInactivityMonitor.ts
index 7bfefe5db6ed8..7bd93d8f3716e 100644
--- a/apps/meteor/ee/app/livechat-enterprise/server/lib/VisitorInactivityMonitor.ts
+++ b/apps/meteor/ee/app/livechat-enterprise/server/lib/VisitorInactivityMonitor.ts
@@ -6,7 +6,7 @@ import { LivechatVisitors, LivechatRooms, LivechatDepartment, Users } from '@roc
import { schedulerLogger } from './logger';
import { notifyOnRoomChangedById } from '../../../../../app/lib/server/lib/notifyListener';
-import { Livechat } from '../../../../../app/livechat/server/lib/LivechatTyped';
+import { closeRoom } from '../../../../../app/livechat/server/lib/closeRoom';
import { settings } from '../../../../../app/settings/server';
import { callbacks } from '../../../../../lib/callbacks';
import { i18n } from '../../../../../server/lib/i18n';
@@ -92,7 +92,7 @@ export class VisitorInactivityMonitor {
if (room.departmentId) {
comment = (await this._getDepartmentAbandonedCustomMessage(room.departmentId)) || comment;
}
- await Livechat.closeRoom({
+ await closeRoom({
comment,
room,
user: this.user,
diff --git a/apps/meteor/ee/app/livechat-enterprise/server/lib/routing/LoadBalancing.ts b/apps/meteor/ee/app/livechat-enterprise/server/lib/routing/LoadBalancing.ts
index 638b1e95545bd..b909e00b27a54 100644
--- a/apps/meteor/ee/app/livechat-enterprise/server/lib/routing/LoadBalancing.ts
+++ b/apps/meteor/ee/app/livechat-enterprise/server/lib/routing/LoadBalancing.ts
@@ -1,6 +1,7 @@
import { Users } from '@rocket.chat/models';
import { RoutingManager } from '../../../../../../app/livechat/server/lib/RoutingManager';
+import { settings } from '../../../../../../app/settings/server';
import type { IRoutingManagerConfig } from '../../../../../../definition/IRoutingManagerConfig';
/* Load Balancing Queuing method:
@@ -28,7 +29,11 @@ class LoadBalancing {
}
async getNextAgent(department?: string, ignoreAgentId?: string) {
- const nextAgent = await Users.getNextLeastBusyAgent(department, ignoreAgentId);
+ const nextAgent = await Users.getNextLeastBusyAgent(
+ department,
+ ignoreAgentId,
+ settings.get('Livechat_enabled_when_agent_idle'),
+ );
if (!nextAgent) {
return;
}
diff --git a/apps/meteor/ee/app/livechat-enterprise/server/lib/routing/LoadRotation.ts b/apps/meteor/ee/app/livechat-enterprise/server/lib/routing/LoadRotation.ts
index a3e24296b29f5..b520a1b2a2a35 100644
--- a/apps/meteor/ee/app/livechat-enterprise/server/lib/routing/LoadRotation.ts
+++ b/apps/meteor/ee/app/livechat-enterprise/server/lib/routing/LoadRotation.ts
@@ -2,6 +2,7 @@ import type { IOmnichannelCustomAgent } from '@rocket.chat/core-typings';
import { Users } from '@rocket.chat/models';
import { RoutingManager } from '../../../../../../app/livechat/server/lib/RoutingManager';
+import { settings } from '../../../../../../app/settings/server';
import type { IRoutingManagerConfig } from '../../../../../../definition/IRoutingManagerConfig';
/* Load Rotation Queuing method:
@@ -27,7 +28,11 @@ class LoadRotation {
}
public async getNextAgent(department?: string, ignoreAgentId?: string): Promise {
- const nextAgent = await Users.getLastAvailableAgentRouted(department, ignoreAgentId);
+ const nextAgent = await Users.getLastAvailableAgentRouted(
+ department,
+ ignoreAgentId,
+ settings.get('Livechat_enabled_when_agent_idle'),
+ );
if (!nextAgent) {
return;
}
diff --git a/apps/meteor/ee/app/livechat-enterprise/server/methods/getUnitsFromUserRoles.ts b/apps/meteor/ee/app/livechat-enterprise/server/methods/getUnitsFromUserRoles.ts
index d32064fdd96cf..03e52bda7d078 100644
--- a/apps/meteor/ee/app/livechat-enterprise/server/methods/getUnitsFromUserRoles.ts
+++ b/apps/meteor/ee/app/livechat-enterprise/server/methods/getUnitsFromUserRoles.ts
@@ -4,6 +4,7 @@ import mem from 'mem';
import { Meteor } from 'meteor/meteor';
import { hasAnyRoleAsync } from '../../../../../app/authorization/server/functions/hasRole';
+import { methodDeprecationLogger } from '../../../../../app/lib/server/lib/deprecationWarningLogger';
import { logger } from '../lib/logger';
async function getUnitsFromUserRoles(user: string): Promise {
@@ -18,6 +19,7 @@ const memoizedGetUnitFromUserRoles = mem(getUnitsFromUserRoles, { maxAge: proces
const memoizedGetDepartmentsFromUserRoles = mem(getDepartmentsFromUserRoles, { maxAge: process.env.TEST_MODE ? 1 : 10000 });
export const getUnitsFromUser = async (user: string): Promise => {
+ // TODO: we can combine these 2 calls into one single query
if (!user || (await hasAnyRoleAsync(user, ['admin', 'livechat-manager']))) {
return;
}
@@ -41,6 +43,7 @@ declare module '@rocket.chat/ddp-client' {
Meteor.methods({
async 'livechat:getUnitsFromUser'(): Promise {
+ methodDeprecationLogger.method('livechat:getUnitsFromUser', '8.0.0');
const user = Meteor.userId();
if (!user) {
return;
diff --git a/apps/meteor/ee/app/livechat-enterprise/server/priorities.ts b/apps/meteor/ee/app/livechat-enterprise/server/priorities.ts
index 843eb72d66e11..68b50503b8f6a 100644
--- a/apps/meteor/ee/app/livechat-enterprise/server/priorities.ts
+++ b/apps/meteor/ee/app/livechat-enterprise/server/priorities.ts
@@ -31,7 +31,7 @@ const defaultPriorities: Omit[] = [
];
export const createDefaultPriorities = async (): Promise => {
- const priorities = await LivechatPriority.col.countDocuments({});
+ const priorities = await LivechatPriority.estimatedDocumentCount();
if (!priorities) {
await LivechatPriority.insertMany(defaultPriorities);
diff --git a/apps/meteor/ee/server/apps/communication/rest.ts b/apps/meteor/ee/server/apps/communication/rest.ts
index 28f404fe5cc5f..4528c9f448b19 100644
--- a/apps/meteor/ee/server/apps/communication/rest.ts
+++ b/apps/meteor/ee/server/apps/communication/rest.ts
@@ -9,6 +9,7 @@ import { serverFetch as fetch } from '@rocket.chat/server-fetch';
import type express from 'express';
import { Meteor } from 'meteor/meteor';
import { WebApp } from 'meteor/webapp';
+import { ZodError } from 'zod';
import { actionButtonsHandler } from './endpoints/actionButtonsHandler';
import { appsCountHandler } from './endpoints/appsCountHandler';
@@ -26,6 +27,7 @@ import { canEnableApp } from '../../../app/license/server/canEnableApp';
import { formatAppInstanceForRest } from '../../../lib/misc/formatAppInstanceForRest';
import { notifyAppInstall } from '../marketplace/appInstall';
import { fetchMarketplaceApps } from '../marketplace/fetchMarketplaceApps';
+import { fetchMarketplaceCategories } from '../marketplace/fetchMarketplaceCategories';
import { MarketplaceConnectionError, MarketplaceAppsError } from '../marketplace/marketplaceErrors';
import type { AppServerOrchestrator } from '../orchestrator';
import { Apps } from '../orchestrator';
@@ -60,7 +62,7 @@ export class AppsRestApi {
enableCors: false,
});
await this.addManagementRoutes();
- (WebApp.connectHandlers as ReturnType).use(this.api.router.router);
+ (WebApp.connectHandlers as unknown as ReturnType).use(this.api.router.router);
}
addManagementRoutes() {
@@ -124,6 +126,11 @@ export class AppsRestApi {
return API.v1.failure({ error: err.message });
}
+ if (err instanceof ZodError) {
+ orchestrator.getRocketChatLogger().error('Error parsing the Marketplace Apps:', err.issues);
+ return API.v1.failure({ error: i18n.t('Marketplace_Failed_To_Fetch_Apps') });
+ }
+
return API.v1.internalError();
}
},
@@ -135,27 +142,26 @@ export class AppsRestApi {
{ authRequired: true },
{
async get() {
- const baseUrl = orchestrator.getMarketplaceUrl();
+ try {
+ const categories = await fetchMarketplaceCategories();
+ return API.v1.success(categories);
+ } catch (err) {
+ orchestrator.getRocketChatLogger().error('Error getting the categories from the Marketplace:', err);
+ if (err instanceof MarketplaceConnectionError) {
+ return handleError('Unable to access Marketplace. Does the server has access to the internet?', err);
+ }
- const headers = getDefaultHeaders();
- const token = await getWorkspaceAccessToken();
- if (token) {
- headers.Authorization = `Bearer ${token}`;
- }
+ if (err instanceof MarketplaceAppsError) {
+ return API.v1.failure({ error: err.message });
+ }
- let result;
- try {
- const request = await fetch(`${baseUrl}/v1/categories`, { headers });
- if (request.status !== 200) {
- orchestrator.getRocketChatLogger().error('Error getting the Apps:', await request.json());
- return API.v1.failure();
+ if (err instanceof ZodError) {
+ orchestrator.getRocketChatLogger().error('Error validating the response from the Marketplace:', err.issues);
+ return API.v1.failure({ error: i18n.t('Marketplace_Failed_To_Fetch_Categories') });
}
- result = await request.json();
- } catch (e: any) {
- return handleError('Unable to access Marketplace. Does the server has access to the internet?', e);
- }
- return API.v1.success(result);
+ return API.v1.internalError();
+ }
},
},
);
@@ -227,32 +233,37 @@ export class AppsRestApi {
return API.v1.failure({ error: e.message });
}
+ if (e instanceof ZodError) {
+ orchestrator.getRocketChatLogger().error('Error parsing the Marketplace Apps:', e.issues);
+ return API.v1.failure({ error: i18n.t('Marketplace_Failed_To_Fetch_Apps') });
+ }
+
return API.v1.internalError();
}
}
if ('categories' in this.queryParams && this.queryParams.categories) {
apiDeprecationLogger.endpoint(this.request.route, '7.0.0', this.response, 'Use /apps/categories to get the categories list.');
- const headers = getDefaultHeaders();
- const token = await getWorkspaceAccessToken();
- if (token) {
- headers.Authorization = `Bearer ${token}`;
- }
-
- let result;
try {
- const request = await fetch(`${baseUrl}/v1/categories`, { headers });
- if (request.status !== 200) {
- orchestrator.getRocketChatLogger().error('Error getting the Apps:', await request.json());
- return API.v1.failure();
+ const categories = await fetchMarketplaceCategories();
+ return API.v1.success(categories);
+ } catch (err) {
+ orchestrator.getRocketChatLogger().error('Error getting the categories from the Marketplace:', err);
+ if (err instanceof MarketplaceConnectionError) {
+ return handleError('Unable to access Marketplace. Does the server has access to the internet?', err);
}
- result = await request.json();
- } catch (e: any) {
- orchestrator.getRocketChatLogger().error('Error getting the categories from the Marketplace:', e);
+
+ if (err instanceof MarketplaceAppsError) {
+ return API.v1.failure({ error: err.message });
+ }
+
+ if (err instanceof ZodError) {
+ orchestrator.getRocketChatLogger().error('Error validating the response from the Marketplace:', err.issues);
+ return API.v1.failure({ error: i18n.t('Marketplace_Failed_To_Fetch_Categories') });
+ }
+
return API.v1.internalError();
}
-
- return API.v1.success(result);
}
if (
@@ -854,6 +865,8 @@ export class AppsRestApi {
orchestrator.getRocketChatLogger().error('Error getting the App from the Marketplace:', e.response.data);
return API.v1.internalError();
}
+
+ permissionsGranted = this.bodyParams.permissionsGranted;
} else {
isPrivateAppUpload = true;
diff --git a/apps/meteor/ee/server/apps/cron.ts b/apps/meteor/ee/server/apps/cron.ts
index 7800d7077c2c3..3ae1afdb5a6a9 100644
--- a/apps/meteor/ee/server/apps/cron.ts
+++ b/apps/meteor/ee/server/apps/cron.ts
@@ -22,14 +22,14 @@ const notifyAdminsAboutInvalidApps = async function _notifyAdminsAboutInvalidApp
const id = 'someAppInInvalidState';
const title = 'Warning';
- const text = 'There is one or more apps in an invalid state. Click here to review.';
- const rocketCatMessage = 'There is one or more apps in an invalid state. Go to Administration > Apps to review.';
- const link = '/admin/apps';
+ const link = '/marketplace/installed';
await sendMessagesToAdmins({
msgs: async ({ adminUser }) => ({
- msg: `*${i18n.t(title, { lng: adminUser.language || 'en' })}*\n${i18n.t(rocketCatMessage, {
+ msg: `*${i18n.t(title, { lng: adminUser.language || 'en' })}*\n${i18n.t('Invalid_apps_admin_message', {
lng: adminUser.language || 'en',
+ marketplace: i18n.t('Marketplace', { lng: adminUser.language || 'en' }),
+ installed: i18n.t('Installed', { lng: adminUser.language || 'en' }),
})}`,
}),
banners: async ({ adminUser }) => {
@@ -40,7 +40,7 @@ const notifyAdminsAboutInvalidApps = async function _notifyAdminsAboutInvalidApp
id,
priority: 10,
title,
- text,
+ text: i18n.t('Invalid_apps_banner_text', { lng: adminUser.language || 'en' }),
modifiers: ['danger'],
link,
},
@@ -64,10 +64,14 @@ const notifyAdminsAboutRenewedApps = async function _notifyAdminsAboutRenewedApp
return;
}
- const rocketCatMessage = 'There is one or more disabled apps with valid licenses. Go to Administration > Apps to review.';
-
await sendMessagesToAdmins({
- msgs: async ({ adminUser }) => ({ msg: `${i18n.t(rocketCatMessage, { lng: adminUser.language || 'en' })}` }),
+ msgs: async ({ adminUser }) => ({
+ msg: i18n.t('Disabled_apps_admin_message', {
+ lng: adminUser.language || 'en',
+ marketplace: i18n.t('Marketplace', { lng: adminUser.language || 'en' }),
+ installed: i18n.t('Installed', { lng: adminUser.language || 'en' }),
+ }),
+ }),
});
};
diff --git a/apps/meteor/ee/server/apps/marketplace/fetchMarketplaceApps.ts b/apps/meteor/ee/server/apps/marketplace/fetchMarketplaceApps.ts
index 8fe1a2cc69e0c..476d4405e3b48 100644
--- a/apps/meteor/ee/server/apps/marketplace/fetchMarketplaceApps.ts
+++ b/apps/meteor/ee/server/apps/marketplace/fetchMarketplaceApps.ts
@@ -12,8 +12,8 @@ type FetchMarketplaceAppsParams = {
};
const markdownObject = z.object({
- raw: z.string(),
- rendered: z.string(),
+ raw: z.string().optional(),
+ rendered: z.string().optional(),
});
const fetchMarketplaceAppsSchema = z.array(
@@ -53,7 +53,7 @@ const fetchMarketplaceAppsSchema = z.array(
classFile: z.string(),
iconFile: z.string(),
iconFileData: z.string(),
- status: z.enum(['submitted', 'author-rejected', 'author-approved', 'rejected', 'approved']),
+ status: z.enum(['submitted', 'author-rejected', 'author-approved', 'rejected', 'approved', 'published']),
reviewedNote: z.string().optional(),
rejectionNote: z.string().optional(),
changesNote: z.string().optional(),
@@ -66,20 +66,20 @@ const fetchMarketplaceAppsSchema = z.array(
addonId: z.string().optional(),
isEnterpriseOnly: z.boolean(),
isBundle: z.boolean(),
- bundedAppIds: z.array(z.string()),
+ bundledAppsIn: z.array(z.string()).optional(),
bundledIn: z.array(
z.object({
bundleId: z.string(),
bundleName: z.string(),
- addonTierId: z.string(),
+ addonTierId: z.string().optional(),
}),
),
isPurchased: z.boolean(),
isSubscribed: z.boolean(),
subscriptionInfo: z
.object({
- typeOf: z.enum(['app', 'service']),
- status: z.enum(['trialing', 'active', 'cancelled', 'cancelling', 'pastDue']),
+ typeOf: z.enum(['app', 'service', '']),
+ status: z.enum(['trialing', 'active', 'cancelled', 'cancelling', 'pastDue', '']),
statusFromBilling: z.boolean(),
isSeatBased: z.boolean(),
seats: z.number(),
@@ -98,27 +98,29 @@ const fetchMarketplaceAppsSchema = z.array(
.optional(),
price: z.number(),
purchaseType: z.enum(['', 'buy', 'subscription']),
- pricingPlans: z.array(
- z.object({
- id: z.string(),
- enabled: z.boolean(),
- price: z.number(),
- trialDays: z.number(),
- strategy: z.enum(['once', 'monthly', 'yearly']),
- isPerSeat: z.boolean(),
- tiers: z
- .array(
- z.object({
- perUnit: z.boolean(),
- minimum: z.number(),
- maximum: z.number(),
- price: z.number(),
- refId: z.string().optional(),
- }),
- )
- .optional(),
- }),
- ),
+ pricingPlans: z
+ .array(
+ z.object({
+ id: z.string(),
+ enabled: z.boolean(),
+ price: z.number(),
+ trialDays: z.number(),
+ strategy: z.enum(['once', 'monthly', 'yearly']),
+ isPerSeat: z.boolean(),
+ tiers: z
+ .array(
+ z.object({
+ perUnit: z.boolean(),
+ minimum: z.number(),
+ maximum: z.number(),
+ price: z.number(),
+ refId: z.string().optional(),
+ }),
+ )
+ .optional(),
+ }),
+ )
+ .optional(),
isUsageBased: z.boolean().optional(),
requestedEndUser: z.boolean().optional(),
requested: z.boolean().optional(),
diff --git a/apps/meteor/ee/server/apps/marketplace/fetchMarketplaceCategories.ts b/apps/meteor/ee/server/apps/marketplace/fetchMarketplaceCategories.ts
new file mode 100644
index 0000000000000..161dcaff06b03
--- /dev/null
+++ b/apps/meteor/ee/server/apps/marketplace/fetchMarketplaceCategories.ts
@@ -0,0 +1,50 @@
+import type { AppCategory } from '@rocket.chat/core-typings';
+import { serverFetch as fetch } from '@rocket.chat/server-fetch';
+import { z } from 'zod';
+
+import { getMarketplaceHeaders } from './getMarketplaceHeaders';
+import { getWorkspaceAccessToken } from '../../../../app/cloud/server';
+import { Apps } from '../orchestrator';
+import { MarketplaceAppsError, MarketplaceConnectionError } from './marketplaceErrors';
+
+const fetchMarketplaceCategoriesSchema = z.array(
+ z.object({
+ id: z.string(),
+ title: z.string(),
+ description: z.string(),
+ hidden: z.boolean(),
+ createdDate: z.string(),
+ modifiedDate: z.string(),
+ }),
+);
+
+export async function fetchMarketplaceCategories(): Promise {
+ const baseUrl = Apps.getMarketplaceUrl();
+ const headers = getMarketplaceHeaders();
+ const token = await getWorkspaceAccessToken();
+ if (token) {
+ headers.Authorization = `Bearer ${token}`;
+ }
+
+ let request;
+ try {
+ request = await fetch(`${baseUrl}/v1/categories`, { headers });
+ } catch (error) {
+ throw new MarketplaceConnectionError('Marketplace_Bad_Marketplace_Connection');
+ }
+
+ if (request.status === 200) {
+ const response = await request.json();
+ fetchMarketplaceCategoriesSchema.parse(response);
+ return response;
+ }
+
+ const response = await request.json();
+ const INTERNAL_MARKETPLACE_ERROR_CODES = [189, 266];
+
+ if (request.status === 500 && INTERNAL_MARKETPLACE_ERROR_CODES.includes(response.code)) {
+ throw new MarketplaceAppsError('Marketplace_Internal_Error');
+ }
+
+ throw new MarketplaceAppsError('Marketplace_Failed_To_Fetch_Categories');
+}
diff --git a/apps/meteor/ee/server/local-services/voip-freeswitch/service.ts b/apps/meteor/ee/server/local-services/voip-freeswitch/service.ts
index 8645aed568e4c..117c260c2f267 100644
--- a/apps/meteor/ee/server/local-services/voip-freeswitch/service.ts
+++ b/apps/meteor/ee/server/local-services/voip-freeswitch/service.ts
@@ -28,7 +28,7 @@ export class VoipFreeSwitchService extends ServiceClassInternal implements IVoip
constructor() {
super();
- this.serviceStarter = new ServiceStarter(() => Promise.resolve(this.startEvents()));
+ this.serviceStarter = new ServiceStarter(() => this.startEvents());
this.onEvent('watch.settings', async ({ setting }): Promise => {
if (setting._id === 'VoIP_TeamCollab_Enabled' && setting.value === true) {
void this.serviceStarter.start();
@@ -42,7 +42,7 @@ export class VoipFreeSwitchService extends ServiceClassInternal implements IVoip
void this.serviceStarter.start();
}
- private startEvents(): void {
+ private async startEvents(): Promise {
if (this.listening) {
return;
}
@@ -50,7 +50,7 @@ export class VoipFreeSwitchService extends ServiceClassInternal implements IVoip
try {
// #ToDo: Reconnection
// #ToDo: Only connect from one rocket.chat instance
- void listenToEvents(
+ await listenToEvents(
async (...args) => wrapExceptions(() => this.onFreeSwitchEvent(...args)).suppress(),
this.getConnectionSettings(),
);
diff --git a/apps/meteor/ee/server/models/raw/LivechatRooms.ts b/apps/meteor/ee/server/models/raw/LivechatRooms.ts
index df099608f9bf1..60cb5bf491648 100644
--- a/apps/meteor/ee/server/models/raw/LivechatRooms.ts
+++ b/apps/meteor/ee/server/models/raw/LivechatRooms.ts
@@ -82,19 +82,19 @@ export class LivechatRoomsRawEE extends LivechatRoomsRaw implements ILivechatRoo
}
countPrioritizedRooms(): Promise {
- return this.col.countDocuments({ priorityId: { $exists: true } });
+ return this.countDocuments({ priorityId: { $exists: true } });
}
countRoomsWithSla(): Promise {
- return this.col.countDocuments({ slaId: { $exists: true } });
+ return this.countDocuments({ slaId: { $exists: true } });
}
countRoomsWithPdfTranscriptRequested(): Promise {
- return this.col.countDocuments({ pdfTranscriptRequested: true });
+ return this.countDocuments({ pdfTranscriptRequested: true });
}
countRoomsWithTranscriptSent(): Promise {
- return this.col.countDocuments({ pdfTranscriptFileId: { $exists: true } });
+ return this.countDocuments({ pdfTranscriptFileId: { $exists: true } });
}
async unsetAllPredictedVisitorAbandonment(): Promise {
@@ -548,7 +548,7 @@ export class LivechatRoomsRawEE extends LivechatRoomsRaw implements ILivechatRoo
}
getTotalConversationsWithoutDepartmentBetweenDates(start: Date, end: Date, extraQuery: Filter): Promise {
- return this.col.countDocuments({
+ return this.countDocuments({
t: 'l',
departmentId: {
$exists: false,
@@ -626,7 +626,7 @@ export class LivechatRoomsRawEE extends LivechatRoomsRaw implements ILivechatRoo
}
getConversationsWithoutTagsBetweenDate(start: Date, end: Date, extraQuery: Filter): Promise {
- return this.col.countDocuments({
+ return this.countDocuments({
t: 'l',
ts: {
$gte: start,
@@ -721,7 +721,7 @@ export class LivechatRoomsRawEE extends LivechatRoomsRaw implements ILivechatRoo
}
getTotalConversationsWithoutAgentsBetweenDate(start: Date, end: Date, extraQuery: Filter): Promise {
- return this.col.countDocuments({
+ return this.countDocuments({
t: 'l',
ts: {
$gte: start,
diff --git a/apps/meteor/ee/server/models/raw/LivechatUnit.ts b/apps/meteor/ee/server/models/raw/LivechatUnit.ts
index 3045d55c9006d..fa112383257d2 100644
--- a/apps/meteor/ee/server/models/raw/LivechatUnit.ts
+++ b/apps/meteor/ee/server/models/raw/LivechatUnit.ts
@@ -187,6 +187,6 @@ export class LivechatUnitRaw extends BaseRaw implement
}
countUnits(): Promise {
- return this.col.countDocuments({ type: 'u' });
+ return this.countDocuments({ type: 'u' });
}
}
diff --git a/apps/meteor/ee/server/services/CHANGELOG.md b/apps/meteor/ee/server/services/CHANGELOG.md
index c9e268f420769..d9520b75d3a23 100644
--- a/apps/meteor/ee/server/services/CHANGELOG.md
+++ b/apps/meteor/ee/server/services/CHANGELOG.md
@@ -1,5 +1,50 @@
# rocketchat-services
+## 2.0.7-rc.0
+
+### Patch Changes
+
+- ([#35181](https://github.com/RocketChat/Rocket.Chat/pull/35181)) Bump meteor to 3.1.2 and Node version to 20.13.1
+
+-
+
+## 2.0.6
+
+### Patch Changes
+
+-
+
+## 2.0.5
+
+### Patch Changes
+
+-
+
## 2.0.4
### Patch Changes
diff --git a/apps/meteor/ee/server/services/Dockerfile b/apps/meteor/ee/server/services/Dockerfile
index 55e1157c0985c..fe26cdcf822fa 100644
--- a/apps/meteor/ee/server/services/Dockerfile
+++ b/apps/meteor/ee/server/services/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:22.11.0 as build
+FROM node:22.13.1 as build
WORKDIR /app
@@ -28,7 +28,7 @@ COPY ./tsconfig.base.json .
RUN yarn workspace @rocket.chat/core-typings run build \
&& yarn workspace @rocket.chat/rest-typings run build
-FROM node:22.11.0-alpine3.20
+FROM node:22.13.1-alpine3.20
ARG SERVICE
diff --git a/apps/meteor/ee/server/services/package.json b/apps/meteor/ee/server/services/package.json
index 253811a592ab4..65bffb21d1037 100644
--- a/apps/meteor/ee/server/services/package.json
+++ b/apps/meteor/ee/server/services/package.json
@@ -1,7 +1,7 @@
{
"name": "rocketchat-services",
"private": true,
- "version": "2.0.4",
+ "version": "2.0.7-rc.0",
"description": "Rocket.Chat Authorization service",
"main": "index.js",
"scripts": {
@@ -35,7 +35,7 @@
"cookie-parser": "^1.4.7",
"ejson": "^2.2.3",
"eventemitter3": "^5.0.1",
- "express": "^4.21.1",
+ "express": "^4.21.2",
"jaeger-client": "^3.19.0",
"mem": "^8.1.1",
"moleculer": "^0.14.35",
diff --git a/apps/meteor/ee/server/startup/index.ts b/apps/meteor/ee/server/startup/index.ts
index 51bb011828ba2..e295467e117cd 100644
--- a/apps/meteor/ee/server/startup/index.ts
+++ b/apps/meteor/ee/server/startup/index.ts
@@ -12,9 +12,9 @@ import { isRunningMs } from '../../../server/lib/isRunningMs';
export const registerEEBroker = async (): Promise => {
// only starts network broker if running in micro services mode
if (isRunningMs()) {
- const { broker } = await import('@rocket.chat/network-broker');
+ const { startBroker } = await import('@rocket.chat/network-broker');
- api.setBroker(broker);
+ api.setBroker(startBroker());
void api.start();
} else {
require('./presence');
diff --git a/apps/meteor/ee/tests/unit/apps/livechat-enterprise/lib/AutoCloseOnHold.tests.ts b/apps/meteor/ee/tests/unit/apps/livechat-enterprise/lib/AutoCloseOnHold.tests.ts
index f998f351d2008..4539f5e63fa21 100644
--- a/apps/meteor/ee/tests/unit/apps/livechat-enterprise/lib/AutoCloseOnHold.tests.ts
+++ b/apps/meteor/ee/tests/unit/apps/livechat-enterprise/lib/AutoCloseOnHold.tests.ts
@@ -64,7 +64,7 @@ const mocks = {
},
},
},
- '../../../../../app/livechat/server/lib/LivechatTyped': { Livechat: { closeRoom: mockLivechatCloseRoom } },
+ '../../../../../app/livechat/server/lib/closeRoom': { closeRoom: mockLivechatCloseRoom },
'./logger': { schedulerLogger: mockLogger },
'@rocket.chat/models': {
LivechatRooms: mockLivechatRooms,
diff --git a/apps/meteor/ee/tests/unit/apps/livechat-enterprise/server/lib/QueueInactivityMonitor.spec.ts b/apps/meteor/ee/tests/unit/apps/livechat-enterprise/server/lib/QueueInactivityMonitor.spec.ts
index 383c785863876..526c981b83bdc 100644
--- a/apps/meteor/ee/tests/unit/apps/livechat-enterprise/server/lib/QueueInactivityMonitor.spec.ts
+++ b/apps/meteor/ee/tests/unit/apps/livechat-enterprise/server/lib/QueueInactivityMonitor.spec.ts
@@ -29,7 +29,7 @@ const mongoMock = {
}),
},
};
-const livechatMock = { Livechat: { closeRoom: sinon.stub() } };
+const livechatMock = { closeRoom: sinon.stub() };
const settingsMock = { settings: { get: sinon.stub() } };
const { OmnichannelQueueInactivityMonitorClass } = proxyquire
@@ -41,7 +41,7 @@ const { OmnichannelQueueInactivityMonitorClass } = proxyquire
'@rocket.chat/models': modelsMock,
'meteor/meteor': meteorMock,
'meteor/mongo': mongoMock,
- '../../../../../app/livechat/server/lib/LivechatTyped': livechatMock,
+ '../../../../../app/livechat/server/lib/closeRoom': livechatMock,
'../../../../../app/settings/server': settingsMock,
'../../../../../server/lib/i18n': { i18n: { t: sinon.stub().returns('Closed automatically') } },
});
@@ -154,7 +154,7 @@ describe('OmnichannelQueueInactivityMonitorClass', () => {
beforeEach(() => {
modelsMock.LivechatInquiry.findOneById.reset();
modelsMock.LivechatRooms.findOneById.reset();
- livechatMock.Livechat.closeRoom.reset();
+ livechatMock.closeRoom.reset();
});
it('should ignore the inquiry if its not in queue anymore', async () => {
const qclass = new OmnichannelQueueInactivityMonitorClass();
@@ -162,7 +162,7 @@ describe('OmnichannelQueueInactivityMonitorClass', () => {
await qclass.closeRoom({ attrs: { data: { inquiryId: 'inquiryId' } } });
expect(modelsMock.LivechatInquiry.findOneById.calledWith('inquiryId')).to.be.true;
- expect(livechatMock.Livechat.closeRoom.notCalled).to.be.true;
+ expect(livechatMock.closeRoom.notCalled).to.be.true;
});
it('should ignore an inquiry with no room', async () => {
const qclass = new OmnichannelQueueInactivityMonitorClass();
@@ -172,7 +172,7 @@ describe('OmnichannelQueueInactivityMonitorClass', () => {
expect(modelsMock.LivechatInquiry.findOneById.calledWith('inquiryId')).to.be.true;
expect(modelsMock.LivechatRooms.findOneById.calledWith('roomId')).to.be.true;
- expect(livechatMock.Livechat.closeRoom.notCalled).to.be.true;
+ expect(livechatMock.closeRoom.notCalled).to.be.true;
});
it('should close a room', async () => {
const qclass = new OmnichannelQueueInactivityMonitorClass();
@@ -185,7 +185,7 @@ describe('OmnichannelQueueInactivityMonitorClass', () => {
expect(modelsMock.LivechatInquiry.findOneById.calledWith('inquiryId')).to.be.true;
expect(modelsMock.LivechatRooms.findOneById.calledWith('roomId')).to.be.true;
expect(
- livechatMock.Livechat.closeRoom.calledWith(
+ livechatMock.closeRoom.calledWith(
sinon.match({
comment: 'Closed automatically',
room: { _id: 'roomId' },
diff --git a/apps/meteor/imports/personal-access-tokens/server/api/methods/generateToken.ts b/apps/meteor/imports/personal-access-tokens/server/api/methods/generateToken.ts
index 7badb659774fc..15ed90b511703 100644
--- a/apps/meteor/imports/personal-access-tokens/server/api/methods/generateToken.ts
+++ b/apps/meteor/imports/personal-access-tokens/server/api/methods/generateToken.ts
@@ -14,6 +14,38 @@ declare module '@rocket.chat/ddp-client' {
}
}
+export const generatePersonalAccessTokenOfUser = async ({ bypassTwoFactor, tokenName, userId }: {tokenName: string, userId: string, bypassTwoFactor: boolean}): Promise => {
+ if (!(await hasPermissionAsync(userId, 'create-personal-access-tokens'))) {
+ throw new Meteor.Error('not-authorized', 'Not Authorized', {
+ method: 'personalAccessTokens:generateToken',
+ });
+ }
+
+ const token = Random.secret();
+ const tokenExist = await Users.findPersonalAccessTokenByTokenNameAndUserId({
+ userId,
+ tokenName,
+ });
+ if (tokenExist) {
+ throw new Meteor.Error('error-token-already-exists', 'A token with this name already exists', {
+ method: 'personalAccessTokens:generateToken',
+ });
+ }
+
+ await Users.addPersonalAccessTokenToUser({
+ userId,
+ loginTokenObject: {
+ hashedToken: Accounts._hashLoginToken(token),
+ type: 'personalAccessToken',
+ createdAt: new Date(),
+ lastTokenPart: token.slice(-6),
+ name: tokenName,
+ bypassTwoFactor,
+ },
+ });
+ return token;
+}
+
Meteor.methods({
'personalAccessTokens:generateToken': twoFactorRequired(async function ({ tokenName, bypassTwoFactor }) {
const uid = Meteor.userId();
@@ -22,34 +54,7 @@ Meteor.methods({
method: 'personalAccessTokens:generateToken',
});
}
- if (!(await hasPermissionAsync(uid, 'create-personal-access-tokens'))) {
- throw new Meteor.Error('not-authorized', 'Not Authorized', {
- method: 'personalAccessTokens:generateToken',
- });
- }
-
- const token = Random.secret();
- const tokenExist = await Users.findPersonalAccessTokenByTokenNameAndUserId({
- userId: uid,
- tokenName,
- });
- if (tokenExist) {
- throw new Meteor.Error('error-token-already-exists', 'A token with this name already exists', {
- method: 'personalAccessTokens:generateToken',
- });
- }
-
- await Users.addPersonalAccessTokenToUser({
- userId: uid,
- loginTokenObject: {
- hashedToken: Accounts._hashLoginToken(token),
- type: 'personalAccessToken',
- createdAt: new Date(),
- lastTokenPart: token.slice(-6),
- name: tokenName,
- bypassTwoFactor,
- },
- });
- return token;
+
+ return generatePersonalAccessTokenOfUser({ tokenName, userId: uid, bypassTwoFactor });
}),
});
diff --git a/apps/meteor/imports/personal-access-tokens/server/api/methods/regenerateToken.ts b/apps/meteor/imports/personal-access-tokens/server/api/methods/regenerateToken.ts
index 14629ce4dd9df..0ee4cf018f38e 100644
--- a/apps/meteor/imports/personal-access-tokens/server/api/methods/regenerateToken.ts
+++ b/apps/meteor/imports/personal-access-tokens/server/api/methods/regenerateToken.ts
@@ -4,6 +4,8 @@ import { Users } from '@rocket.chat/models';
import { hasPermissionAsync } from '../../../../../app/authorization/server/functions/hasPermission';
import { twoFactorRequired } from '../../../../../app/2fa/server/twoFactorRequired';
+import { removePersonalAccessTokenOfUser } from './removeToken';
+import { generatePersonalAccessTokenOfUser } from './generateToken';
declare module '@rocket.chat/ddp-client' {
// eslint-disable-next-line @typescript-eslint/naming-convention
@@ -12,6 +14,28 @@ declare module '@rocket.chat/ddp-client' {
}
}
+export const regeneratePersonalAccessTokenOfUser = async (tokenName: string, userId: string): Promise => {
+ if (!(await hasPermissionAsync(userId, 'create-personal-access-tokens'))) {
+ throw new Meteor.Error('not-authorized', 'Not Authorized', {
+ method: 'personalAccessTokens:regenerateToken',
+ });
+ }
+
+ const tokenExist = await Users.findPersonalAccessTokenByTokenNameAndUserId({
+ userId,
+ tokenName,
+ });
+ if (!tokenExist) {
+ throw new Meteor.Error('error-token-does-not-exists', 'Token does not exist', {
+ method: 'personalAccessTokens:regenerateToken',
+ });
+ }
+
+ await removePersonalAccessTokenOfUser(tokenName, userId);
+
+ return generatePersonalAccessTokenOfUser({ tokenName, userId, bypassTwoFactor: tokenExist.bypassTwoFactor || false });
+}
+
Meteor.methods({
'personalAccessTokens:regenerateToken': twoFactorRequired(async function ({ tokenName }) {
const uid = Meteor.userId();
@@ -20,26 +44,7 @@ Meteor.methods({
method: 'personalAccessTokens:regenerateToken',
});
}
- if (!(await hasPermissionAsync(uid, 'create-personal-access-tokens'))) {
- throw new Meteor.Error('not-authorized', 'Not Authorized', {
- method: 'personalAccessTokens:regenerateToken',
- });
- }
-
- const tokenExist = await Users.findPersonalAccessTokenByTokenNameAndUserId({
- userId: uid,
- tokenName,
- });
- if (!tokenExist) {
- throw new Meteor.Error('error-token-does-not-exists', 'Token does not exist', {
- method: 'personalAccessTokens:regenerateToken',
- });
- }
-
- await Meteor.callAsync('personalAccessTokens:removeToken', { tokenName });
- return Meteor.callAsync('personalAccessTokens:generateToken', {
- tokenName,
- bypassTwoFactor: tokenExist.bypassTwoFactor,
- });
+
+ return regeneratePersonalAccessTokenOfUser(tokenName, uid);
}),
});
diff --git a/apps/meteor/imports/personal-access-tokens/server/api/methods/removeToken.ts b/apps/meteor/imports/personal-access-tokens/server/api/methods/removeToken.ts
index 0f03e6087ee2c..3bc249143e12d 100644
--- a/apps/meteor/imports/personal-access-tokens/server/api/methods/removeToken.ts
+++ b/apps/meteor/imports/personal-access-tokens/server/api/methods/removeToken.ts
@@ -12,6 +12,30 @@ declare module '@rocket.chat/ddp-client' {
}
}
+export const removePersonalAccessTokenOfUser = async (tokenName: string, userId: string): Promise => {
+ if (!(await hasPermissionAsync(userId, 'create-personal-access-tokens'))) {
+ throw new Meteor.Error('not-authorized', 'Not Authorized', {
+ method: 'personalAccessTokens:removeToken',
+ });
+ }
+ const tokenExist = await Users.findPersonalAccessTokenByTokenNameAndUserId({
+ userId,
+ tokenName,
+ });
+ if (!tokenExist) {
+ throw new Meteor.Error('error-token-does-not-exists', 'Token does not exist', {
+ method: 'personalAccessTokens:removeToken',
+ });
+ }
+ await Users.removePersonalAccessTokenOfUser({
+ userId,
+ loginTokenObject: {
+ type: 'personalAccessToken',
+ name: tokenName,
+ },
+ });
+}
+
Meteor.methods({
'personalAccessTokens:removeToken': twoFactorRequired(async function ({ tokenName }) {
const uid = Meteor.userId();
@@ -20,26 +44,7 @@ Meteor.methods({
method: 'personalAccessTokens:removeToken',
});
}
- if (!(await hasPermissionAsync(uid, 'create-personal-access-tokens'))) {
- throw new Meteor.Error('not-authorized', 'Not Authorized', {
- method: 'personalAccessTokens:removeToken',
- });
- }
- const tokenExist = await Users.findPersonalAccessTokenByTokenNameAndUserId({
- userId: uid,
- tokenName,
- });
- if (!tokenExist) {
- throw new Meteor.Error('error-token-does-not-exists', 'Token does not exist', {
- method: 'personalAccessTokens:removeToken',
- });
- }
- await Users.removePersonalAccessTokenOfUser({
- userId: uid,
- loginTokenObject: {
- type: 'personalAccessToken',
- name: tokenName,
- },
- });
+
+ return removePersonalAccessTokenOfUser(tokenName, uid);
}),
});
diff --git a/apps/meteor/lib/callbacks.ts b/apps/meteor/lib/callbacks.ts
index 746c56401b91a..7a6420da40dc2 100644
--- a/apps/meteor/lib/callbacks.ts
+++ b/apps/meteor/lib/callbacks.ts
@@ -179,7 +179,7 @@ type ChainedCallbackSignatures = {
query: FilterOperators,
params: { userId: IUser['_id'] },
) => FilterOperators;
- 'livechat.applyRoomRestrictions': (query: FilterOperators) => FilterOperators;
+ 'livechat.applyRoomRestrictions': (query: FilterOperators, unitsFilter?: string[]) => FilterOperators;
'livechat.onMaxNumberSimultaneousChatsReached': (inquiry: ILivechatInquiryRecord) => ILivechatInquiryRecord;
'on-business-hour-start': (params: { BusinessHourBehaviorClass: { new (): IBusinessHourBehavior } }) => {
BusinessHourBehaviorClass: { new (): IBusinessHourBehavior };
diff --git a/apps/meteor/lib/createQuoteAttachment.ts b/apps/meteor/lib/createQuoteAttachment.ts
index 99e0f6f9229c6..d7a757b1549d9 100644
--- a/apps/meteor/lib/createQuoteAttachment.ts
+++ b/apps/meteor/lib/createQuoteAttachment.ts
@@ -1,8 +1,6 @@
-import { isTranslatedMessage } from '@rocket.chat/core-typings';
+import { isTranslatedMessage, getUserDisplayName } from '@rocket.chat/core-typings';
import type { ITranslatedMessage, IMessage } from '@rocket.chat/core-typings';
-import { getUserDisplayName } from './getUserDisplayName';
-
export function createQuoteAttachment(
message: IMessage | ITranslatedMessage,
messageLink: string,
diff --git a/apps/meteor/lib/getUserDisplayName.ts b/apps/meteor/lib/getUserDisplayName.ts
deleted file mode 100644
index 5722a39be8a18..0000000000000
--- a/apps/meteor/lib/getUserDisplayName.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import type { IUser } from '@rocket.chat/core-typings';
-
-export const getUserDisplayName = (name: IUser['name'], username: IUser['username'], useRealName: boolean): string | undefined =>
- useRealName ? name || username : username;
diff --git a/apps/meteor/lib/roles/calculateRoomRolePriorityFromRoles.ts b/apps/meteor/lib/roles/calculateRoomRolePriorityFromRoles.ts
new file mode 100644
index 0000000000000..0576de3efd201
--- /dev/null
+++ b/apps/meteor/lib/roles/calculateRoomRolePriorityFromRoles.ts
@@ -0,0 +1,18 @@
+import type { IRole } from '@rocket.chat/core-typings';
+import { ROOM_ROLE_PRIORITY_MAP } from '@rocket.chat/core-typings';
+
+/**
+ * Retrieves the role priority for a given role.
+ * @param role The role ID.
+ * @returns The priority of the role.
+ */
+export const getRoomRolePriorityForRole = (role: IRole['_id']): number =>
+ ROOM_ROLE_PRIORITY_MAP[role as keyof typeof ROOM_ROLE_PRIORITY_MAP] ?? ROOM_ROLE_PRIORITY_MAP.default;
+
+/**
+ * Calculates the minimum role priority from a list of roles.
+ * @param roles The array of role IDs.
+ * @returns The minimum role priority.
+ */
+export const calculateRoomRolePriorityFromRoles = (roles: IRole['_id'][]): number =>
+ roles.reduce((currentMin, role) => Math.min(currentMin, getRoomRolePriorityForRole(role)), ROOM_ROLE_PRIORITY_MAP.default);
diff --git a/apps/meteor/package.json b/apps/meteor/package.json
index ce1822ecc6c21..0f89d041b68d2 100644
--- a/apps/meteor/package.json
+++ b/apps/meteor/package.json
@@ -1,7 +1,7 @@
{
"name": "@rocket.chat/meteor",
"description": "The Ultimate Open Source WebChat Platform",
- "version": "7.4.0-develop",
+ "version": "7.5.0-develop",
"private": true,
"type": "commonjs",
"author": {
@@ -129,7 +129,6 @@
"@types/mkdirp": "^1.0.2",
"@types/mocha": "github:whitecolor/mocha-types",
"@types/node": "~20.17.8",
- "@types/node-gcm": "^1.0.5",
"@types/node-rsa": "^1.1.4",
"@types/nodemailer": "^6.4.16",
"@types/oauth2-server": "^3.0.18",
@@ -185,7 +184,7 @@
"jest": "~29.7.0",
"jsdom-global": "^3.0.2",
"mocha": "^9.2.2",
- "nyc": "^15.1.0",
+ "nyc": "^17.1.0",
"outdent": "~0.8.0",
"pino-pretty": "^7.6.1",
"playwright-qase-reporter": "^2.0.16",
@@ -292,7 +291,7 @@
"@rocket.chat/ui-video-conf": "workspace:^",
"@rocket.chat/ui-voip": "workspace:^",
"@rocket.chat/web-ui-registration": "workspace:^",
- "@slack/bolt": "^4.2.0",
+ "@slack/bolt": "^3.22.0",
"@slack/rtm-api": "^7.0.2",
"@tanstack/react-query": "~5.65.1",
"@types/meteor": "^2.9.8",
@@ -328,7 +327,7 @@
"date-fns": "^2.30.0",
"date.js": "~0.3.3",
"debug": "~4.3.7",
- "dompurify": "^3.2.0",
+ "dompurify": "^3.2.4",
"ejson": "^2.2.3",
"emailreplyparser": "^0.0.5",
"emoji-toolkit": "^7.0.1",
@@ -337,7 +336,7 @@
"eventemitter3": "^5.0.1",
"exif-be-gone": "^1.5.1",
"expiry-map": "^2.0.0",
- "express": "^4.21.1",
+ "express": "^4.21.2",
"express-rate-limit": "^5.5.1",
"fastq": "^1.17.1",
"fflate": "^0.8.2",
@@ -390,7 +389,6 @@
"nats": "^2.28.2",
"node-dogstatsd": "^0.0.7",
"node-fetch": "2.7.0",
- "node-gcm": "1.1.4",
"node-rsa": "^1.1.1",
"nodemailer": "^6.9.16",
"object-path": "^0.11.8",
diff --git a/apps/meteor/public/images/teams-voip-config.svg b/apps/meteor/public/images/teams-voip-config.svg
new file mode 100644
index 0000000000000..f5282c60815fc
--- /dev/null
+++ b/apps/meteor/public/images/teams-voip-config.svg
@@ -0,0 +1,104 @@
+
diff --git a/apps/meteor/server/configuration/pushNotification.ts b/apps/meteor/server/configuration/pushNotification.ts
index 2bf870de4a223..49401806b6f3c 100644
--- a/apps/meteor/server/configuration/pushNotification.ts
+++ b/apps/meteor/server/configuration/pushNotification.ts
@@ -27,10 +27,11 @@ export async function configurePushNotifications(settings: ICachedSettings): Pro
}
| undefined;
+ // TODO: this part of the code should be refactored as the deprecated GCM methods are no longer being used and FCM is preferred.
if (!gateways) {
gcm = {
- apiKey: settings.get('Push_gcm_api_key'),
- projectNumber: settings.get('Push_gcm_project_number'),
+ apiKey: 'TO_BE_REFACTORED',
+ projectNumber: 'TO_BE_REFACTORED',
};
apn = {
diff --git a/apps/meteor/server/ee.ts b/apps/meteor/server/ee.ts
deleted file mode 100644
index d981192dca13b..0000000000000
--- a/apps/meteor/server/ee.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export { startLicense } from '../ee/app/license/server/startup';
-export { registerEEBroker } from '../ee/server';
diff --git a/apps/meteor/server/foss.ts b/apps/meteor/server/foss.ts
deleted file mode 100644
index cf5cf9d13f4db..0000000000000
--- a/apps/meteor/server/foss.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-// This file is used in FOSS builds of Rocket.Chat to replace the default ee.ts file with mocked functions
-export const startLicense = async () => undefined;
-export const registerEEBroker = async () => undefined;
diff --git a/apps/meteor/server/lib/roles/syncRoomRolePriority.ts b/apps/meteor/server/lib/roles/syncRoomRolePriority.ts
index ec78d43210b0a..677ee73a6270a 100644
--- a/apps/meteor/server/lib/roles/syncRoomRolePriority.ts
+++ b/apps/meteor/server/lib/roles/syncRoomRolePriority.ts
@@ -1,22 +1,7 @@
import type { IRole, IRoom, IUser } from '@rocket.chat/core-typings';
-import { ROOM_ROLE_PRIORITY_MAP } from '@rocket.chat/core-typings';
import { Subscriptions, Users } from '@rocket.chat/models';
-/**
- * Retrieves the role priority for a given role.
- * @param role The role ID.
- * @returns The priority of the role.
- */
-export const getRoomRolePriorityForRole = (role: IRole['_id']): number =>
- ROOM_ROLE_PRIORITY_MAP[role as keyof typeof ROOM_ROLE_PRIORITY_MAP] ?? ROOM_ROLE_PRIORITY_MAP.default;
-
-/**
- * Calculates the minimum role priority from a list of roles.
- * @param roles The array of role IDs.
- * @returns The minimum role priority.
- */
-export const calculateRoomRolePriorityFromRoles = (roles: IRole['_id'][]): number =>
- roles.reduce((currentMin, role) => Math.min(currentMin, getRoomRolePriorityForRole(role)), ROOM_ROLE_PRIORITY_MAP.default);
+import { calculateRoomRolePriorityFromRoles } from '../../../lib/roles/calculateRoomRolePriorityFromRoles';
/**
* Updates the room role priority for a user in a given room.
diff --git a/apps/meteor/server/lib/rooms/roomCoordinator.ts b/apps/meteor/server/lib/rooms/roomCoordinator.ts
index 4f4242f5a34aa..0f5ff97bdc213 100644
--- a/apps/meteor/server/lib/rooms/roomCoordinator.ts
+++ b/apps/meteor/server/lib/rooms/roomCoordinator.ts
@@ -1,9 +1,9 @@
+import { getUserDisplayName } from '@rocket.chat/core-typings';
import type { IRoom, RoomType, IUser, IMessage, ReadReceipt, ValueOf, AtLeast } from '@rocket.chat/core-typings';
import { Users } from '@rocket.chat/models';
import { settings } from '../../../app/settings/server';
import type { IRoomTypeConfig, IRoomTypeServerDirectives, RoomSettingsEnum, RoomMemberActions } from '../../../definition/IRoomTypeConfig';
-import { getUserDisplayName } from '../../../lib/getUserDisplayName';
import { RoomCoordinator } from '../../../lib/rooms/coordinator';
class RoomCoordinatorServer extends RoomCoordinator {
diff --git a/apps/meteor/server/main.ts b/apps/meteor/server/main.ts
index e2bfcda554737..ae771837dfde7 100644
--- a/apps/meteor/server/main.ts
+++ b/apps/meteor/server/main.ts
@@ -11,9 +11,7 @@ import { configureServer } from './configuration';
import { registerServices } from './services/startup';
import { startup } from './startup';
import { settings } from '../app/settings/server';
-import { startLicense } from '../ee/app/license/server/startup';
-import { registerEEBroker } from '../ee/server';
-import { startFederationService } from '../ee/server/startup/services';
+import { startRocketChat } from '../startRocketChat';
import './routes';
import '../app/lib/server/startup';
@@ -24,8 +22,6 @@ import '../lib/oauthRedirectUriServer';
import './lib/pushConfig';
import './features/EmailInbox/index';
-await Promise.all([configureServer(settings), registerServices(), registerEEBroker(), startup()]);
+await Promise.all([configureServer(settings), registerServices(), startup()]);
-await startLicense();
-
-await Promise.all([startFederationService()]);
+await startRocketChat();
diff --git a/apps/meteor/server/methods/deleteUser.ts b/apps/meteor/server/methods/deleteUser.ts
index 32dc4f8eb313c..8eaec34182889 100644
--- a/apps/meteor/server/methods/deleteUser.ts
+++ b/apps/meteor/server/methods/deleteUser.ts
@@ -38,7 +38,7 @@ Meteor.methods({
});
}
- const adminCount = await Users.col.countDocuments({ roles: 'admin' });
+ const adminCount = await Users.countDocuments({ roles: 'admin' });
const userIsAdmin = user.roles?.indexOf('admin') > -1;
diff --git a/apps/meteor/server/methods/getTotalChannels.ts b/apps/meteor/server/methods/getTotalChannels.ts
index f1492d85d458a..0a73f06a1be9c 100644
--- a/apps/meteor/server/methods/getTotalChannels.ts
+++ b/apps/meteor/server/methods/getTotalChannels.ts
@@ -17,6 +17,6 @@ Meteor.methods({
});
}
- return Rooms.col.countDocuments({ t: 'c' });
+ return Rooms.countDocuments({ t: 'c' });
},
});
diff --git a/apps/meteor/server/modules/notifications/notifications.module.ts b/apps/meteor/server/modules/notifications/notifications.module.ts
index a0394591aadf2..ad6bacba354b2 100644
--- a/apps/meteor/server/modules/notifications/notifications.module.ts
+++ b/apps/meteor/server/modules/notifications/notifications.module.ts
@@ -101,16 +101,7 @@ export class NotificationsModule {
return false;
}
- const canAccess = await Authorization.canAccessRoom(room, { _id: this.userId || '' }, extraData);
- if (!canAccess) {
- // verify if can preview messages from public channels
- if (room.t === 'c' && this.userId) {
- return Authorization.hasPermission(this.userId, 'preview-c-room');
- }
- return false;
- }
-
- return true;
+ return Authorization.canReadRoom(room, { _id: this.userId || '' }, extraData);
});
this.streamRoomMessage.allowRead('__my_messages__', 'all');
diff --git a/apps/meteor/server/publications/messages.ts b/apps/meteor/server/publications/messages.ts
index 21fcfd3524c0a..6aaf35e391699 100644
--- a/apps/meteor/server/publications/messages.ts
+++ b/apps/meteor/server/publications/messages.ts
@@ -6,6 +6,7 @@ import { Meteor } from 'meteor/meteor';
import type { FindOptions } from 'mongodb';
import { canAccessRoomIdAsync } from '../../app/authorization/server/functions/canAccessRoom';
+import { getChannelHistory } from '../../app/lib/server/methods/getChannelHistory';
type CursorPaginationType = 'UPDATED' | 'DELETED';
@@ -25,14 +26,19 @@ declare module '@rocket.chat/ddp-client' {
previous?: string;
type?: CursorPaginationType;
},
- ) => Promise<{
- updated: IMessage[];
- deleted: IMessage[];
- cursor: {
- next: string | null;
- previous: string | null;
- };
- }>;
+ ) => Promise<
+ | {
+ updated: IMessage[];
+ deleted: IMessage[];
+ cursor?: {
+ next: string | null;
+ previous: string | null;
+ };
+ }
+ | boolean
+ | IMessage[]
+ | { messages: IMessage[]; firstUnread?: any; unreadNotLoaded?: number }
+ >;
}
}
@@ -155,13 +161,23 @@ export async function handleCursorPagination(
count: number,
next?: string,
previous?: string,
-) {
+): Promise<{
+ updated: IMessage[];
+ deleted: IMessage[];
+ cursor?: {
+ next: string | null;
+ previous: string | null;
+ };
+}> {
const { query, options } = mountCursorQuery({ next, previous, count });
const response =
type === 'UPDATED'
? await Messages.findForUpdates(rid, query, options).toArray()
- : ((await Messages.trashFind({ rid, _deletedAt: query }, { projection: { _id: 1, _deletedAt: 1 }, ...options })!.toArray()) ?? []);
+ : ((await Messages.trashFind(
+ { rid, _deletedAt: query },
+ { projection: { _id: 1, _deletedAt: 1 }, ...options },
+ )!.toArray()) as IMessage[]);
const cursor = {
next: mountNextCursor(response, count, type, next, previous),
@@ -173,11 +189,89 @@ export async function handleCursorPagination(
}
return {
- [type.toLowerCase()]: response,
+ updated: type === 'UPDATED' ? response : [],
+ deleted: type === 'DELETED' ? response : [],
cursor,
};
}
+export const getMessageHistory = async (
+ rid: IRoom['_id'],
+ fromId: string,
+ {
+ lastUpdate,
+ latestDate = new Date(),
+ oldestDate,
+ inclusive = false,
+ count = 20,
+ unreads = false,
+ next,
+ previous,
+ type,
+ }: {
+ lastUpdate?: Date;
+ latestDate?: Date;
+ oldestDate?: Date;
+ inclusive?: boolean;
+ count?: number;
+ unreads?: boolean;
+ next?: string;
+ previous?: string;
+ type?: CursorPaginationType;
+ },
+): Promise<
+ | {
+ updated: IMessage[];
+ deleted: IMessage[];
+ cursor?: {
+ next: string | null;
+ previous: string | null;
+ };
+ }
+ | false
+ | IMessage[]
+ | { messages: IMessage[]; firstUnread?: any; unreadNotLoaded?: number }
+> => {
+ if (!(await canAccessRoomIdAsync(rid, fromId))) {
+ throw new Meteor.Error('error-not-allowed', 'Not allowed', { method: 'messages/get' });
+ }
+
+ if (type && !['UPDATED', 'DELETED'].includes(type)) {
+ throw new Meteor.Error('error-type-param-not-supported', 'The "type" parameter must be either "UPDATED" or "DELETED"');
+ }
+
+ if ((next || previous) && !type) {
+ throw new Meteor.Error('error-type-param-required', 'The "type" parameter is required when using the "next" or "previous" parameters');
+ }
+
+ if (next && previous) {
+ throw new Meteor.Error('error-cursor-conflict', 'You cannot provide both "next" and "previous" parameters');
+ }
+
+ if ((next || previous) && lastUpdate) {
+ throw new Meteor.Error(
+ 'error-cursor-and-lastUpdate-conflict',
+ 'The attributes "next", "previous" and "lastUpdate" cannot be used together',
+ );
+ }
+
+ const hasCursorPagination = !!((next || previous) && count !== null && type);
+
+ if (!hasCursorPagination && !lastUpdate) {
+ return getChannelHistory({ rid, fromUserId: fromId, latest: latestDate, oldest: oldestDate, inclusive, count, unreads });
+ }
+
+ if (lastUpdate) {
+ return handleWithoutPagination(rid, lastUpdate);
+ }
+
+ if (!type) {
+ throw new Meteor.Error('error-param-required', 'The "type" or "lastUpdate" parameters must be provided');
+ }
+
+ return handleCursorPagination(type, rid, count, next, previous);
+};
+
Meteor.methods({
async 'messages/get'(
rid,
@@ -195,53 +289,6 @@ Meteor.methods({
throw new Meteor.Error('error-invalid-room', 'Invalid room', { method: 'messages/get' });
}
- if (!(await canAccessRoomIdAsync(rid, fromId))) {
- throw new Meteor.Error('error-not-allowed', 'Not allowed', { method: 'messages/get' });
- }
-
- if (type && !['UPDATED', 'DELETED'].includes(type)) {
- throw new Meteor.Error('error-type-param-not-supported', 'The "type" parameter must be either "UPDATED" or "DELETED"');
- }
-
- if ((next || previous) && !type) {
- throw new Meteor.Error(
- 'error-type-param-required',
- 'The "type" parameter is required when using the "next" or "previous" parameters',
- );
- }
-
- if (next && previous) {
- throw new Meteor.Error('error-cursor-conflict', 'You cannot provide both "next" and "previous" parameters');
- }
-
- if ((next || previous) && lastUpdate) {
- throw new Meteor.Error(
- 'error-cursor-and-lastUpdate-conflict',
- 'The attributes "next", "previous" and "lastUpdate" cannot be used together',
- );
- }
-
- const hasCursorPagination = !!((next || previous) && count !== null && type);
-
- if (!hasCursorPagination && !lastUpdate) {
- return Meteor.callAsync('getChannelHistory', {
- rid,
- latest: latestDate,
- oldest: oldestDate,
- inclusive,
- count,
- unreads,
- });
- }
-
- if (lastUpdate) {
- return handleWithoutPagination(rid, lastUpdate);
- }
-
- if (!type) {
- throw new Meteor.Error('error-param-required', 'The "type" or "lastUpdate" parameters must be provided');
- }
-
- return handleCursorPagination(type, rid, count, next, previous);
+ return getMessageHistory(rid, fromId, { lastUpdate, latestDate, oldestDate, inclusive, count, unreads, next, previous, type });
},
});
diff --git a/apps/meteor/server/publications/room/index.ts b/apps/meteor/server/publications/room/index.ts
index f8ced449f8cb6..07dd94be23d00 100644
--- a/apps/meteor/server/publications/room/index.ts
+++ b/apps/meteor/server/publications/room/index.ts
@@ -48,6 +48,12 @@ Meteor.methods({
},
async 'getRoomByTypeAndName'(type, name) {
+ if (!type || !name) {
+ throw new Meteor.Error('error-invalid-room', 'Invalid room', {
+ method: 'getRoomByTypeAndName',
+ });
+ }
+
const userId = Meteor.userId();
if (!userId && settings.get('Accounts_AllowAnonymousRead') === false) {
diff --git a/apps/meteor/server/publications/subscription/index.ts b/apps/meteor/server/publications/subscription/index.ts
index b691b7daf9eee..fdd05cf69c821 100644
--- a/apps/meteor/server/publications/subscription/index.ts
+++ b/apps/meteor/server/publications/subscription/index.ts
@@ -12,6 +12,37 @@ declare module '@rocket.chat/ddp-client' {
}
}
+export const getSubscriptions = async (
+ uid: string,
+ updatedAt?: Date,
+): Promise => {
+ const options = { projection: subscriptionFields };
+
+ const records: ISubscription[] = await Subscriptions.findByUserId(uid, options).toArray();
+
+ if (updatedAt instanceof Date) {
+ return {
+ update: records.filter((record) => {
+ return record._updatedAt > updatedAt;
+ }),
+ remove: await Subscriptions.trashFindDeletedAfter(
+ updatedAt,
+ {
+ 'u._id': uid,
+ },
+ {
+ projection: {
+ _id: 1,
+ _deletedAt: 1,
+ },
+ },
+ ).toArray(),
+ };
+ }
+
+ return records;
+};
+
Meteor.methods({
async 'subscriptions/get'(updatedAt) {
const uid = Meteor.userId();
@@ -19,30 +50,6 @@ Meteor.methods({
return [];
}
- const options = { projection: subscriptionFields };
-
- const records: ISubscription[] = await Subscriptions.findByUserId(uid, options).toArray();
-
- if (updatedAt instanceof Date) {
- return {
- update: records.filter((record) => {
- return record._updatedAt > updatedAt;
- }),
- remove: await Subscriptions.trashFindDeletedAfter(
- updatedAt,
- {
- 'u._id': uid,
- },
- {
- projection: {
- _id: 1,
- _deletedAt: 1,
- },
- },
- ).toArray(),
- };
- }
-
- return records;
+ return getSubscriptions(uid, updatedAt);
},
});
diff --git a/apps/meteor/server/routes/avatar/utils.spec.ts b/apps/meteor/server/routes/avatar/utils.spec.ts
index 7f6bc2c28fe04..5c31e286467ab 100644
--- a/apps/meteor/server/routes/avatar/utils.spec.ts
+++ b/apps/meteor/server/routes/avatar/utils.spec.ts
@@ -156,6 +156,7 @@ describe('#renderSvgLetters', () => {
expect(renderSVGLetters('arthur', 16)).to.include('>\nA\n');
expect(renderSVGLetters('Bob', 16)).to.include('>\nB\n');
expect(renderSVGLetters('yan', 16)).to.include('>\nY\n');
+ expect(renderSVGLetters('山田 太郎', 16)).to.include('>\n山\n');
});
it('should render question mark with color #000', () => {
expect(renderSVGLetters('?', 16)).to.include('>\n?\n').and.to.include('fill="#000"');
diff --git a/apps/meteor/server/routes/avatar/utils.ts b/apps/meteor/server/routes/avatar/utils.ts
index 377369f4a4504..9dbb50719ab13 100644
--- a/apps/meteor/server/routes/avatar/utils.ts
+++ b/apps/meteor/server/routes/avatar/utils.ts
@@ -5,6 +5,7 @@ import type { IIncomingMessage, IUpload } from '@rocket.chat/core-typings';
import { Users } from '@rocket.chat/models';
import type { NextFunction } from 'connect';
import { Cookies } from 'meteor/ostrio:cookies';
+import sanitizeHtml from 'sanitize-html';
import sharp from 'sharp';
import { throttle } from 'underscore';
@@ -122,24 +123,23 @@ export async function userCanAccessAvatar({ headers = {}, query = {} }: IIncomin
return isAuthenticated;
}
-const getFirstLetter = (name: string) =>
- name
- .replace(/[^A-Za-z0-9]/g, '')
- .substr(0, 1)
- .toUpperCase();
+const getFirstLetter = (name: string) => {
+ const sanitizedName = sanitizeHtml(name);
+ return sanitizedName.substring(0, 1).toUpperCase();
+};
const getInitials = (name: string) => name.split(' ').slice(0, MAX_SVG_AVATAR_INITIALS).map(getFirstLetter).join('');
-export const renderSVGLetters = (username: string, viewSize = 200, useAllInitials = false) => {
+export const renderSVGLetters = (name: string, viewSize = 200, useAllInitials = false) => {
let color = '';
let initials = '';
- if (username === '?') {
+ if (name === '?') {
color = '#000';
- initials = username;
+ initials = name;
} else {
- color = getAvatarColor(username);
- initials = !useAllInitials ? getFirstLetter(username) : getInitials(username);
+ color = getAvatarColor(name);
+ initials = !useAllInitials ? getFirstLetter(name) : getInitials(name);
}
const reductionFactor = initials.length > 1 ? Math.pow(initials.length, 2) / 10 : 0;
diff --git a/apps/meteor/server/services/authorization/canReadRoom.ts b/apps/meteor/server/services/authorization/canReadRoom.ts
new file mode 100644
index 0000000000000..73e4dd86e5bd7
--- /dev/null
+++ b/apps/meteor/server/services/authorization/canReadRoom.ts
@@ -0,0 +1,24 @@
+import type { RoomAccessValidator } from '@rocket.chat/core-services';
+import { Authorization } from '@rocket.chat/core-services';
+import { Subscriptions } from '@rocket.chat/models';
+
+import { canAccessRoom } from './canAccessRoom';
+
+export const canReadRoom: RoomAccessValidator = async (...args) => {
+ if (!(await canAccessRoom(...args))) {
+ return false;
+ }
+
+ const [room, user] = args;
+
+ if (
+ user?._id &&
+ room?.t === 'c' &&
+ !(await Authorization.hasPermission(user._id, 'preview-c-room')) &&
+ !(await Subscriptions.findOneByRoomIdAndUserId(room?._id, user._id, { projection: { _id: 1 } }))
+ ) {
+ return false;
+ }
+
+ return true;
+};
diff --git a/apps/meteor/server/services/authorization/service.ts b/apps/meteor/server/services/authorization/service.ts
index 5e67cf87b372c..d970068e23ba4 100644
--- a/apps/meteor/server/services/authorization/service.ts
+++ b/apps/meteor/server/services/authorization/service.ts
@@ -5,6 +5,7 @@ import { Subscriptions, Rooms, Users, Roles, Permissions } from '@rocket.chat/mo
import mem from 'mem';
import { canAccessRoom } from './canAccessRoom';
+import { canReadRoom } from './canReadRoom';
import { AuthorizationUtils } from '../../../app/authorization/lib/AuthorizationUtils';
import './canAccessRoomLivechat';
@@ -80,6 +81,10 @@ export class Authorization extends ServiceClass implements IAuthorization {
return canAccessRoom(...args);
}
+ async canReadRoom(...args: Parameters): Promise {
+ return canReadRoom(...args);
+ }
+
async canAccessRoomId(rid: IRoom['_id'], uid: IUser['_id']): Promise {
const room = await Rooms.findOneById>(rid, {
projection: {
diff --git a/apps/meteor/server/services/messages/service.ts b/apps/meteor/server/services/messages/service.ts
index 85afcf394f28b..828d2da19ead4 100644
--- a/apps/meteor/server/services/messages/service.ts
+++ b/apps/meteor/server/services/messages/service.ts
@@ -1,3 +1,4 @@
+import { Apps } from '@rocket.chat/apps';
import type { IMessageService } from '@rocket.chat/core-services';
import { Authorization, ServiceClassInternal } from '@rocket.chat/core-services';
import { type IMessage, type MessageTypesValues, type IUser, type IRoom, isEditedMessage, type AtLeast } from '@rocket.chat/core-typings';
@@ -152,6 +153,10 @@ export class MessageService extends ServiceClassInternal implements IMessageServ
throw new Error('Failed to find the created message.');
}
+ if (Apps.self?.isLoaded()) {
+ void Apps.getBridges()?.getListenerBridge().messageEvent('IPostSystemMessageSent', createdMessage);
+ }
+
void notifyOnMessageChange({ id: createdMessage._id, data: createdMessage });
void notifyOnRoomChangedById(rid);
diff --git a/apps/meteor/server/settings/layout.ts b/apps/meteor/server/settings/layout.ts
index d89c5559c1d68..984c11b21a0ea 100644
--- a/apps/meteor/server/settings/layout.ts
+++ b/apps/meteor/server/settings/layout.ts
@@ -8,18 +8,21 @@ export const createLayoutSettings = () =>
public: true,
enterprise: true,
invalidValue: false,
+ modules: ['hide-watermark'],
});
await this.add('Layout_Login_Hide_Title', false, {
type: 'boolean',
public: true,
enterprise: true,
invalidValue: false,
+ modules: ['hide-watermark'],
});
await this.add('Layout_Login_Hide_Powered_By', false, {
type: 'boolean',
public: true,
enterprise: true,
invalidValue: false,
+ modules: ['hide-watermark'],
});
await this.add('Layout_Login_Template', 'horizontal-template', {
type: 'select',
@@ -36,6 +39,7 @@ export const createLayoutSettings = () =>
public: true,
enterprise: true,
invalidValue: 'horizontal-template',
+ modules: ['hide-watermark'],
});
await this.add('Accounts_ShowFormLogin', true, {
type: 'boolean',
diff --git a/apps/meteor/server/settings/omnichannel.ts b/apps/meteor/server/settings/omnichannel.ts
index 58e325c13004e..28c42fb755175 100644
--- a/apps/meteor/server/settings/omnichannel.ts
+++ b/apps/meteor/server/settings/omnichannel.ts
@@ -666,6 +666,14 @@ export const createOmniSettings = () =>
i18nLabel: 'Call_provider',
enableQuery: omnichannelEnabledQuery,
});
+
+ await this.add('Omnichannel_Metrics_Ignore_Automatic_Messages', false, {
+ type: 'boolean',
+ public: true,
+ group: 'Omnichannel',
+ section: 'Analytics',
+ i18nLabel: 'Omnichannel_Ignore_automatic_responses_for_performance_metrics',
+ });
});
await settingsRegistry.addGroup('SMS', async function () {
await this.add('SMS_Enabled', false, {
diff --git a/apps/meteor/server/settings/push.ts b/apps/meteor/server/settings/push.ts
index 035c6c1b41aea..714641721bc42 100644
--- a/apps/meteor/server/settings/push.ts
+++ b/apps/meteor/server/settings/push.ts
@@ -19,8 +19,10 @@ export const createPushSettings = () =>
alert: 'Push_Setting_Requires_Restart_Alert',
});
+ // TODO: Push_UseLegacy should be removed in 8.0.0, as well as Push_gcm_project_number and Push_gcm_api_key
await this.add('Push_UseLegacy', false, {
type: 'boolean',
+ hidden: true,
alert: 'Push_Setting_Legacy_Warning',
});
@@ -109,6 +111,7 @@ export const createPushSettings = () =>
});
await this.add('Push_gcm_api_key', '', {
type: 'string',
+ hidden: true,
enableQuery: [
{
_id: 'Push_UseLegacy',
@@ -132,7 +135,7 @@ export const createPushSettings = () =>
return this.add('Push_gcm_project_number', '', {
type: 'string',
- public: true,
+ hidden: true,
enableQuery: [
{
_id: 'Push_UseLegacy',
diff --git a/apps/meteor/server/settings/setup-wizard.ts b/apps/meteor/server/settings/setup-wizard.ts
index 13d76a6070d92..a63b4cfe49c66 100644
--- a/apps/meteor/server/settings/setup-wizard.ts
+++ b/apps/meteor/server/settings/setup-wizard.ts
@@ -1223,6 +1223,13 @@ export const createSetupWSettings = () =>
secret: true,
});
+ await this.add('Omnigateway_Url', 'https://omni-gateway.rocket.chat', {
+ type: 'string',
+ hidden: true,
+ secret: true,
+ readonly: true,
+ });
+
await this.add('Cloud_Service_Agree_PrivacyTerms', false, {
type: 'boolean',
});
diff --git a/apps/meteor/startRocketChat.ts b/apps/meteor/startRocketChat.ts
new file mode 100644
index 0000000000000..f0ba6f3899b14
--- /dev/null
+++ b/apps/meteor/startRocketChat.ts
@@ -0,0 +1,19 @@
+import { startLicense } from './ee/app/license/server/startup';
+import { registerEEBroker } from './ee/server';
+import { startFederationService } from './ee/server/startup/services';
+
+const loadBeforeLicense = async () => {
+ await registerEEBroker();
+};
+
+const loadAfterLicense = async () => {
+ await startFederationService();
+};
+
+export const startRocketChat = async () => {
+ await loadBeforeLicense();
+
+ await startLicense();
+
+ await loadAfterLicense();
+};
diff --git a/apps/meteor/startRocketChatFOSS.ts b/apps/meteor/startRocketChatFOSS.ts
new file mode 100644
index 0000000000000..568f1738547ff
--- /dev/null
+++ b/apps/meteor/startRocketChatFOSS.ts
@@ -0,0 +1,4 @@
+// This file is used in FOSS builds of Rocket.Chat to replace the default startRocketChat.ts file, removing references to licensed code.
+export const startRocketChat = async () => {
+ // Nothing to do here
+};
diff --git a/apps/meteor/tests/data/livechat/rooms.ts b/apps/meteor/tests/data/livechat/rooms.ts
index 0ca00556a02dc..9262db61b67d6 100644
--- a/apps/meteor/tests/data/livechat/rooms.ts
+++ b/apps/meteor/tests/data/livechat/rooms.ts
@@ -227,6 +227,14 @@ export const createManager = (overrideUsername?: string): Promise => {
+ await request
+ .post(api('livechat/agent.status'))
+ .set(overrideCredentials || credentials)
+ .send({ status })
+ .expect(200);
+};
+
export const makeAgentAvailable = async (overrideCredentials?: Credentials): Promise => {
await restorePermissionToRoles('view-l-room');
await request
diff --git a/apps/meteor/tests/data/livechat/units.ts b/apps/meteor/tests/data/livechat/units.ts
index 8a2d0f5a833a4..4ec1265797a41 100644
--- a/apps/meteor/tests/data/livechat/units.ts
+++ b/apps/meteor/tests/data/livechat/units.ts
@@ -31,6 +31,7 @@ export const createUnit = async (
username: string,
departmentIds: string[],
name?: string,
+ extraMonitor: { monitorId: string; username: string }[] = [],
): Promise => {
return new Promise((resolve, reject) => {
void request
@@ -42,7 +43,7 @@ export const createUnit = async (
params: [
null,
{ name: name || faker.person.firstName(), visibility: faker.helpers.arrayElement(['public', 'private']) },
- [{ monitorId, username }],
+ [{ monitorId, username }, ...extraMonitor],
departmentIds.map((departmentId) => ({ departmentId })),
],
id: '101',
diff --git a/apps/meteor/tests/data/users.helper.ts b/apps/meteor/tests/data/users.helper.ts
index ceeb671d3a4be..1022edef686ed 100644
--- a/apps/meteor/tests/data/users.helper.ts
+++ b/apps/meteor/tests/data/users.helper.ts
@@ -2,7 +2,7 @@ import type { Credentials } from '@rocket.chat/api-client';
import type { IUser } from '@rocket.chat/core-typings';
import { UserStatus } from '@rocket.chat/core-typings';
-import { api, credentials, request } from './api-data';
+import { api, credentials, methodCall, request } from './api-data';
import { password } from './user';
export type TestUser = TUser & { username: string; emails: string[] };
@@ -100,3 +100,29 @@ export const setUserStatus = (overrideCredentials = credentials, status = UserSt
message: '',
status,
});
+
+export const setUserAway = (overrideCredentials = credentials) =>
+ request
+ .post(methodCall('UserPresence:away'))
+ .set(overrideCredentials)
+ .send({
+ message: JSON.stringify({
+ method: 'UserPresence:away',
+ params: [],
+ id: 'id',
+ msg: 'method',
+ }),
+ });
+
+export const setUserOnline = (overrideCredentials = credentials) =>
+ request
+ .post(methodCall('UserPresence:online'))
+ .set(overrideCredentials)
+ .send({
+ message: JSON.stringify({
+ method: 'UserPresence:online',
+ params: [],
+ id: 'id',
+ msg: 'method',
+ }),
+ });
diff --git a/apps/meteor/tests/e2e/account-profile.spec.ts b/apps/meteor/tests/e2e/account-profile.spec.ts
index c549a8b420c75..c8b7f4e277467 100644
--- a/apps/meteor/tests/e2e/account-profile.spec.ts
+++ b/apps/meteor/tests/e2e/account-profile.spec.ts
@@ -69,12 +69,35 @@ test.describe.serial('settings-account-profile', () => {
});
test.describe('Security', () => {
+ test.beforeEach(async ({ page }) => {
+ await page.goto('account/security');
+ await page.waitForSelector('.main-content');
+ });
+
test('should not have any accessibility violations', async ({ page, makeAxeBuilder }) => {
await page.goto('/account/security');
const results = await makeAxeBuilder().analyze();
expect(results.violations).toEqual([]);
});
+
+ test('expect to disable email 2FA', async () => {
+ await poAccountProfile.security2FASection.click();
+ await expect(poAccountProfile.disableEmail2FAButton).toBeVisible();
+ await poAccountProfile.disableEmail2FAButton.click();
+
+ await expect(poHomeChannel.toastSuccess).toBeVisible();
+ await expect(poAccountProfile.enableEmail2FAButton).toBeVisible();
+ });
+
+ test('expect to enable email 2FA', async () => {
+ await poAccountProfile.security2FASection.click();
+ await expect(poAccountProfile.enableEmail2FAButton).toBeVisible();
+ await poAccountProfile.enableEmail2FAButton.click();
+
+ await expect(poHomeChannel.toastSuccess).toBeVisible();
+ await expect(poAccountProfile.disableEmail2FAButton).toBeVisible();
+ });
});
test('Personal Access Tokens', async ({ page }) => {
diff --git a/apps/meteor/tests/e2e/fixtures/collections/users.ts b/apps/meteor/tests/e2e/fixtures/collections/users.ts
index 5baaccc101345..650d894e1fca0 100644
--- a/apps/meteor/tests/e2e/fixtures/collections/users.ts
+++ b/apps/meteor/tests/e2e/fixtures/collections/users.ts
@@ -16,7 +16,7 @@ export function createUserFixture(user: IUserState): UserFixture {
_id: `${username}`,
type: 'user',
active: true,
- emails: [{ address: `${username}@email.com`, verified: false }],
+ emails: [{ address: `${username}@email.com`, verified: true }],
roles: ['user'],
name: username,
lastLogin: new Date(),
diff --git a/apps/meteor/tests/e2e/jump-to-thread-message.spec.ts b/apps/meteor/tests/e2e/jump-to-thread-message.spec.ts
index da67d0601344a..5bcb23d76d342 100644
--- a/apps/meteor/tests/e2e/jump-to-thread-message.spec.ts
+++ b/apps/meteor/tests/e2e/jump-to-thread-message.spec.ts
@@ -47,7 +47,7 @@ test.describe.serial('Threads', () => {
const messageLink = `/channel/${targetChannel.name}?msg=${mainMessage._id}`;
await page.goto(messageLink);
- const message = await page.locator(`[aria-label=\"Message list\"] [data-id=\"${mainMessage._id}\"]`);
+ const message = page.locator(`[aria-label=\"Message list\"] [data-id=\"${mainMessage._id}\"]`);
await expect(message).toBeVisible();
await expect(message).toBeInViewport();
diff --git a/apps/meteor/tests/e2e/omnichannel/omnichannel-contact-center.spec.ts b/apps/meteor/tests/e2e/omnichannel/omnichannel-contact-center.spec.ts
index 1225d2355f1af..9c624b0c49bfc 100644
--- a/apps/meteor/tests/e2e/omnichannel/omnichannel-contact-center.spec.ts
+++ b/apps/meteor/tests/e2e/omnichannel/omnichannel-contact-center.spec.ts
@@ -18,7 +18,13 @@ const createContact = (generateToken = false) => ({
const NEW_CONTACT = createContact();
const EDIT_CONTACT = createContact();
-const EXISTING_CONTACT = createContact(true);
+const EXISTING_CONTACT = {
+ id: undefined,
+ name: `${faker.person.firstName()} ${faker.person.lastName()}`,
+ emails: [faker.internet.email().toLowerCase()],
+ phones: [faker.phone.number('+############')],
+ token: undefined,
+};
const NEW_CUSTOM_FIELD = {
searchable: true,
field: 'hiddenCustomField',
@@ -45,7 +51,9 @@ const ERROR = {
nameRequired: 'Name required',
invalidEmail: 'Invalid email address',
emailRequired: 'Email required',
+ emailAlreadyExists: 'Email already exists',
phoneRequired: 'Phone required',
+ phoneAlreadyExists: 'Phone already exists',
};
test.use({ storageState: Users.admin.state });
@@ -56,8 +64,7 @@ test.describe('Omnichannel Contact Center', () => {
test.beforeAll(async ({ api }) => {
// Add a contact
- const { id: _, ...data } = EXISTING_CONTACT;
- await api.post('/omnichannel/contacts', data);
+ await api.post('/omnichannel/contacts', EXISTING_CONTACT);
if (IS_EE) {
await api.post('/livechat/custom.field', NEW_CUSTOM_FIELD);
@@ -65,9 +72,10 @@ test.describe('Omnichannel Contact Center', () => {
});
test.afterAll(async ({ api }) => {
- // Remove added contacts
- await api.delete(`/livechat/visitor/${EXISTING_CONTACT.token}`);
+ // Remove added contact
await api.delete(`/livechat/visitor/${NEW_CONTACT.token}`);
+ await api.delete(`/livechat/visitor/${EXISTING_CONTACT.token}`);
+
if (IS_EE) {
await api.post('method.call/livechat:removeCustomField', { message: NEW_CUSTOM_FIELD.field });
}
@@ -86,6 +94,14 @@ test.describe('Omnichannel Contact Center', () => {
NEW_CONTACT.token = res.contacts?.[0]?.token;
NEW_CONTACT.id = res.contacts?.[0]?._id;
});
+
+ await api
+ .get('/omnichannel/contacts.search', { searchText: EXISTING_CONTACT.phones[0] })
+ .then((res) => res.json())
+ .then((res) => {
+ EXISTING_CONTACT.token = res.contacts?.[0]?.token;
+ EXISTING_CONTACT.id = res.contacts?.[0]?._id;
+ });
});
test.beforeEach(async ({ page }) => {
@@ -122,15 +138,34 @@ test.describe('Omnichannel Contact Center', () => {
await expect(poContacts.newContact.getErrorMessage(ERROR.invalidEmail)).toBeVisible();
});
+ await test.step('validate email is duplicated', async () => {
+ await poContacts.newContact.inputEmail.fill(EXISTING_CONTACT.emails[0]);
+ await page.keyboard.press('Tab');
+ await expect(poContacts.newContact.getErrorMessage(ERROR.emailAlreadyExists)).toBeVisible();
+ });
+
+ await test.step('validate email is required', async () => {
+ await poContacts.newContact.inputEmail.clear();
+ await page.keyboard.press('Tab');
+ await expect(poContacts.newContact.getErrorMessage(ERROR.emailRequired)).toBeVisible();
+ });
+
await test.step('input email', async () => {
await poContacts.newContact.inputEmail.fill(NEW_CONTACT.email);
await page.keyboard.press('Tab');
await expect(poContacts.newContact.getErrorMessage(ERROR.invalidEmail)).not.toBeVisible();
await expect(poContacts.newContact.getErrorMessage(ERROR.emailRequired)).not.toBeVisible();
+ await expect(poContacts.newContact.getErrorMessage(ERROR.emailAlreadyExists)).not.toBeVisible();
});
- await test.step('input phone', async () => {
+ await test.step('validate phone is duplicated', async () => {
await poContacts.newContact.btnAddPhone.click();
+ await poContacts.newContact.inputPhone.fill(EXISTING_CONTACT.phones[0]);
+ await page.keyboard.press('Tab');
+ await expect(poContacts.newContact.getErrorMessage(ERROR.phoneAlreadyExists)).toBeVisible();
+ });
+
+ await test.step('input phone', async () => {
await poContacts.newContact.inputPhone.fill(NEW_CONTACT.phone);
await page.keyboard.press('Tab');
await expect(poContacts.newContact.getErrorMessage(ERROR.phoneRequired)).not.toBeVisible();
@@ -173,9 +208,21 @@ test.describe('Omnichannel Contact Center', () => {
});
await test.step('validate email format', async () => {
- await poContacts.contactInfo.inputEmail.fill('invalidemail');
+ await poContacts.newContact.inputEmail.fill('invalidemail');
+ await page.keyboard.press('Tab');
+ await expect(poContacts.newContact.getErrorMessage(ERROR.invalidEmail)).toBeVisible();
+ });
+
+ await test.step('validate email is duplicated', async () => {
+ await poContacts.newContact.inputEmail.fill(EXISTING_CONTACT.emails[0]);
+ await page.keyboard.press('Tab');
+ await expect(poContacts.newContact.getErrorMessage(ERROR.emailAlreadyExists)).toBeVisible();
+ });
+
+ await test.step('validate email is required', async () => {
+ await poContacts.newContact.inputEmail.clear();
await page.keyboard.press('Tab');
- await expect(poContacts.contactInfo.getErrorMessage(ERROR.invalidEmail)).toBeVisible();
+ await expect(poContacts.newContact.getErrorMessage(ERROR.emailRequired)).toBeVisible();
});
await test.step('validate name is required', async () => {
@@ -188,6 +235,12 @@ test.describe('Omnichannel Contact Center', () => {
await poContacts.contactInfo.inputName.fill(EDIT_CONTACT.name);
});
+ await test.step('validate phone is duplicated', async () => {
+ await poContacts.newContact.inputPhone.fill(EXISTING_CONTACT.phones[0]);
+ await page.keyboard.press('Tab');
+ await expect(poContacts.newContact.getErrorMessage(ERROR.phoneAlreadyExists)).toBeVisible();
+ });
+
await test.step('input phone ', async () => {
await poContacts.newContact.inputPhone.fill(EDIT_CONTACT.phone);
await page.keyboard.press('Tab');
@@ -199,6 +252,7 @@ test.describe('Omnichannel Contact Center', () => {
await page.keyboard.press('Tab');
await expect(poContacts.newContact.getErrorMessage(ERROR.invalidEmail)).not.toBeVisible();
await expect(poContacts.newContact.getErrorMessage(ERROR.emailRequired)).not.toBeVisible();
+ await expect(poContacts.newContact.getErrorMessage(ERROR.emailAlreadyExists)).not.toBeVisible();
});
await test.step('save new contact ', async () => {
diff --git a/apps/meteor/tests/e2e/omnichannel/omnichannel-livechat-api.spec.ts b/apps/meteor/tests/e2e/omnichannel/omnichannel-livechat-api.spec.ts
index e14e3b43fbe30..18e57dbdfbb71 100644
--- a/apps/meteor/tests/e2e/omnichannel/omnichannel-livechat-api.spec.ts
+++ b/apps/meteor/tests/e2e/omnichannel/omnichannel-livechat-api.spec.ts
@@ -233,6 +233,7 @@ test.describe('OC - Livechat API', () => {
await addAgentToDepartment(api, { department: departmentA, agentId: agent.data._id });
await addAgentToDepartment(api, { department: departmentB, agentId: agent2.data._id });
expect((await api.post('/settings/Livechat_offline_email', { value: 'test@testing.com' })).status()).toBe(200);
+ await api.post('/settings/Livechat_enabled_when_agent_idle', { value: false });
});
test.beforeEach(async ({ browser }, testInfo) => {
@@ -266,6 +267,7 @@ test.describe('OC - Livechat API', () => {
await expect((await api.post('/settings/Omnichannel_enable_department_removal', { value: true })).status()).toBe(200);
await Promise.all([...departments.map((department) => department.delete())]);
await expect((await api.post('/settings/Omnichannel_enable_department_removal', { value: false })).status()).toBe(200);
+ await api.post('/settings/Livechat_enabled_when_agent_idle', { value: true });
});
// clearBusinessUnit
@@ -698,6 +700,7 @@ test.describe('OC - Livechat API', () => {
test.beforeAll(async ({ api }) => {
agent = await createAgent(api, 'user1');
expect((await api.post('/settings/Livechat_offline_email', { value: 'test@testing.com' })).status()).toBe(200);
+ await api.post('/settings/Livechat_enabled_when_agent_idle', { value: false });
});
test.beforeEach(async ({ browser }, testInfo) => {
@@ -723,8 +726,9 @@ test.describe('OC - Livechat API', () => {
await page.close();
});
- test.afterAll(async () => {
+ test.afterAll(async ({ api }) => {
await agent.delete();
+ await api.post('/settings/Livechat_enabled_when_agent_idle', { value: true });
});
test('OC - Livechat API - onChatMaximized & onChatMinimized', async () => {
@@ -856,6 +860,7 @@ test.describe('OC - Livechat API', () => {
const newVisitor = createFakeVisitor();
await poAuxContext.poHomeOmnichannel.sidenav.switchStatus('offline');
+ await poAuxContext.poHomeOmnichannel.sidenav.switchOmnichannelStatus('offline');
const watchForTrigger = page.waitForFunction(() => window.onOfflineFormSubmit === true);
diff --git a/apps/meteor/tests/e2e/page-objects/account-profile.ts b/apps/meteor/tests/e2e/page-objects/account-profile.ts
index c1493a077fa43..d23b00dbe47f8 100644
--- a/apps/meteor/tests/e2e/page-objects/account-profile.ts
+++ b/apps/meteor/tests/e2e/page-objects/account-profile.ts
@@ -28,6 +28,7 @@ export class AccountProfile {
return this.page.locator('//label[contains(text(), "Username")]/..//input');
}
+ // TODO: remove this locator
get btnSubmit(): Locator {
return this.page.locator('[data-qa="AccountProfilePageSaveButton"]');
}
@@ -44,6 +45,14 @@ export class AccountProfile {
return this.page.locator('//label[contains(text(), "Email")]/..//input');
}
+ get preferencesSoundAccordionOption(): Locator {
+ return this.page.locator('h2:has-text("Sound")');
+ }
+
+ get preferencesCallRingerVolumeSlider(): Locator {
+ return this.page.getByRole('slider', { name: 'Call Ringer Volume' });
+ }
+
get btnClose(): Locator {
return this.page.locator('role=navigation >> role=button[name=Close]');
}
@@ -123,4 +132,12 @@ export class AccountProfile {
get btnSaveChanges(): Locator {
return this.page.getByRole('button', { name: 'Save changes', exact: true });
}
+
+ get enableEmail2FAButton(): Locator {
+ return this.page.locator('role=button[name="Enable two-factor authentication via Email"]');
+ }
+
+ get disableEmail2FAButton(): Locator {
+ return this.page.locator('role=button[name="Disable two-factor authentication via Email"]');
+ }
}
diff --git a/apps/meteor/tests/e2e/page-objects/fragments/home-content.ts b/apps/meteor/tests/e2e/page-objects/fragments/home-content.ts
index 418631e5c6f92..eab20f959b515 100644
--- a/apps/meteor/tests/e2e/page-objects/fragments/home-content.ts
+++ b/apps/meteor/tests/e2e/page-objects/fragments/home-content.ts
@@ -371,6 +371,10 @@ export class HomeContent {
return this.page.locator('#video-conf-root .rcx-button--primary.rcx-button >> text="Start call"');
}
+ getIncomingCallByName(name: string): Locator {
+ return this.page.getByRole('dialog', { name });
+ }
+
get btnDeclineVideoCall(): Locator {
return this.page.locator('.rcx-button--secondary-danger.rcx-button >> text="Decline"');
}
diff --git a/apps/meteor/tests/e2e/page-objects/fragments/home-sidenav.ts b/apps/meteor/tests/e2e/page-objects/fragments/home-sidenav.ts
index 5278e03c29f07..7b6a67ced7cdf 100644
--- a/apps/meteor/tests/e2e/page-objects/fragments/home-sidenav.ts
+++ b/apps/meteor/tests/e2e/page-objects/fragments/home-sidenav.ts
@@ -68,6 +68,10 @@ export class HomeSidenav {
return this.page.locator('role=menuitemcheckbox[name="Profile"]');
}
+ get accountPreferencesOption(): Locator {
+ return this.page.locator('role=menuitemcheckbox[name="Preferences"]');
+ }
+
// TODO: refactor getSidebarItemByName to not use data-qa
getSidebarItemByName(name: string, isRead?: boolean): Locator {
return this.page.locator(
diff --git a/apps/meteor/tests/e2e/page-objects/home-channel.ts b/apps/meteor/tests/e2e/page-objects/home-channel.ts
index d6f42c2b2d8c8..d1e676bf978ce 100644
--- a/apps/meteor/tests/e2e/page-objects/home-channel.ts
+++ b/apps/meteor/tests/e2e/page-objects/home-channel.ts
@@ -77,6 +77,14 @@ export class HomeChannel {
return this.page.locator('role=menuitem[name="Mark Unread"]');
}
+ get audioVideoConfRingtone(): Locator {
+ return this.page.locator('#custom-sound-ringtone');
+ }
+
+ get audioVideoConfDialtone(): Locator {
+ return this.page.locator('#custom-sound-dialtone');
+ }
+
get dialogEnterE2EEPassword(): Locator {
return this.page.getByRole('dialog', { name: 'Enter E2EE password' });
}
diff --git a/apps/meteor/tests/e2e/video-conference-ring.spec.ts b/apps/meteor/tests/e2e/video-conference-ring.spec.ts
index 0b26c16cffc61..cd117b9adb834 100644
--- a/apps/meteor/tests/e2e/video-conference-ring.spec.ts
+++ b/apps/meteor/tests/e2e/video-conference-ring.spec.ts
@@ -3,33 +3,35 @@ import type { Page } from '@playwright/test';
import { IS_EE } from './config/constants';
import { createAuxContext } from './fixtures/createAuxContext';
import { Users } from './fixtures/userStates';
-import { HomeChannel } from './page-objects';
+import { HomeChannel, AccountProfile } from './page-objects';
import { expect, test } from './utils/test';
test.use({ storageState: Users.user1.state });
test.describe('video conference ringing', () => {
let poHomeChannel: HomeChannel;
+ let poAccountProfile: AccountProfile;
test.skip(!IS_EE, 'Enterprise Only');
test.beforeEach(async ({ page }) => {
poHomeChannel = new HomeChannel(page);
+ poAccountProfile = new AccountProfile(page);
await page.goto('/home');
});
- let auxContext: { page: Page; poHomeChannel: HomeChannel };
+ let auxContext: { page: Page; poHomeChannel: HomeChannel; poAccountProfile: AccountProfile };
test.beforeEach(async ({ browser }) => {
const { page } = await createAuxContext(browser, Users.user2);
- auxContext = { page, poHomeChannel: new HomeChannel(page) };
+ auxContext = { page, poHomeChannel: new HomeChannel(page), poAccountProfile: new AccountProfile(page) };
});
test.afterEach(async () => {
await auxContext.page.close();
});
- test('expect is ringing in direct', async () => {
+ test('should show call is ringing in direct', async () => {
await poHomeChannel.sidenav.openChat('user2');
await auxContext.poHomeChannel.sidenav.openChat('user1');
@@ -41,7 +43,40 @@ test.describe('video conference ringing', () => {
await expect(auxContext.poHomeChannel.content.videoConfRingCallText('Incoming call from')).toBeVisible();
await auxContext.poHomeChannel.content.btnDeclineVideoCall.click();
+ });
- await auxContext.page.close();
+ const changeCallRingerVolumeFromHome = async (poHomeChannel: HomeChannel, poAccountProfile: AccountProfile, volume: string) => {
+ await poHomeChannel.sidenav.userProfileMenu.click();
+ await poHomeChannel.sidenav.accountPreferencesOption.click();
+
+ await poAccountProfile.preferencesSoundAccordionOption.click();
+ await poAccountProfile.preferencesCallRingerVolumeSlider.fill(volume);
+
+ await poAccountProfile.btnSaveChanges.click();
+ await poAccountProfile.btnClose.click();
+ };
+
+ test('should be ringing/dialing according to volume preference', async () => {
+ await changeCallRingerVolumeFromHome(poHomeChannel, poAccountProfile, '50');
+ await changeCallRingerVolumeFromHome(auxContext.poHomeChannel, auxContext.poAccountProfile, '25');
+
+ await poHomeChannel.sidenav.openChat('user2');
+ await auxContext.poHomeChannel.sidenav.openChat('user1');
+
+ await poHomeChannel.content.btnCall.click();
+ await poHomeChannel.content.menuItemVideoCall.click();
+ await poHomeChannel.content.btnStartVideoCall.click();
+
+ await expect(auxContext.poHomeChannel.content.getIncomingCallByName('user1')).toBeVisible();
+
+ const dialToneVolume = await poHomeChannel.audioVideoConfDialtone.evaluate((el: HTMLAudioElement) => el.volume);
+ const ringToneVolume = await auxContext.poHomeChannel.audioVideoConfRingtone.evaluate((el: HTMLAudioElement) => el.volume);
+
+ expect(dialToneVolume).toBe(0.5);
+ expect(ringToneVolume).toBe(0.25);
+
+ await auxContext.poHomeChannel.content.btnDeclineVideoCall.click();
+ await changeCallRingerVolumeFromHome(poHomeChannel, poAccountProfile, '100');
+ await changeCallRingerVolumeFromHome(auxContext.poHomeChannel, auxContext.poAccountProfile, '100');
});
});
diff --git a/apps/meteor/tests/end-to-end/api/channels.ts b/apps/meteor/tests/end-to-end/api/channels.ts
index 0e105a728cd46..c51357f9c07af 100644
--- a/apps/meteor/tests/end-to-end/api/channels.ts
+++ b/apps/meteor/tests/end-to-end/api/channels.ts
@@ -1,5 +1,6 @@
import type { Credentials } from '@rocket.chat/api-client';
-import type { IIntegration, IMessage, IRoom, ITeam, IUser } from '@rocket.chat/core-typings';
+import { TEAM_TYPE, type IIntegration, type IMessage, type IRoom, type ITeam, type IUser } from '@rocket.chat/core-typings';
+import { Random } from '@rocket.chat/random';
import { expect, assert } from 'chai';
import { after, before, describe, it } from 'mocha';
@@ -9,7 +10,7 @@ import { CI_MAX_ROOMS_PER_GUEST as maxRoomsPerGuest } from '../../data/constants
import { createIntegration, removeIntegration } from '../../data/integration.helper';
import { updatePermission, updateSetting } from '../../data/permissions.helper';
import { createRoom, deleteRoom } from '../../data/rooms.helper';
-import { deleteTeam } from '../../data/teams.helper';
+import { createTeam, deleteTeam } from '../../data/teams.helper';
import { testFileUploads } from '../../data/uploads.helper';
import { adminUsername, password } from '../../data/user';
import type { TestUser } from '../../data/users.helper';
@@ -763,8 +764,9 @@ describe('[Channels]', () => {
});
});
});
+
describe('[/channels.info]', () => {
- const testChannelName = `api-channel-test-${Date.now()}`;
+ const testChannelName = `api-channel-test-${Date.now()}.${Random.id()}`;
let testChannel: IRoom;
after(async () => {
@@ -944,6 +946,312 @@ describe('[Channels]', () => {
})
.end(done);
});
+ describe('Additional Visibility Tests', () => {
+ let outsiderUser: IUser;
+ let insideUser: IUser;
+ let nonTeamUser: IUser;
+ let outsiderCredentials: { 'X-Auth-Token': string; 'X-User-Id': string };
+ let insideCredentials: { 'X-Auth-Token': string; 'X-User-Id': string };
+ let nonTeamCredentials: { 'X-Auth-Token': string; 'X-User-Id': string };
+
+ let privateChannel: IRoom;
+ let publicChannel: IRoom;
+ let publicTeam: ITeam;
+ let privateTeam: ITeam;
+ let privateChannelInPublicTeam: IRoom;
+ let publicChannelInPublicTeam: IRoom;
+ let privateChannelInPrivateTeam: IRoom;
+ let publicChannelInPrivateTeam: IRoom;
+
+ before(async () => {
+ [outsiderUser, insideUser, nonTeamUser] = await Promise.all([
+ createUser({ username: `e_${Random.id()}` }),
+ createUser({ username: `f_${Random.id()}` }),
+ createUser({ username: `g_${Random.id()}` }),
+ ]);
+ [outsiderCredentials, insideCredentials, nonTeamCredentials] = await Promise.all([
+ login(outsiderUser.username, password),
+ login(insideUser.username, password),
+ login(nonTeamUser.username, password),
+ ]);
+
+ // Create a public team and a private team
+ [publicTeam, privateTeam] = await Promise.all([
+ createTeam(insideCredentials, `channels.info.team.public.${Random.id()}`, TEAM_TYPE.PUBLIC, [outsiderUser.username as string]),
+ createTeam(insideCredentials, `channels.info.team.private.${Random.id()}`, TEAM_TYPE.PRIVATE, [outsiderUser.username as string]),
+ ]);
+
+ const [
+ privateInPublicResponse,
+ publicInPublicResponse,
+ privateInPrivateResponse,
+ publicInPrivateResponse,
+ privateRoomResponse,
+ publicRoomResponse,
+ ] = await Promise.all([
+ createRoom({
+ type: 'p',
+ name: `teamPublic.privateChannel.${Date.now()}`,
+ credentials: insideCredentials,
+ extraData: {
+ teamId: publicTeam._id,
+ },
+ }),
+ createRoom({
+ type: 'c',
+ name: `teamPublic.publicChannel.${Date.now()}`,
+ credentials: insideCredentials,
+ extraData: {
+ teamId: publicTeam._id,
+ },
+ }),
+ createRoom({
+ type: 'p',
+ name: `teamPrivate.privateChannel.${Date.now()}`,
+ credentials: insideCredentials,
+ extraData: {
+ teamId: privateTeam._id,
+ },
+ }),
+ createRoom({
+ type: 'c',
+ name: `teamPrivate.publicChannel.${Date.now()}`,
+ credentials: insideCredentials,
+ extraData: {
+ teamId: privateTeam._id,
+ },
+ }),
+ createRoom({
+ type: 'p',
+ name: `channels.info.private.${Date.now()}`,
+ credentials: insideCredentials,
+ }),
+ createRoom({
+ type: 'c',
+ name: `channels.info.public.${Date.now()}`,
+ credentials: insideCredentials,
+ }),
+ ]);
+
+ privateChannelInPublicTeam = privateInPublicResponse.body.group;
+ publicChannelInPublicTeam = publicInPublicResponse.body.channel;
+ privateChannelInPrivateTeam = privateInPrivateResponse.body.group;
+ publicChannelInPrivateTeam = publicInPrivateResponse.body.channel;
+ privateChannel = privateRoomResponse.body.group;
+ publicChannel = publicRoomResponse.body.channel;
+ });
+
+ after(async () => {
+ await Promise.all([
+ deleteRoom({ type: 'p', roomId: privateChannel._id }),
+ deleteRoom({ type: 'c', roomId: publicChannel._id }),
+ deleteRoom({ type: 'p', roomId: privateChannelInPublicTeam._id }),
+ deleteRoom({ type: 'c', roomId: publicChannelInPublicTeam._id }),
+ deleteRoom({ type: 'p', roomId: privateChannelInPrivateTeam._id }),
+ deleteRoom({ type: 'c', roomId: publicChannelInPrivateTeam._id }),
+ ]);
+
+ await Promise.all([deleteTeam(credentials, publicTeam.name), deleteTeam(credentials, privateTeam.name)]);
+
+ await Promise.all([deleteUser(outsiderUser), deleteUser(insideUser), deleteUser(nonTeamUser)]);
+ });
+
+ it('should not fetch private room info by user not part of room', async () => {
+ await request
+ .get(api('channels.info'))
+ .set(outsiderCredentials)
+ .query({ roomId: privateChannel._id })
+ .expect('Content-Type', 'application/json')
+ .expect(400)
+ .expect((res) => {
+ expect(res.body).to.have.property('success', false);
+ });
+ });
+
+ it('should not fetch private room info by user who is part of the room', async () => {
+ const response = await request
+ .get(api('channels.info'))
+ .set(insideCredentials)
+ .query({ roomId: privateChannel._id })
+ .expect('Content-Type', 'application/json')
+ .expect(400);
+
+ expect(response.body.success).to.be.false;
+ });
+
+ it('should fetch public room info by user who is part of the room', async () => {
+ const response = await request
+ .get(api('channels.info'))
+ .set(insideCredentials)
+ .query({ roomId: publicChannel._id })
+ .expect('Content-Type', 'application/json')
+ .expect(200);
+
+ expect(response.body.success).to.be.true;
+ expect(response.body).to.have.property('channel');
+ });
+
+ it('should fetch public room info by user not part of room - because public', async () => {
+ const response = await request
+ .get(api('channels.info'))
+ .set(outsiderCredentials)
+ .query({ roomId: publicChannel._id })
+ .expect('Content-Type', 'application/json')
+ .expect(200);
+
+ expect(response.body.success).to.be.true;
+ expect(response.body).to.have.property('channel');
+ });
+
+ it('should not fetch a private channel info inside a public team by someone part of the room ', async () => {
+ await request
+ .get(api('channels.info'))
+ .set(insideCredentials)
+ .query({ roomId: privateChannelInPublicTeam._id })
+ .expect('Content-Type', 'application/json')
+ .expect(400)
+ .expect((res) => {
+ expect(res.body).to.have.property('success', false);
+ });
+ });
+
+ it('should not fetch a private channel info inside a public team by someone not part of the room, but part of team', async () => {
+ await request
+ .get(api('channels.info'))
+ .set(outsiderCredentials)
+ .query({ roomId: privateChannelInPublicTeam._id })
+ .expect('Content-Type', 'application/json')
+ .expect(400)
+ .expect((res) => {
+ expect(res.body).to.have.property('success', false);
+ });
+ });
+
+ it('should not fetch a private channel info inside a public team by someone not part of the team ', async () => {
+ await request
+ .get(api('channels.info'))
+ .set(nonTeamCredentials)
+ .query({ roomId: privateChannelInPublicTeam._id })
+ .expect('Content-Type', 'application/json')
+ .expect(400)
+ .expect((res) => {
+ expect(res.body).to.have.property('success', false);
+ });
+ });
+
+ it('should fetch a public channel info inside a public team by someone part of the room ', async () => {
+ await request
+ .get(api('channels.info'))
+ .set(insideCredentials)
+ .query({ roomId: publicChannelInPublicTeam._id })
+ .expect('Content-Type', 'application/json')
+ .expect(200)
+ .expect((res) => {
+ expect(res.body).to.have.property('success', true);
+ expect(res.body).to.have.property('channel');
+ });
+ });
+
+ it('should fetch a public channel info inside a public team by someone not part of the room, but part of team', async () => {
+ await request
+ .get(api('channels.info'))
+ .set(outsiderCredentials)
+ .query({ roomId: publicChannelInPublicTeam._id })
+ .expect('Content-Type', 'application/json')
+ .expect(200)
+ .expect((res) => {
+ expect(res.body).to.have.property('success', true);
+ expect(res.body).to.have.property('channel');
+ });
+ });
+
+ it('should fetch a public channel info inside a public team by someone not part of the team ', async () => {
+ await request
+ .get(api('channels.info'))
+ .set(nonTeamCredentials)
+ .query({ roomId: publicChannelInPublicTeam._id })
+ .expect('Content-Type', 'application/json')
+ .expect(200)
+ .expect((res) => {
+ expect(res.body).to.have.property('success', true);
+ expect(res.body).to.have.property('channel');
+ });
+ });
+
+ it('should fetch a public channel info inside a private team by someone part of the room', async () => {
+ await request
+ .get(api('channels.info'))
+ .set(insideCredentials)
+ .query({ roomId: publicChannelInPrivateTeam._id })
+ .expect('Content-Type', 'application/json')
+ .expect(200)
+ .expect((res) => {
+ expect(res.body).to.have.property('success', true);
+ expect(res.body).to.have.property('channel');
+ });
+ });
+
+ it('should fetch a public channel info inside a private team by someone not part of the room, but part of team', async () => {
+ await request
+ .get(api('channels.info'))
+ .set(outsiderCredentials)
+ .query({ roomId: publicChannelInPrivateTeam._id })
+ .expect('Content-Type', 'application/json')
+ .expect(200)
+ .expect((res) => {
+ expect(res.body).to.have.property('success', true);
+ expect(res.body).to.have.property('channel');
+ });
+ });
+
+ it('should not fetch a public channel info inside a private team by someone not part of team', async () => {
+ await request
+ .get(api('channels.info'))
+ .set(nonTeamCredentials)
+ .query({ roomId: publicChannelInPrivateTeam._id })
+ .expect('Content-Type', 'application/json')
+ .expect(403)
+ .expect((res) => {
+ expect(res.body).to.have.property('success', false);
+ });
+ });
+
+ it('should not fetch a private channel info inside a private team by someone part of the room', async () => {
+ await request
+ .get(api('channels.info'))
+ .set(insideCredentials)
+ .query({ roomId: privateChannelInPrivateTeam._id })
+ .expect('Content-Type', 'application/json')
+ .expect(400)
+ .expect((res) => {
+ expect(res.body).to.have.property('success', false);
+ });
+ });
+
+ it('should not fetch a private channel info inside a private team by someone not part of the room, but part of team', async () => {
+ await request
+ .get(api('channels.info'))
+ .set(outsiderCredentials)
+ .query({ roomId: privateChannelInPrivateTeam._id })
+ .expect('Content-Type', 'application/json')
+ .expect(400)
+ .expect((res) => {
+ expect(res.body).to.have.property('success', false);
+ });
+ });
+
+ it('should not fetch a private channel info inside a private team by someone not part of team', async () => {
+ await request
+ .get(api('channels.info'))
+ .set(nonTeamCredentials)
+ .query({ roomId: privateChannelInPrivateTeam._id })
+ .expect('Content-Type', 'application/json')
+ .expect(400)
+ .expect((res) => {
+ expect(res.body).to.have.property('success', false);
+ });
+ });
+ });
});
describe('[/channels.online]', () => {
@@ -1487,6 +1795,316 @@ describe('[Channels]', () => {
})
.end(done);
});
+
+ describe('Additional Visibility Tests', () => {
+ let outsiderUser: IUser;
+ let insideUser: IUser;
+ let nonTeamUser: IUser;
+ let outsiderCredentials: { 'X-Auth-Token': string; 'X-User-Id': string };
+ let insideCredentials: { 'X-Auth-Token': string; 'X-User-Id': string };
+ let nonTeamCredentials: { 'X-Auth-Token': string; 'X-User-Id': string };
+
+ let privateChannel: IRoom;
+ let publicChannel: IRoom;
+ let publicTeam: ITeam;
+ let privateTeam: ITeam;
+ let privateChannelInPublicTeam: IRoom;
+ let publicChannelInPublicTeam: IRoom;
+ let privateChannelInPrivateTeam: IRoom;
+ let publicChannelInPrivateTeam: IRoom;
+
+ before(async () => {
+ [outsiderUser, insideUser, nonTeamUser] = await Promise.all([
+ createUser({ username: `e_${Random.id()}` }),
+ createUser({ username: `f_${Random.id()}` }),
+ createUser({ username: `g_${Random.id()}` }),
+ ]);
+ [outsiderCredentials, insideCredentials, nonTeamCredentials] = await Promise.all([
+ login(outsiderUser.username, password),
+ login(insideUser.username, password),
+ login(nonTeamUser.username, password),
+ ]);
+
+ // Create a public team and a private team
+ [publicTeam, privateTeam] = await Promise.all([
+ createTeam(insideCredentials, `channels.members.team.public.${Random.id()}`, TEAM_TYPE.PUBLIC, [outsiderUser.username as string]),
+ createTeam(insideCredentials, `channels.members.team.private.${Random.id()}`, TEAM_TYPE.PRIVATE, [
+ outsiderUser.username as string,
+ ]),
+ ]);
+
+ const [
+ privateInPublicResponse,
+ publicInPublicResponse,
+ privateInPrivateResponse,
+ publicInPrivateResponse,
+ privateRoomResponse,
+ publicRoomResponse,
+ ] = await Promise.all([
+ createRoom({
+ type: 'p',
+ name: `teamPublic.privateChannel.${Date.now()}`,
+ credentials: insideCredentials,
+ extraData: {
+ teamId: publicTeam._id,
+ },
+ }),
+ createRoom({
+ type: 'c',
+ name: `teamPublic.publicChannel.${Date.now()}`,
+ credentials: insideCredentials,
+ extraData: {
+ teamId: publicTeam._id,
+ },
+ }),
+ createRoom({
+ type: 'p',
+ name: `teamPrivate.privateChannel.${Date.now()}`,
+ credentials: insideCredentials,
+ extraData: {
+ teamId: privateTeam._id,
+ },
+ }),
+ createRoom({
+ type: 'c',
+ name: `teamPrivate.publicChannel.${Date.now()}`,
+ credentials: insideCredentials,
+ extraData: {
+ teamId: privateTeam._id,
+ },
+ }),
+ createRoom({
+ type: 'p',
+ name: `rooms.members.private.${Date.now()}`,
+ credentials: insideCredentials,
+ }),
+ createRoom({
+ type: 'c',
+ name: `rooms.members.public.${Date.now()}`,
+ credentials: insideCredentials,
+ }),
+ ]);
+
+ privateChannelInPublicTeam = privateInPublicResponse.body.group;
+ publicChannelInPublicTeam = publicInPublicResponse.body.channel;
+ privateChannelInPrivateTeam = privateInPrivateResponse.body.group;
+ publicChannelInPrivateTeam = publicInPrivateResponse.body.channel;
+ privateChannel = privateRoomResponse.body.group;
+ publicChannel = publicRoomResponse.body.channel;
+ });
+
+ after(async () => {
+ await Promise.all([
+ deleteRoom({ type: 'p', roomId: privateChannel._id }),
+ deleteRoom({ type: 'c', roomId: publicChannel._id }),
+ deleteRoom({ type: 'p', roomId: privateChannelInPublicTeam._id }),
+ deleteRoom({ type: 'c', roomId: publicChannelInPublicTeam._id }),
+ deleteRoom({ type: 'p', roomId: privateChannelInPrivateTeam._id }),
+ deleteRoom({ type: 'c', roomId: publicChannelInPrivateTeam._id }),
+ ]);
+
+ await Promise.all([deleteTeam(credentials, publicTeam.name), deleteTeam(credentials, privateTeam.name)]);
+
+ await Promise.all([deleteUser(outsiderUser), deleteUser(insideUser), deleteUser(nonTeamUser)]);
+ });
+
+ it('should not fetch private room members by user not part of room', async () => {
+ await request
+ .get(api('channels.members'))
+ .set(outsiderCredentials)
+ .query({ roomId: privateChannel._id })
+ .expect('Content-Type', 'application/json')
+ .expect(400)
+ .expect((res) => {
+ expect(res.body).to.have.property('success', false);
+ });
+ });
+
+ it('should not fetch private room members by user who is part of the room', async () => {
+ const response = await request
+ .get(api('channels.members'))
+ .set(insideCredentials)
+ .query({ roomId: privateChannel._id })
+ .expect('Content-Type', 'application/json')
+ .expect(400);
+
+ expect(response.body.success).to.be.false;
+ });
+
+ it('should fetch public room members by user who is part of the room', async () => {
+ const response = await request
+ .get(api('channels.members'))
+ .set(insideCredentials)
+ .query({ roomId: publicChannel._id })
+ .expect('Content-Type', 'application/json')
+ .expect(200);
+
+ expect(response.body.success).to.be.true;
+ expect(response.body.members).to.be.an('array');
+ });
+
+ it('should fetch public room members by user not part of room - because public', async () => {
+ await updatePermission('view-c-room', ['admin', 'user', 'guest']);
+ const response = await request
+ .get(api('channels.members'))
+ .set(outsiderCredentials)
+ .query({ roomId: publicChannel._id })
+ .expect('Content-Type', 'application/json')
+ .expect(200);
+
+ expect(response.body.success).to.be.true;
+ expect(response.body.members).to.be.an('array');
+ });
+
+ it('should not fetch a private channel members inside a public team by someone part of the room ', async () => {
+ await request
+ .get(api('channels.members'))
+ .set(insideCredentials)
+ .query({ roomId: privateChannelInPublicTeam._id })
+ .expect('Content-Type', 'application/json')
+ .expect(400)
+ .expect((res) => {
+ expect(res.body).to.have.property('success', false);
+ });
+ });
+
+ it('should not fetch a private channel members inside a public team by someone not part of the room, but part of team', async () => {
+ await request
+ .get(api('channels.members'))
+ .set(outsiderCredentials)
+ .query({ roomId: privateChannelInPublicTeam._id })
+ .expect('Content-Type', 'application/json')
+ .expect(400)
+ .expect((res) => {
+ expect(res.body).to.have.property('success', false);
+ });
+ });
+
+ it('should not fetch a private channel members inside a public team by someone not part of the team ', async () => {
+ await request
+ .get(api('channels.members'))
+ .set(nonTeamCredentials)
+ .query({ roomId: privateChannelInPublicTeam._id })
+ .expect('Content-Type', 'application/json')
+ .expect(400)
+ .expect((res) => {
+ expect(res.body).to.have.property('success', false);
+ });
+ });
+
+ it('should fetch a public channel members inside a public team by someone part of the room ', async () => {
+ await request
+ .get(api('channels.members'))
+ .set(insideCredentials)
+ .query({ roomId: publicChannelInPublicTeam._id })
+ .expect('Content-Type', 'application/json')
+ .expect(200)
+ .expect((res) => {
+ expect(res.body).to.have.property('success', true);
+ expect(res.body.members).to.be.an('array');
+ });
+ });
+
+ it('should fetch a public channel members inside a public team by someone not part of the room, but part of team', async () => {
+ await request
+ .get(api('channels.members'))
+ .set(outsiderCredentials)
+ .query({ roomId: publicChannelInPublicTeam._id })
+ .expect('Content-Type', 'application/json')
+ .expect(200)
+ .expect((res) => {
+ expect(res.body).to.have.property('success', true);
+ expect(res.body.members).to.be.an('array');
+ });
+ });
+
+ it('should fetch a public channel members inside a public team by someone not part of the team ', async () => {
+ await request
+ .get(api('channels.members'))
+ .set(nonTeamCredentials)
+ .query({ roomId: publicChannelInPublicTeam._id })
+ .expect('Content-Type', 'application/json')
+ .expect(200)
+ .expect((res) => {
+ expect(res.body).to.have.property('success', true);
+ expect(res.body.members).to.be.an('array');
+ });
+ });
+
+ it('should fetch a public channel members inside a private team by someone part of the room', async () => {
+ await request
+ .get(api('channels.members'))
+ .set(insideCredentials)
+ .query({ roomId: publicChannelInPrivateTeam._id })
+ .expect('Content-Type', 'application/json')
+ .expect(200)
+ .expect((res) => {
+ expect(res.body).to.have.property('success', true);
+ expect(res.body.members).to.be.an('array');
+ });
+ });
+
+ it('should fetch a public channel members inside a private team by someone not part of the room, but part of team', async () => {
+ await request
+ .get(api('channels.members'))
+ .set(outsiderCredentials)
+ .query({ roomId: publicChannelInPrivateTeam._id })
+ .expect('Content-Type', 'application/json')
+ .expect(200)
+ .expect((res) => {
+ expect(res.body).to.have.property('success', true);
+ expect(res.body.members).to.be.an('array');
+ });
+ });
+
+ it('should not fetch a public channel members inside a private team by someone not part of team', async () => {
+ await request
+ .get(api('channels.members'))
+ .set(nonTeamCredentials)
+ .query({ roomId: publicChannelInPrivateTeam._id })
+ .expect('Content-Type', 'application/json')
+ .expect(403)
+ .expect((res) => {
+ expect(res.body).to.have.property('success', false);
+ });
+ });
+
+ it('should not fetch a private channel members inside a private team by someone part of the room', async () => {
+ await request
+ .get(api('channels.members'))
+ .set(insideCredentials)
+ .query({ roomId: privateChannelInPrivateTeam._id })
+ .expect('Content-Type', 'application/json')
+ .expect(400)
+ .expect((res) => {
+ expect(res.body).to.have.property('success', false);
+ });
+ });
+
+ it('should not fetch a private channel members inside a private team by someone not part of the room, but part of team', async () => {
+ await request
+ .get(api('channels.members'))
+ .set(outsiderCredentials)
+ .query({ roomId: privateChannelInPrivateTeam._id })
+ .expect('Content-Type', 'application/json')
+ .expect(400)
+ .expect((res) => {
+ expect(res.body).to.have.property('success', false);
+ });
+ });
+
+ it('should not fetch a private channel members inside a private team by someone not part of team', async () => {
+ await request
+ .get(api('channels.members'))
+ .set(nonTeamCredentials)
+ .query({ roomId: privateChannelInPrivateTeam._id })
+ .expect('Content-Type', 'application/json')
+ .expect(400)
+ .expect((res) => {
+ expect(res.body).to.have.property('success', false);
+ });
+ });
+ });
});
describe('/channels.getIntegrations', () => {
@@ -1602,15 +2220,318 @@ describe('[Channels]', () => {
expect(res.body).to.have.property('error', 'User does not have the permissions required for this action [error-unauthorized]');
});
});
- });
-
- describe('/channels.setCustomFields:', () => {
- let withCFChannel: IRoom;
- let withoutCFChannel: IRoom;
- after(async () => {
- await deleteRoom({ type: 'c', roomId: withCFChannel._id });
- });
+ describe('Additional Visibility Tests', () => {
+ let outsiderUser: IUser;
+ let insideUser: IUser;
+ let nonTeamUser: IUser;
+ let outsiderCredentials: { 'X-Auth-Token': string; 'X-User-Id': string };
+ let insideCredentials: { 'X-Auth-Token': string; 'X-User-Id': string };
+ let nonTeamCredentials: { 'X-Auth-Token': string; 'X-User-Id': string };
+
+ let privateChannel: IRoom;
+ let publicChannel: IRoom;
+ let publicTeam: ITeam;
+ let privateTeam: ITeam;
+ let privateChannelInPublicTeam: IRoom;
+ let publicChannelInPublicTeam: IRoom;
+ let privateChannelInPrivateTeam: IRoom;
+ let publicChannelInPrivateTeam: IRoom;
+
+ before(async () => {
+ [outsiderUser, insideUser, nonTeamUser] = await Promise.all([
+ createUser({ username: `e_${Random.id()}` }),
+ createUser({ username: `f_${Random.id()}` }),
+ createUser({ username: `g_${Random.id()}` }),
+ ]);
+ [outsiderCredentials, insideCredentials, nonTeamCredentials] = await Promise.all([
+ login(outsiderUser.username, password),
+ login(insideUser.username, password),
+ login(nonTeamUser.username, password),
+ ]);
+
+ // Create a public team and a private team
+ [publicTeam, privateTeam] = await Promise.all([
+ createTeam(insideCredentials, `channels.getIntegrations.team.public.${Random.id()}`, TEAM_TYPE.PUBLIC, [
+ outsiderUser.username as string,
+ ]),
+ createTeam(insideCredentials, `channels.getIntegrations.team.private.${Random.id()}`, TEAM_TYPE.PRIVATE, [
+ outsiderUser.username as string,
+ ]),
+ ]);
+
+ const [
+ privateInPublicResponse,
+ publicInPublicResponse,
+ privateInPrivateResponse,
+ publicInPrivateResponse,
+ privateRoomResponse,
+ publicRoomResponse,
+ ] = await Promise.all([
+ createRoom({
+ type: 'p',
+ name: `teamPublic.privateChannel.${Date.now()}`,
+ credentials: insideCredentials,
+ extraData: {
+ teamId: publicTeam._id,
+ },
+ }),
+ createRoom({
+ type: 'c',
+ name: `teamPublic.publicChannel.${Date.now()}`,
+ credentials: insideCredentials,
+ extraData: {
+ teamId: publicTeam._id,
+ },
+ }),
+ createRoom({
+ type: 'p',
+ name: `teamPrivate.privateChannel.${Date.now()}`,
+ credentials: insideCredentials,
+ extraData: {
+ teamId: privateTeam._id,
+ },
+ }),
+ createRoom({
+ type: 'c',
+ name: `teamPrivate.publicChannel.${Date.now()}`,
+ credentials: insideCredentials,
+ extraData: {
+ teamId: privateTeam._id,
+ },
+ }),
+ createRoom({
+ type: 'p',
+ name: `channels.getIntegrations.private.${Date.now()}`,
+ credentials: insideCredentials,
+ }),
+ createRoom({
+ type: 'c',
+ name: `channels.getIntegrations.public.${Date.now()}`,
+ credentials: insideCredentials,
+ }),
+ ]);
+
+ privateChannelInPublicTeam = privateInPublicResponse.body.group;
+ publicChannelInPublicTeam = publicInPublicResponse.body.channel;
+ privateChannelInPrivateTeam = privateInPrivateResponse.body.group;
+ publicChannelInPrivateTeam = publicInPrivateResponse.body.channel;
+ privateChannel = privateRoomResponse.body.group;
+ publicChannel = publicRoomResponse.body.channel;
+
+ await updatePermission('manage-incoming-integrations', ['admin', 'user']);
+ });
+
+ after(async () => {
+ await Promise.all([
+ deleteRoom({ type: 'p', roomId: privateChannel._id }),
+ deleteRoom({ type: 'c', roomId: publicChannel._id }),
+ deleteRoom({ type: 'p', roomId: privateChannelInPublicTeam._id }),
+ deleteRoom({ type: 'c', roomId: publicChannelInPublicTeam._id }),
+ deleteRoom({ type: 'p', roomId: privateChannelInPrivateTeam._id }),
+ deleteRoom({ type: 'c', roomId: publicChannelInPrivateTeam._id }),
+ ]);
+
+ await Promise.all([deleteTeam(credentials, publicTeam.name), deleteTeam(credentials, privateTeam.name)]);
+
+ await Promise.all([deleteUser(outsiderUser), deleteUser(insideUser), deleteUser(nonTeamUser)]);
+
+ await updatePermission('manage-incoming-integrations', ['admin']);
+ });
+
+ it('should not fetch private room integrations by user who is part of the room', async () => {
+ const response = await request
+ .get(api('channels.getIntegrations'))
+ .set(insideCredentials)
+ .query({ roomId: privateChannel._id })
+ .expect('Content-Type', 'application/json')
+ .expect(400);
+
+ expect(response.body.success).to.be.false;
+ });
+
+ it('should fetch public room integrations by user who is part of the room', async () => {
+ const response = await request
+ .get(api('channels.getIntegrations'))
+ .set(insideCredentials)
+ .query({ roomId: publicChannel._id })
+ .expect('Content-Type', 'application/json')
+ .expect(200);
+
+ expect(response.body.success).to.be.true;
+ expect(response.body).to.have.property('integrations');
+ });
+
+ it('should fetch public room integrations by user not part of room - because public', async () => {
+ const response = await request
+ .get(api('channels.getIntegrations'))
+ .set(outsiderCredentials)
+ .query({ roomId: publicChannel._id })
+ .expect('Content-Type', 'application/json')
+ .expect(200);
+
+ expect(response.body.success).to.be.true;
+ expect(response.body).to.have.property('integrations');
+ });
+
+ it('should not fetch a private channel integrations inside a public team by someone part of the room ', async () => {
+ await request
+ .get(api('channels.getIntegrations'))
+ .set(insideCredentials)
+ .query({ roomId: privateChannelInPublicTeam._id })
+ .expect('Content-Type', 'application/json')
+ .expect(400)
+ .expect((res) => {
+ expect(res.body).to.have.property('success', false);
+ });
+ });
+
+ it('should not fetch a private channel integrations inside a public team by someone not part of the room, but part of team', async () => {
+ await request
+ .get(api('channels.getIntegrations'))
+ .set(outsiderCredentials)
+ .query({ roomId: privateChannelInPublicTeam._id })
+ .expect('Content-Type', 'application/json')
+ .expect(400)
+ .expect((res) => {
+ expect(res.body).to.have.property('success', false);
+ });
+ });
+
+ it('should not fetch a private channel integrations inside a public team by someone not part of the team ', async () => {
+ await request
+ .get(api('channels.getIntegrations'))
+ .set(nonTeamCredentials)
+ .query({ roomId: privateChannelInPublicTeam._id })
+ .expect('Content-Type', 'application/json')
+ .expect(400)
+ .expect((res) => {
+ expect(res.body).to.have.property('success', false);
+ });
+ });
+
+ it('should fetch a public channel integrations inside a public team by someone part of the room ', async () => {
+ await request
+ .get(api('channels.getIntegrations'))
+ .set(insideCredentials)
+ .query({ roomId: publicChannelInPublicTeam._id })
+ .expect('Content-Type', 'application/json')
+ .expect(200)
+ .expect((res) => {
+ expect(res.body).to.have.property('success', true);
+ expect(res.body).to.have.property('integrations');
+ });
+ });
+
+ it('should fetch a public channel integrations inside a public team by someone not part of the room, but part of team', async () => {
+ await request
+ .get(api('channels.getIntegrations'))
+ .set(outsiderCredentials)
+ .query({ roomId: publicChannelInPublicTeam._id })
+ .expect('Content-Type', 'application/json')
+ .expect(200)
+ .expect((res) => {
+ expect(res.body).to.have.property('success', true);
+ expect(res.body).to.have.property('integrations');
+ });
+ });
+
+ it('should fetch a public channel integrations inside a public team by someone not part of the team ', async () => {
+ await request
+ .get(api('channels.getIntegrations'))
+ .set(nonTeamCredentials)
+ .query({ roomId: publicChannelInPublicTeam._id })
+ .expect('Content-Type', 'application/json')
+ .expect(200)
+ .expect((res) => {
+ expect(res.body).to.have.property('success', true);
+ expect(res.body).to.have.property('integrations');
+ });
+ });
+
+ it('should fetch a public channel integrations inside a private team by someone part of the room', async () => {
+ await request
+ .get(api('channels.getIntegrations'))
+ .set(insideCredentials)
+ .query({ roomId: publicChannelInPrivateTeam._id })
+ .expect('Content-Type', 'application/json')
+ .expect(200)
+ .expect((res) => {
+ expect(res.body).to.have.property('success', true);
+ expect(res.body).to.have.property('integrations');
+ });
+ });
+
+ it('should fetch a public channel integrations inside a private team by someone not part of the room, but part of team', async () => {
+ await request
+ .get(api('channels.getIntegrations'))
+ .set(outsiderCredentials)
+ .query({ roomId: publicChannelInPrivateTeam._id })
+ .expect('Content-Type', 'application/json')
+ .expect(200)
+ .expect((res) => {
+ expect(res.body).to.have.property('success', true);
+ expect(res.body).to.have.property('integrations');
+ });
+ });
+
+ it('should not fetch a public channel integrations inside a private team by someone not part of team', async () => {
+ await request
+ .get(api('channels.getIntegrations'))
+ .set(nonTeamCredentials)
+ .query({ roomId: publicChannelInPrivateTeam._id })
+ .expect('Content-Type', 'application/json')
+ .expect(403)
+ .expect((res) => {
+ expect(res.body).to.have.property('success', false);
+ });
+ });
+
+ it('should not fetch a private channel integrations inside a private team by someone part of the room', async () => {
+ await request
+ .get(api('channels.getIntegrations'))
+ .set(insideCredentials)
+ .query({ roomId: privateChannelInPrivateTeam._id })
+ .expect('Content-Type', 'application/json')
+ .expect(400)
+ .expect((res) => {
+ expect(res.body).to.have.property('success', false);
+ });
+ });
+
+ it('should not fetch a private channel integrations inside a private team by someone not part of the room, but part of team', async () => {
+ await request
+ .get(api('channels.getIntegrations'))
+ .set(outsiderCredentials)
+ .query({ roomId: privateChannelInPrivateTeam._id })
+ .expect('Content-Type', 'application/json')
+ .expect(400)
+ .expect((res) => {
+ expect(res.body).to.have.property('success', false);
+ });
+ });
+
+ it('should not fetch a private channel integrations inside a private team by someone not part of team', async () => {
+ await request
+ .get(api('channels.getIntegrations'))
+ .set(nonTeamCredentials)
+ .query({ roomId: privateChannelInPrivateTeam._id })
+ .expect('Content-Type', 'application/json')
+ .expect(400)
+ .expect((res) => {
+ expect(res.body).to.have.property('success', false);
+ });
+ });
+ });
+ });
+
+ describe('/channels.setCustomFields:', () => {
+ let withCFChannel: IRoom;
+ let withoutCFChannel: IRoom;
+
+ after(async () => {
+ await deleteRoom({ type: 'c', roomId: withCFChannel._id });
+ });
it('create channel with customFields', (done) => {
const customFields = { field0: 'value0' };
@@ -2190,6 +3111,317 @@ describe('[Channels]', () => {
})
.end(done);
});
+
+ describe('Additional Visibility Tests', () => {
+ let outsiderUser: IUser;
+ let insideUser: IUser;
+ let nonTeamUser: IUser;
+ let outsiderCredentials: { 'X-Auth-Token': string; 'X-User-Id': string };
+ let insideCredentials: { 'X-Auth-Token': string; 'X-User-Id': string };
+ let nonTeamCredentials: { 'X-Auth-Token': string; 'X-User-Id': string };
+
+ let privateChannel: IRoom;
+ let publicChannel: IRoom;
+ let publicTeam: ITeam;
+ let privateTeam: ITeam;
+ let privateChannelInPublicTeam: IRoom;
+ let publicChannelInPublicTeam: IRoom;
+ let privateChannelInPrivateTeam: IRoom;
+ let publicChannelInPrivateTeam: IRoom;
+
+ before(async () => {
+ [outsiderUser, insideUser, nonTeamUser] = await Promise.all([
+ createUser({ username: `e_${Random.id()}` }),
+ createUser({ username: `f_${Random.id()}` }),
+ createUser({ username: `g_${Random.id()}` }),
+ ]);
+ [outsiderCredentials, insideCredentials, nonTeamCredentials] = await Promise.all([
+ login(outsiderUser.username, password),
+ login(insideUser.username, password),
+ login(nonTeamUser.username, password),
+ ]);
+
+ // Create a public team and a private team
+ [publicTeam, privateTeam] = await Promise.all([
+ createTeam(insideCredentials, `channels.moderators.team.public.${Random.id()}`, TEAM_TYPE.PUBLIC, [
+ outsiderUser.username as string,
+ ]),
+ createTeam(insideCredentials, `channels.moderators.team.private.${Random.id()}`, TEAM_TYPE.PRIVATE, [
+ outsiderUser.username as string,
+ ]),
+ ]);
+
+ const [
+ privateInPublicResponse,
+ publicInPublicResponse,
+ privateInPrivateResponse,
+ publicInPrivateResponse,
+ privateRoomResponse,
+ publicRoomResponse,
+ ] = await Promise.all([
+ createRoom({
+ type: 'p',
+ name: `teamPublic.privateChannel.${Date.now()}`,
+ credentials: insideCredentials,
+ extraData: {
+ teamId: publicTeam._id,
+ },
+ }),
+ createRoom({
+ type: 'c',
+ name: `teamPublic.publicChannel.${Date.now()}`,
+ credentials: insideCredentials,
+ extraData: {
+ teamId: publicTeam._id,
+ },
+ }),
+ createRoom({
+ type: 'p',
+ name: `teamPrivate.privateChannel.${Date.now()}`,
+ credentials: insideCredentials,
+ extraData: {
+ teamId: privateTeam._id,
+ },
+ }),
+ createRoom({
+ type: 'c',
+ name: `teamPrivate.publicChannel.${Date.now()}`,
+ credentials: insideCredentials,
+ extraData: {
+ teamId: privateTeam._id,
+ },
+ }),
+ createRoom({
+ type: 'p',
+ name: `channels.moderators.private.${Date.now()}`,
+ credentials: insideCredentials,
+ }),
+ createRoom({
+ type: 'c',
+ name: `channels.moderators.public.${Date.now()}`,
+ credentials: insideCredentials,
+ }),
+ ]);
+
+ privateChannelInPublicTeam = privateInPublicResponse.body.group;
+ publicChannelInPublicTeam = publicInPublicResponse.body.channel;
+ privateChannelInPrivateTeam = privateInPrivateResponse.body.group;
+ publicChannelInPrivateTeam = publicInPrivateResponse.body.channel;
+ privateChannel = privateRoomResponse.body.group;
+ publicChannel = publicRoomResponse.body.channel;
+ });
+
+ after(async () => {
+ await Promise.all([
+ deleteRoom({ type: 'p', roomId: privateChannel._id }),
+ deleteRoom({ type: 'c', roomId: publicChannel._id }),
+ deleteRoom({ type: 'p', roomId: privateChannelInPublicTeam._id }),
+ deleteRoom({ type: 'c', roomId: publicChannelInPublicTeam._id }),
+ deleteRoom({ type: 'p', roomId: privateChannelInPrivateTeam._id }),
+ deleteRoom({ type: 'c', roomId: publicChannelInPrivateTeam._id }),
+ ]);
+
+ await Promise.all([deleteTeam(credentials, publicTeam.name), deleteTeam(credentials, privateTeam.name)]);
+
+ await Promise.all([deleteUser(outsiderUser), deleteUser(insideUser), deleteUser(nonTeamUser)]);
+ });
+
+ it('should not fetch private room moderators by user not part of room', async () => {
+ await request
+ .get(api('channels.moderators'))
+ .set(outsiderCredentials)
+ .query({ roomId: privateChannel._id })
+ .expect('Content-Type', 'application/json')
+ .expect(400)
+ .expect((res) => {
+ expect(res.body).to.have.property('success', false);
+ });
+ });
+
+ it('should not fetch private room moderators by user who is part of the room', async () => {
+ const response = await request
+ .get(api('channels.moderators'))
+ .set(insideCredentials)
+ .query({ roomId: privateChannel._id })
+ .expect('Content-Type', 'application/json')
+ .expect(400);
+
+ expect(response.body.success).to.be.false;
+ });
+
+ it('should fetch public room moderators by user who is part of the room', async () => {
+ const response = await request
+ .get(api('channels.moderators'))
+ .set(insideCredentials)
+ .query({ roomId: publicChannel._id })
+ .expect('Content-Type', 'application/json')
+ .expect(200);
+
+ expect(response.body.success).to.be.true;
+ expect(response.body).to.have.property('moderators');
+ });
+
+ it('should fetch public room moderators by user not part of room - because public', async () => {
+ const response = await request
+ .get(api('channels.moderators'))
+ .set(outsiderCredentials)
+ .query({ roomId: publicChannel._id })
+ .expect('Content-Type', 'application/json')
+ .expect(200);
+
+ expect(response.body.success).to.be.true;
+ expect(response.body).to.have.property('moderators');
+ });
+
+ it('should not fetch a private channel moderators inside a public team by someone part of the room ', async () => {
+ await request
+ .get(api('channels.moderators'))
+ .set(insideCredentials)
+ .query({ roomId: privateChannelInPublicTeam._id })
+ .expect('Content-Type', 'application/json')
+ .expect(400)
+ .expect((res) => {
+ expect(res.body).to.have.property('success', false);
+ });
+ });
+
+ it('should not fetch a private channel moderators inside a public team by someone not part of the room, but part of team', async () => {
+ await request
+ .get(api('channels.moderators'))
+ .set(outsiderCredentials)
+ .query({ roomId: privateChannelInPublicTeam._id })
+ .expect('Content-Type', 'application/json')
+ .expect(400)
+ .expect((res) => {
+ expect(res.body).to.have.property('success', false);
+ });
+ });
+
+ it('should not fetch a private channel moderators inside a public team by someone not part of the team ', async () => {
+ await request
+ .get(api('channels.moderators'))
+ .set(nonTeamCredentials)
+ .query({ roomId: privateChannelInPublicTeam._id })
+ .expect('Content-Type', 'application/json')
+ .expect(400)
+ .expect((res) => {
+ expect(res.body).to.have.property('success', false);
+ });
+ });
+
+ it('should fetch a public channel moderators inside a public team by someone part of the room ', async () => {
+ await request
+ .get(api('channels.moderators'))
+ .set(insideCredentials)
+ .query({ roomId: publicChannelInPublicTeam._id })
+ .expect('Content-Type', 'application/json')
+ .expect(200)
+ .expect((res) => {
+ expect(res.body).to.have.property('success', true);
+ expect(res.body).to.have.property('moderators');
+ });
+ });
+
+ it('should fetch a public channel moderators inside a public team by someone not part of the room, but part of team', async () => {
+ await request
+ .get(api('channels.moderators'))
+ .set(outsiderCredentials)
+ .query({ roomId: publicChannelInPublicTeam._id })
+ .expect('Content-Type', 'application/json')
+ .expect(200)
+ .expect((res) => {
+ expect(res.body).to.have.property('success', true);
+ expect(res.body).to.have.property('moderators');
+ });
+ });
+
+ it('should fetch a public channel moderators inside a public team by someone not part of the team ', async () => {
+ await request
+ .get(api('channels.moderators'))
+ .set(nonTeamCredentials)
+ .query({ roomId: publicChannelInPublicTeam._id })
+ .expect('Content-Type', 'application/json')
+ .expect(200)
+ .expect((res) => {
+ expect(res.body).to.have.property('success', true);
+ expect(res.body).to.have.property('moderators');
+ });
+ });
+
+ it('should fetch a public channel moderators inside a private team by someone part of the room', async () => {
+ await request
+ .get(api('channels.moderators'))
+ .set(insideCredentials)
+ .query({ roomId: publicChannelInPrivateTeam._id })
+ .expect('Content-Type', 'application/json')
+ .expect(200)
+ .expect((res) => {
+ expect(res.body).to.have.property('success', true);
+ expect(res.body).to.have.property('moderators');
+ });
+ });
+
+ it('should fetch a public channel moderators inside a private team by someone not part of the room, but part of team', async () => {
+ await request
+ .get(api('channels.moderators'))
+ .set(outsiderCredentials)
+ .query({ roomId: publicChannelInPrivateTeam._id })
+ .expect('Content-Type', 'application/json')
+ .expect(200)
+ .expect((res) => {
+ expect(res.body).to.have.property('success', true);
+ expect(res.body).to.have.property('moderators');
+ });
+ });
+
+ it('should not fetch a public channel moderators inside a private team by someone not part of team', async () => {
+ await request
+ .get(api('channels.moderators'))
+ .set(nonTeamCredentials)
+ .query({ roomId: publicChannelInPrivateTeam._id })
+ .expect('Content-Type', 'application/json')
+ .expect(403)
+ .expect((res) => {
+ expect(res.body).to.have.property('success', false);
+ });
+ });
+
+ it('should not fetch a private channel moderators inside a private team by someone part of the room', async () => {
+ await request
+ .get(api('channels.moderators'))
+ .set(insideCredentials)
+ .query({ roomId: privateChannelInPrivateTeam._id })
+ .expect('Content-Type', 'application/json')
+ .expect(400)
+ .expect((res) => {
+ expect(res.body).to.have.property('success', false);
+ });
+ });
+
+ it('should not fetch a private channel moderators inside a private team by someone not part of the room, but part of team', async () => {
+ await request
+ .get(api('channels.moderators'))
+ .set(outsiderCredentials)
+ .query({ roomId: privateChannelInPrivateTeam._id })
+ .expect('Content-Type', 'application/json')
+ .expect(400)
+ .expect((res) => {
+ expect(res.body).to.have.property('success', false);
+ });
+ });
+
+ it('should not fetch a private channel moderators inside a private team by someone not part of team', async () => {
+ await request
+ .get(api('channels.moderators'))
+ .set(nonTeamCredentials)
+ .query({ roomId: privateChannelInPrivateTeam._id })
+ .expect('Content-Type', 'application/json')
+ .expect(400)
+ .expect((res) => {
+ expect(res.body).to.have.property('success', false);
+ });
+ });
+ });
});
describe('/channels.anonymousread', () => {
@@ -2214,10 +3446,7 @@ describe('[Channels]', () => {
.expect(400)
.expect((res) => {
expect(res.body).to.have.a.property('success', false);
- expect(res.body).to.have.a.property('error');
- expect(res.body).to.have.a.property('errorType');
- expect(res.body.errorType).to.be.equal('error-not-allowed');
- expect(res.body.error).to.be.equal('Enable "Allow Anonymous Read" [error-not-allowed]');
+ expect(res.body).to.have.a.property('error', 'Enable "Allow Anonymous Read" [error-not-allowed]');
})
.end(done);
});
@@ -2256,6 +3485,107 @@ describe('[Channels]', () => {
.end(done);
});
});
+ describe('Additional Visibility Tests', () => {
+ let outsiderUser: IUser;
+ let insideUser: IUser;
+ let nonTeamUser: IUser;
+ let outsiderCredentials: { 'X-Auth-Token': string; 'X-User-Id': string };
+ let insideCredentials: { 'X-Auth-Token': string; 'X-User-Id': string };
+ let nonTeamCredentials: { 'X-Auth-Token': string; 'X-User-Id': string };
+
+ let privateTeam: ITeam;
+ let publicChannelInPrivateTeam: IRoom;
+
+ before(async () => {
+ [outsiderUser, insideUser, nonTeamUser] = await Promise.all([
+ createUser({ username: `e_${Random.id()}` }),
+ createUser({ username: `f_${Random.id()}` }),
+ createUser({ username: `g_${Random.id()}` }),
+ ]);
+ [outsiderCredentials, insideCredentials, nonTeamCredentials] = await Promise.all([
+ login(outsiderUser.username, password),
+ login(insideUser.username, password),
+ login(nonTeamUser.username, password),
+ ]);
+
+ // Create a private team
+ privateTeam = await createTeam(insideCredentials, `channels.anonymousread.team.private.${Random.id()}`, TEAM_TYPE.PRIVATE, [
+ outsiderUser.username as string,
+ ]);
+
+ const publicInPrivateResponse = await createRoom({
+ type: 'c',
+ name: `teamPrivate.publicChannel.${Date.now()}`,
+ credentials: insideCredentials,
+ extraData: {
+ teamId: privateTeam._id,
+ },
+ });
+
+ publicChannelInPrivateTeam = publicInPrivateResponse.body.channel;
+
+ await updateSetting('Accounts_AllowAnonymousRead', true);
+ });
+
+ after(async () => {
+ await deleteRoom({ type: 'c', roomId: publicChannelInPrivateTeam._id });
+
+ await Promise.all([deleteTeam(credentials, privateTeam.name)]);
+
+ await Promise.all([deleteUser(outsiderUser), deleteUser(insideUser), deleteUser(nonTeamUser)]);
+
+ await updateSetting('Accounts_AllowAnonymousRead', false);
+ });
+
+ it('should fetch a public channel messages inside a private team by someone part of the room', async () => {
+ await request
+ .get(api('channels.anonymousread'))
+ .set(insideCredentials)
+ .query({ roomId: publicChannelInPrivateTeam._id })
+ .expect('Content-Type', 'application/json')
+ .expect(200)
+ .expect((res) => {
+ expect(res.body).to.have.property('success', true);
+ expect(res.body).to.have.property('messages');
+ });
+ });
+
+ it('should fetch a public channel messages inside a private team by someone not part of the room, but part of team', async () => {
+ await request
+ .get(api('channels.anonymousread'))
+ .set(outsiderCredentials)
+ .query({ roomId: publicChannelInPrivateTeam._id })
+ .expect('Content-Type', 'application/json')
+ .expect(200)
+ .expect((res) => {
+ expect(res.body).to.have.property('success', true);
+ expect(res.body).to.have.property('messages');
+ });
+ });
+
+ it('should not fetch a public channel messages inside a private team by someone not part of team', async () => {
+ await request
+ .get(api('channels.anonymousread'))
+ .set(nonTeamCredentials)
+ .query({ roomId: publicChannelInPrivateTeam._id })
+ .expect('Content-Type', 'application/json')
+ .expect(404)
+ .expect((res) => {
+ expect(res.body).to.have.property('success', false);
+ });
+ });
+
+ it('should not fetch a public channel messages inside a private team when unauthenticated', async () => {
+ await request
+ .get(api('channels.anonymousread'))
+ .query({ roomId: publicChannelInPrivateTeam._id })
+ .expect('Content-Type', 'application/json')
+ .expect(404)
+ .expect((res) => {
+ expect(res.body).to.have.property('success', false);
+ });
+ });
+ });
});
describe('/channels.convertToTeam', () => {
@@ -2653,5 +3983,317 @@ describe('[Channels]', () => {
expect(res.body).to.have.property('total', 1);
});
});
+
+ describe('Additional Visibility Tests', () => {
+ let outsiderUser: IUser;
+ let insideUser: IUser;
+ let nonTeamUser: IUser;
+ let outsiderCredentials: { 'X-Auth-Token': string; 'X-User-Id': string };
+ let insideCredentials: { 'X-Auth-Token': string; 'X-User-Id': string };
+ let nonTeamCredentials: { 'X-Auth-Token': string; 'X-User-Id': string };
+
+ let privateChannel: IRoom;
+ let publicChannel: IRoom;
+ let publicTeam: ITeam;
+ let privateTeam: ITeam;
+ let privateChannelInPublicTeam: IRoom;
+ let publicChannelInPublicTeam: IRoom;
+ let privateChannelInPrivateTeam: IRoom;
+ let publicChannelInPrivateTeam: IRoom;
+
+ before(async () => {
+ [outsiderUser, insideUser, nonTeamUser] = await Promise.all([
+ createUser({ username: `e_${Random.id()}` }),
+ createUser({ username: `f_${Random.id()}` }),
+ createUser({ username: `g_${Random.id()}` }),
+ ]);
+ [outsiderCredentials, insideCredentials, nonTeamCredentials] = await Promise.all([
+ login(outsiderUser.username, password),
+ login(insideUser.username, password),
+ login(nonTeamUser.username, password),
+ ]);
+
+ // Create a public team and a private team
+ [publicTeam, privateTeam] = await Promise.all([
+ createTeam(insideCredentials, `channels.messages.team.public.${Random.id()}`, TEAM_TYPE.PUBLIC, [
+ outsiderUser.username as string,
+ ]),
+ createTeam(insideCredentials, `channels.messages.team.private.${Random.id()}`, TEAM_TYPE.PRIVATE, [
+ outsiderUser.username as string,
+ ]),
+ ]);
+
+ const [
+ privateInPublicResponse,
+ publicInPublicResponse,
+ privateInPrivateResponse,
+ publicInPrivateResponse,
+ privateRoomResponse,
+ publicRoomResponse,
+ ] = await Promise.all([
+ createRoom({
+ type: 'p',
+ name: `teamPublic.privateChannel.${Date.now()}`,
+ credentials: insideCredentials,
+ extraData: {
+ teamId: publicTeam._id,
+ },
+ }),
+ createRoom({
+ type: 'c',
+ name: `teamPublic.publicChannel.${Date.now()}`,
+ credentials: insideCredentials,
+ extraData: {
+ teamId: publicTeam._id,
+ },
+ }),
+ createRoom({
+ type: 'p',
+ name: `teamPrivate.privateChannel.${Date.now()}`,
+ credentials: insideCredentials,
+ extraData: {
+ teamId: privateTeam._id,
+ },
+ }),
+ createRoom({
+ type: 'c',
+ name: `teamPrivate.publicChannel.${Date.now()}`,
+ credentials: insideCredentials,
+ extraData: {
+ teamId: privateTeam._id,
+ },
+ }),
+ createRoom({
+ type: 'p',
+ name: `channels.messages.private.${Date.now()}`,
+ credentials: insideCredentials,
+ }),
+ createRoom({
+ type: 'c',
+ name: `channels.messages.public.${Date.now()}`,
+ credentials: insideCredentials,
+ }),
+ ]);
+
+ privateChannelInPublicTeam = privateInPublicResponse.body.group;
+ publicChannelInPublicTeam = publicInPublicResponse.body.channel;
+ privateChannelInPrivateTeam = privateInPrivateResponse.body.group;
+ publicChannelInPrivateTeam = publicInPrivateResponse.body.channel;
+ privateChannel = privateRoomResponse.body.group;
+ publicChannel = publicRoomResponse.body.channel;
+ });
+
+ after(async () => {
+ await Promise.all([
+ deleteRoom({ type: 'p', roomId: privateChannel._id }),
+ deleteRoom({ type: 'c', roomId: publicChannel._id }),
+ deleteRoom({ type: 'p', roomId: privateChannelInPublicTeam._id }),
+ deleteRoom({ type: 'c', roomId: publicChannelInPublicTeam._id }),
+ deleteRoom({ type: 'p', roomId: privateChannelInPrivateTeam._id }),
+ deleteRoom({ type: 'c', roomId: publicChannelInPrivateTeam._id }),
+ ]);
+
+ await Promise.all([deleteTeam(credentials, publicTeam.name), deleteTeam(credentials, privateTeam.name)]);
+
+ await Promise.all([deleteUser(outsiderUser), deleteUser(insideUser), deleteUser(nonTeamUser)]);
+ });
+
+ it('should not fetch private room messages by user not part of room', async () => {
+ await request
+ .get(api('channels.messages'))
+ .set(outsiderCredentials)
+ .query({ roomId: privateChannel._id })
+ .expect('Content-Type', 'application/json')
+ .expect(400)
+ .expect((res) => {
+ expect(res.body).to.have.property('success', false);
+ });
+ });
+
+ it('should not fetch private room messages by user who is part of the room', async () => {
+ const response = await request
+ .get(api('channels.messages'))
+ .set(insideCredentials)
+ .query({ roomId: privateChannel._id })
+ .expect('Content-Type', 'application/json')
+ .expect(400);
+
+ expect(response.body.success).to.be.false;
+ });
+
+ it('should fetch public room messages by user who is part of the room', async () => {
+ const response = await request
+ .get(api('channels.messages'))
+ .set(insideCredentials)
+ .query({ roomId: publicChannel._id })
+ .expect('Content-Type', 'application/json')
+ .expect(200);
+
+ expect(response.body.success).to.be.true;
+ expect(response.body.messages).to.be.an('array');
+ });
+
+ it('should fetch public room messages by user not part of room - because public', async () => {
+ await updatePermission('view-c-room', ['admin', 'user', 'guest']);
+ const response = await request
+ .get(api('channels.messages'))
+ .set(outsiderCredentials)
+ .query({ roomId: publicChannel._id })
+ .expect('Content-Type', 'application/json')
+ .expect(200);
+
+ expect(response.body.success).to.be.true;
+ expect(response.body.messages).to.be.an('array');
+ });
+
+ it('should not fetch a private channel messages inside a public team by someone part of the room ', async () => {
+ await request
+ .get(api('channels.messages'))
+ .set(insideCredentials)
+ .query({ roomId: privateChannelInPublicTeam._id })
+ .expect('Content-Type', 'application/json')
+ .expect(400)
+ .expect((res) => {
+ expect(res.body).to.have.property('success', false);
+ });
+ });
+
+ it('should not fetch a private channel messages inside a public team by someone not part of the room, but part of team', async () => {
+ await request
+ .get(api('channels.messages'))
+ .set(outsiderCredentials)
+ .query({ roomId: privateChannelInPublicTeam._id })
+ .expect('Content-Type', 'application/json')
+ .expect(400)
+ .expect((res) => {
+ expect(res.body).to.have.property('success', false);
+ });
+ });
+
+ it('should not fetch a private channel messages inside a public team by someone not part of the team ', async () => {
+ await request
+ .get(api('channels.messages'))
+ .set(nonTeamCredentials)
+ .query({ roomId: privateChannelInPublicTeam._id })
+ .expect('Content-Type', 'application/json')
+ .expect(400)
+ .expect((res) => {
+ expect(res.body).to.have.property('success', false);
+ });
+ });
+
+ it('should fetch a public channel messages inside a public team by someone part of the room ', async () => {
+ await request
+ .get(api('channels.messages'))
+ .set(insideCredentials)
+ .query({ roomId: publicChannelInPublicTeam._id })
+ .expect('Content-Type', 'application/json')
+ .expect(200)
+ .expect((res) => {
+ expect(res.body).to.have.property('success', true);
+ expect(res.body.messages).to.be.an('array');
+ });
+ });
+
+ it('should fetch a public channel messages inside a public team by someone not part of the room, but part of team', async () => {
+ await request
+ .get(api('channels.messages'))
+ .set(outsiderCredentials)
+ .query({ roomId: publicChannelInPublicTeam._id })
+ .expect('Content-Type', 'application/json')
+ .expect(200)
+ .expect((res) => {
+ expect(res.body).to.have.property('success', true);
+ expect(res.body.messages).to.be.an('array');
+ });
+ });
+
+ it('should fetch a public channel messages inside a public team by someone not part of the team ', async () => {
+ await request
+ .get(api('channels.messages'))
+ .set(nonTeamCredentials)
+ .query({ roomId: publicChannelInPublicTeam._id })
+ .expect('Content-Type', 'application/json')
+ .expect(200)
+ .expect((res) => {
+ expect(res.body).to.have.property('success', true);
+ expect(res.body.messages).to.be.an('array');
+ });
+ });
+
+ it('should fetch a public channel messages inside a private team by someone part of the room', async () => {
+ await request
+ .get(api('channels.messages'))
+ .set(insideCredentials)
+ .query({ roomId: publicChannelInPrivateTeam._id })
+ .expect('Content-Type', 'application/json')
+ .expect(200)
+ .expect((res) => {
+ expect(res.body).to.have.property('success', true);
+ expect(res.body.messages).to.be.an('array');
+ });
+ });
+
+ it('should fetch a public channel messages inside a private team by someone not part of the room, but part of team', async () => {
+ await request
+ .get(api('channels.messages'))
+ .set(outsiderCredentials)
+ .query({ roomId: publicChannelInPrivateTeam._id })
+ .expect('Content-Type', 'application/json')
+ .expect(200)
+ .expect((res) => {
+ expect(res.body).to.have.property('success', true);
+ expect(res.body.messages).to.be.an('array');
+ });
+ });
+
+ it('should not fetch a public channel messages inside a private team by someone not part of team', async () => {
+ await request
+ .get(api('channels.messages'))
+ .set(nonTeamCredentials)
+ .query({ roomId: publicChannelInPrivateTeam._id })
+ .expect('Content-Type', 'application/json')
+ .expect(403)
+ .expect((res) => {
+ expect(res.body).to.have.property('success', false);
+ });
+ });
+
+ it('should not fetch a private channel messages inside a private team by someone part of the room', async () => {
+ await request
+ .get(api('channels.messages'))
+ .set(insideCredentials)
+ .query({ roomId: privateChannelInPrivateTeam._id })
+ .expect('Content-Type', 'application/json')
+ .expect(400)
+ .expect((res) => {
+ expect(res.body).to.have.property('success', false);
+ });
+ });
+
+ it('should not fetch a private channel messages inside a private team by someone not part of the room, but part of team', async () => {
+ await request
+ .get(api('channels.messages'))
+ .set(outsiderCredentials)
+ .query({ roomId: privateChannelInPrivateTeam._id })
+ .expect('Content-Type', 'application/json')
+ .expect(400)
+ .expect((res) => {
+ expect(res.body).to.have.property('success', false);
+ });
+ });
+
+ it('should not fetch a private channel messages inside a private team by someone not part of team', async () => {
+ await request
+ .get(api('channels.messages'))
+ .set(nonTeamCredentials)
+ .query({ roomId: privateChannelInPrivateTeam._id })
+ .expect('Content-Type', 'application/json')
+ .expect(400)
+ .expect((res) => {
+ expect(res.body).to.have.property('success', false);
+ });
+ });
+ });
});
});
diff --git a/apps/meteor/tests/end-to-end/api/chat.ts b/apps/meteor/tests/end-to-end/api/chat.ts
index 43df270bbec1e..2656799332a77 100644
--- a/apps/meteor/tests/end-to-end/api/chat.ts
+++ b/apps/meteor/tests/end-to-end/api/chat.ts
@@ -51,7 +51,6 @@ describe('[Chat]', () => {
.expect(400)
.expect((res) => {
expect(res.body).to.have.property('success', false);
- expect(res.body).to.have.property('error', '[invalid-channel]');
})
.end(done);
});
@@ -1386,7 +1385,7 @@ describe('[Chat]', () => {
.set(credentials)
.send({
roomId: testChannel._id,
- msg: 'Sample message',
+ text: 'Sample message',
customFields,
})
.expect('Content-Type', 'application/json')
@@ -2455,7 +2454,7 @@ describe('[Chat]', () => {
});
describe('when an error occurs', () => {
- it('should return statusCode 400 and an error when "roomId" is not provided', (done) => {
+ it('should return statusCode 400', (done) => {
void request
.get(api('chat.getDeletedMessages'))
.set(credentials)
@@ -2468,7 +2467,6 @@ describe('[Chat]', () => {
.expect(400)
.expect((res) => {
expect(res.body).to.have.property('success', false);
- expect(res.body.errorType).to.be.equal('The required "roomId" query param is missing.');
})
.end(done);
});
@@ -2485,7 +2483,6 @@ describe('[Chat]', () => {
.expect(400)
.expect((res) => {
expect(res.body).to.have.property('success', false);
- expect(res.body.errorType).to.be.equal('The required "since" query param is missing.');
})
.end(done);
});
@@ -2503,7 +2500,6 @@ describe('[Chat]', () => {
.expect(400)
.expect((res) => {
expect(res.body).to.have.property('success', false);
- expect(res.body.errorType).to.be.equal('The "since" query parameter must be a valid date.');
})
.end(done);
});
@@ -2923,7 +2919,6 @@ describe('[Chat]', () => {
.expect(400)
.expect((res) => {
expect(res.body).to.have.property('success', false);
- expect(res.body.errorType).to.be.equal('error-roomId-param-not-provided');
})
.end(done);
});
@@ -2952,7 +2947,7 @@ describe('[Chat]', () => {
.expect(400)
.expect((res) => {
expect(res.body).to.have.property('success', false);
- expect(res.body.errorType).to.be.equal('error-invalid-params');
+ expect(res.body.errorType).to.be.equal('invalid-params');
})
.end(done);
});
@@ -3011,7 +3006,7 @@ describe('[Chat]', () => {
.expect(400)
.expect((res) => {
expect(res.body).to.have.property('success', false);
- expect(res.body.errorType).to.be.equal('error-invalid-params');
+ expect(res.body.errorType).to.be.equal('invalid-params');
})
.end(done);
});
@@ -3087,7 +3082,6 @@ describe('[Chat]', () => {
.expect(400)
.expect((res) => {
expect(res.body).to.have.property('success', false);
- expect(res.body.errorType).to.be.equal('error-invalid-params');
})
.end(done);
});
@@ -3847,8 +3841,7 @@ describe('Threads', () => {
.expect(400)
.expect((res) => {
expect(res.body).to.have.property('success', false);
- expect(res.body).to.have.property('errorType', 'error-room-id-param-not-provided');
- expect(res.body).to.have.property('error', 'The required "rid" query param is missing. [error-room-id-param-not-provided]');
+ expect(res.body).to.have.property('errorType', 'invalid-params');
})
.end(done);
});
@@ -3866,8 +3859,7 @@ describe('Threads', () => {
.expect(400)
.expect((res) => {
expect(res.body).to.have.property('success', false);
- expect(res.body).to.have.property('errorType', 'error-updatedSince-param-invalid');
- expect(res.body).to.have.property('error', 'The required param "updatedSince" is missing. [error-updatedSince-param-invalid]');
+ expect(res.body).to.have.property('errorType', 'invalid-params');
})
.end(done);
});
@@ -3886,11 +3878,7 @@ describe('Threads', () => {
.expect(400)
.expect((res) => {
expect(res.body).to.have.property('success', false);
- expect(res.body).to.have.property('errorType', 'error-updatedSince-param-invalid');
- expect(res.body).to.have.property(
- 'error',
- 'The "updatedSince" query parameter must be a valid date. [error-updatedSince-param-invalid]',
- );
+ expect(res.body).to.have.property('errorType', 'invalid-params');
})
.end(done);
});
@@ -4088,7 +4076,7 @@ describe('Threads', () => {
.set(credentials)
.query({
tmid: threadMessage.tmid,
- updatedSince: 'updatedSince',
+ updatedSince: new Date().toISOString(),
})
.expect('Content-Type', 'application/json')
.expect(400)
@@ -4111,8 +4099,7 @@ describe('Threads', () => {
.expect(400)
.expect((res) => {
expect(res.body).to.have.property('success', false);
- expect(res.body).to.have.property('errorType', 'error-invalid-params');
- expect(res.body).to.have.property('error', 'The required "tmid" query param is missing. [error-invalid-params]');
+ expect(res.body).to.have.property('errorType', 'invalid-params');
})
.end(done);
});
@@ -4130,8 +4117,7 @@ describe('Threads', () => {
.expect(400)
.expect((res) => {
expect(res.body).to.have.property('success', false);
- expect(res.body).to.have.property('errorType', 'error-updatedSince-param-invalid');
- expect(res.body).to.have.property('error', 'The required param "updatedSince" is missing. [error-updatedSince-param-invalid]');
+ expect(res.body).to.have.property('errorType', 'invalid-params');
})
.end(done);
});
@@ -4150,11 +4136,7 @@ describe('Threads', () => {
.expect(400)
.expect((res) => {
expect(res.body).to.have.property('success', false);
- expect(res.body).to.have.property('errorType', 'error-updatedSince-param-invalid');
- expect(res.body).to.have.property(
- 'error',
- 'The "updatedSince" query parameter must be a valid date. [error-updatedSince-param-invalid]',
- );
+ expect(res.body).to.have.property('errorType', 'invalid-params');
})
.end(done);
});
@@ -4461,7 +4443,6 @@ describe('Threads', () => {
.expect(400)
.expect((res) => {
expect(res.body).to.have.property('success', false);
- expect(res.body.errorType).to.be.equal('invalid-params');
});
});
it('should return statusCode 400 and an error when "url" is not provided', async () => {
@@ -4475,7 +4456,6 @@ describe('Threads', () => {
.expect(400)
.expect((res) => {
expect(res.body).to.have.property('success', false);
- expect(res.body.errorType).to.be.equal('invalid-params');
});
});
it('should return statusCode 400 and an error when "roomId" is provided but user is not in the room', async () => {
diff --git a/apps/meteor/tests/end-to-end/api/direct-message.ts b/apps/meteor/tests/end-to-end/api/direct-message.ts
index 9a6155fd40fee..08c5abee1ae0d 100644
--- a/apps/meteor/tests/end-to-end/api/direct-message.ts
+++ b/apps/meteor/tests/end-to-end/api/direct-message.ts
@@ -1,5 +1,6 @@
import type { Credentials } from '@rocket.chat/api-client';
import type { IMessage, IRoom, IUser } from '@rocket.chat/core-typings';
+import { Random } from '@rocket.chat/random';
import { expect } from 'chai';
import { after, before, describe, it } from 'mocha';
@@ -462,23 +463,33 @@ describe('[Direct Messages]', () => {
describe('/im.messages', () => {
let testUser: IUser;
+ let testUser2: IUser;
let testUserDMRoom: IRoom;
let testUserCredentials: Credentials;
+ let testUser2Credentials: Credentials;
+
+ let messages: Pick[] = [];
before(async () => {
- testUser = await createUser({ joinDefaultChannels: false, roles: ['admin'] });
+ [testUser, testUser2] = await Promise.all([
+ createUser({ joinDefaultChannels: false, roles: ['admin'], username: `a_${Random.id()}` }),
+ createUser({ joinDefaultChannels: false, username: `b_${Random.id()}` }),
+ ]);
- testUserCredentials = await login(testUser.username, password);
+ [testUserCredentials, testUser2Credentials] = await Promise.all([
+ login(testUser.username, password),
+ login(testUser2.username, password),
+ ]);
await setUserStatus(testUserCredentials);
testUserDMRoom = (
await request
.post(api('im.create'))
.set(testUserCredentials)
- .send({ username: `${testUser.username}` })
+ .send({ username: `${testUser2.username}` })
).body.room;
- const messages = [
+ messages = [
{
rid: testUserDMRoom._id,
msg: `@${adminUsername} youre being mentioned`,
@@ -499,9 +510,14 @@ describe('[Direct Messages]', () => {
},
];
- const [, , starredMessage, pinnedMessage] = await Promise.all(
- messages.map((message) => sendMessage({ message, requestCredentials: testUserCredentials })),
- );
+ /**
+ * We are not using `Promise.all` here because we want to ensure that each message is sent sequentially.
+ * This approach helps in maintaining the order of messages by ts.
+ */
+ const starredMessage = await sendMessage({ message: messages[0], requestCredentials: testUserCredentials });
+ const pinnedMessage = await sendMessage({ message: messages[1], requestCredentials: testUser2Credentials });
+ await sendMessage({ message: messages[2], requestCredentials: testUserCredentials });
+ await sendMessage({ message: messages[3], requestCredentials: testUser2Credentials });
await Promise.all([
starMessage({ messageId: starredMessage.body.message._id, requestCredentials: testUserCredentials }),
@@ -509,6 +525,8 @@ describe('[Direct Messages]', () => {
]);
});
+ after(async () => Promise.all([deleteUser(testUser), deleteUser(testUser2)]));
+
it('should return all DM messages that were sent to yourself using your username', (done) => {
void request
.get(api('im.messages'))
@@ -525,6 +543,57 @@ describe('[Direct Messages]', () => {
.end(done);
});
+ it('should sort by ts by default', async () => {
+ await request
+ .get(api('im.messages'))
+ .set(testUserCredentials)
+ .query({
+ roomId: testUserDMRoom._id,
+ })
+ .expect('Content-Type', 'application/json')
+ .expect(200)
+ .expect((res) => {
+ expect(res.body).to.have.property('success', true);
+ expect(res.body.messages.map((m: IMessage) => m.u.username)).to.deep.equal(
+ res.body.messages
+ .sort((a: IMessage, b: IMessage) => new Date(b.ts).getTime() - new Date(a.ts).getTime())
+ .map((m: IMessage) => m.u.username),
+ );
+ });
+ });
+
+ it('should allow custom sorting', async () => {
+ const { messages } = (
+ await request
+ .get(api('im.messages'))
+ .set(testUserCredentials)
+ .query({
+ roomId: testUserDMRoom._id,
+ })
+ .expect('Content-Type', 'application/json')
+ .expect(200)
+ .expect((res) => {
+ expect(res.body).to.have.property('success', true);
+ })
+ ).body;
+
+ await request
+ .get(api('im.messages'))
+ .set(testUserCredentials)
+ .query({
+ roomId: testUserDMRoom._id,
+ sort: '{"u.username":-1}',
+ })
+ .expect('Content-Type', 'application/json')
+ .expect(200)
+ .expect((res) => {
+ expect(res.body).to.have.property('success', true);
+ expect(res.body.messages.map((m: IMessage) => m.u.username)).to.deep.equal(
+ messages.map((m: IMessage) => m.u.username).sort((a: string, b: string) => b.localeCompare(a)),
+ );
+ });
+ });
+
it('should return an error when trying to access a DM that does not belong to the current user', async () => {
await request
.get(api('im.messages'))
diff --git a/apps/meteor/tests/end-to-end/api/livechat/00-rooms.ts b/apps/meteor/tests/end-to-end/api/livechat/00-rooms.ts
index 06c62e8a96dfb..1f4f331fa44df 100644
--- a/apps/meteor/tests/end-to-end/api/livechat/00-rooms.ts
+++ b/apps/meteor/tests/end-to-end/api/livechat/00-rooms.ts
@@ -10,6 +10,8 @@ import type {
ILivechatPriority,
ILivechatDepartment,
ISubscription,
+ IOmnichannelBusinessUnit,
+ IUser,
} from '@rocket.chat/core-typings';
import { LivechatPriorityWeight } from '@rocket.chat/core-typings';
import { expect } from 'chai';
@@ -39,6 +41,7 @@ import {
fetchInquiry,
} from '../../../data/livechat/rooms';
import { saveTags } from '../../../data/livechat/tags';
+import { createMonitor, createUnit, deleteUnit } from '../../../data/livechat/units';
import type { DummyResponse } from '../../../data/livechat/utils';
import { parseMethodResponse, sleep } from '../../../data/livechat/utils';
import {
@@ -188,7 +191,8 @@ describe('LIVECHAT - rooms', () => {
it('should return an error when the "departmentId" query parameter is not valid', async () => {
await request
.get(api('livechat/rooms'))
- .query({ 'departmentId[]': 'marcos' })
+ // it accepts an array now!
+ .query({ departmentId: { test: true } })
.set(credentials)
.expect('Content-Type', 'application/json')
.expect(400)
@@ -432,6 +436,30 @@ describe('LIVECHAT - rooms', () => {
expect(body.rooms.length).to.be.equal(1);
expect(body.rooms.some((room: IOmnichannelRoom) => room._id === expectedRoom._id)).to.be.true;
});
+ (IS_EE ? it : it.skip)('should return rooms with the given departments', async () => {
+ const { department } = await createDepartmentWithAnOnlineAgent();
+ const { department: department2 } = await createDepartmentWithAnOnlineAgent();
+
+ const { room: expectedRoom } = await startANewLivechatRoomAndTakeIt({
+ departmentId: department._id,
+ });
+
+ const { room: expectedRoom2 } = await startANewLivechatRoomAndTakeIt({
+ departmentId: department2._id,
+ });
+
+ const { body } = await request
+ .get(api('livechat/rooms'))
+ .query({ departmentId: [department._id, department2._id] })
+ .set(credentials)
+ .expect(200);
+
+ expect(body.rooms.length).to.be.equal(2);
+ expect(body.rooms.some((room: IOmnichannelRoom) => room._id === expectedRoom._id)).to.be.true;
+ expect(body.rooms.some((room: IOmnichannelRoom) => room._id === expectedRoom2._id)).to.be.true;
+
+ await Promise.all([deleteDepartment(department._id), deleteDepartment(department2._id)]);
+ });
(IS_EE ? it : it.skip)('should return rooms with the given department and the given status', async () => {
const { department } = await createDepartmentWithAnOnlineAgent();
@@ -475,6 +503,35 @@ describe('LIVECHAT - rooms', () => {
expect(body.rooms.length).to.be.equal(1);
expect(body.rooms.some((room: IOmnichannelRoom) => room._id === expectedRoom._id)).to.be.true;
+
+ await Promise.all([deleteDepartment(department._id)]);
+ });
+ (IS_EE ? it : it.skip)('should return only rooms served by the given agents', async () => {
+ const { department, agent } = await createDepartmentWithAnOnlineAgent();
+
+ const { room: expectedRoom } = await startANewLivechatRoomAndTakeIt({
+ departmentId: department._id,
+ agent: agent.credentials,
+ });
+
+ const { department: department2, agent: agent2 } = await createDepartmentWithAnOnlineAgent();
+
+ const { room: expectedRoom2 } = await startANewLivechatRoomAndTakeIt({
+ departmentId: department2._id,
+ agent: agent2.credentials,
+ });
+
+ const { body } = await request
+ .get(api('livechat/rooms'))
+ .query({ agents: [agent.user._id, agent2.user._id] })
+ .set(credentials)
+ .expect(200);
+
+ expect(body.rooms.length).to.be.equal(2);
+ expect(body.rooms.some((room: IOmnichannelRoom) => room._id === expectedRoom._id)).to.be.true;
+ expect(body.rooms.some((room: IOmnichannelRoom) => room._id === expectedRoom2._id)).to.be.true;
+
+ await Promise.all([deleteDepartment(department._id), deleteDepartment(department2._id)]);
});
(IS_EE ? it : it.skip)('should return only rooms with the given tags', async () => {
const tag = await saveTags();
@@ -529,6 +586,99 @@ describe('LIVECHAT - rooms', () => {
expect(body.rooms[1]._id).to.be.equal(closeRoom._id);
});
});
+ (IS_EE ? describe : describe.skip)('monitors', () => {
+ let user: IUser;
+ let userCreds: Credentials;
+ let user2: IUser;
+ let user2Creds: Credentials;
+ let department: ILivechatDepartment;
+ let department2: ILivechatDepartment;
+ let agent: any;
+ let agent2: any;
+ let unit: IOmnichannelBusinessUnit;
+ let unit2: IOmnichannelBusinessUnit;
+ let room1: IOmnichannelRoom;
+ let room2: IOmnichannelRoom;
+
+ before(async () => {
+ user = await createUser();
+ userCreds = await login(user.username!, password);
+ user2 = await createUser();
+ user2Creds = await login(user2.username!, password);
+
+ await createMonitor(user.username!);
+ await createMonitor(user2.username!);
+ const { department: dep1, agent: agent1 } = await createDepartmentWithAnOnlineAgent();
+ const { department: dep2, agent: agen2 } = await createDepartmentWithAnOnlineAgent();
+
+ department = dep1;
+ agent = agent1;
+ department2 = dep2;
+ agent2 = agen2;
+
+ unit = await createUnit(user._id, user.username!, [department._id], '', [{ monitorId: user2._id, username: user2.username! }]);
+ unit2 = await createUnit(user2._id, user2.username!, [department2._id]);
+ });
+ before(async () => {
+ const { room: localOpenRoom } = await startANewLivechatRoomAndTakeIt({
+ departmentId: department._id,
+ agent: agent.credentials,
+ });
+ room1 = localOpenRoom;
+ const { room: localOpenRoom2 } = await startANewLivechatRoomAndTakeIt({
+ departmentId: department2._id,
+ agent: agent2.credentials,
+ });
+ room2 = localOpenRoom2;
+ });
+ before(async () => {
+ await restorePermissionToRoles('view-livechat-rooms');
+ });
+ after(async () => {
+ await Promise.all([
+ deleteUser(user),
+ deleteUser(user),
+ deleteUnit(unit),
+ deleteUnit(unit2),
+ deleteDepartment(department._id),
+ deleteDepartment(department2._id),
+ ]);
+ });
+
+ it('should return valid list of rooms for monitor', () => {
+ return request
+ .get(api('livechat/rooms'))
+ .set(userCreds)
+ .expect(200)
+ .expect((res) => {
+ expect(res.body.rooms.length).to.be.equal(1);
+ expect(res.body.rooms[0]._id).to.be.equal(room1._id);
+ });
+ });
+ it('should return a valid list of rooms for monitor 2', () => {
+ return request
+ .get(api('livechat/rooms'))
+ .set(user2Creds)
+ .expect(200)
+ .expect((res) => {
+ expect(res.body.rooms.length).to.be.equal(2);
+ });
+ });
+ it('should allow monitor 1 to filter by units', async () => {
+ const { body } = await request.get(api('livechat/rooms')).set(userCreds).query({ 'units[]': unit._id }).expect(200);
+ expect(body.rooms.length).to.be.equal(1);
+ expect(body.rooms[0]._id).to.be.equal(room1._id);
+ });
+ it('should not allow monitor 1 to filter by a unit hes not part of', async () => {
+ const { body } = await request.get(api('livechat/rooms')).set(userCreds).query({ 'units[]': unit2._id }).expect(200);
+ expect(body.rooms.length).to.be.equal(0);
+ });
+ it('should allow monitor 2 to filter by only one unit', async () => {
+ const { body } = await request.get(api('livechat/rooms')).set(user2Creds).query({ 'units[]': unit2._id }).expect(200);
+ expect(body.rooms.length).to.be.equal(1);
+ expect(body.rooms[0]._id).to.be.equal(room2._id);
+ });
+ });
});
describe('livechat/room.join', () => {
diff --git a/apps/meteor/tests/end-to-end/api/livechat/04-dashboards.ts b/apps/meteor/tests/end-to-end/api/livechat/04-dashboards.ts
index 351abecff21c2..5facfbe965a7a 100644
--- a/apps/meteor/tests/end-to-end/api/livechat/04-dashboards.ts
+++ b/apps/meteor/tests/end-to-end/api/livechat/04-dashboards.ts
@@ -16,7 +16,7 @@ import {
sendMessage,
startANewLivechatRoomAndTakeIt,
} from '../../../data/livechat/rooms';
-import { createAnOnlineAgent } from '../../../data/livechat/users';
+import { createAnOnlineAgent, createBotAgent } from '../../../data/livechat/users';
import { sleep } from '../../../data/livechat/utils';
import { removePermissionFromAllRoles, restorePermissionToRoles, updateEESetting, updateSetting } from '../../../data/permissions.helper';
import { deleteUser } from '../../../data/users.helper';
@@ -923,6 +923,7 @@ describe('LIVECHAT - dashboards', function () {
describe('[livechat/analytics/agent-overview] - Average first response time', () => {
let agent: { credentials: Credentials; user: IUser & { username: string } };
let forwardAgent: { credentials: Credentials; user: IUser & { username: string } };
+ let botAgent: { credentials: Credentials; user: IUser };
let originalFirstResponseTimeInSeconds: number;
let roomId: string;
const firstDelayInSeconds = 4;
@@ -931,9 +932,18 @@ describe('LIVECHAT - dashboards', function () {
before(async () => {
agent = await createAnOnlineAgent();
forwardAgent = await createAnOnlineAgent();
+ botAgent = await createBotAgent();
+
+ await updateSetting('Omnichannel_Metrics_Ignore_Automatic_Messages', true);
});
- after(async () => Promise.all([deleteUser(agent.user), deleteUser(forwardAgent.user)]));
+ after(async () =>
+ Promise.all([
+ deleteUser(agent.user),
+ deleteUser(forwardAgent.user),
+ updateSetting('Omnichannel_Metrics_Ignore_Automatic_Messages', false),
+ ]),
+ );
it('should return no average response time for an agent if no response has been sent in the period', async () => {
await startANewLivechatRoomAndTakeIt({ agent: agent.credentials });
@@ -984,6 +994,34 @@ describe('LIVECHAT - dashboards', function () {
expect(originalFirstResponseTimeInSeconds).to.be.greaterThanOrEqual(firstDelayInSeconds);
});
+ it("should not consider bot messages in agent's first response time metric if setting is enabled", async () => {
+ const response = await startANewLivechatRoomAndTakeIt({ agent: botAgent.credentials });
+
+ roomId = response.room._id;
+
+ await sleep(firstDelayInSeconds * 1000);
+
+ await sendAgentMessage(roomId, 'first response from agent', botAgent.credentials);
+
+ const today = moment().startOf('day').format('YYYY-MM-DD');
+ const result = await request
+ .get(api('livechat/analytics/agent-overview'))
+ .query({ from: today, to: today, name: 'Avg_first_response_time' })
+ .set(credentials)
+ .expect('Content-Type', 'application/json')
+ .expect(200);
+
+ expect(result.body).to.have.property('success', true);
+ expect(result.body).to.have.property('head');
+ expect(result.body).to.have.property('data');
+ expect(result.body.data).to.be.an('array');
+
+ const agentData = result.body.data.find(
+ (agentOverviewData: { name: string; value: string }) => agentOverviewData.name === botAgent.user.username,
+ );
+ expect(agentData).to.be.undefined;
+ });
+
it('should correctly associate the first response time to the first agent who responded the room', async () => {
const response = await startANewLivechatRoomAndTakeIt({ agent: forwardAgent.credentials });
roomId = response.room._id;
@@ -1284,12 +1322,12 @@ describe('LIVECHAT - dashboards', function () {
expect(result.body).to.be.an('array');
const expectedResult = [
- { title: 'Total_conversations', value: 15 },
- { title: 'Open_conversations', value: 12 },
+ { title: 'Total_conversations', value: 16 },
+ { title: 'Open_conversations', value: 13 },
{ title: 'On_Hold_conversations', value: 1 },
// { title: 'Total_messages', value: 6 },
// { title: 'Busiest_day', value: moment().format('dddd') },
- { title: 'Conversations_per_day', value: '7.50' },
+ { title: 'Conversations_per_day', value: '8.00' },
// { title: 'Busiest_time', value: '' },
];
diff --git a/apps/meteor/tests/end-to-end/api/livechat/09-visitors.ts b/apps/meteor/tests/end-to-end/api/livechat/09-visitors.ts
index 8224773082c73..1bba0a170dd9d 100644
--- a/apps/meteor/tests/end-to-end/api/livechat/09-visitors.ts
+++ b/apps/meteor/tests/end-to-end/api/livechat/09-visitors.ts
@@ -190,7 +190,7 @@ describe('LIVECHAT - visitors', () => {
expect(body.visitor).to.not.have.property('livechatData');
});
- it('should not update a custom field whe the overwrite flag is false', async () => {
+ it('should not update a custom field when the overwrite flag is false', async () => {
const token = `${new Date().getTime()}-test`;
const customFieldName = `new_custom_field_${Date.now()}`;
await createCustomField({
@@ -223,6 +223,59 @@ describe('LIVECHAT - visitors', () => {
expect(body.visitor.livechatData).to.have.property(customFieldName, 'Not a real address :)');
});
+ it('should not validate required custom fields if no custom fields are provided', async () => {
+ const token = `${new Date().getTime()}-test`;
+ const customFieldName = `required_custom_field`;
+ await createCustomField({
+ searchable: true,
+ field: customFieldName,
+ label: customFieldName,
+ defaultValue: 'default_value',
+ scope: 'visitor',
+ visibility: 'public',
+ regexp: '',
+ required: true,
+ });
+ const { body } = await request.post(api('livechat/visitor')).send({ visitor: { token } });
+ expect(body).to.have.property('success', true);
+ expect(body).to.have.property('visitor');
+ expect(body.visitor).to.have.property('token', token);
+ await deleteCustomField(customFieldName);
+ });
+
+ it('should fail if provided custom fields but are missing required ones', async () => {
+ const token = `${new Date().getTime()}-test`;
+ const optionalCustomFieldName = `optional_custom_field`;
+ await createCustomField({
+ searchable: true,
+ field: optionalCustomFieldName,
+ label: optionalCustomFieldName,
+ defaultValue: 'default_value',
+ scope: 'visitor',
+ visibility: 'public',
+ regexp: '',
+ required: false,
+ });
+ const requiredCustomFieldName = `required_custom_field`;
+ await createCustomField({
+ searchable: true,
+ field: requiredCustomFieldName,
+ label: requiredCustomFieldName,
+ defaultValue: 'default_value',
+ scope: 'visitor',
+ visibility: 'public',
+ regexp: '',
+ required: true,
+ });
+ const { body } = await request
+ .post(api('livechat/visitor'))
+ .send({ visitor: { token, customFields: [{ key: optionalCustomFieldName, value: 'test', overwrite: true }] } });
+ expect(body).to.have.property('success', false);
+ expect(body).to.have.property('error');
+ expect(body.error).to.be.equal(`Missing required custom fields: required_custom_field`);
+ await Promise.all([deleteCustomField(optionalCustomFieldName), deleteCustomField(requiredCustomFieldName)]);
+ });
+
describe('special cases', () => {
before(async () => {
await updateSetting('Livechat_Allow_collect_and_store_HTTP_header_informations', true);
diff --git a/apps/meteor/tests/end-to-end/api/livechat/14-units.ts b/apps/meteor/tests/end-to-end/api/livechat/14-units.ts
index cd891095c118b..0f0d377c84de7 100644
--- a/apps/meteor/tests/end-to-end/api/livechat/14-units.ts
+++ b/apps/meteor/tests/end-to-end/api/livechat/14-units.ts
@@ -24,7 +24,7 @@ import { IS_EE } from '../../../e2e/config/constants';
});
describe('[GET] livechat/units', () => {
- it('should fail if manage-livechat-units permission is missing', async () => {
+ it('should return empty if manage-livechat-units permission is missing', async () => {
await updatePermission('manage-livechat-units', []);
return request
.get(api('livechat/units'))
@@ -37,7 +37,10 @@ import { IS_EE } from '../../../e2e/config/constants';
unitMonitors: [],
unitDepartments: [],
})
- .expect(403);
+ .expect(200)
+ .expect((res: Response) => {
+ expect(res.body).to.have.property('units').that.is.an('array').with.lengthOf(0);
+ });
});
it('should return a list of units', async () => {
await updatePermission('manage-livechat-units', ['admin']);
diff --git a/apps/meteor/tests/end-to-end/api/livechat/24-routing.ts b/apps/meteor/tests/end-to-end/api/livechat/24-routing.ts
index 5a35547460646..4a36699bfd29b 100644
--- a/apps/meteor/tests/end-to-end/api/livechat/24-routing.ts
+++ b/apps/meteor/tests/end-to-end/api/livechat/24-routing.ts
@@ -14,11 +14,12 @@ import {
createLivechatRoom,
getLivechatRoomInfo,
makeAgentUnavailable,
+ switchLivechatStatus,
} from '../../../data/livechat/rooms';
import { sleep } from '../../../data/livechat/utils';
import { updateSetting } from '../../../data/permissions.helper';
import { password } from '../../../data/user';
-import { createUser, deleteUser, login, setUserActiveStatus, setUserStatus } from '../../../data/users.helper';
+import { createUser, deleteUser, login, setUserActiveStatus, setUserAway, setUserStatus } from '../../../data/users.helper';
import { IS_EE } from '../../../e2e/config/constants';
(IS_EE ? describe : describe.skip)('Omnichannel - Routing', () => {
@@ -271,7 +272,14 @@ import { IS_EE } from '../../../e2e/config/constants';
});
});
- after(async () => Promise.all([deleteUser(testUser.user), deleteUser(testUser2.user), deleteUser(testUser3.user)]));
+ after(async () =>
+ Promise.all([
+ deleteUser(testUser.user),
+ deleteUser(testUser2.user),
+ deleteUser(testUser3.user),
+ updateSetting('Livechat_enabled_when_agent_idle', true),
+ ]),
+ );
it('should route a room to an available agent', async () => {
const visitor = await createVisitor(testDepartment._id);
@@ -364,6 +372,29 @@ import { IS_EE } from '../../../e2e/config/constants';
const roomInfo = await getLivechatRoomInfo(room._id);
expect(roomInfo.servedBy).to.be.undefined;
});
+ it('should not route to an idle user', async () => {
+ await setUserStatus(testUser.credentials, UserStatus.AWAY);
+ await setUserAway(testUser.credentials);
+ await setUserStatus(testUser3.credentials, UserStatus.AWAY);
+ await setUserAway(testUser3.credentials);
+ // Agent is available but should be ignored
+ await switchLivechatStatus('available', testUser.credentials);
+
+ const visitor = await createVisitor(testDepartment._id);
+ const room = await createLivechatRoom(visitor.token);
+
+ const roomInfo = await getLivechatRoomInfo(room._id);
+ expect(roomInfo.servedBy).to.be.undefined;
+ });
+ it('should route to an idle user', async () => {
+ await updateSetting('Livechat_enabled_when_agent_idle', true);
+
+ const visitor = await createVisitor(testDepartment._id);
+ const room = await createLivechatRoom(visitor.token);
+
+ const roomInfo = await getLivechatRoomInfo(room._id);
+ expect(roomInfo.servedBy).to.be.an('object');
+ });
it('should route to another available agent if contact manager is unavailable and Omnichannel_contact_manager_routing is enabled', async () => {
await makeAgentAvailable(testUser.credentials);
const visitor = await createVisitor(testDepartment._id, faker.person.fullName(), visitorEmail);
@@ -505,6 +536,35 @@ import { IS_EE } from '../../../e2e/config/constants';
expect(roomInfo.servedBy).to.be.an('object');
expect(roomInfo.servedBy?._id).to.be.equal(testUser2.user._id);
});
+ it('should not route to an idle user', async () => {
+ await updateSetting('Livechat_enabled_when_agent_idle', false);
+ await setUserStatus(testUser.credentials, UserStatus.AWAY);
+ await setUserAway(testUser.credentials);
+ await setUserStatus(testUser2.credentials, UserStatus.AWAY);
+ await setUserAway(testUser2.credentials);
+ // Agent is available but should be ignored
+ await switchLivechatStatus('available', testUser.credentials);
+
+ const visitor = await createVisitor(testDepartment._id);
+ const room = await createLivechatRoom(visitor.token);
+
+ const roomInfo = await getLivechatRoomInfo(room._id);
+ expect(roomInfo.servedBy).to.be.undefined;
+ });
+ it('should route to agents even if theyre idle when setting is enabled', async () => {
+ await updateSetting('Livechat_enabled_when_agent_idle', true);
+ await setUserStatus(testUser.credentials, UserStatus.AWAY);
+ await setUserStatus(testUser2.credentials, UserStatus.AWAY);
+
+ const visitor = await createVisitor(testDepartment._id);
+ const room = await createLivechatRoom(visitor.token);
+
+ await sleep(5000);
+
+ const roomInfo = await getLivechatRoomInfo(room._id);
+ // Not checking who, just checking it's served
+ expect(roomInfo.servedBy).to.be.an('object');
+ });
});
describe('Load Rotation', () => {
before(async () => {
@@ -594,5 +654,32 @@ import { IS_EE } from '../../../e2e/config/constants';
expect(roomInfo.servedBy).to.be.an('object');
expect(roomInfo.servedBy?._id).to.be.equal(testUser.user._id);
});
+ it('should not route to an idle user', async () => {
+ await updateSetting('Livechat_enabled_when_agent_idle', false);
+ await setUserStatus(testUser.credentials, UserStatus.AWAY);
+ await setUserAway(testUser.credentials);
+ await setUserStatus(testUser2.credentials, UserStatus.AWAY);
+ await setUserAway(testUser2.credentials);
+ // Agent is available but should be ignored
+ await switchLivechatStatus('available', testUser.credentials);
+
+ const visitor = await createVisitor(testDepartment._id);
+ const room = await createLivechatRoom(visitor.token);
+
+ const roomInfo = await getLivechatRoomInfo(room._id);
+ expect(roomInfo.servedBy).to.be.undefined;
+ });
+ it('should route to agents even if theyre idle when setting is enabled', async () => {
+ await updateSetting('Livechat_enabled_when_agent_idle', true);
+ await setUserStatus(testUser.credentials, UserStatus.AWAY);
+ await setUserStatus(testUser2.credentials, UserStatus.AWAY);
+
+ const visitor = await createVisitor(testDepartment._id);
+ const room = await createLivechatRoom(visitor.token);
+
+ const roomInfo = await getLivechatRoomInfo(room._id);
+ // Not checking who, just checking it's served
+ expect(roomInfo.servedBy).to.be.an('object');
+ });
});
});
diff --git a/apps/meteor/tests/end-to-end/api/methods.ts b/apps/meteor/tests/end-to-end/api/methods.ts
index 8e4950be51275..2671e7f189c0f 100644
--- a/apps/meteor/tests/end-to-end/api/methods.ts
+++ b/apps/meteor/tests/end-to-end/api/methods.ts
@@ -2568,6 +2568,216 @@ describe('Meteor.methods', () => {
});
});
+ describe('[@getRoomByTypeAndName]', () => {
+ let testUser: TestUser;
+ let testUser2: TestUser;
+ let testUserCredentials: Credentials;
+ let dmId: IRoom['_id'];
+ let room: IRoom;
+
+ before(async () => {
+ testUser = await createUser();
+ testUser2 = await createUser();
+ testUserCredentials = await login(testUser.username, password);
+ });
+
+ before(async () => {
+ room = (
+ await createRoom({
+ type: 'c',
+ name: `channel.test.${Date.now()}-${Math.random()}`,
+ })
+ ).body.channel;
+ });
+
+ before('create direct conversation with user', (done) => {
+ void request
+ .post(methodCall('createDirectMessage'))
+ .set(credentials)
+ .send({
+ message: JSON.stringify({
+ method: 'createDirectMessage',
+ params: [testUser2.username],
+ id: 'id',
+ msg: 'method',
+ }),
+ })
+ .end((_err, res) => {
+ const result = JSON.parse(res.body.message);
+ expect(result.result).to.be.an('object');
+ expect(result.result).to.have.property('rid').that.is.an('string');
+
+ dmId = result.result.rid;
+ done();
+ });
+ });
+
+ after(() =>
+ Promise.all([
+ deleteRoom({ type: 'd', roomId: dmId }),
+ deleteRoom({ type: 'c', roomId: room._id }),
+ deleteUser(testUser),
+ deleteUser(testUser2),
+ ]),
+ );
+
+ it("should throw an error if the user isn't logged in", (done) => {
+ void request
+ .post(methodCall('getRoomByTypeAndName'))
+ .send({
+ message: JSON.stringify({
+ method: 'getRoomByTypeAndName',
+ params: ['d', dmId],
+ id: 'id',
+ msg: 'method',
+ }),
+ })
+ .end((_err, res) => {
+ expect(res.body).to.have.property('status', 'error');
+ expect(res.body).to.have.property('message');
+ expect(res.body.message).to.be.equal('You must be logged in to do this.');
+ done();
+ });
+ });
+
+ it("should throw an error if name isn't provided", (done) => {
+ void request
+ .post(methodCall('getRoomByTypeAndName'))
+ .set(credentials)
+ .send({
+ message: JSON.stringify({
+ method: 'getRoomByTypeAndName',
+ params: ['d', null],
+ id: 'id',
+ msg: 'method',
+ }),
+ })
+ .end((_err, res) => {
+ expect(res.body).to.have.property('message');
+
+ const parsedResponse = JSON.parse(res.body.message);
+
+ expect(parsedResponse).to.have.property('error');
+ expect(parsedResponse.error).to.have.property('error');
+ expect(parsedResponse.error.error).to.equal('error-invalid-room');
+ done();
+ });
+ });
+
+ it("should throw an error if type isn't provided", (done) => {
+ void request
+ .post(methodCall('getRoomByTypeAndName'))
+ .set(credentials)
+ .send({
+ message: JSON.stringify({
+ method: 'getRoomByTypeAndName',
+ params: [null, dmId],
+ id: 'id',
+ msg: 'method',
+ }),
+ })
+ .end((_err, res) => {
+ expect(res.body).to.have.property('message');
+
+ const parsedResponse = JSON.parse(res.body.message);
+
+ expect(parsedResponse).to.have.property('error');
+ expect(parsedResponse.error).to.have.property('error');
+ expect(parsedResponse.error.error).to.equal('error-invalid-room');
+ done();
+ });
+ });
+
+ it("should throw an error if the user doesn't have access to the room", (done) => {
+ void request
+ .post(methodCall('getRoomByTypeAndName'))
+ .set(testUserCredentials)
+ .send({
+ message: JSON.stringify({
+ method: 'getRoomByTypeAndName',
+ params: ['d', dmId],
+ id: 'id',
+ msg: 'method',
+ }),
+ })
+ .end((_err, res) => {
+ expect(res.body).to.have.property('message');
+
+ const parsedResponse = JSON.parse(res.body.message);
+ expect(parsedResponse).to.have.property('error');
+ expect(parsedResponse.error).to.have.property('error');
+ expect(parsedResponse.error.error).to.equal('error-no-permission');
+ done();
+ });
+ });
+
+ it("should throw an error if the room doesn't exist", (done) => {
+ void request
+ .post(methodCall('getRoomByTypeAndName'))
+ .set(testUserCredentials)
+ .send({
+ message: JSON.stringify({
+ method: 'getRoomByTypeAndName',
+ params: ['d', 'testId'],
+ id: 'id',
+ msg: 'method',
+ }),
+ })
+ .end((_err, res) => {
+ expect(res.body).to.have.property('message');
+
+ const parsedResponse = JSON.parse(res.body.message);
+
+ expect(parsedResponse).to.have.property('error');
+ expect(parsedResponse.error).to.have.property('error');
+ expect(parsedResponse.error.error).to.equal('error-invalid-room');
+ done();
+ });
+ });
+
+ it('should return the room object for a Public Channel if anonymous read is enabled', async () => {
+ await updateSetting('Accounts_AllowAnonymousRead', true);
+
+ const res = await request
+ .post(methodCall('getRoomByTypeAndName'))
+ .set(credentials)
+ .send({
+ message: JSON.stringify({
+ method: 'getRoomByTypeAndName',
+ params: ['c', room._id],
+ id: 'id',
+ msg: 'method',
+ }),
+ });
+
+ expect(res.body.success).to.equal(true);
+ const parsedResponse = JSON.parse(res.body.message);
+ expect(parsedResponse.result.name).to.equal(room.name);
+
+ await updateSetting('Accounts_AllowAnonymousRead', false);
+ });
+
+ it('should return the room object for a DM', (done) => {
+ void request
+ .post(methodCall('getRoomByTypeAndName'))
+ .set(credentials)
+ .send({
+ message: JSON.stringify({
+ method: 'getRoomByTypeAndName',
+ params: ['d', dmId],
+ id: 'id',
+ msg: 'method',
+ }),
+ })
+ .end((_err, res) => {
+ expect(res.body.success).to.equal(true);
+ const parsedResponse = JSON.parse(res.body.message);
+ expect(parsedResponse.result._id).to.equal(dmId);
+ done();
+ });
+ });
+ });
+
describe('[@setUserActiveStatus]', () => {
let testUser: TestUser;
let testUser2: TestUser;
diff --git a/apps/meteor/tests/end-to-end/api/rooms.ts b/apps/meteor/tests/end-to-end/api/rooms.ts
index d9f6b727d0453..94a1e3b1eca6a 100644
--- a/apps/meteor/tests/end-to-end/api/rooms.ts
+++ b/apps/meteor/tests/end-to-end/api/rooms.ts
@@ -3642,6 +3642,7 @@ describe('[Rooms]', () => {
let testChannel: IRoom;
let ownerUser: IUser;
+ let leaderUser: IUser;
let moderatorUser: IUser;
let memberUser1: IUser;
let memberUser2: IUser;
@@ -3652,11 +3653,12 @@ describe('[Rooms]', () => {
let memberUser2Credentials: { 'X-Auth-Token': string; 'X-User-Id': string };
before(async () => {
- [ownerUser, moderatorUser, memberUser1, memberUser2] = await Promise.all([
+ [ownerUser, leaderUser, moderatorUser, memberUser1, memberUser2] = await Promise.all([
createUser({ username: `a_${Random.id()}`, roles: ['admin'] }),
createUser({ username: `b_${Random.id()}` }),
createUser({ username: `c_${Random.id()}` }),
createUser({ username: `d_${Random.id()}` }),
+ createUser({ username: `e_${Random.id()}` }),
]);
[ownerCredentials, memberUser1Credentials, memberUser2Credentials] = await Promise.all([
@@ -3680,7 +3682,7 @@ describe('[Rooms]', () => {
testChannel = roomCreationResponse.body.channel;
await Promise.all(
- [moderatorUser._id, memberUser1._id, memberUser2._id].map((userId) =>
+ [leaderUser._id, moderatorUser._id, memberUser1._id, memberUser2._id].map((userId) =>
request
.post(api('channels.invite'))
.set(ownerCredentials)
@@ -3692,14 +3694,24 @@ describe('[Rooms]', () => {
),
);
- await request
- .post(api('channels.addModerator'))
- .set(ownerCredentials)
- .send({
- roomId: testChannel._id,
- userId: moderatorUser._id,
- })
- .expect(200);
+ await Promise.all([
+ request
+ .post(api('channels.addLeader'))
+ .set(ownerCredentials)
+ .send({
+ roomId: testChannel._id,
+ userId: leaderUser._id,
+ })
+ .expect(200),
+ request
+ .post(api('channels.addModerator'))
+ .set(ownerCredentials)
+ .send({
+ roomId: testChannel._id,
+ userId: moderatorUser._id,
+ })
+ .expect(200),
+ ]);
});
after(async () => {
@@ -3710,7 +3722,7 @@ describe('[Rooms]', () => {
}
});
- it('should return a list of members ordered by owner, moderator, then members by default', async () => {
+ it('should return a list of members ordered by owner, leader, moderator, then members by default', async () => {
const response = await request
.get(api('rooms.membersOrderedByRole'))
.set(credentials)
@@ -3723,16 +3735,17 @@ describe('[Rooms]', () => {
expect(response.body).to.have.property('success', true);
expect(response.body.members).to.be.an('array');
- const [first, second, ...rest] = response.body.members;
+ const [first, second, third, ...rest] = response.body.members;
expect(first.username).to.equal(ownerUser.username);
- expect(second.username).to.equal(moderatorUser.username);
+ expect(second.username).to.equal(leaderUser.username);
+ expect(third.username).to.equal(moderatorUser.username);
const memberUsernames = rest.map((m: any) => m.username);
expect(memberUsernames).to.include(memberUser1.username);
expect(memberUsernames).to.include(memberUser2.username);
expect(response.body).to.have.property('total');
- expect(response.body.total).to.be.gte(4);
+ expect(response.body.total).to.be.eq(5);
});
it('should support sorting by role in descending priority', async () => {
@@ -3747,12 +3760,13 @@ describe('[Rooms]', () => {
.expect(200);
expect(response.body).to.have.property('success', true);
- const [first, second, third, fourth] = response.body.members;
+ const [first, second, third, fourth, fifth] = response.body.members;
expect(first.username).to.equal(memberUser1.username);
expect(second.username).to.equal(memberUser2.username);
expect(third.username).to.equal(moderatorUser.username);
- expect(fourth.username).to.equal(ownerUser.username);
+ expect(fourth.username).to.equal(leaderUser.username);
+ expect(fifth.username).to.equal(ownerUser.username);
});
it('should support pagination', async () => {
@@ -3769,7 +3783,7 @@ describe('[Rooms]', () => {
expect(response.body).to.have.property('success', true);
expect(response.body.members).to.have.lengthOf(2);
- expect(response.body.total).to.be.gte(4);
+ expect(response.body.total).to.be.eq(5);
});
it('should return matched members when using filter param', async () => {
@@ -3819,6 +3833,7 @@ describe('[Rooms]', () => {
const expected = [
ownerUser.username, // since owner
+ leaderUser.username, // since leader
moderatorUser.username, // since moderator
memberUser2.username,
memberUser1.username,
@@ -3846,12 +3861,13 @@ describe('[Rooms]', () => {
.expect(200);
expect(response.body).to.have.property('success', true);
- const [first, second, third, fourth] = response.body.members;
+ const [first, second, third, fourth, fifth] = response.body.members;
expect(first.username).to.equal(ownerUser.username);
- expect(second.username).to.equal(moderatorUser.username);
- expect(third.username).to.equal(memberUser1.username);
- expect(fourth.username).to.equal(memberUser2.username);
+ expect(second.username).to.equal(leaderUser.username);
+ expect(third.username).to.equal(moderatorUser.username);
+ expect(fourth.username).to.equal(memberUser1.username);
+ expect(fifth.username).to.equal(memberUser2.username);
});
describe('Sort by user status', () => {
@@ -3880,12 +3896,13 @@ describe('[Rooms]', () => {
.expect(200);
expect(response.body).to.have.property('success', true);
- const [first, second, third, fourth] = response.body.members;
+ const [first, second, third, fourth, fifth] = response.body.members;
expect(first.username).to.equal(ownerUser.username); // since owner
- expect(second.username).to.equal(moderatorUser.username); // siince moderator
- expect(third.username).to.equal(memberUser2.username); // since online
- expect(fourth.username).to.equal(memberUser1.username); // since offline
+ expect(second.username).to.equal(leaderUser.username); // since leader
+ expect(third.username).to.equal(moderatorUser.username); // since moderator
+ expect(fourth.username).to.equal(memberUser2.username); // since online
+ expect(fifth.username).to.equal(memberUser1.username); // since offline
});
});
@@ -4204,4 +4221,94 @@ describe('[Rooms]', () => {
});
});
});
+
+ describe('/rooms.hide', () => {
+ let roomA: IRoom;
+ let roomB: IRoom;
+ const roomName = `rooms.hide.test.${Date.now()}`;
+ let memberA: TestUser;
+ let memberB: TestUser;
+ let nonMember: TestUser;
+ let nonMemberCredentials: Credentials;
+
+ before(async () => {
+ memberA = await createUser();
+ memberB = await createUser();
+ nonMember = await createUser();
+ nonMemberCredentials = await login(nonMember.username, password);
+ });
+
+ before(async () => {
+ roomA = (await createRoom({ type: 'c', name: roomName, members: [memberA.username, memberB.username] })).body.channel;
+ roomB = (await createRoom({ type: 'd', username: memberB.username })).body.room;
+ });
+
+ after(async () => {
+ await deleteRoom({ type: 'c', roomId: roomA._id });
+ await deleteRoom({ type: 'd', roomId: roomB._id });
+ await deleteUser(memberA);
+ await deleteUser(memberB);
+ await deleteUser(nonMember);
+ });
+
+ it('should hide the room', async () => {
+ await request
+ .post(api('rooms.hide'))
+ .set(credentials)
+ .send({ roomId: roomA._id })
+ .expect('Content-Type', 'application/json')
+ .expect(200)
+ .expect((res) => {
+ expect(res.body).to.have.property('success', true);
+ });
+ });
+
+ it('should be already hidden', async () => {
+ await request
+ .post(api('rooms.hide'))
+ .set(credentials)
+ .send({ roomId: roomA._id })
+ .expect('Content-Type', 'application/json')
+ .expect(400)
+ .expect((res) => {
+ expect(res.body).to.have.property('success', false);
+ expect(res.body).to.have.property('error', `error-room-already-hidden`);
+ });
+ });
+
+ it('should fail if roomId is not provided', async () => {
+ await request
+ .post(api('rooms.hide'))
+ .set(credentials)
+ .send()
+ .expect('Content-Type', 'application/json')
+ .expect(400)
+ .expect((res: Response) => {
+ expect(res.body).to.have.property('success', false);
+ });
+ });
+
+ it('should return 401 if user is not logged in', async () => {
+ await request
+ .post(api('rooms.hide'))
+ .expect('Content-Type', 'application/json')
+ .expect(401)
+ .expect((res) => {
+ expect(res.body).to.have.property('status', 'error');
+ expect(res.body).to.have.property('message');
+ });
+ });
+
+ it('should return forbidden if user does not have access to the room', async () => {
+ await request
+ .post(api('rooms.hide'))
+ .set(nonMemberCredentials)
+ .send({ roomId: roomB._id })
+ .expect('Content-Type', 'application/json')
+ .expect(401)
+ .expect((res) => {
+ expect(res.body).to.have.property('success', false);
+ });
+ });
+ });
});
diff --git a/apps/meteor/tests/unit/app/apps/server/messages.tests.js b/apps/meteor/tests/unit/app/apps/server/messages.tests.js
index 04866f6440b6d..29921ed84a790 100644
--- a/apps/meteor/tests/unit/app/apps/server/messages.tests.js
+++ b/apps/meteor/tests/unit/app/apps/server/messages.tests.js
@@ -1,7 +1,7 @@
import { expect } from 'chai';
import proxyquire from 'proxyquire';
-import { appMessageMock, appMessageInvalidRoomMock } from './mocks/data/messages.data';
+import { appMessageMock, appMessageInvalidRoomMock, appPartialMessageMock } from './mocks/data/messages.data';
import { MessagesMock } from './mocks/models/Messages.mock';
import { RoomsMock } from './mocks/models/Rooms.mock';
import { UsersMock } from './mocks/models/Users.mock';
@@ -101,12 +101,6 @@ describe('The AppMessagesConverter instance', () => {
});
});
- it('should add an `_unmappedProperties_` field to the converted message which contains the `t` property of the message', async () => {
- const appMessage = await messagesConverter.convertMessage(messagesMock.findOneById('SimpleMessageMock'));
-
- expect(appMessage).to.have.property('_unmappedProperties_').which.has.property('t', 'uj');
- });
-
it("should return basic sender info when it's not a Rocket.Chat user (e.g. Livechat Guest)", async () => {
const appMessage = await messagesConverter.convertMessage(messagesMock.findOneById('LivechatGuestMessageMock'));
@@ -140,6 +134,20 @@ describe('The AppMessagesConverter instance', () => {
});
});
+ it('should return a proper schema when receiving a partial object', async () => {
+ const rocketchatMessage = await messagesConverter.convertAppMessage(appPartialMessageMock, true);
+
+ expect(rocketchatMessage).to.have.property('_id', 'appPartialMessageMock');
+ expect(rocketchatMessage).to.have.property('groupable', false);
+ expect(rocketchatMessage).to.have.property('emoji', ':smirk:');
+ expect(rocketchatMessage).to.have.property('alias', 'rocket.feline');
+
+ expect(rocketchatMessage).to.not.have.property('ts');
+ expect(rocketchatMessage).to.not.have.property('u');
+ expect(rocketchatMessage).to.not.have.property('rid');
+ expect(rocketchatMessage).to.not.have.property('_updatedAt');
+ });
+
it('should merge `_unmappedProperties_` into the returned message', async () => {
const rocketchatMessage = await messagesConverter.convertAppMessage(appMessageMock);
@@ -147,6 +155,18 @@ describe('The AppMessagesConverter instance', () => {
expect(rocketchatMessage).to.have.property('t', 'uj');
});
+ it('should not merge `_unmappedProperties_` into the returned message when receiving a partial object', async () => {
+ const invalidPartialMessage = structuredClone(appPartialMessageMock);
+ invalidPartialMessage._unmappedProperties_ = {
+ t: 'uj',
+ };
+
+ const rocketchatMessage = await messagesConverter.convertAppMessage(invalidPartialMessage, true);
+
+ expect(rocketchatMessage).to.not.have.property('_unmappedProperties_');
+ expect(rocketchatMessage).to.not.have.property('t');
+ });
+
it('should throw if message has an invalid room', async () => {
try {
await messagesConverter.convertAppMessage(appMessageInvalidRoomMock);
diff --git a/apps/meteor/tests/unit/app/apps/server/mocks/data/messages.data.js b/apps/meteor/tests/unit/app/apps/server/mocks/data/messages.data.js
index 70d1505d97fef..50e9089140f5b 100644
--- a/apps/meteor/tests/unit/app/apps/server/mocks/data/messages.data.js
+++ b/apps/meteor/tests/unit/app/apps/server/mocks/data/messages.data.js
@@ -56,6 +56,14 @@ export const appMessageMock = {
},
};
+export const appPartialMessageMock = {
+ id: 'appPartialMessageMock',
+ text: 'rocket.cat',
+ groupable: false,
+ emoji: ':smirk:',
+ alias: 'rocket.feline',
+};
+
export const appMessageInvalidRoomMock = {
id: 'appMessageInvalidRoomMock',
text: 'rocket.cat',
diff --git a/apps/meteor/tests/unit/app/apps/server/mocks/models/Rooms.mock.js b/apps/meteor/tests/unit/app/apps/server/mocks/models/Rooms.mock.js
index 5a0a776f037bf..6cf0370f1754e 100644
--- a/apps/meteor/tests/unit/app/apps/server/mocks/models/Rooms.mock.js
+++ b/apps/meteor/tests/unit/app/apps/server/mocks/models/Rooms.mock.js
@@ -108,6 +108,13 @@ export class RoomsMock extends BaseModelMock {
customFields: {},
},
+ GENERALPartial: {
+ id: 'GENERAL',
+ slugifiedName: 'general',
+ displaySystemMessages: true,
+ updatedAt: new Date('2019-04-10T17:44:34.931Z'),
+ },
+
LivechatRoom: {
id: 'LivechatRoom',
slugifiedName: undefined,
diff --git a/apps/meteor/tests/unit/app/apps/server/rooms.tests.ts b/apps/meteor/tests/unit/app/apps/server/rooms.tests.ts
new file mode 100644
index 0000000000000..718d79baef361
--- /dev/null
+++ b/apps/meteor/tests/unit/app/apps/server/rooms.tests.ts
@@ -0,0 +1,122 @@
+import type { IAppRoomsConverter, IAppsRoom } from '@rocket.chat/apps';
+import type { IRoom } from '@rocket.chat/core-typings';
+import { expect } from 'chai';
+import { before, describe, it } from 'mocha';
+import proxyquire from 'proxyquire';
+
+import { MessagesMock } from './mocks/models/Messages.mock';
+import { RoomsMock } from './mocks/models/Rooms.mock';
+import { UsersMock } from './mocks/models/Users.mock';
+import { AppServerOrchestratorMock } from './mocks/orchestrator.mock';
+
+const { AppRoomsConverter } = proxyquire.noCallThru().load('../../../../../app/apps/server/converters/rooms', {
+ '@rocket.chat/random': {
+ Random: {
+ id: () => 1,
+ },
+ },
+ '@rocket.chat/models': {
+ Rooms: new RoomsMock(),
+ Messages: new MessagesMock(),
+ Users: new UsersMock(),
+ },
+});
+
+describe('The AppMessagesConverter instance', () => {
+ let roomConverter: IAppRoomsConverter;
+ let roomsMock: RoomsMock;
+
+ before(() => {
+ const orchestrator = new AppServerOrchestratorMock();
+
+ const usersConverter = orchestrator.getConverters().get('users');
+
+ usersConverter.convertById = function convertUserByIdStub(id: string) {
+ return UsersMock.convertedData[id as 'rocket.cat'] || undefined;
+ };
+
+ usersConverter.convertToApp = function convertUserToAppStub(user: UsersMock['data']['rocket.cat']) {
+ return {
+ id: user._id,
+ username: user.username,
+ name: user.name,
+ };
+ };
+
+ orchestrator.getConverters().get('messages').convertById = async function convertRoomByIdStub(_id: string) {
+ return {};
+ };
+
+ roomConverter = new AppRoomsConverter(orchestrator);
+ roomsMock = new RoomsMock();
+ });
+
+ describe('when converting a room from Rocket.Chat to the Engine schema', () => {
+ it('should return `undefined` when `originalRoom` is falsy', async () => {
+ const appRoom = await roomConverter.convertRoom(undefined);
+
+ expect(appRoom).to.be.undefined;
+ });
+
+ it('should return a proper schema', async () => {
+ const mockedRoom = roomsMock.findOneById('GENERAL') as RoomsMock['data']['GENERAL'];
+ const appRoom = await roomConverter.convertRoom(mockedRoom as unknown as IRoom);
+
+ expect(appRoom).to.have.property('id', mockedRoom._id);
+ expect(appRoom).to.have.property('type', mockedRoom.t);
+ expect(appRoom).to.have.property('slugifiedName', mockedRoom.name);
+ expect(appRoom).to.have.property('createdAt').which.equalTime(mockedRoom.ts);
+ expect(appRoom).to.have.property('updatedAt').which.equalTime(mockedRoom._updatedAt);
+ expect(appRoom).to.have.property('messageCount', mockedRoom.msgs);
+ });
+
+ it('should not mutate the original room object', async () => {
+ const rocketchatRoomMock = structuredClone(roomsMock.findOneById('GENERAL'));
+
+ await roomConverter.convertRoom(rocketchatRoomMock);
+
+ expect(rocketchatRoomMock).to.deep.equal(roomsMock.findOneById('GENERAL'));
+ });
+
+ it('should add an `_unmappedProperties_` field to the converted room which contains the `lastMessage` property of the room', async () => {
+ const mockedRoom = roomsMock.findOneById('GENERAL') as RoomsMock['data']['GENERAL'];
+ const appMessage = await roomConverter.convertRoom(mockedRoom as unknown as IRoom);
+
+ expect(appMessage).to.have.property('_unmappedProperties_').which.has.property('lastMessage').to.deep.equal(mockedRoom.lastMessage);
+ });
+ });
+
+ describe('when converting a room from the Engine schema back to Rocket.Chat', () => {
+ it('should return `undefined` when `room` is falsy', async () => {
+ const rocketchatMessage = await roomConverter.convertAppRoom(undefined);
+
+ expect(rocketchatMessage).to.be.undefined;
+ });
+
+ it('should return a proper schema', async () => {
+ const appRoom = RoomsMock.convertedData.GENERAL as unknown as IAppsRoom;
+ const rocketchatRoom = await roomConverter.convertAppRoom(appRoom);
+
+ expect(rocketchatRoom).to.have.property('_id', appRoom.id);
+ expect(rocketchatRoom).to.have.property('ts', appRoom.createdAt);
+ expect(rocketchatRoom).to.have.property('lm', appRoom.lastModifiedAt);
+ expect(rocketchatRoom).to.have.property('_updatedAt', appRoom.updatedAt);
+ expect(rocketchatRoom).to.have.property('t', appRoom.type);
+ expect(rocketchatRoom).to.have.property('name', appRoom.slugifiedName);
+ });
+
+ it('should return a proper schema when receiving a partial object', async () => {
+ const appRoom = RoomsMock.convertedData.GENERALPartial as unknown as IAppsRoom;
+ const rocketchatRoom = await roomConverter.convertAppRoom(appRoom, true);
+
+ expect(rocketchatRoom).to.have.property('_id', appRoom.id);
+ expect(rocketchatRoom).to.have.property('name', appRoom.slugifiedName);
+ expect(rocketchatRoom).to.have.property('sysMes', appRoom.displaySystemMessages);
+ expect(rocketchatRoom).to.have.property('_updatedAt', appRoom.updatedAt);
+
+ expect(rocketchatRoom).to.not.have.property('msgs');
+ expect(rocketchatRoom).to.not.have.property('ro');
+ expect(rocketchatRoom).to.not.have.property('default');
+ });
+ });
+});
diff --git a/apps/meteor/tests/unit/app/e2e/server/functions/resetRoomKey.spec.ts b/apps/meteor/tests/unit/app/e2e/server/functions/resetRoomKey.spec.ts
index 2af2e07c0452a..de95bbe546938 100644
--- a/apps/meteor/tests/unit/app/e2e/server/functions/resetRoomKey.spec.ts
+++ b/apps/meteor/tests/unit/app/e2e/server/functions/resetRoomKey.spec.ts
@@ -5,6 +5,10 @@ import sinon from 'sinon';
import { generateMultipleSubs } from '../../../../../mocks/data/subscriptions';
+function addSecondsToDate(seconds: number, date = new Date()) {
+ return new Date(date.getTime() + seconds * 1000);
+}
+
const models = {
Users: {
findOneById: sinon.stub(),
@@ -66,16 +70,16 @@ describe('replicateMongoSlice', () => {
it('should unshift a new key, and eliminate the 10th key if array has 10 items', () => {
const result = replicateMongoSlice('1', {
oldRoomKeys: [
- { E2EKey: '1', ts: new Date() },
- { E2EKey: '2', ts: new Date() },
- { E2EKey: '3', ts: new Date() },
- { E2EKey: '4', ts: new Date() },
- { E2EKey: '5', ts: new Date() },
- { E2EKey: '6', ts: new Date() },
- { E2EKey: '7', ts: new Date() },
- { E2EKey: '8', ts: new Date() },
- { E2EKey: '9', ts: new Date() },
- { E2EKey: '10', ts: new Date() },
+ { E2EKey: '1', ts: addSecondsToDate(0) },
+ { E2EKey: '2', ts: addSecondsToDate(-10) },
+ { E2EKey: '3', ts: addSecondsToDate(-20) },
+ { E2EKey: '4', ts: addSecondsToDate(-30) },
+ { E2EKey: '5', ts: addSecondsToDate(-40) },
+ { E2EKey: '6', ts: addSecondsToDate(-50) },
+ { E2EKey: '7', ts: addSecondsToDate(-60) },
+ { E2EKey: '8', ts: addSecondsToDate(-70) },
+ { E2EKey: '9', ts: addSecondsToDate(-80) },
+ { E2EKey: '10', ts: addSecondsToDate(-90) },
],
E2EKey: '11',
});
diff --git a/apps/meteor/tests/unit/app/lib/server/functions/closeLivechatRoom.tests.ts b/apps/meteor/tests/unit/app/lib/server/functions/closeLivechatRoom.tests.ts
index 307885f7a92f7..1fda43c3bb079 100644
--- a/apps/meteor/tests/unit/app/lib/server/functions/closeLivechatRoom.tests.ts
+++ b/apps/meteor/tests/unit/app/lib/server/functions/closeLivechatRoom.tests.ts
@@ -22,9 +22,7 @@ const livechatStub = {
const hasPermissionStub = sinon.stub();
const { closeLivechatRoom } = proxyquire.noCallThru().load('../../../../../../app/lib/server/functions/closeLivechatRoom.ts', {
- '../../../livechat/server/lib/LivechatTyped': {
- Livechat: livechatStub,
- },
+ '../../../livechat/server/lib/closeRoom': livechatStub,
'../../../authorization/server/functions/hasPermission': {
hasPermissionAsync: hasPermissionStub,
},
diff --git a/apps/meteor/tests/unit/app/lib/server/functions/notifications/messageContainsHighlight.tests.ts b/apps/meteor/tests/unit/app/lib/server/functions/notifications/messageContainsHighlight.tests.ts
index 2cc8a9248c34a..ad1d5461cdb91 100644
--- a/apps/meteor/tests/unit/app/lib/server/functions/notifications/messageContainsHighlight.tests.ts
+++ b/apps/meteor/tests/unit/app/lib/server/functions/notifications/messageContainsHighlight.tests.ts
@@ -66,4 +66,25 @@ describe('messageContainsHighlight', () => {
};
expect(messageContainsHighlight(message, ['thumbsup'])).to.be.true;
});
+
+ it('should return true when find a cyrillic highlight in the end of the message', async () => {
+ const message = {
+ msg: 'highlighted regular Привет',
+ };
+ expect(messageContainsHighlight(message, ['Привет'])).to.be.true;
+ });
+
+ it('should return true when find a cyrillic highlight in the beginning of the message', async () => {
+ const message = {
+ msg: 'Привет highlighted regular',
+ };
+ expect(messageContainsHighlight(message, ['Привет'])).to.be.true;
+ });
+
+ it('should return true when find a cyrillic highlight in the middle of the message', async () => {
+ const message = {
+ msg: 'highlighted Привет regular',
+ };
+ expect(messageContainsHighlight(message, ['Привет'])).to.be.true;
+ });
});
diff --git a/apps/meteor/tests/unit/app/livechat/server/lib/isMessageFromBot.spec.ts b/apps/meteor/tests/unit/app/livechat/server/lib/isMessageFromBot.spec.ts
new file mode 100644
index 0000000000000..6449f3a52cb72
--- /dev/null
+++ b/apps/meteor/tests/unit/app/livechat/server/lib/isMessageFromBot.spec.ts
@@ -0,0 +1,35 @@
+import { expect } from 'chai';
+import p from 'proxyquire';
+import sinon from 'sinon';
+
+import { createFakeMessage } from '../../../../../mocks/data';
+
+const modelsMock = {
+ Users: {
+ isUserInRole: sinon.stub(),
+ },
+};
+
+const { isMessageFromBot } = p.noCallThru().load('../../../../../../app/livechat/server/lib/isMessageFromBot', {
+ '@rocket.chat/models': modelsMock,
+});
+
+describe('isMessageFromBot', () => {
+ const mockMessage = createFakeMessage();
+
+ beforeEach(() => {
+ modelsMock.Users.isUserInRole.reset();
+ });
+
+ it('Should return true if user has bot role', async () => {
+ modelsMock.Users.isUserInRole.resolves(true);
+ const result = await isMessageFromBot(mockMessage);
+ expect(result).to.be.true;
+ });
+
+ it('Should return false if user does not have bot role', async () => {
+ modelsMock.Users.isUserInRole.resolves(false);
+ const result = await isMessageFromBot(mockMessage);
+ expect(result).to.be.false;
+ });
+});
diff --git a/apps/meteor/tests/unit/app/livechat/server/lib/validateRequiredCustomFields.spec.ts b/apps/meteor/tests/unit/app/livechat/server/lib/validateRequiredCustomFields.spec.ts
new file mode 100644
index 0000000000000..a8ad3f083812e
--- /dev/null
+++ b/apps/meteor/tests/unit/app/livechat/server/lib/validateRequiredCustomFields.spec.ts
@@ -0,0 +1,64 @@
+import type { ILivechatCustomField } from '@rocket.chat/core-typings';
+import { expect } from 'chai';
+
+import { validateRequiredCustomFields } from '../../../../../../app/livechat/server/lib/validateRequiredCustomFields';
+
+describe('validateRequiredCustomFields', () => {
+ it('should throw an error if the required custom fields are not provided', async () => {
+ const customFields = ['customField1'];
+ const livechatCustomFields: ILivechatCustomField[] = [
+ { _id: 'customField1', required: true, label: 'Custom Field 1', scope: 'visitor', visibility: 'public', _updatedAt: new Date() },
+ { _id: 'customField2', required: true, label: 'Custom Field 2', scope: 'visitor', visibility: 'public', _updatedAt: new Date() },
+ ];
+
+ try {
+ validateRequiredCustomFields(customFields, livechatCustomFields);
+ throw new Error('Expected error was not thrown');
+ } catch (error) {
+ if (error instanceof Error) {
+ expect(error.message).to.equal('Missing required custom fields: customField2');
+ } else {
+ throw error;
+ }
+ }
+ });
+
+ it('should not throw an error if all required custom fields are provided', async () => {
+ const customFields = ['customField1', 'customField2'];
+ const livechatCustomFields: ILivechatCustomField[] = [
+ { _id: 'customField1', required: true, label: 'Custom Field 1', scope: 'visitor', visibility: 'public', _updatedAt: new Date() },
+ { _id: 'customField2', required: true, label: 'Custom Field 2', scope: 'visitor', visibility: 'public', _updatedAt: new Date() },
+ ];
+
+ validateRequiredCustomFields(customFields, livechatCustomFields);
+ });
+
+ it('should not throw an error if no custom fields are required', async () => {
+ const customFields = ['customField1'];
+ const livechatCustomFields: ILivechatCustomField[] = [
+ { _id: 'customField1', required: false, label: 'Custom Field 1', scope: 'visitor', visibility: 'public', _updatedAt: new Date() },
+ { _id: 'customField2', required: false, label: 'Custom Field 2', scope: 'visitor', visibility: 'public', _updatedAt: new Date() },
+ ];
+
+ validateRequiredCustomFields(customFields, livechatCustomFields);
+ });
+
+ it('should throw an error if none of the required custom fields are provided', async () => {
+ const customFields: string[] = [];
+ const livechatCustomFields: ILivechatCustomField[] = [
+ { _id: 'customField1', required: true, label: 'Custom Field 1', scope: 'visitor', visibility: 'public', _updatedAt: new Date() },
+ { _id: 'customField2', required: true, label: 'Custom Field 2', scope: 'visitor', visibility: 'public', _updatedAt: new Date() },
+ ];
+
+ try {
+ validateRequiredCustomFields(customFields, livechatCustomFields);
+ throw new Error('Expected error was not thrown');
+ } catch (error) {
+ if (error instanceof Error) {
+ expect(error.message).to.equal('Missing required custom fields: customField1, customField2');
+ } else {
+ throw error;
+ }
+ }
+ });
+});
diff --git a/apps/meteor/tests/unit/server/livechat/hooks/markRoomResponded.spec.ts b/apps/meteor/tests/unit/server/livechat/hooks/markRoomResponded.spec.ts
index 39dbff8013f64..61cd97784b34a 100644
--- a/apps/meteor/tests/unit/server/livechat/hooks/markRoomResponded.spec.ts
+++ b/apps/meteor/tests/unit/server/livechat/hooks/markRoomResponded.spec.ts
@@ -3,6 +3,8 @@ import { describe, it, beforeEach } from 'mocha';
import proxyquire from 'proxyquire';
import Sinon from 'sinon';
+import { createFakeMessage, createFakeUser } from '../../../../mocks/data';
+
const models = {
LivechatContacts: { isContactActiveOnPeriod: Sinon.stub(), markContactActiveForPeriod: Sinon.stub() },
LivechatInquiry: { markInquiryActiveForPeriod: Sinon.stub() },
@@ -13,10 +15,18 @@ const models = {
},
};
-const { markRoomResponded } = proxyquire.load('../../../../../app/livechat/server/hooks/markRoomResponded.ts', {
+const settingsGetMock = {
+ get: Sinon.stub(),
+};
+
+const isMessageFromBotMock = { isMessageFromBot: Sinon.stub() };
+
+const { markRoomResponded } = proxyquire.noCallThru().load('../../../../../app/livechat/server/hooks/markRoomResponded.ts', {
'../../../../lib/callbacks': { callbacks: { add: Sinon.stub(), priority: { HIGH: 'high' } } },
'../../../lib/server/lib/notifyListener': { notifyOnLivechatInquiryChanged: Sinon.stub() },
'@rocket.chat/models': models,
+ '../../../settings/server': { settings: settingsGetMock },
+ '../lib/isMessageFromBot': isMessageFromBotMock,
});
describe('markRoomResponded', () => {
@@ -27,6 +37,8 @@ describe('markRoomResponded', () => {
models.LivechatRooms.getVisitorActiveForPeriodUpdateQuery.reset();
models.LivechatRooms.getAgentLastMessageTsUpdateQuery.reset();
models.LivechatRooms.getResponseByRoomIdUpdateQuery.reset();
+
+ settingsGetMock.get.reset();
});
it('should return void if message is system message', async () => {
@@ -66,6 +78,21 @@ describe('markRoomResponded', () => {
expect(res).to.be.undefined;
});
+ it('should return void if message is from bot and setting is enabled', async () => {
+ settingsGetMock.get.withArgs('Omnichannel_Metrics_Ignore_Automatic_Messages').resolves(true);
+
+ const user = createFakeUser({ roles: ['bot'] });
+
+ isMessageFromBotMock.isMessageFromBot.resolves(user);
+
+ const message = createFakeMessage();
+ const room = {};
+
+ const res = await markRoomResponded(message, room, user);
+
+ expect(res).to.be.undefined;
+ });
+
it('should try to mark visitor as active for current period', async () => {
const message = {};
const room = { v: { _id: '1234' } };
diff --git a/apps/meteor/tests/unit/server/publications/messages.spec.ts b/apps/meteor/tests/unit/server/publications/messages.spec.ts
index cb4a86b6cb55c..8fb9d6f030b97 100644
--- a/apps/meteor/tests/unit/server/publications/messages.spec.ts
+++ b/apps/meteor/tests/unit/server/publications/messages.spec.ts
@@ -33,6 +33,9 @@ const {
'meteor/check': {
check: sinon.stub(),
},
+ '../../app/lib/server/methods/getChannelHistory': {
+ getChannelHistory: sinon.stub(),
+ },
'meteor/meteor': {
'Meteor': {
methods: sinon.stub(),
diff --git a/apps/uikit-playground/CHANGELOG.md b/apps/uikit-playground/CHANGELOG.md
index 77fff4e09df20..67a11b0ddbab2 100644
--- a/apps/uikit-playground/CHANGELOG.md
+++ b/apps/uikit-playground/CHANGELOG.md
@@ -1,5 +1,41 @@
# @rocket.chat/uikit-playground
+## 0.6.7-rc.0
+
+### Patch Changes
+
+-
+
+## 0.6.6
+
+### Patch Changes
+
+-
+
+## 0.6.5
+
+### Patch Changes
+
+-
+
## 0.6.4
### Patch Changes
diff --git a/apps/uikit-playground/package.json b/apps/uikit-playground/package.json
index eab87610b0fe8..e7d7cc748f380 100644
--- a/apps/uikit-playground/package.json
+++ b/apps/uikit-playground/package.json
@@ -1,7 +1,7 @@
{
"name": "@rocket.chat/uikit-playground",
"private": true,
- "version": "0.6.4",
+ "version": "0.6.7-rc.0",
"type": "module",
"scripts": {
"dev": "vite",
diff --git a/ee/apps/account-service/CHANGELOG.md b/ee/apps/account-service/CHANGELOG.md
index 2b4e02487da0e..896e3f8abdc3f 100644
--- a/ee/apps/account-service/CHANGELOG.md
+++ b/ee/apps/account-service/CHANGELOG.md
@@ -1,5 +1,51 @@
# @rocket.chat/account-service
+## 0.4.16-rc.0
+
+### Patch Changes
+
+- ([#35120](https://github.com/RocketChat/Rocket.Chat/pull/35120)) Fixes behavior of app updates that would save undesired field changes to documents
+
+- ([#35181](https://github.com/RocketChat/Rocket.Chat/pull/35181)) Bump meteor to 3.1.2 and Node version to 20.13.1
+
+-
+
+## 0.4.15
+
+### Patch Changes
+
+-
+
+## 0.4.14
+
+### Patch Changes
+
+-
+
## 0.4.13
### Patch Changes
diff --git a/ee/apps/account-service/Dockerfile b/ee/apps/account-service/Dockerfile
index 9ff933b759bf5..7d5abaf8ab4a7 100644
--- a/ee/apps/account-service/Dockerfile
+++ b/ee/apps/account-service/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:22.11.0-alpine3.20
+FROM node:22.13.1-alpine3.20
ARG SERVICE
diff --git a/ee/apps/account-service/package.json b/ee/apps/account-service/package.json
index 8d18be21943a0..26b8ca72605f9 100644
--- a/ee/apps/account-service/package.json
+++ b/ee/apps/account-service/package.json
@@ -1,7 +1,7 @@
{
"name": "@rocket.chat/account-service",
"private": true,
- "version": "0.4.13",
+ "version": "0.4.16-rc.0",
"description": "Rocket.Chat Account service",
"scripts": {
"build": "tsc -p tsconfig.json",
diff --git a/ee/apps/account-service/src/service.ts b/ee/apps/account-service/src/service.ts
index 54ecd217091df..470d983313689 100755
--- a/ee/apps/account-service/src/service.ts
+++ b/ee/apps/account-service/src/service.ts
@@ -1,6 +1,6 @@
import { api, getConnection, getTrashCollection } from '@rocket.chat/core-services';
import { registerServiceModels } from '@rocket.chat/models';
-import { broker } from '@rocket.chat/network-broker';
+import { startBroker } from '@rocket.chat/network-broker';
import { startTracing } from '@rocket.chat/tracing';
import polka from 'polka';
@@ -13,7 +13,7 @@ const PORT = process.env.PORT || 3033;
registerServiceModels(db, await getTrashCollection());
- api.setBroker(broker);
+ api.setBroker(startBroker());
// need to import service after models are registered
const { Account } = await import('./Account');
diff --git a/ee/apps/authorization-service/CHANGELOG.md b/ee/apps/authorization-service/CHANGELOG.md
index 35f91bf56a0fc..df089fda85ab3 100644
--- a/ee/apps/authorization-service/CHANGELOG.md
+++ b/ee/apps/authorization-service/CHANGELOG.md
@@ -1,5 +1,51 @@
# @rocket.chat/authorization-service
+## 0.4.16-rc.0
+
+### Patch Changes
+
+- ([#35120](https://github.com/RocketChat/Rocket.Chat/pull/35120)) Fixes behavior of app updates that would save undesired field changes to documents
+
+- ([#35181](https://github.com/RocketChat/Rocket.Chat/pull/35181)) Bump meteor to 3.1.2 and Node version to 20.13.1
+
+-
+
+## 0.4.15
+
+### Patch Changes
+
+-
+
+## 0.4.14
+
+### Patch Changes
+
+-
+
## 0.4.13
### Patch Changes
diff --git a/ee/apps/authorization-service/Dockerfile b/ee/apps/authorization-service/Dockerfile
index a3b016c7fac07..8317ff4a38400 100644
--- a/ee/apps/authorization-service/Dockerfile
+++ b/ee/apps/authorization-service/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:22.11.0-alpine3.20
+FROM node:22.13.1-alpine3.20
ARG SERVICE
diff --git a/ee/apps/authorization-service/package.json b/ee/apps/authorization-service/package.json
index 256ac793a9237..f23fec006c306 100644
--- a/ee/apps/authorization-service/package.json
+++ b/ee/apps/authorization-service/package.json
@@ -1,7 +1,7 @@
{
"name": "@rocket.chat/authorization-service",
"private": true,
- "version": "0.4.13",
+ "version": "0.4.16-rc.0",
"description": "Rocket.Chat Authorization service",
"scripts": {
"build": "tsc -p tsconfig.json",
diff --git a/ee/apps/authorization-service/src/service.ts b/ee/apps/authorization-service/src/service.ts
index 0ed1e83177a13..e09d87de6d245 100755
--- a/ee/apps/authorization-service/src/service.ts
+++ b/ee/apps/authorization-service/src/service.ts
@@ -1,6 +1,6 @@
import { api, getConnection, getTrashCollection } from '@rocket.chat/core-services';
import { registerServiceModels } from '@rocket.chat/models';
-import { broker } from '@rocket.chat/network-broker';
+import { startBroker } from '@rocket.chat/network-broker';
import { startTracing } from '@rocket.chat/tracing';
import polka from 'polka';
@@ -13,7 +13,7 @@ const PORT = process.env.PORT || 3034;
registerServiceModels(db, await getTrashCollection());
- api.setBroker(broker);
+ api.setBroker(startBroker());
// need to import service after models are registered
const { Authorization } = await import('../../../../apps/meteor/server/services/authorization/service');
diff --git a/ee/apps/ddp-streamer/CHANGELOG.md b/ee/apps/ddp-streamer/CHANGELOG.md
index 3b9c63d9c1287..d4138a864f3f5 100644
--- a/ee/apps/ddp-streamer/CHANGELOG.md
+++ b/ee/apps/ddp-streamer/CHANGELOG.md
@@ -1,5 +1,54 @@
# @rocket.chat/ddp-streamer
+## 0.3.16-rc.0
+
+### Patch Changes
+
+- ([#35120](https://github.com/RocketChat/Rocket.Chat/pull/35120)) Fixes behavior of app updates that would save undesired field changes to documents
+
+- ([#35181](https://github.com/RocketChat/Rocket.Chat/pull/35181)) Bump meteor to 3.1.2 and Node version to 20.13.1
+
+-
+
+## 0.3.15
+
+### Patch Changes
+
+-
+
+## 0.3.14
+
+### Patch Changes
+
+-
+
## 0.3.13
### Patch Changes
diff --git a/ee/apps/ddp-streamer/Dockerfile b/ee/apps/ddp-streamer/Dockerfile
index f4a581c5e60ee..e5a51de429e27 100644
--- a/ee/apps/ddp-streamer/Dockerfile
+++ b/ee/apps/ddp-streamer/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:22.11.0-alpine3.20
+FROM node:22.13.1-alpine3.20
ARG SERVICE
diff --git a/ee/apps/ddp-streamer/package.json b/ee/apps/ddp-streamer/package.json
index c5dd5c34a7d37..8054f9f3e7209 100644
--- a/ee/apps/ddp-streamer/package.json
+++ b/ee/apps/ddp-streamer/package.json
@@ -1,7 +1,7 @@
{
"name": "@rocket.chat/ddp-streamer",
"private": true,
- "version": "0.3.13",
+ "version": "0.3.16-rc.0",
"description": "Rocket.Chat DDP-Streamer service",
"scripts": {
"build": "tsc -p tsconfig.json",
diff --git a/ee/apps/ddp-streamer/src/service.ts b/ee/apps/ddp-streamer/src/service.ts
index 0afea31dc2319..e0e430c7eebbf 100755
--- a/ee/apps/ddp-streamer/src/service.ts
+++ b/ee/apps/ddp-streamer/src/service.ts
@@ -1,6 +1,9 @@
+import os from 'os';
+
import { api, getConnection, getTrashCollection } from '@rocket.chat/core-services';
+import { InstanceStatus } from '@rocket.chat/instance-status';
import { registerServiceModels } from '@rocket.chat/models';
-import { broker } from '@rocket.chat/network-broker';
+import { startBroker } from '@rocket.chat/network-broker';
import { startTracing } from '@rocket.chat/tracing';
(async () => {
@@ -10,7 +13,11 @@ import { startTracing } from '@rocket.chat/tracing';
registerServiceModels(db, await getTrashCollection());
- api.setBroker(broker);
+ api.setBroker(
+ startBroker({
+ nodeID: `${os.hostname().toLowerCase()}-${InstanceStatus.id()}`,
+ }),
+ );
// need to import service after models are registered
const { NotificationsModule } = await import('../../../../apps/meteor/server/modules/notifications/notifications.module');
diff --git a/ee/apps/omnichannel-transcript/CHANGELOG.md b/ee/apps/omnichannel-transcript/CHANGELOG.md
index f8b89addda0af..2dbf0a6c6da88 100644
--- a/ee/apps/omnichannel-transcript/CHANGELOG.md
+++ b/ee/apps/omnichannel-transcript/CHANGELOG.md
@@ -1,5 +1,54 @@
# @rocket.chat/omnichannel-transcript
+## 0.4.16-rc.0
+
+### Patch Changes
+
+- ([#35120](https://github.com/RocketChat/Rocket.Chat/pull/35120)) Fixes behavior of app updates that would save undesired field changes to documents
+
+- ([#35181](https://github.com/RocketChat/Rocket.Chat/pull/35181)) Bump meteor to 3.1.2 and Node version to 20.13.1
+
+-
+
+## 0.4.15
+
+### Patch Changes
+
+-
+
+## 0.4.14
+
+### Patch Changes
+
+-
+
## 0.4.13
### Patch Changes
diff --git a/ee/apps/omnichannel-transcript/Dockerfile b/ee/apps/omnichannel-transcript/Dockerfile
index 10551af8d966d..4de1425275c87 100644
--- a/ee/apps/omnichannel-transcript/Dockerfile
+++ b/ee/apps/omnichannel-transcript/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:22.11.0-alpine3.20
+FROM node:22.13.1-alpine3.20
ARG SERVICE
diff --git a/ee/apps/omnichannel-transcript/package.json b/ee/apps/omnichannel-transcript/package.json
index 34fab7ca822a3..c59e1fdbe7d64 100644
--- a/ee/apps/omnichannel-transcript/package.json
+++ b/ee/apps/omnichannel-transcript/package.json
@@ -1,7 +1,7 @@
{
"name": "@rocket.chat/omnichannel-transcript",
"private": true,
- "version": "0.4.13",
+ "version": "0.4.16-rc.0",
"description": "Rocket.Chat service",
"scripts": {
"build": "tsc -p tsconfig.json",
diff --git a/ee/apps/omnichannel-transcript/src/service.ts b/ee/apps/omnichannel-transcript/src/service.ts
index 840da856b6d75..689f710327c8b 100644
--- a/ee/apps/omnichannel-transcript/src/service.ts
+++ b/ee/apps/omnichannel-transcript/src/service.ts
@@ -1,7 +1,7 @@
import { api, getConnection, getTrashCollection } from '@rocket.chat/core-services';
import { Logger } from '@rocket.chat/logger';
import { registerServiceModels } from '@rocket.chat/models';
-import { broker } from '@rocket.chat/network-broker';
+import { startBroker } from '@rocket.chat/network-broker';
import { startTracing } from '@rocket.chat/tracing';
import polka from 'polka';
@@ -14,7 +14,7 @@ const PORT = process.env.PORT || 3036;
registerServiceModels(db, await getTrashCollection());
- api.setBroker(broker);
+ api.setBroker(startBroker());
// need to import service after models are registered
const { OmnichannelTranscript } = await import('@rocket.chat/omnichannel-services');
diff --git a/ee/apps/presence-service/CHANGELOG.md b/ee/apps/presence-service/CHANGELOG.md
index 1a718ed559b1a..2084643234638 100644
--- a/ee/apps/presence-service/CHANGELOG.md
+++ b/ee/apps/presence-service/CHANGELOG.md
@@ -1,5 +1,51 @@
# @rocket.chat/presence-service
+## 0.4.16-rc.0
+
+### Patch Changes
+
+- ([#35120](https://github.com/RocketChat/Rocket.Chat/pull/35120)) Fixes behavior of app updates that would save undesired field changes to documents
+
+- ([#35181](https://github.com/RocketChat/Rocket.Chat/pull/35181)) Bump meteor to 3.1.2 and Node version to 20.13.1
+
+-
+
+## 0.4.15
+
+### Patch Changes
+
+-
+
+## 0.4.14
+
+### Patch Changes
+
+-
+
## 0.4.13
### Patch Changes
diff --git a/ee/apps/presence-service/Dockerfile b/ee/apps/presence-service/Dockerfile
index 082e4629df390..56d506b5510a5 100644
--- a/ee/apps/presence-service/Dockerfile
+++ b/ee/apps/presence-service/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:22.11.0-alpine3.20
+FROM node:22.13.1-alpine3.20
ARG SERVICE
diff --git a/ee/apps/presence-service/package.json b/ee/apps/presence-service/package.json
index af4a3e25e0792..81529f44d0577 100644
--- a/ee/apps/presence-service/package.json
+++ b/ee/apps/presence-service/package.json
@@ -1,7 +1,7 @@
{
"name": "@rocket.chat/presence-service",
"private": true,
- "version": "0.4.13",
+ "version": "0.4.16-rc.0",
"description": "Rocket.Chat Presence service",
"scripts": {
"build": "tsc -p tsconfig.json",
diff --git a/ee/apps/presence-service/src/service.ts b/ee/apps/presence-service/src/service.ts
index e87d659dac251..ab1c1ee405617 100755
--- a/ee/apps/presence-service/src/service.ts
+++ b/ee/apps/presence-service/src/service.ts
@@ -1,6 +1,6 @@
import { api, getConnection, getTrashCollection } from '@rocket.chat/core-services';
import { registerServiceModels } from '@rocket.chat/models';
-import { broker } from '@rocket.chat/network-broker';
+import { startBroker } from '@rocket.chat/network-broker';
import { startTracing } from '@rocket.chat/tracing';
import polka from 'polka';
@@ -13,7 +13,7 @@ const PORT = process.env.PORT || 3031;
registerServiceModels(db, await getTrashCollection());
- api.setBroker(broker);
+ api.setBroker(startBroker());
// need to import Presence service after models are registered
const { Presence } = await import('@rocket.chat/presence');
diff --git a/ee/apps/queue-worker/CHANGELOG.md b/ee/apps/queue-worker/CHANGELOG.md
index cef052db3375b..857f8d406fb1b 100644
--- a/ee/apps/queue-worker/CHANGELOG.md
+++ b/ee/apps/queue-worker/CHANGELOG.md
@@ -1,5 +1,51 @@
# @rocket.chat/queue-worker
+## 0.4.16-rc.0
+
+### Patch Changes
+
+- ([#35120](https://github.com/RocketChat/Rocket.Chat/pull/35120)) Fixes behavior of app updates that would save undesired field changes to documents
+
+- ([#35181](https://github.com/RocketChat/Rocket.Chat/pull/35181)) Bump meteor to 3.1.2 and Node version to 20.13.1
+
+-
+
+## 0.4.15
+
+### Patch Changes
+
+-
+
+## 0.4.14
+
+### Patch Changes
+
+-
+
## 0.4.13
### Patch Changes
diff --git a/ee/apps/queue-worker/Dockerfile b/ee/apps/queue-worker/Dockerfile
index 10551af8d966d..4de1425275c87 100644
--- a/ee/apps/queue-worker/Dockerfile
+++ b/ee/apps/queue-worker/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:22.11.0-alpine3.20
+FROM node:22.13.1-alpine3.20
ARG SERVICE
diff --git a/ee/apps/queue-worker/package.json b/ee/apps/queue-worker/package.json
index 7d1ef255777f4..f7c9eb1f2aa47 100644
--- a/ee/apps/queue-worker/package.json
+++ b/ee/apps/queue-worker/package.json
@@ -1,7 +1,7 @@
{
"name": "@rocket.chat/queue-worker",
"private": true,
- "version": "0.4.13",
+ "version": "0.4.16-rc.0",
"description": "Rocket.Chat service",
"scripts": {
"build": "tsc -p tsconfig.json",
diff --git a/ee/apps/queue-worker/src/service.ts b/ee/apps/queue-worker/src/service.ts
index 69817f42a3234..7895e78b37e9c 100644
--- a/ee/apps/queue-worker/src/service.ts
+++ b/ee/apps/queue-worker/src/service.ts
@@ -1,7 +1,7 @@
import { api, getConnection, getTrashCollection } from '@rocket.chat/core-services';
import { Logger } from '@rocket.chat/logger';
import { registerServiceModels } from '@rocket.chat/models';
-import { broker } from '@rocket.chat/network-broker';
+import { startBroker } from '@rocket.chat/network-broker';
import { startTracing } from '@rocket.chat/tracing';
import polka from 'polka';
@@ -14,7 +14,7 @@ const PORT = process.env.PORT || 3038;
registerServiceModels(db, await getTrashCollection());
- api.setBroker(broker);
+ api.setBroker(startBroker());
// need to import service after models are registeredpackagfe
const { QueueWorker } = await import('@rocket.chat/omnichannel-services');
diff --git a/ee/apps/stream-hub-service/CHANGELOG.md b/ee/apps/stream-hub-service/CHANGELOG.md
index 3b691eac46dbb..d3f5a03b3821e 100644
--- a/ee/apps/stream-hub-service/CHANGELOG.md
+++ b/ee/apps/stream-hub-service/CHANGELOG.md
@@ -1,5 +1,48 @@
# @rocket.chat/stream-hub-service
+## 0.4.16-rc.0
+
+### Patch Changes
+
+- ([#35120](https://github.com/RocketChat/Rocket.Chat/pull/35120)) Fixes behavior of app updates that would save undesired field changes to documents
+
+- ([#35181](https://github.com/RocketChat/Rocket.Chat/pull/35181)) Bump meteor to 3.1.2 and Node version to 20.13.1
+
+-
+
+## 0.4.15
+
+### Patch Changes
+
+-
+
+## 0.4.14
+
+### Patch Changes
+
+-
+
## 0.4.13
### Patch Changes
diff --git a/ee/apps/stream-hub-service/Dockerfile b/ee/apps/stream-hub-service/Dockerfile
index a3b016c7fac07..8317ff4a38400 100644
--- a/ee/apps/stream-hub-service/Dockerfile
+++ b/ee/apps/stream-hub-service/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:22.11.0-alpine3.20
+FROM node:22.13.1-alpine3.20
ARG SERVICE
diff --git a/ee/apps/stream-hub-service/package.json b/ee/apps/stream-hub-service/package.json
index 38b9b30ea0f59..73449d579958f 100644
--- a/ee/apps/stream-hub-service/package.json
+++ b/ee/apps/stream-hub-service/package.json
@@ -1,7 +1,7 @@
{
"name": "@rocket.chat/stream-hub-service",
"private": true,
- "version": "0.4.13",
+ "version": "0.4.16-rc.0",
"description": "Rocket.Chat Stream Hub service",
"scripts": {
"build": "tsc -p tsconfig.json",
diff --git a/ee/apps/stream-hub-service/src/service.ts b/ee/apps/stream-hub-service/src/service.ts
index 576e4e5e9be09..12f3d4fe02631 100755
--- a/ee/apps/stream-hub-service/src/service.ts
+++ b/ee/apps/stream-hub-service/src/service.ts
@@ -1,7 +1,7 @@
import { api, getConnection, getTrashCollection } from '@rocket.chat/core-services';
import { Logger } from '@rocket.chat/logger';
import { DatabaseWatcher, registerServiceModels } from '@rocket.chat/models';
-import { broker } from '@rocket.chat/network-broker';
+import { startBroker } from '@rocket.chat/network-broker';
import { startTracing } from '@rocket.chat/tracing';
import polka from 'polka';
@@ -16,7 +16,7 @@ const PORT = process.env.PORT || 3035;
registerServiceModels(db, await getTrashCollection());
- api.setBroker(broker);
+ api.setBroker(startBroker());
// TODO having to import Logger to pass as a param is a temporary solution. logger should come from the service (either from broker or api)
const watcher = new DatabaseWatcher({ db, logger: Logger });
diff --git a/ee/packages/license/CHANGELOG.md b/ee/packages/license/CHANGELOG.md
index 117d51c2bb253..d35c01f8b73b5 100644
--- a/ee/packages/license/CHANGELOG.md
+++ b/ee/packages/license/CHANGELOG.md
@@ -1,5 +1,32 @@
# @rocket.chat/license
+## 1.0.7-rc.0
+
+### Patch Changes
+
+-
+
+## 1.0.6
+
+### Patch Changes
+
+-
+
+## 1.0.5
+
+### Patch Changes
+
+-
+
## 1.0.4
### Patch Changes
diff --git a/ee/packages/license/package.json b/ee/packages/license/package.json
index 57928b47c678b..906bfe969b575 100644
--- a/ee/packages/license/package.json
+++ b/ee/packages/license/package.json
@@ -1,6 +1,6 @@
{
"name": "@rocket.chat/license",
- "version": "1.0.4",
+ "version": "1.0.7-rc.0",
"private": true,
"devDependencies": {
"@rocket.chat/jest-presets": "workspace:~",
diff --git a/ee/packages/network-broker/CHANGELOG.md b/ee/packages/network-broker/CHANGELOG.md
index fd6a49d5fd39c..c29497dff4392 100644
--- a/ee/packages/network-broker/CHANGELOG.md
+++ b/ee/packages/network-broker/CHANGELOG.md
@@ -1,5 +1,34 @@
# @rocket.chat/network-broker
+## 0.1.8-rc.0
+
+### Patch Changes
+
+- ([#35120](https://github.com/RocketChat/Rocket.Chat/pull/35120)) Fixes behavior of app updates that would save undesired field changes to documents
+
+-
+
+## 0.1.7
+
+### Patch Changes
+
+-
+
+## 0.1.6
+
+### Patch Changes
+
+-
+
## 0.1.5
### Patch Changes
diff --git a/ee/packages/network-broker/package.json b/ee/packages/network-broker/package.json
index 9acad71403309..15e48c668471e 100644
--- a/ee/packages/network-broker/package.json
+++ b/ee/packages/network-broker/package.json
@@ -1,6 +1,6 @@
{
"name": "@rocket.chat/network-broker",
- "version": "0.1.5",
+ "version": "0.1.8-rc.0",
"private": true,
"devDependencies": {
"@rocket.chat/eslint-config": "workspace:^",
diff --git a/ee/packages/network-broker/src/NetworkBroker.ts b/ee/packages/network-broker/src/NetworkBroker.ts
index e6e1cdf3a2e21..c38650e9ad7de 100644
--- a/ee/packages/network-broker/src/NetworkBroker.ts
+++ b/ee/packages/network-broker/src/NetworkBroker.ts
@@ -22,6 +22,8 @@ export class NetworkBroker implements IBroker {
private started: Promise = Promise.resolve(false);
+ private defaultDependencies = ['settings', 'license'];
+
metrics: IServiceMetrics;
constructor(broker: ServiceBroker) {
@@ -64,7 +66,7 @@ export class NetworkBroker implements IBroker {
instance.removeAllListeners();
}
- createService(instance: IServiceClass, serviceDependencies?: string[]): void {
+ createService(instance: IServiceClass, serviceDependencies: string[] = []): void {
const methods = (
instance.constructor?.name === 'Object'
? Object.getOwnPropertyNames(instance)
@@ -83,13 +85,15 @@ export class NetworkBroker implements IBroker {
return;
}
- // Allow services to depend on other services too
- const dependencies = name !== 'license' ? { dependencies: ['license', ...(serviceDependencies || [])] } : {};
+ const dependencies = [...serviceDependencies, ...(name === 'settings' ? [] : this.defaultDependencies)].filter(
+ (dependency) => dependency !== name,
+ );
+
const service: ServiceSchema = {
name,
actions: {},
mixins: !instance.isInternal() ? [EnterpriseCheck] : [],
- ...dependencies,
+ ...(dependencies.length ? { dependencies } : {}),
events: instanceEvents.reduce void>>((map, { eventName }) => {
map[eventName] = /^\$/.test(eventName)
? (ctx: Context): void => {
diff --git a/ee/packages/network-broker/src/index.ts b/ee/packages/network-broker/src/index.ts
index 4424c084bdaa6..2c6da09750e31 100644
--- a/ee/packages/network-broker/src/index.ts
+++ b/ee/packages/network-broker/src/index.ts
@@ -1,5 +1,6 @@
import { isMeteorError, MeteorError } from '@rocket.chat/core-services';
import EJSON from 'ejson';
+import type Moleculer from 'moleculer';
import { Errors, Serializers, ServiceBroker } from 'moleculer';
import { pino } from 'pino';
@@ -70,82 +71,85 @@ class EJSONSerializer extends Base {
}
}
-const network = new ServiceBroker({
- namespace: MS_NAMESPACE,
- skipProcessEventRegistration: SKIP_PROCESS_EVENT_REGISTRATION === 'true',
- transporter: TRANSPORTER,
- metrics: {
- enabled: MS_METRICS === 'true',
- reporter: [
- {
- type: 'Prometheus',
- options: {
- port: MS_METRICS_PORT,
+export function startBroker(options: Moleculer.BrokerOptions = {}): NetworkBroker {
+ const network = new ServiceBroker({
+ namespace: MS_NAMESPACE,
+ skipProcessEventRegistration: SKIP_PROCESS_EVENT_REGISTRATION === 'true',
+ transporter: TRANSPORTER,
+ metrics: {
+ enabled: MS_METRICS === 'true',
+ reporter: [
+ {
+ type: 'Prometheus',
+ options: {
+ port: MS_METRICS_PORT,
+ },
},
- },
- ],
- },
- cacher: CACHE,
- serializer: SERIALIZER === 'EJSON' ? new EJSONSerializer() : SERIALIZER,
- logger: {
- type: 'Pino',
- options: {
- level: MOLECULER_LOG_LEVEL,
- pino: {
- options: {
- timestamp: pino.stdTimeFunctions.isoTime,
- ...(process.env.NODE_ENV !== 'production'
- ? {
- transport: {
- target: 'pino-pretty',
- options: {
- colorize: true,
+ ],
+ },
+ cacher: CACHE,
+ serializer: SERIALIZER === 'EJSON' ? new EJSONSerializer() : SERIALIZER,
+ logger: {
+ type: 'Pino',
+ options: {
+ level: MOLECULER_LOG_LEVEL,
+ pino: {
+ options: {
+ timestamp: pino.stdTimeFunctions.isoTime,
+ ...(process.env.NODE_ENV !== 'production'
+ ? {
+ transport: {
+ target: 'pino-pretty',
+ options: {
+ colorize: true,
+ },
},
- },
- }
- : {}),
+ }
+ : {}),
+ },
},
},
},
- },
- registry: {
- strategy: BALANCE_STRATEGY,
- preferLocal: BALANCE_PREFER_LOCAL !== 'false',
- },
-
- requestTimeout: parseInt(REQUEST_TIMEOUT) * 1000,
- retryPolicy: {
- enabled: RETRY_ENABLED === 'true',
- retries: parseInt(RETRY_RETRIES),
- delay: parseInt(RETRY_DELAY),
- maxDelay: parseInt(RETRY_MAX_DELAY),
- factor: parseInt(RETRY_FACTOR),
- check: (err: any): boolean => err && !!err.retryable,
- },
-
- maxCallLevel: 100,
- heartbeatInterval: parseInt(HEARTBEAT_INTERVAL),
- heartbeatTimeout: parseInt(HEARTBEAT_TIMEOUT),
-
- // circuitBreaker: {
- // enabled: false,
- // threshold: 0.5,
- // windowTime: 60,
- // minRequestCount: 20,
- // halfOpenTime: 10 * 1000,
- // check: (err: any): boolean => err && err.code >= 500,
- // },
-
- bulkhead: {
- enabled: BULKHEAD_ENABLED === 'true',
- concurrency: parseInt(BULKHEAD_CONCURRENCY),
- maxQueueSize: parseInt(BULKHEAD_MAX_QUEUE_SIZE),
- },
-
- errorRegenerator: new CustomRegenerator(),
- started(): void {
- console.log('NetworkBroker started successfully.');
- },
-});
-
-export const broker = new NetworkBroker(network);
+ registry: {
+ strategy: BALANCE_STRATEGY,
+ preferLocal: BALANCE_PREFER_LOCAL !== 'false',
+ },
+
+ requestTimeout: parseInt(REQUEST_TIMEOUT) * 1000,
+ retryPolicy: {
+ enabled: RETRY_ENABLED === 'true',
+ retries: parseInt(RETRY_RETRIES),
+ delay: parseInt(RETRY_DELAY),
+ maxDelay: parseInt(RETRY_MAX_DELAY),
+ factor: parseInt(RETRY_FACTOR),
+ check: (err: any): boolean => err && !!err.retryable,
+ },
+
+ maxCallLevel: 100,
+ heartbeatInterval: parseInt(HEARTBEAT_INTERVAL),
+ heartbeatTimeout: parseInt(HEARTBEAT_TIMEOUT),
+
+ // circuitBreaker: {
+ // enabled: false,
+ // threshold: 0.5,
+ // windowTime: 60,
+ // minRequestCount: 20,
+ // halfOpenTime: 10 * 1000,
+ // check: (err: any): boolean => err && err.code >= 500,
+ // },
+
+ bulkhead: {
+ enabled: BULKHEAD_ENABLED === 'true',
+ concurrency: parseInt(BULKHEAD_CONCURRENCY),
+ maxQueueSize: parseInt(BULKHEAD_MAX_QUEUE_SIZE),
+ },
+
+ errorRegenerator: new CustomRegenerator(),
+ started(): void {
+ console.log('NetworkBroker started successfully.');
+ },
+ ...options,
+ });
+
+ return new NetworkBroker(network);
+}
diff --git a/ee/packages/omnichannel-services/CHANGELOG.md b/ee/packages/omnichannel-services/CHANGELOG.md
index 8384d772ee7dc..7d653e51ad115 100644
--- a/ee/packages/omnichannel-services/CHANGELOG.md
+++ b/ee/packages/omnichannel-services/CHANGELOG.md
@@ -1,5 +1,49 @@
# @rocket.chat/omnichannel-services
+## 0.3.13-rc.0
+
+### Patch Changes
+
+- ([#35215](https://github.com/RocketChat/Rocket.Chat/pull/35215)) Fixes omnichannel transcript filename breaking download links
+
+-
+
+## 0.3.12
+
+### Patch Changes
+
+-
+
+## 0.3.11
+
+### Patch Changes
+
+-
+
## 0.3.10
### Patch Changes
diff --git a/ee/packages/omnichannel-services/package.json b/ee/packages/omnichannel-services/package.json
index ad74aa02d2542..23ac3d27534c3 100644
--- a/ee/packages/omnichannel-services/package.json
+++ b/ee/packages/omnichannel-services/package.json
@@ -1,6 +1,6 @@
{
"name": "@rocket.chat/omnichannel-services",
- "version": "0.3.10",
+ "version": "0.3.13-rc.0",
"private": true,
"devDependencies": {
"@rocket.chat/eslint-config": "workspace:^",
diff --git a/ee/packages/omnichannel-services/src/OmnichannelTranscript.ts b/ee/packages/omnichannel-services/src/OmnichannelTranscript.ts
index 3700b456b0673..8f4d0e44b5544 100644
--- a/ee/packages/omnichannel-services/src/OmnichannelTranscript.ts
+++ b/ee/packages/omnichannel-services/src/OmnichannelTranscript.ts
@@ -57,7 +57,7 @@ export type MessageData = Pick<
| 'slaData'
| 'priorityData'
> & {
- files: ({ name?: string; buffer: Buffer | null; extension?: string } | undefined)[];
+ files: ({ name?: string; buffer?: Buffer; extension?: string } | undefined)[];
quotes: (Quote | undefined)[];
};
@@ -230,14 +230,14 @@ export class OmnichannelTranscript extends ServiceClass implements IOmnichannelT
if (!isFileImageAttachment(attachment)) {
this.log.error(`Invalid attachment type ${attachment.type} for file ${attachment.title} in room ${message.rid}!`);
// ignore other types of attachments
- files.push({ name: attachment.title, buffer: null });
+ files.push({ name: attachment.title });
continue;
}
if (!this.worker.isMimeTypeValid(attachment.image_type)) {
this.log.error(`Invalid mime type ${attachment.image_type} for file ${attachment.title} in room ${message.rid}!`);
// ignore invalid mime types
- files.push({ name: attachment.title, buffer: null });
+ files.push({ name: attachment.title });
continue;
}
let file = message.files?.map((v) => ({ _id: v._id, name: v.name })).find((file) => file.name === attachment.title);
@@ -249,7 +249,7 @@ export class OmnichannelTranscript extends ServiceClass implements IOmnichannelT
if (!fileId) {
this.log.error(`File ${attachment.title} not found in room ${message.rid}!`);
// ignore attachments without file
- files.push({ name: attachment.title, buffer: null });
+ files.push({ name: attachment.title });
continue;
}
file = { _id: fileId, name: attachment.title || 'upload' };
@@ -258,7 +258,7 @@ export class OmnichannelTranscript extends ServiceClass implements IOmnichannelT
if (!file) {
this.log.warn(`File ${attachment.title} not found in room ${message.rid}!`);
// ignore attachments without file
- files.push({ name: attachment.title, buffer: null });
+ files.push({ name: attachment.title });
continue;
}
@@ -266,7 +266,7 @@ export class OmnichannelTranscript extends ServiceClass implements IOmnichannelT
if (!uploadedFile) {
this.log.error(`Uploaded file ${file._id} not found in room ${message.rid}!`);
// ignore attachments without file
- files.push({ name: file.name, buffer: null });
+ files.push({ name: file.name });
continue;
}
@@ -276,7 +276,7 @@ export class OmnichannelTranscript extends ServiceClass implements IOmnichannelT
} catch (e: unknown) {
this.log.error(`Failed to get file ${file._id}`, e);
// Push empty buffer so parser processes this as "unsupported file"
- files.push({ name: file.name, buffer: null });
+ files.push({ name: file.name });
// TODO: this is a NATS error message, even when we shouldn't tie it, since it's the only way we have right now we'll live with it for a while
if ((e as Error).message === 'MAX_PAYLOAD_EXCEEDED') {
@@ -476,7 +476,7 @@ export class OmnichannelTranscript extends ServiceClass implements IOmnichannelT
buffer,
details: {
// transcript_{company-name}_{date}_{hour}.pdf
- name: `${transcriptText}_${data.siteName}_${new Intl.DateTimeFormat('en-US').format(new Date())}_${
+ name: `${transcriptText}_${data.siteName}_${new Intl.DateTimeFormat('en-US').format(new Date()).replace(/\//g, '-')}_${
data.visitor?.name || data.visitor?.username || 'Visitor'
}.pdf`,
type: 'application/pdf',
diff --git a/ee/packages/pdf-worker/CHANGELOG.md b/ee/packages/pdf-worker/CHANGELOG.md
index 4fa69cac87dec..130277d218a2a 100644
--- a/ee/packages/pdf-worker/CHANGELOG.md
+++ b/ee/packages/pdf-worker/CHANGELOG.md
@@ -1,5 +1,34 @@
# @rocket.chat/pdf-worker
+## 0.2.13-rc.0
+
+### Patch Changes
+
+- ([#35215](https://github.com/RocketChat/Rocket.Chat/pull/35215)) Fixes omnichannel transcript filename breaking download links
+
+-
+
+## 0.2.12
+
+### Patch Changes
+
+-
+
+## 0.2.11
+
+### Patch Changes
+
+-
+
## 0.2.10
### Patch Changes
diff --git a/ee/packages/pdf-worker/package.json b/ee/packages/pdf-worker/package.json
index 3c4baf7ac89bb..6cc96ba023809 100644
--- a/ee/packages/pdf-worker/package.json
+++ b/ee/packages/pdf-worker/package.json
@@ -1,6 +1,6 @@
{
"name": "@rocket.chat/pdf-worker",
- "version": "0.2.10",
+ "version": "0.2.13-rc.0",
"private": true,
"main": "./dist/index.js",
"typings": "./dist/index.d.ts",
diff --git a/ee/packages/pdf-worker/src/worker.fixtures.ts b/ee/packages/pdf-worker/src/worker.fixtures.ts
index 5031a35e5ea7c..a1a6cf388e4c5 100644
--- a/ee/packages/pdf-worker/src/worker.fixtures.ts
+++ b/ee/packages/pdf-worker/src/worker.fixtures.ts
@@ -424,7 +424,7 @@ export const bigConversationData = {
},
files: [
{
- name: 'Transcript_Another test_4/24/2024_Alayna.pdf',
+ name: 'Transcript_Another test_4-24-2024_Alayna.pdf',
buffer: null,
},
],
@@ -454,7 +454,7 @@ export const bigConversationData = {
},
files: [
{
- name: 'Transcript_Another test_4/24/2024_Alayna.pdf',
+ name: 'Transcript_Another test_4-24-2024_Alayna.pdf',
buffer: null,
},
],
diff --git a/ee/packages/presence/CHANGELOG.md b/ee/packages/presence/CHANGELOG.md
index 2a5a45618e157..09f3707564ab0 100644
--- a/ee/packages/presence/CHANGELOG.md
+++ b/ee/packages/presence/CHANGELOG.md
@@ -1,5 +1,38 @@
# @rocket.chat/presence
+## 0.2.16-rc.0
+
+### Patch Changes
+
+-
+
+## 0.2.15
+
+### Patch Changes
+
+-
+
+## 0.2.14
+
+### Patch Changes
+
+-
+
## 0.2.13
### Patch Changes
diff --git a/ee/packages/presence/package.json b/ee/packages/presence/package.json
index 325324de4aebb..e21176cf8fe7a 100644
--- a/ee/packages/presence/package.json
+++ b/ee/packages/presence/package.json
@@ -1,6 +1,6 @@
{
"name": "@rocket.chat/presence",
- "version": "0.2.13",
+ "version": "0.2.16-rc.0",
"private": true,
"devDependencies": {
"@babel/core": "~7.26.0",
diff --git a/package.json b/package.json
index 446e01186bbc4..da44a878f991f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "rocket.chat",
- "version": "7.4.0-develop",
+ "version": "7.5.0-develop",
"description": "Rocket.Chat Monorepo",
"main": "index.js",
"private": true,
@@ -42,7 +42,7 @@
"homepage": "https://github.com/RocketChat/Rocket.Chat#readme",
"engines": {
"yarn": "4.6.0",
- "node": "22.11.0",
+ "node": "22.13.1",
"npm": "Use yarn instead"
},
"packageManager": "yarn@4.6.0",
@@ -54,7 +54,7 @@
]
},
"volta": {
- "node": "22.11.0",
+ "node": "22.13.1",
"yarn": "1.22.18"
},
"resolutions": {
@@ -65,7 +65,8 @@
"mongodb@^4.17.1": "patch:mongodb@npm:4.17.1#.yarn/patches/mongodb-npm-4.17.1-a2fe811ff1.patch",
"typia@~6.9.0": "patch:typia@npm%3A6.9.0#./.yarn/patches/typia-npm-6.9.0-2fd4d85f25.patch",
"moleculer@^0.14.34": "patch:moleculer@npm%3A0.14.34#./.yarn/patches/moleculer-npm-0.14.34-440e26767d.patch",
- "mongodb": "6.10.0"
+ "mongodb": "6.10.0",
+ "cross-spawn": "7.0.6"
},
"dependencies": {
"@types/stream-buffers": "^3.0.7",
diff --git a/packages/api-client/CHANGELOG.md b/packages/api-client/CHANGELOG.md
index c5c2c789edf9a..acd35022581d6 100644
--- a/packages/api-client/CHANGELOG.md
+++ b/packages/api-client/CHANGELOG.md
@@ -1,5 +1,35 @@
# @rocket.chat/api-client
+## 0.2.16-rc.0
+
+### Patch Changes
+
+-
+
+## 0.2.15
+
+### Patch Changes
+
+-
+
+## 0.2.14
+
+### Patch Changes
+
+-
+
## 0.2.13
### Patch Changes
diff --git a/packages/api-client/package.json b/packages/api-client/package.json
index 4f34d194cd977..c3352b73831c0 100644
--- a/packages/api-client/package.json
+++ b/packages/api-client/package.json
@@ -1,6 +1,6 @@
{
"name": "@rocket.chat/api-client",
- "version": "0.2.13",
+ "version": "0.2.16-rc.0",
"devDependencies": {
"@rocket.chat/jest-presets": "workspace:~",
"@types/jest": "~29.5.14",
diff --git a/packages/apps-engine/CHANGELOG.md b/packages/apps-engine/CHANGELOG.md
index 318e780675ac4..0a50572574181 100644
--- a/packages/apps-engine/CHANGELOG.md
+++ b/packages/apps-engine/CHANGELOG.md
@@ -1,5 +1,21 @@
# @rocket.chat/apps-engine
+## 1.49.0-rc.0
+
+### Minor Changes
+
+- ([#35177](https://github.com/RocketChat/Rocket.Chat/pull/35177)) Adds a new IPostSystemMessageSent event, that is triggered whenever a new System Message is sent
+
+- ([#35013](https://github.com/RocketChat/Rocket.Chat/pull/35013)) Adds a filter option to include or exclude threads in the Apps Engine room read/unread messages bridge, enhancing flexibility in message retrieval.
+
+- ([#35199](https://github.com/RocketChat/Rocket.Chat/pull/35199)) Enables specifying hidden settings that are enabled to be accessed through the apps-engine in the permission list.
+
+### Patch Changes
+
+- ([#35120](https://github.com/RocketChat/Rocket.Chat/pull/35120)) Fixes behavior of app updates that would save undesired field changes to documents
+
+- ([#35170](https://github.com/RocketChat/Rocket.Chat/pull/35170)) Fixes an issue that would cause marketplace apps to become invalid installations after an update
+
## 1.48.2
### Patch Changes
diff --git a/packages/apps-engine/deno-runtime/lib/accessors/builders/MessageBuilder.ts b/packages/apps-engine/deno-runtime/lib/accessors/builders/MessageBuilder.ts
index 98cd919f7b002..d4005e3ec52b3 100644
--- a/packages/apps-engine/deno-runtime/lib/accessors/builders/MessageBuilder.ts
+++ b/packages/apps-engine/deno-runtime/lib/accessors/builders/MessageBuilder.ts
@@ -20,6 +20,10 @@ export class MessageBuilder implements IMessageBuilder {
private msg: IMessage;
+ private changes: Partial = {};
+ private attachmentsChanged = false;
+ private customFieldsChanged = false;
+
constructor(message?: IMessage) {
this.kind = RocketChatAssociationModel.MESSAGE;
this.msg = message || ({} as IMessage);
@@ -37,11 +41,14 @@ export class MessageBuilder implements IMessageBuilder {
this.msg.editor = editor;
this.msg.editedAt = new Date();
+ this.changes = structuredClone(this.msg);
+
return this as IMessageBuilder;
}
public setThreadId(threadId: string): IMessageBuilder {
this.msg.threadId = threadId;
+ this.changes.threadId = threadId;
return this as IMessageBuilder;
}
@@ -52,6 +59,8 @@ export class MessageBuilder implements IMessageBuilder {
public setRoom(room: IRoom): IMessageBuilder {
this.msg.room = room;
+ this.changes.room = room;
+
return this as IMessageBuilder;
}
@@ -61,6 +70,8 @@ export class MessageBuilder implements IMessageBuilder {
public setSender(sender: IUser): IMessageBuilder {
this.msg.sender = sender;
+ this.changes.sender = sender;
+
return this as IMessageBuilder;
}
@@ -70,6 +81,8 @@ export class MessageBuilder implements IMessageBuilder {
public setText(text: string): IMessageBuilder {
this.msg.text = text;
+ this.changes.text = text;
+
return this as IMessageBuilder;
}
@@ -79,6 +92,8 @@ export class MessageBuilder implements IMessageBuilder {
public setEmojiAvatar(emoji: string): IMessageBuilder {
this.msg.emoji = emoji;
+ this.changes.emoji = emoji;
+
return this as IMessageBuilder;
}
@@ -88,6 +103,8 @@ export class MessageBuilder implements IMessageBuilder {
public setAvatarUrl(avatarUrl: string): IMessageBuilder {
this.msg.avatarUrl = avatarUrl;
+ this.changes.avatarUrl = avatarUrl;
+
return this as IMessageBuilder;
}
@@ -97,6 +114,8 @@ export class MessageBuilder implements IMessageBuilder {
public setUsernameAlias(alias: string): IMessageBuilder {
this.msg.alias = alias;
+ this.changes.alias = alias;
+
return this as IMessageBuilder;
}
@@ -110,11 +129,15 @@ export class MessageBuilder implements IMessageBuilder {
}
this.msg.attachments.push(attachment);
+ this.attachmentsChanged = true;
+
return this as IMessageBuilder;
}
public setAttachments(attachments: Array): IMessageBuilder {
this.msg.attachments = attachments;
+ this.attachmentsChanged = true;
+
return this as IMessageBuilder;
}
@@ -123,34 +146,31 @@ export class MessageBuilder implements IMessageBuilder {
}
public replaceAttachment(position: number, attachment: IMessageAttachment): IMessageBuilder {
- if (!this.msg.attachments) {
- this.msg.attachments = [];
- }
-
- if (!this.msg.attachments[position]) {
+ if (!this.msg.attachments?.[position]) {
throw new Error(`No attachment found at the index of "${position}" to replace.`);
}
this.msg.attachments[position] = attachment;
+ this.attachmentsChanged = true;
+
return this as IMessageBuilder;
}
public removeAttachment(position: number): IMessageBuilder {
- if (!this.msg.attachments) {
- this.msg.attachments = [];
- }
-
- if (!this.msg.attachments[position]) {
+ if (!this.msg.attachments?.[position]) {
throw new Error(`No attachment found at the index of "${position}" to remove.`);
}
this.msg.attachments.splice(position, 1);
+ this.attachmentsChanged = true;
return this as IMessageBuilder;
}
public setEditor(user: IUser): IMessageBuilder {
this.msg.editor = user;
+ this.changes.editor = user;
+
return this as IMessageBuilder;
}
@@ -160,6 +180,8 @@ export class MessageBuilder implements IMessageBuilder {
public setGroupable(groupable: boolean): IMessageBuilder {
this.msg.groupable = groupable;
+ this.changes.groupable = groupable;
+
return this as IMessageBuilder;
}
@@ -169,6 +191,8 @@ export class MessageBuilder implements IMessageBuilder {
public setParseUrls(parseUrls: boolean): IMessageBuilder {
this.msg.parseUrls = parseUrls;
+ this.changes.parseUrls = parseUrls;
+
return this as IMessageBuilder;
}
@@ -203,6 +227,7 @@ export class MessageBuilder implements IMessageBuilder {
this.msg.blocks = blocks.getBlocks();
} else {
this.msg.blocks = blocks;
+ this.changes.blocks = blocks;
}
return this as IMessageBuilder;
@@ -227,6 +252,22 @@ export class MessageBuilder implements IMessageBuilder {
this.msg.customFields[key] = value;
+ this.customFieldsChanged = true;
+
return this as IMessageBuilder;
}
+
+ public getChanges(): Partial {
+ const changes: typeof this.changes = structuredClone(this.changes);
+
+ if (this.attachmentsChanged) {
+ changes.attachments = structuredClone(this.msg.attachments);
+ }
+
+ if (this.customFieldsChanged) {
+ changes.customFields = structuredClone(this.msg.customFields);
+ }
+
+ return changes;
+ }
}
diff --git a/packages/apps-engine/deno-runtime/lib/accessors/builders/RoomBuilder.ts b/packages/apps-engine/deno-runtime/lib/accessors/builders/RoomBuilder.ts
index 38983475162d1..44119ab67ab41 100644
--- a/packages/apps-engine/deno-runtime/lib/accessors/builders/RoomBuilder.ts
+++ b/packages/apps-engine/deno-runtime/lib/accessors/builders/RoomBuilder.ts
@@ -18,6 +18,9 @@ export class RoomBuilder implements IRoomBuilder {
private members: Array;
+ private changes: Partial = {};
+ private customFieldsChanged = false;
+
constructor(data?: Partial) {
this.kind = RocketChatAssociationModel.ROOM;
this.room = (data || { customFields: {} }) as IRoom;
@@ -28,11 +31,15 @@ export class RoomBuilder implements IRoomBuilder {
delete data.id;
this.room = data as IRoom;
+ this.changes = structuredClone(this.room);
+
return this;
}
public setDisplayName(name: string): IRoomBuilder {
this.room.displayName = name;
+ this.changes.displayName = name;
+
return this;
}
@@ -42,6 +49,8 @@ export class RoomBuilder implements IRoomBuilder {
public setSlugifiedName(name: string): IRoomBuilder {
this.room.slugifiedName = name;
+ this.changes.slugifiedName = name;
+
return this;
}
@@ -51,6 +60,8 @@ export class RoomBuilder implements IRoomBuilder {
public setType(type: RoomType): IRoomBuilder {
this.room.type = type;
+ this.changes.type = type;
+
return this;
}
@@ -60,6 +71,8 @@ export class RoomBuilder implements IRoomBuilder {
public setCreator(creator: IUser): IRoomBuilder {
this.room.creator = creator;
+ this.changes.creator = creator;
+
return this;
}
@@ -110,6 +123,8 @@ export class RoomBuilder implements IRoomBuilder {
public setDefault(isDefault: boolean): IRoomBuilder {
this.room.isDefault = isDefault;
+ this.changes.isDefault = isDefault;
+
return this;
}
@@ -119,6 +134,8 @@ export class RoomBuilder implements IRoomBuilder {
public setReadOnly(isReadOnly: boolean): IRoomBuilder {
this.room.isReadOnly = isReadOnly;
+ this.changes.isReadOnly = isReadOnly;
+
return this;
}
@@ -128,6 +145,8 @@ export class RoomBuilder implements IRoomBuilder {
public setDisplayingOfSystemMessages(displaySystemMessages: boolean): IRoomBuilder {
this.room.displaySystemMessages = displaySystemMessages;
+ this.changes.displaySystemMessages = displaySystemMessages;
+
return this;
}
@@ -141,11 +160,16 @@ export class RoomBuilder implements IRoomBuilder {
}
this.room.customFields[key] = value;
+
+ this.customFieldsChanged = true;
+
return this;
}
public setCustomFields(fields: { [key: string]: object }): IRoomBuilder {
this.room.customFields = fields;
+ this.customFieldsChanged = true;
+
return this;
}
@@ -160,4 +184,14 @@ export class RoomBuilder implements IRoomBuilder {
public getRoom(): IRoom {
return this.room;
}
+
+ public getChanges() {
+ const changes: Partial = structuredClone(this.changes);
+
+ if (this.customFieldsChanged) {
+ changes.customFields = structuredClone(this.room.customFields);
+ }
+
+ return changes;
+ }
}
diff --git a/packages/apps-engine/deno-runtime/lib/accessors/modify/ModifyUpdater.ts b/packages/apps-engine/deno-runtime/lib/accessors/modify/ModifyUpdater.ts
index 8befe7bfa983e..fbdeee609e9d2 100644
--- a/packages/apps-engine/deno-runtime/lib/accessors/modify/ModifyUpdater.ts
+++ b/packages/apps-engine/deno-runtime/lib/accessors/modify/ModifyUpdater.ts
@@ -70,13 +70,17 @@ export class ModifyUpdater implements IModifyUpdater {
) as IUserUpdater;
}
- public async message(messageId: string, _updater: IUser): Promise {
+ public async message(messageId: string, editor: IUser): Promise {
const response = await this.senderFn({
method: 'bridges:getMessageBridge:doGetById',
params: [messageId, AppObjectRegistry.get('id')],
});
- return new MessageBuilder(response.result as IMessage);
+ const builder = new MessageBuilder(response.result as IMessage);
+
+ builder.setEditor(editor);
+
+ return builder;
}
public async room(roomId: string, _updater: IUser): Promise {
@@ -91,15 +95,15 @@ export class ModifyUpdater implements IModifyUpdater {
public finish(builder: IMessageBuilder | IRoomBuilder): Promise {
switch (builder.kind) {
case RocketChatAssociationModel.MESSAGE:
- return this._finishMessage(builder as IMessageBuilder);
+ return this._finishMessage(builder as MessageBuilder);
case RocketChatAssociationModel.ROOM:
- return this._finishRoom(builder as IRoomBuilder);
+ return this._finishRoom(builder as RoomBuilder);
default:
throw new Error('Invalid builder passed to the ModifyUpdater.finish function.');
}
}
- private async _finishMessage(builder: IMessageBuilder): Promise {
+ private async _finishMessage(builder: MessageBuilder): Promise {
const result = builder.getMessage();
if (!result.id) {
@@ -114,40 +118,44 @@ export class ModifyUpdater implements IModifyUpdater {
result.blocks = UIHelper.assignIds(result.blocks, AppObjectRegistry.get('id') || '');
}
+ const changes = { id: result.id, ...builder.getChanges() };
+
await this.senderFn({
method: 'bridges:getMessageBridge:doUpdate',
- params: [result, AppObjectRegistry.get('id')],
+ params: [changes, AppObjectRegistry.get('id')],
});
}
- private async _finishRoom(builder: IRoomBuilder): Promise {
- const result = builder.getRoom();
+ private async _finishRoom(builder: RoomBuilder): Promise
+
+ {zoomScale !== 1 && (
+
String(keyCode) === '27' && onClose()}
- modules={[Navigation, Zoom, Keyboard, A11y]}
- onInit={(swiper: SwiperClass) => setSwiperInst(swiper)}
- onSlidesGridLengthChange={(swiper: SwiperClass) => {
- swiper.slideTo(images.length - gridSize, 0);
- setGridSize(images.length);
- }}
- onReachBeginning={loadMore}
- initialSlide={images.length - 1}
- >
- {[...images].reverse().map(({ _id, path, url }) => (
-
-
+ ))}
+
+
+
- {/* eslint-disable-next-line
- jsx-a11y/no-noninteractive-element-interactions,
- jsx-a11y/click-events-have-key-events
- */}
- 
-
-
- ,
+
- String(keyCode) === '27' && onClose()}
+ modules={[Navigation, Zoom, Keyboard, A11y]}
+ onInit={(swiper: SwiperClass) => setSwiperInst(swiper)}
+ onSlidesGridLengthChange={(swiper: SwiperClass) => {
+ swiper.slideTo(images.length - gridSize, 0);
+ setGridSize(images.length);
+ }}
+ onReachBeginning={loadMore}
+ initialSlide={images.length - 1}
+ >
+ {[...images].reverse().map(({ _id, path, url }) => (
+
+
-
- ))}
-
-
+ {/* eslint-disable-next-line
+ jsx-a11y/no-noninteractive-element-interactions,
+ jsx-a11y/click-events-have-key-events
+ */}
+
+
-
+