Skip to content

fix: prevent push notifications from being sent after logout #37845

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

fix: prevent push notifications from being sent after logout #37845

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
51cdce5
fix: make push tokens to be removed after user logged out
ricardogarim Dec 17, 2025
a756cb9
add changeset
ricardogarim Dec 17, 2025
d8a4e0b
test: add automatic token removal checks
ricardogarim Dec 18, 2025
a4e9c9e
Merge branch 'develop' into fix/push-tokens
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
5 changes: 5 additions & 0 deletions .changeset/poor-apricots-heal.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rocket.chat/meteor': patch
---

Fixes push notifications continuing after logout due to missing token cleanup.
6 changes: 4 additions & 2 deletions apps/meteor/server/services/push/service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,13 @@ export class PushService extends ServiceClassInternal implements IPushService {
if (!('diff' in data) || !data.diff || !('services.resume.loginTokens' in data.diff)) {
return;
}
if (data.diff['services.resume.loginTokens'] === undefined) {

const loginTokens = Array.isArray(data.diff['services.resume.loginTokens']) ? data.diff['services.resume.loginTokens'] : [];

if (data.diff['services.resume.loginTokens'] === undefined || loginTokens.length === 0) {
await PushToken.removeAllByUserId(data.id);
return;
}
const loginTokens = Array.isArray(data.diff['services.resume.loginTokens']) ? data.diff['services.resume.loginTokens'] : [];
const tokens = loginTokens.map(({ hashedToken }: { hashedToken: string }) => hashedToken);
if (tokens.length > 0) {
await PushToken.removeByUserIdExceptTokens(data.id, tokens);
Expand Down
Loading