From 6792464fbf77b445564e19ecbfe0d64eea19b59f Mon Sep 17 00:00:00 2001 From: Matteo Pagliazzi Date: Mon, 5 Sep 2016 17:54:24 +0200 Subject: [PATCH] limit rtc to parties --- website/client/js/services/pusherService.js | 4 +--- website/server/controllers/api-v3/auth.js | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/website/client/js/services/pusherService.js b/website/client/js/services/pusherService.js index 041e389e95..70bed993ad 100644 --- a/website/client/js/services/pusherService.js +++ b/website/client/js/services/pusherService.js @@ -58,8 +58,6 @@ angular.module('habitrpg') api.socketId = api.pusher.connection.socket_id; }); - if (!partyId) return; - var partyChannelName = 'presence-group-' + partyId; var partyChannel = api.pusher.subscribe(partyChannelName); @@ -132,7 +130,7 @@ angular.module('habitrpg') // Connect the user to Pusher and to the party's chat channel partyId = user && $rootScope.user.party && $rootScope.user.party._id; - // if (!partyId) return; + if (!partyId) return; // See if another tab is already connected to Pusher if (!localStorage.getItem(tabIdKey)) { diff --git a/website/server/controllers/api-v3/auth.js b/website/server/controllers/api-v3/auth.js index 74e3663637..48a138d5da 100644 --- a/website/server/controllers/api-v3/auth.js +++ b/website/server/controllers/api-v3/auth.js @@ -327,7 +327,7 @@ api.pusherAuth = { // Channel names are in the form of {presence|private}-{group|...}-{resourceId} let [channelType, resourceType, ...resourceId] = channelName.split('-'); - if (['presence'].indexOf(channelType) === -1) { // presence is used only for parties, private for guilds too + if (['presence'].indexOf(channelType) === -1) { // presence is used only for parties, private for guilds throw new BadRequest('Invalid Pusher channel type.'); }