Missing token on endpoints and contact tab.

RocketChat · Dec 22, 2020 · 528a184 · 528a184
1 parent 749ccfd
commit 528a184
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/app/livechat/server/api/v1/contact.js b/app/livechat/server/api/v1/contact.js
@@ -6,13 +6,12 @@ import {
 	LivechatVisitors,
 } from '../../../../models';
 
-const createToken = () => Math.random().toString(36).substring(2, 15) + Math.random().toString(36).substring(2, 15);
-
 API.v1.addRoute('omnichannel/contact', { authRequired: true }, {
 	post() {
 		try {
 			check(this.bodyParams, {
 				_id: Match.Maybe(String),
+				token: String,
 				name: String,
 				email: Match.Maybe(String),
 				phone: Match.Maybe(String),
@@ -24,9 +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 data = Object.assign(contactParams, { token: createToken() });
-			const contact = Livechat.registerGuest(data);
 			return API.v1.success({ contact });
 		} catch (e) {
 			return API.v1.failure(e);

diff --git a/client/components/helpers.js b/client/components/helpers.js
@@ -0,0 +1 @@
+export const createToken = () => Math.random().toString(36).substring(2, 15) + Math.random().toString(36).substring(2, 15);
diff --git a/client/omnichannel/directory/ContactForm.js b/client/omnichannel/directory/ContactForm.js
@@ -16,8 +16,10 @@ import CustomFieldsForm from '../../components/CustomFieldsForm';
 import { hasAtLeastOnePermission } from '../../../app/authorization';
 import { AsyncStatePhase } from '../../hooks/useAsyncState';
 import { formsSubscription } from '../../views/omnichannel/additionalForms';
+import { createToken } from '../../components/helpers';
 
 const initialValues = {
+	token: '',
 	name: '',
 	email: '',
 	phone: '',
@@ -29,9 +31,10 @@ const getInitialValues = (data) => {
 		return initialValues;
 	}
 
-	const { contact: { name, phone, visitorEmails, livechatData, contactManager } } = data;
+	const { contact: { name, token, phone, visitorEmails, livechatData, contactManager } } = data;
 
 	return {
+		token: token ?? '',
 		name: name ?? '',
 		email: visitorEmails ? visitorEmails[0].address : '',
 		phone: phone ? phone[0].phoneNumber : '',
@@ -76,6 +79,7 @@ export function ContactNewEdit({ id, data, reload, close }) {
 		handleUsername,
 	} = handlers;
 	const {
+		token,
 		name,
 		email,
 		phone,
@@ -148,8 +152,10 @@ export function ContactNewEdit({ id, data, reload, close }) {
 
 		if (id) {
 			payload._id = id;
+			payload.token = token;
+		} else {
+			payload.token = createToken();
 		}
-
 		if (livechatData) { payload.livechatData = livechatData; }
 		if (username) { payload.contactManager = { username }; }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		export const createToken = () => Math.random().toString(36).substring(2, 15) + Math.random().toString(36).substring(2, 15);