Skip to content

chore: properly close websocket connection on device logout #39383

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
juliajforesti wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

chore: properly close websocket connection on device logout #39383

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f0e36d7
chore: close connection on session `forceLogout`
juliajforesti Mar 5, 2026
57e4c74
chore: remove reload from `useForceLogout`
juliajforesti Mar 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 1 addition & 8 deletions apps/meteor/client/views/root/hooks/loggedIn/useForceLogout.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { useStream, useSessionDispatch } from '@rocket.chat/ui-contexts';
import { Meteor } from 'meteor/meteor';
import { useEffect } from 'react';

export const useForceLogout = (userId: string) => {
Expand All @@ -9,13 +8,7 @@ export const useForceLogout = (userId: string) => {
useEffect(() => {
setForceLogout(false);

const unsubscribe = getNotifyUserStream(`${userId}/force_logout`, (sessionId) => {
const currentSessionId = Meteor.connection._lastSessionId;

if (sessionId === currentSessionId) {
window.location.reload();
}

const unsubscribe = getNotifyUserStream(`${userId}/force_logout`, () => {
setForceLogout(true);
});

Expand Down
3 changes: 1 addition & 2 deletions apps/meteor/definition/externals/meteor/meteor.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ declare module 'meteor/meteor' {
}

const server: {
sessions: Map<string, { userId: string; heartbeat: DDPCommon.Heartbeat }>;
sessions: Map<string, { userId: string; heartbeat: DDPCommon.Heartbeat; connectionHandle: Meteor.Connection }>;
publish_handlers: {
meteor_autoupdate_clientVersions(): void;
};
Expand Down Expand Up @@ -118,7 +118,6 @@ declare module 'meteor/meteor' {
},
]
): SubscriptionHandle;
_lastSessionId: string;

call(methodName: string, ...args: [...unknown, callback?: (error: Error | null, result: unknown) => void]): void;
}
Expand Down
5 changes: 5 additions & 0 deletions apps/meteor/server/modules/listeners/listeners.module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import type { IUser, IRoom, IRole, VideoConference, ISetting, IOmnichannelRoom }
import { Logger } from '@rocket.chat/logger';
import type { ServerMediaSignal } from '@rocket.chat/media-signaling';
import { parse } from '@rocket.chat/message-parser';
import { Meteor } from 'meteor/meteor';

import { settings } from '../../../app/settings/server/cached';
import type { NotificationsModule } from '../notifications/notifications.module';
Expand Down Expand Up @@ -48,6 +49,10 @@ export class ListenersModule {

service.onEvent('user.forceLogout', (uid: string, sessionId?: string) => {
notifications.notifyUserInThisInstance(uid, 'force_logout', sessionId);
if (sessionId) {
const sessions = Meteor.server.sessions.get(sessionId);
sessions?.connectionHandle.close();
}
});

service.onEvent('notify.ephemeralMessage', (uid, rid, message) => {
Expand Down
Loading