Skip to content

fix: session not being marked as logged out when logging out via REST /v1/logout #41573

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

Merged
dionisio-bot merged 10 commits into from
Aug 4, 2026
Merged

fix: session not being marked as logged out when logging out via REST /v1/logout #41573

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
3d47dff
fix: mark session as logged out on REST /v1/logout
Rohit3523 Jul 25, 2026
b6e2eeb
using logoutBySessionIdAndUserId
Rohit3523 Jul 25, 2026
f3f8ea5
Added test
Rohit3523 Jul 27, 2026
7deef47
making coderabbit happy
Rohit3523 Jul 27, 2026
93bc9f2
remove console
Rohit3523 Jul 27, 2026
ef9062c
lint fix
Rohit3523 Jul 27, 2026
08fbfdf
remove db thing from test
Rohit3523 Jul 27, 2026
773a2b9
removed query...
Rohit3523 Jul 27, 2026
f0ee6c6
added condition for test...
Rohit3523 Jul 27, 2026
923dd74
Added session id check
Rohit3523 Aug 3, 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
5 changes: 5 additions & 0 deletions .changeset/rest-logout-session-cleanup.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rocket.chat/meteor': patch
---

Marks the user session as logged out in the Sessions collection when logging out via `POST /v1/logout`. Previously the session cleanup relied on an indirect chain through `watch.users` → `Accounts.onLogout` that could be broken by a race condition, leaving orphaned sessions visible in Device Manager.
5 changes: 2 additions & 3 deletions apps/meteor/server/api/ApiClass.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import type { IMethodConnection, IUser } from '@rocket.chat/core-typings';
import type { Route, Router } from '@rocket.chat/http-router';
import { License } from '@rocket.chat/license';
import { Logger } from '@rocket.chat/logger';
import { Users } from '@rocket.chat/models';
import { Sessions, Users } from '@rocket.chat/models';
import { Random } from '@rocket.chat/random';
import type { JoinPathPattern, Method } from '@rocket.chat/rest-typings';
import { ajv } from '@rocket.chat/rest-typings';
Expand Down Expand Up @@ -1135,8 +1135,7 @@ export class APIClass<TBasePath extends string = '', TOperations extends Record<
},
);

// TODO this can be optmized so places that care about loginTokens being removed are invoked directly
// instead of having to listen to every watch.users event
await Sessions.logoutByloginTokenAndUserId({ loginToken: hashedToken, userId: this.userId });
Comment thread
Rohit3523 marked this conversation as resolved.
Resolved
Comment thread
Rohit3523 marked this conversation as resolved.
Resolved
void notifyOnUserChangeAsync(async () => {
const userTokens = await Users.findOneById(this.userId, { projection: { [tokenPath]: 1 } });
if (!userTokens) {
Expand Down
Loading