haskal
/
jiti-meet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #951 from jitsi/prosody-tokens-case-insensitive-room 

Prosody tokens case insensitive room name
This commit is contained in:
Paweł Domas 2016-09-28 12:36:28 -05:00 committed by GitHub
parent 066b4f16a0 f3381b31ed
commit 94e5cda02d
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
conference.js
View File

@ -1220,8 +1220,9 @@ export default {
APP.UI.handleLastNEndpoints(ids, enteringIds);
});
room.on(
ConferenceEvents.PARTICIPANT_CONN_STATUS_CHANGED, (id, isActive) => {
APP.UI.participantConnectionStatusChanged(id, isActive);
ConferenceEvents.PARTICIPANT_CONN_STATUS_CHANGED,
(id, isActive) => {
APP.UI.participantConnectionStatusChanged(id, isActive);
});
room.on(ConferenceEvents.DOMINANT_SPEAKER_CHANGED, (id) => {
if (this.isLocalId(id)) {

2
modules/UI/videolayout/LargeVideoManager.js
View File

@ -92,7 +92,7 @@ export default class LargeVideoManager {
*/
onVideoInterrupted () {
this.enableLocalConnectionProblemFilter(true);
this._setLocalConnectionMessage("connection.RECONNECTING")
this._setLocalConnectionMessage("connection.RECONNECTING");
// Show the message only if the video is currently being displayed
this.showLocalConnectionMessage(this.state === VIDEO_CONTAINER_TYPE);
}

4
modules/UI/videolayout/RemoteVideo.js
View File

@ -197,7 +197,7 @@ RemoteVideo.prototype.setMutedView = function(isMuted) {
SmallVideo.prototype.setMutedView.call(this, isMuted);
// Update 'mutedWhileDisconnected' flag
this._figureOutMutedWhileDisconnected(this.isConnectionActive() === false);
}
};
/**
* Figures out the value of {@link #mutedWhileDisconnected} flag by taking into
@ -215,7 +215,7 @@ RemoteVideo.prototype._figureOutMutedWhileDisconnected
} else if (!isDisconnected && !this.isVideoMuted) {
this.mutedWhileDisconnected = false;
}
}
};
/**
* Adds the remote video menu element for the given <tt>id</tt> in the

2
prosody-plugins/mod_token_verification.lua
View File

@ -60,7 +60,7 @@ local function verify_user(session, stanza)
local token = session.auth_token;
local auth_room = session.jitsi_meet_room;
if room ~= auth_room and disableRoomNameConstraints ~= true then
if disableRoomNameConstraints ~= true and room ~= string.lower(auth_room) then
log("error", "Token %s not allowed to join: %s",
tostring(token), tostring(auth_room));
session.send(