diff --git a/.meteor/packages b/.meteor/packages index f0837a936ed..35a6346ae3c 100644 --- a/.meteor/packages +++ b/.meteor/packages @@ -168,7 +168,6 @@ raix:push raix:ui-dropped-event smoral:sweetalert steffo:meteor-accounts-saml -tmeasday:crypto-md5 todda00:friendly-slugs yasaricli:slugify yasinuslu:blaze-meta diff --git a/.meteor/versions b/.meteor/versions index a0065e08ef3..cb1f95c189e 100644 --- a/.meteor/versions +++ b/.meteor/versions @@ -245,8 +245,6 @@ templating@1.3.2 templating-compiler@1.3.3 templating-runtime@1.3.2 templating-tools@1.1.2 -tmeasday:crypto-base@3.1.2 -tmeasday:crypto-md5@3.1.2 todda00:friendly-slugs@0.6.0 tracker@1.1.3 twitter-oauth@1.2.0 diff --git a/packages/rocketchat-livechat/server/methods/startVideoCall.js b/packages/rocketchat-livechat/server/methods/startVideoCall.js index fc23e1dd07f..5180ee5e44a 100644 --- a/packages/rocketchat-livechat/server/methods/startVideoCall.js +++ b/packages/rocketchat-livechat/server/methods/startVideoCall.js @@ -27,7 +27,7 @@ Meteor.methods({ return { roomId: room._id, domain: RocketChat.settings.get('Jitsi_Domain'), - jitsiRoom: RocketChat.settings.get('Jitsi_URL_Room_Prefix') + CryptoJS.MD5(RocketChat.settings.get('uniqueID') + roomId).toString() + jitsiRoom: RocketChat.settings.get('Jitsi_URL_Room_Prefix') + RocketChat.settings.get('uniqueID') + roomId }; } }); diff --git a/packages/rocketchat-videobridge/client/views/videoFlexTab.js b/packages/rocketchat-videobridge/client/views/videoFlexTab.js index 43c707c3f65..cafbfe8d153 100644 --- a/packages/rocketchat-videobridge/client/views/videoFlexTab.js +++ b/packages/rocketchat-videobridge/client/views/videoFlexTab.js @@ -59,7 +59,7 @@ Template.videoFlexTab.onRendered(function() { const roomId = Session.get('openedRoom'); const domain = RocketChat.settings.get('Jitsi_Domain'); - const jitsiRoom = RocketChat.settings.get('Jitsi_URL_Room_Prefix') + CryptoJS.MD5(RocketChat.settings.get('uniqueID') + roomId).toString(); + const jitsiRoom = RocketChat.settings.get('Jitsi_URL_Room_Prefix') + RocketChat.settings.get('uniqueID') + roomId; const noSsl = RocketChat.settings.get('Jitsi_SSL') ? false : true; if (jitsiRoomActive !== null && jitsiRoomActive !== jitsiRoom) {