[FIX] Livechat.RegisterGuest method removing unset fields

app/livechat/server/api/v1/contact.js

@@ -1,7 +1,7 @@
 import { Match, check } from 'meteor/check';
 
 import { API } from '../../../../api/server';
-import { Livechat } from '../../lib/Livechat';
+import { Contacts } from '../../lib/Contacts';
 import {
 	LivechatVisitors,
 } from '../../../../models';
@@ -23,7 +23,8 @@ API.v1.addRoute('omnichannel/contact', { authRequired: true }, {
 			if (this.bodyParams.phone) {
 				contactParams.phone = { number: this.bodyParams.phone };
 			}
-			const contact = Livechat.registerGuest(contactParams);
+
+			const contact = Contacts.registerContact(contactParams);
 
 			return API.v1.success({ contact });
 		} catch (e) {

app/livechat/server/lib/Contacts.js

@@ -0,0 +1,62 @@
+import { check } from 'meteor/check';
+import s from 'underscore.string';
+import _ from 'underscore';
+
+import {
+	LivechatVisitors,
+} from '../../../models';
+
+export const Contacts = {
+
+	registerContact({ token, name, email, phone, username, livechatData, contactManager } = {}) {
+		check(token, String);
+
+		let userId;
+		const updateUser = {
+			$set: {
+				token,
+			},
+		};
+
+		const user = LivechatVisitors.getVisitorByToken(token, { fields: { _id: 1 } });
+
+		if (user) {
+			userId = user._id;
+		} else {
+			if (!username) {
+				username = LivechatVisitors.getNextVisitorUsername();
+			}
+
+			let existingUser = null;
+
+			if (s.trim(email) !== '' && (existingUser = LivechatVisitors.findOneGuestByEmailAddress(email))) {
+				userId = existingUser._id;
+			} else {
+				const userData = {
+					username,
+					ts: new Date(),
+				};
+
+				userId = LivechatVisitors.insert(userData);
+			}
+		}
+
+		updateUser.$set.name = name;
+
+		updateUser.$set.phone = [
+			{ phoneNumber: phone?.number },
+		];
+
+		updateUser.$set.visitorEmails = [
+			{ address: email },
+		];
+
+		updateUser.$set.livechatData = livechatData;
+
+		updateUser.$set.contactManager = !_.isEmpty(contactManager) ? contactManager : '';
+
+		LivechatVisitors.updateById(userId, updateUser);
+
+		return userId;
+	},
+};

app/livechat/server/lib/Livechat.js

@@ -192,15 +192,14 @@ export const Livechat = {
 		return true;
 	},
 
-	registerGuest({ token, name, email, department, phone, username, livechatData, contactManager, connectionData } = {}) {
+	registerGuest({ token, name, email, department, phone, username, connectionData } = {}) {
 		check(token, String);
 
 		let userId;
 		const updateUser = {
 			$set: {
 				token,
 			},
-			$unset: { },
 		};
 
 		const user = LivechatVisitors.getVisitorByToken(token, { fields: { _id: 1 } });
@@ -235,45 +234,29 @@ export const Livechat = {
 			}
 		}
 
-		if (name) {
-			updateUser.$set.name = name;
-		}
-
 		if (phone) {
 			updateUser.$set.phone = [
 				{ phoneNumber: phone.number },
 			];
-		} else {
-			updateUser.$unset.phone = 1;
 		}
 
 		if (email && email.trim() !== '') {
 			updateUser.$set.visitorEmails = [
 				{ address: email },
 			];
-		} else {
-			updateUser.$unset.visitorEmails = 1;
 		}
 
-		if (livechatData) {
-			updateUser.$set.livechatData = livechatData;
-		} else {
-			updateUser.$unset.livechatData = 1;
-		}
-
-		if (contactManager) {
-			updateUser.$set.contactManager = contactManager;
-		} else {
-			updateUser.$unset.contactManager = 1;
+		if (name) {
+			updateUser.$set.name = name;
 		}
 
 		if (!department) {
-			updateUser.$unset.department = 1;
+			Object.assign(updateUser, { $unset: { department: 1 } });
 		} else {
 			const dep = LivechatDepartment.findOneByIdOrName(department);
 			updateUser.$set.department = dep && dep._id;
 		}
-		if (_.isEmpty(updateUser.$unset)) { delete updateUser.$unset; }
+
 		LivechatVisitors.updateById(userId, updateUser);
 
 		return userId;

client/omnichannel/directory/ContactForm.js

@@ -146,18 +146,18 @@ export function ContactNewEdit({ id, data, reload, close }) {
 
 		const payload = {
 			name,
-			email,
-			phone,
 		};
+		payload.phone = phone;
+		payload.email = email;
+		payload.livechatData = livechatData;
+		payload.contactManager = username ? { username } : {};
 
 		if (id) {
 			payload._id = id;
 			payload.token = token;
 		} else {
 			payload.token = createToken();
 		}
-		if (livechatData) { payload.livechatData = livechatData; }
-		if (username) { payload.contactManager = { username }; }
 
 		try {
 			await saveContact(payload);