Merge pull request #8743 from RocketChat/remove-tmeasday-crypto-md5

Removed tmeasday:crypto-md5
pull/8531/head^2
Rodrigo Nascimento 9 years ago committed by GitHub
commit 9e2d043912
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 1
      .meteor/packages
  2. 2
      .meteor/versions
  3. 2
      packages/rocketchat-livechat/server/methods/startVideoCall.js
  4. 2
      packages/rocketchat-videobridge/client/views/videoFlexTab.js

@ -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

@ -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

@ -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
};
}
});

@ -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) {

Loading…
Cancel
Save