fix user.forceLogout for microservices

RocketChat · Apr 22, 2024 · 4e8f579 · 4e8f579
1 parent 7eca905
commit 4e8f579
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/apps/meteor/server/lib/resetUserE2EKey.ts b/apps/meteor/server/lib/resetUserE2EKey.ts
@@ -1,8 +1,8 @@
+import { api } from '@rocket.chat/core-services';
 import { Subscriptions, Users } from '@rocket.chat/models';
 import { Meteor } from 'meteor/meteor';
 
 import * as Mailer from '../../app/mailer/server/api';
-import { Notifications } from '../../app/notifications/server';
 import { settings } from '../../app/settings/server';
 import { i18n } from './i18n';
 import { isUserIdFederated } from './isUserIdFederated';
@@ -66,7 +66,8 @@ export async function resetUserE2EEncriptionKey(uid: string, notifyUser: boolean
 	}
 
 	// force logout the live sessions
-	Notifications.notifyUser(uid, 'force_logout');
+
+	await api.broadcast('user.forceLogout', uid);
 
 	await Users.resetE2EKey(uid);
 	await Subscriptions.resetUserE2EKey(uid);

diff --git a/apps/meteor/server/modules/listeners/listeners.module.ts b/apps/meteor/server/modules/listeners/listeners.module.ts
@@ -45,6 +45,10 @@ export class ListenersModule {
 			});
 		});
 
+		service.onEvent('user.forceLogout', (uid) => {
+			notifications.notifyUserInThisInstance(uid, 'force_logout');
+		});
+
 		service.onEvent('notify.ephemeralMessage', (uid, rid, message) => {
 			if (!isMessageParserDisabled && message.msg) {
 				const customDomains = settings.get<string>('Message_CustomDomain_AutoLink')

diff --git a/packages/core-services/src/events/Events.ts b/packages/core-services/src/events/Events.ts
@@ -130,6 +130,7 @@ export type EventSignatures = {
 			  },
 	): void;
 	'user.deleteCustomStatus'(userStatus: Omit<ICustomUserStatus, '_updatedAt'>): void;
+	'user.forceLogout': (uid: string) => void;
 	'user.nameChanged'(user: Pick<IUser, '_id' | 'name' | 'username'>): void;
 	'user.realNameChanged'(user: Partial<IUser>): void;
 	'user.roleUpdate'(update: {