Merge branch 'develop' into feat/new-user-panel-active

.changeset/cuddly-ravens-swim.md

@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+Fixed an issue where adding `OVERWRITE_SETTING_` for any setting wasn't immediately taking effect sometimes, and needed a server restart to reflect.

.changeset/funny-snails-promise.md

@@ -0,0 +1,10 @@
+---
+"@rocket.chat/meteor": patch
+"@rocket.chat/livechat": patch
+---
+
+livechat `setDepartment` livechat api fixes: 
+- Changing department didn't reflect on the registration form in real time
+- Changing the department mid conversation didn't transfer the chat
+- Depending on the state of the department, it couldn't be set as default
+

.changeset/rare-penguins-hope.md

@@ -0,0 +1,6 @@
+---
+"@rocket.chat/meteor": patch
+"@rocket.chat/core-typings": patch
+---
+
+Allow customFields on livechat creation bridge

.github/ISSUE_TEMPLATE/bug_report.md

@@ -35,6 +35,8 @@ If you are experiencing a bug please search our issues to be sure it is not alre
 ### Server Setup Information:
 
 - Version of Rocket.Chat Server: 
+- License Type:
+- Number of Users: 
 - Operating System: 
 - Deployment Method: <!-- snap/docker/tar/etc -->
 - Number of Running Instances: 

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

@@ -6,13 +6,17 @@ on:
       node-version:
         required: true
         type: string
+      enterprise-license:
+        required: false
+        type: string
     secrets:
       CODECOV_TOKEN:
         required: false
 
 env:
   MONGO_URL: mongodb://localhost:27017/rocketchat?replicaSet=rs0&directConnection=true
   TOOL_NODE_FLAGS: ${{ vars.TOOL_NODE_FLAGS }}
+  ENTERPRISE_LICENSE: ${{ inputs.enterprise-license }}
 
 jobs:
   test:

.github/workflows/ci.yml

@@ -33,7 +33,7 @@ jobs:
       node-version: ${{ steps.var.outputs.node-version }}
       # this is 100% intentional, secrets are not available for forks, so ee-tests will always fail
       # to avoid this, we are using a dummy license, expiring at 2024-06-30
-      enterprise-license: WMa5i+/t/LZbYOj8u3XUkivRhWBtWO6ycUjaZoVAw2DxMfdyBIAa2gMMI4x7Z2BrTZIZhFEImfOxcXcgD0QbXHGBJaMI+eYG+eofnVWi2VA7RWbpvWTULgPFgyJ4UEFeCOzVjcBLTQbmMSam3u0RlekWJkfAO0KnmLtsaEYNNA2rz1U+CLI/CdNGfdqrBu5PZZbGkH0KEzyIZMaykOjzvX+C6vd7fRxh23HecwhkBbqE8eQsCBt2ad0qC4MoVXsDaSOmSzGW+aXjuXt/9zjvrLlsmWQTSlkrEHdNkdywm0UkGxqz3+CP99n0WggUBioUiChjMuNMoceWvDvmxYP9Ml2NpYU7SnfhjmMFyXOah8ofzv8w509Y7XODvQBz+iB4Co9YnF3vT96HDDQyAV5t4jATE+0t37EAXmwjTi3qqyP7DLGK/revl+mlcwJ5kS4zZBsm1E4519FkXQOZSyWRnPdjqvh4mCLqoispZ49wKvklDvjPxCSP9us6cVXLDg7NTJr/4pfxLPOkvv7qCgugDvlDx17bXpQFPSDxmpw66FLzvb5Id0dkWjOzrRYSXb0bFWoUQjtHFzmcpFkyVhOKrQ9zA9+Zm7vXmU9Y2l2dK79EloOuHMSYAqsPEag8GMW6vI/cT4iIjHGGDePKnD0HblvTEKzql11cfT/abf2IiaY=
+      enterprise-license: X/XumwIkgwQuld0alWKt37lVA90XjKOrfiMvMZ0/RtqsMtrdL9GoAk+4jXnaY1b2ePoG7XSzGhuxEDxFKIWJK3hIKGNTvrd980LgH5sM5+1T4P42ivSpd8UZi0bwjJkCFLIu9RozzYwslGG0IehMxe0S6VjcO0UYlUJtbMCBHuR2WmTAmO6YVU3ln+pZCbrPFaTPSS1RovhKaNCNkZwIx/CLWW8UTXUuFV/ML4PbKKVoa5nvvJwPeatgL7UCnlSD90lfCiiuikpzj/Y/JLkIL6velFbwNxsrxg9iRJ2k0sKheMMSmlTiGzSvZUm+na5WQq91aKGncih+DmaEZA7QGrjp4eoA0dqTk6OmItsy0fHmQhvZIOKNMeO7vNQiLbaSV6rqibrzu7WPpeIvsvL57T1h37USoCSB6+jDqkzdfoqIpz8BxTiJDj1d8xGPJFVrgxoqQqkj9qIP/gCaEz5DF39QFv5sovk4yK2O8fEQYod2d14V9yECYl4szZPMk1IBfCAC2w7czWGHHFonhL+CQGT403y5wmDmnsnjlCqMKF72odqfTPTI8XnCvJDriPMWohnQEAGtTTyciAhNokx/mjAVJ4NeZPcsbm4BjhvJvnjxx/BhYhBBTNWPaCSZzocfrGUj9Z+ZA7BEz+xAFQyGDx3xRzqIXfT0G7w8fvgYJMU=
     steps:
       - uses: actions/checkout@v4
         with:
