Regression: Revert Livechat packages upgrades/removals that were caus…

…ing issues (#26077)
RocketChat · Jun 30, 2022 · 26a9965 · 26a9965
1 parent cb7c9a9
commit 26a9965
Show file tree

Hide file tree

Showing 6 changed files with 280 additions and 251 deletions.
diff --git a/apps/meteor/app/livechat/server/api/v1/config.js b/apps/meteor/app/livechat/server/api/v1/config.js
@@ -26,7 +26,7 @@ API.v1.addRoute('livechat/config', {
 			const config = await cachedSettings({ businessUnit });
 
 			const status = Livechat.online(department);
-			const guest = token && Livechat.findGuest(token);
+			const guest = token && (await Livechat.findGuest(token));
 
 			const room = guest && findOpenRoom(token);
 			const agent = guest && room && room.servedBy && findAgent(room.servedBy._id);

diff --git a/packages/livechat/package.json b/packages/livechat/package.json
@@ -76,7 +76,7 @@
 		"url-loader": "^4.1.0",
 		"webpack": "^4.44.1",
 		"webpack-cli": "^3.3.12",
-		"webpack-dev-server": "^4.9.2"
+		"webpack-dev-server": "^3.11.0"
 	},
 	"dependencies": {
 		"@rocket.chat/fuselage-tokens": "~0.31.11",
@@ -87,6 +87,7 @@
 		"css-vars-ponyfill": "^2.3.2",
 		"date-fns": "^2.15.0",
 		"emoji-mart": "^3.0.0",
+		"history": "^5.3.0",
 		"i18next": "^21.8.4",
 		"markdown-it": "^11.0.0",
 		"mem": "^6.1.0",

diff --git a/packages/livechat/src/components/App/App.js b/packages/livechat/src/components/App/App.js
@@ -4,6 +4,7 @@ import { Router, route } from 'preact-router';
 import { parse } from 'query-string';
 import { withTranslation } from 'react-i18next';
 
+import history from '../../history';
 import Connection from '../../lib/connection';
 import CustomFields from '../../lib/customFields';
 import Hooks from '../../lib/hooks';
@@ -230,7 +231,7 @@ export class App extends Component {
 		};
 
 		return (
-			<Router onChange={this.handleRoute}>
+			<Router history={history} onChange={this.handleRoute}>
 				<ChatConnector default path='/' {...screenProps} />
 				<ChatFinished path='/chat-finished' {...screenProps} />
 				<GDPRAgreement path='/gdpr' {...screenProps} />

diff --git a/packages/livechat/src/history.ts b/packages/livechat/src/history.ts
@@ -0,0 +1,5 @@
+import { createMemoryHistory } from 'history';
+
+export const history = createMemoryHistory();
+
+export default history;
diff --git a/packages/livechat/src/routes/Register/container.js b/packages/livechat/src/routes/Register/container.js
@@ -61,7 +61,7 @@ export class RegisterContainer extends Component {
 		const { user: prevUser } = prevProps;
 		const { user } = this.props;
 
-		if (!prevUser && user && user._id) {
+		if ((!prevUser || Object.keys(prevUser).length === 0) && user && user._id) {
 			route('/');
 		}
 	}