Skip to content

[FIX] Uncaught error by listening stream-notify-room without subscription #27020

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 6 commits into from
Oct 18, 2022
Merged

[FIX] Uncaught error by listening stream-notify-room without subscription #27020

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
da513c7
fix error
tiagoevanp Oct 6, 2022
8a2fade
fix gazzo review
tiagoevanp Oct 6, 2022
ee0da4c
fix
tiagoevanp Oct 6, 2022
21cd2bd
...
tiagoevanp Oct 6, 2022
7326bca
use canAccessRoomId
tiagoevanp Oct 17, 2022
c67434d
Merge branch 'develop' into fix/uncaught-stream-notify-room
kodiakhq[bot] Oct 18, 2022
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
12 changes: 10 additions & 2 deletions apps/meteor/server/modules/notifications/notifications.module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,14 @@ export class NotificationsModule {
return true;
}

const room = await Rooms.findOneById<Pick<IOmnichannelRoom, 't' | 'v' | '_id'>>(rid, {
projection: { 't': 1, 'v.token': 1 },
});

if (!room) {
return false;
}

// typing from livechat widget
if (extraData?.token) {
// TODO improve this to make a query 'v.token'
Expand All @@ -173,9 +181,9 @@ export class NotificationsModule {
if (!this.userId) {
return false;
}
const canAccess = await Authorization.canAccessRoomId(room._id, this.userId);

const subsCount = await Subscriptions.countByRoomIdAndUserId(rid, this.userId);
return subsCount > 0;
return canAccess;
});

async function canType({
Expand Down