@@ -305,6 +305,7 @@ jobs:
     uses: ./.github/workflows/ci-test-unit.yml
     with:
       node-version: ${{ needs.release-versions.outputs.node-version }}
+      enterprise-license: ${{ needs.release-versions.outputs.enterprise-license }}
     secrets:
       CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
 

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

@@ -15,6 +15,12 @@ import { getRoom } from '../../../livechat/server/api/lib/livechat';
 import { type ILivechatMessage, Livechat as LivechatTyped } from '../../../livechat/server/lib/LivechatTyped';
 import { settings } from '../../../settings/server';
 
+declare module '@rocket.chat/apps-engine/definition/accessors/ILivechatCreator' {
+	interface IExtraRoomParams {
+		customFields?: Record<string, any>;
+	}
+}
+
 export class AppLivechatBridge extends LivechatBridge {
 	constructor(private readonly orch: IAppServerOrchestrator) {
 		super();
@@ -79,17 +85,14 @@ export class AppLivechatBridge extends LivechatBridge {
 		await LivechatTyped.updateMessage(data);
 	}
 
-	protected async createRoom(visitor: IVisitor, agent: IUser, appId: string, extraParams?: IExtraRoomParams): Promise<ILivechatRoom> {
+	protected async createRoom(
+		visitor: IVisitor,
+		agent: IUser,
+		appId: string,
+		{ source, customFields }: IExtraRoomParams = {},
+	): Promise<ILivechatRoom> {
 		this.orch.debugLog(`The App ${appId} is creating a livechat room.`);
 
-		const { source } = extraParams || {};
-		// `source` will likely have the properties below, so we tell TS it's alright
-		const { sidebarIcon, defaultIcon, label } = (source || {}) as {
-			sidebarIcon?: string;
-			defaultIcon?: string;
-			label?: string;
-		};
-
 		let agentRoom: SelectedAgent | undefined;
 		if (agent?.id) {
 			const user = await Users.getAgentInfo(agent.id, settings.get('Livechat_show_agent_email'));
@@ -108,12 +111,15 @@ export class AppLivechatBridge extends LivechatBridge {
 					type: OmnichannelSourceType.APP,
 					id: appId,
 					alias: this.orch.getManager()?.getOneById(appId)?.getName(),
-					label,
-					sidebarIcon,
-					defaultIcon,
+					...(source &&
+						source.type === 'app' && {
+							sidebarIcon: source.sidebarIcon,
+							defaultIcon: source.defaultIcon,
+							label: source.label,
+						}),
 				},
 			},
-			extraParams: undefined,
+			extraParams: customFields && { customFields },
 		});
 
 		// #TODO: #AppsEngineTypes - Remove explicit types and typecasts once the apps-engine definition/implementation mismatch is fixed.
@@ -195,7 +201,33 @@ export class AppLivechatBridge extends LivechatBridge {
 			...(visitor.visitorEmails?.length && { email: visitor.visitorEmails[0].address }),
 		};
 
-		return LivechatTyped.registerGuest(registerData);
+		const livechatVisitor = await LivechatTyped.registerGuest(registerData);
+
+		if (!livechatVisitor) {
+			throw new Error('Invalid visitor, cannot create');
+		}
+
+		return livechatVisitor._id;
+	}
+
+	protected async createAndReturnVisitor(visitor: IVisitor, appId: string): Promise<IVisitor | undefined> {
+		this.orch.debugLog(`The App ${appId} is creating a livechat visitor.`);
+
+		const registerData = {
+			department: visitor.department,
+			username: visitor.username,
+			name: visitor.name,
+			token: visitor.token,
+			email: '',
+			connectionData: undefined,
+			id: visitor.id,
+			...(visitor.phone?.length && { phone: { number: visitor.phone[0].phoneNumber } }),
+			...(visitor.visitorEmails?.length && { email: visitor.visitorEmails[0].address }),
+		};
+
+		const livechatVisitor = await LivechatTyped.registerGuest(registerData);
+
+		return this.orch.getConverters()?.get('visitors').convertVisitor(livechatVisitor);
 	}
 
 	protected async transferVisitor(visitor: IVisitor, transferData: ILivechatTransferData, appId: string): Promise<boolean> {

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

@@ -209,4 +209,12 @@ export class AppRoomBridge extends RoomBridge {
 		const userConverter = this.orch.getConverters().get('users');
 		return users.map((user: ICoreUser) => userConverter.convertToApp(user));
 	}
+
+	protected getMessages(
+		_roomId: string,
+		_options: { limit: number; skip?: number; sort?: Record<string, 1 | -1> },
+		_appId: string,
+	): Promise<IMessage[]> {
+		throw new Error('Method not implemented.');
+	}
 }