fix: customFields ignored in livechat room creation

[abhinavkrin]

Proposed changes (including videos or screenshots)

The function createLivechatRoom does not take into account the customFields passed in the extraData param

Rocket.Chat/apps/meteor/app/livechat/server/lib/Helper.ts

Line 60 in 05db8aa

export const createLivechatRoom = async <

In various places the functions is passed customFields in extraData param. This extraData is passed to livechat.beforeRoom callback and expects to receive extraRoomInfo. But the customField is not taken into account in this callback

Rocket.Chat/apps/meteor/app/livechat/server/lib/Helper.ts

Line 85 in 05db8aa

const extraRoomInfo = await callbacks.run('livechat.beforeRoom', roomInfo, extraData);

Rocket.Chat/apps/meteor/ee/app/livechat-enterprise/server/hooks/beforeNewRoom.ts

Lines 6 to 29 in 42a176f

	callbacks.add(
	'livechat.beforeRoom',
	async (roomInfo, extraData) => {
	if (!extraData) {
	return roomInfo;
	}
	const { sla: searchTerm, customFields } = extraData;
	const roomInfoWithExtraData = { ...roomInfo, ...(!!customFields && { customFields }) };
	if (!searchTerm) {
	return roomInfoWithExtraData;
	}
	const sla = await OmnichannelServiceLevelAgreements.findOneByIdOrName(searchTerm);
	if (!sla) {
	throw new Meteor.Error('error-invalid-sla', 'Invalid sla', {
	function: 'livechat.beforeRoom',
	});
	}
	const { _id: slaId } = sla;
	return { ...roomInfoWithExtraData, slaId };
	},

This PR fixes the callback to also include the customFields in the result from the callback livechat.beforeRoom

I found this bug while investigating the issue related to on premise whatsapp app. In which, a new room was created everytime a message was sent from WA to RC. Since the custom fields was not being saved in the room data (due to the reason above), the wa app was not able to find existing room related to what whatsapp number and created a new room everytime.

I believe this bug can affect other apps as well as the rc where function is used.

Issue(s)

Steps to test or reproduce

Further comments

CORE-643

[dionisio-bot]

Looks like this PR is ready to merge! 🎉
If you have any trouble, please check the PR guidelines

[changeset-bot]

🦋 Changeset detected

Latest commit: 9d27458

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 32 packages

Name	Type
@rocket.chat/meteor	Patch
@rocket.chat/core-typings	Patch
@rocket.chat/rest-typings	Patch
@rocket.chat/apps	Patch
@rocket.chat/core-services	Patch
@rocket.chat/cron	Patch
@rocket.chat/fuselage-ui-kit	Patch
@rocket.chat/gazzodown	Patch
@rocket.chat/livechat	Patch
@rocket.chat/model-typings	Patch
@rocket.chat/ui-contexts	Patch
@rocket.chat/account-service	Patch
@rocket.chat/authorization-service	Patch
@rocket.chat/ddp-streamer	Patch
@rocket.chat/omnichannel-transcript	Patch
@rocket.chat/presence-service	Patch
@rocket.chat/queue-worker	Patch
@rocket.chat/stream-hub-service	Patch
@rocket.chat/api-client	Patch
@rocket.chat/ddp-client	Patch
@rocket.chat/license	Patch
@rocket.chat/omnichannel-services	Patch
@rocket.chat/pdf-worker	Patch
@rocket.chat/presence	Patch
rocketchat-services	Patch
@rocket.chat/uikit-playground	Patch
@rocket.chat/models	Patch
@rocket.chat/ui-avatar	Patch
@rocket.chat/ui-client	Patch
@rocket.chat/ui-video-conf	Patch
@rocket.chat/web-ui-registration	Patch
@rocket.chat/instance-status	Patch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

[codecov]

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 59.40%. Comparing base (a40541b) to head (9d27458).
Report is 1 commits behind head on develop.

Additional details and impacted files

@@           Coverage Diff            @@
##           develop   #33047   +/-   ##
========================================
  Coverage    59.39%   59.40%           
========================================
  Files         2541     2543    +2     
  Lines        63174    63192   +18     
  Branches     14219    14224    +5     
========================================
+ Hits         37525    37541   +16     
- Misses       22934    22935    +1     
- Partials      2715     2716    +1     

Flag	Coverage Δ
unit	76.03% <100.00%> (+0.01%)	⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

[ggazzo]

can we provide some kind of tests here?

[KevLehman]

@abhinavkrin just one small thing: this PR should have its own task related to 589 instead of being linked directly to it as this fix will require it's own QA (and it's not related to the issue described on 589)