Skip to content

fix: update /v1/users.logout to properly log out all user sessions #37846

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
ggazzo merged 4 commits into from
Dec 19, 2025
Merged

fix: update /v1/users.logout to properly log out all user sessions #37846

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
37fe77b
fix: mark sessions as logged out when user logs out
ricardogarim Dec 17, 2025
516e919
add changeset
ricardogarim Dec 17, 2025
cf9b629
Merge branch 'develop' into fix/logout-sessions
kodiakhq[bot] Dec 19, 2025
7d51add
Merge branch 'develop' into fix/logout-sessions
kodiakhq[bot] Dec 19, 2025
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
7 changes: 7 additions & 0 deletions .changeset/slimy-ads-sing.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
'@rocket.chat/model-typings': patch
'@rocket.chat/models': patch
'@rocket.chat/meteor': patch
---

Fixes /v1/users.logout not marking user sessions as logged out, leaving stale sessions active.
4 changes: 3 additions & 1 deletion apps/meteor/app/api/server/v1/users.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { MeteorError, Team, api, Calendar } from '@rocket.chat/core-services';
import { type IExportOperation, type ILoginToken, type IPersonalAccessToken, type IUser, type UserStatus } from '@rocket.chat/core-typings';
import { Users, Subscriptions } from '@rocket.chat/models';
import { Users, Subscriptions, Sessions } from '@rocket.chat/models';
import {
isUserCreateParamsPOST,
isUserSetActiveStatusParamsPOST,
Expand Down Expand Up @@ -1283,6 +1283,8 @@ API.v1.addRoute(
throw new Meteor.Error('error-invalid-user-id', 'Invalid user id');
}

await Sessions.logoutAllByUserId(userId, this.userId);

void notifyOnUserChange({ clientAction: 'updated', id: userId, diff: { 'services.resume.loginTokens': [] } });

return API.v1.success({
Expand Down
2 changes: 2 additions & 0 deletions packages/model-typings/src/models/ISessionsModel.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,8 @@ export interface ISessionsModel extends IBaseModel<ISession> {
logoutBy?: IUser['_id'];
}): Promise<UpdateResult | Document>;

logoutAllByUserId(userId: IUser['_id'], logoutBy: IUser['_id']): Promise<UpdateResult | Document>;

createBatch(sessions: OptionalId<ISession>[]): Promise<BulkWriteResult | undefined>;

updateDailySessionById(_id: ISession['_id'], record: Partial<ISession>): Promise<UpdateResult>;
Expand Down
12 changes: 12 additions & 0 deletions packages/models/src/models/Sessions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1575,6 +1575,18 @@ export class SessionsRaw extends BaseRaw<ISession> implements ISessionsModel {
return this.updateMany({ userId, loginToken }, updateObj);
}

async logoutAllByUserId(userId: IUser['_id'], logoutBy: IUser['_id']): Promise<UpdateResult | Document> {
const logoutAt = new Date();
const updateObj = {
$set: {
logoutAt,
logoutBy,
},
};

return this.updateMany({ userId, logoutAt: { $exists: false } }, updateObj);
}

async createBatch(sessions: OptionalId<ISession>[]): Promise<BulkWriteResult | undefined> {
if (!sessions || sessions.length === 0) {
return;
Expand Down
Loading