Browse Source

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

Prosody tokens case insensitive room name
master
Paweł Domas 8 years ago
parent
commit
94e5cda02d

+ 3
- 2
conference.js View File

1220
             APP.UI.handleLastNEndpoints(ids, enteringIds);
1220
             APP.UI.handleLastNEndpoints(ids, enteringIds);
1221
         });
1221
         });
1222
         room.on(
1222
         room.on(
1223
-            ConferenceEvents.PARTICIPANT_CONN_STATUS_CHANGED, (id, isActive) => {
1224
-            APP.UI.participantConnectionStatusChanged(id, isActive);
1223
+            ConferenceEvents.PARTICIPANT_CONN_STATUS_CHANGED,
1224
+            (id, isActive) => {
1225
+                APP.UI.participantConnectionStatusChanged(id, isActive);
1225
         });
1226
         });
1226
         room.on(ConferenceEvents.DOMINANT_SPEAKER_CHANGED, (id) => {
1227
         room.on(ConferenceEvents.DOMINANT_SPEAKER_CHANGED, (id) => {
1227
             if (this.isLocalId(id)) {
1228
             if (this.isLocalId(id)) {

+ 1
- 1
modules/UI/videolayout/LargeVideoManager.js View File

92
      */
92
      */
93
     onVideoInterrupted () {
93
     onVideoInterrupted () {
94
         this.enableLocalConnectionProblemFilter(true);
94
         this.enableLocalConnectionProblemFilter(true);
95
-        this._setLocalConnectionMessage("connection.RECONNECTING")
95
+        this._setLocalConnectionMessage("connection.RECONNECTING");
96
         // Show the message only if the video is currently being displayed
96
         // Show the message only if the video is currently being displayed
97
         this.showLocalConnectionMessage(this.state === VIDEO_CONTAINER_TYPE);
97
         this.showLocalConnectionMessage(this.state === VIDEO_CONTAINER_TYPE);
98
     }
98
     }

+ 2
- 2
modules/UI/videolayout/RemoteVideo.js View File

197
     SmallVideo.prototype.setMutedView.call(this, isMuted);
197
     SmallVideo.prototype.setMutedView.call(this, isMuted);
198
     // Update 'mutedWhileDisconnected' flag
198
     // Update 'mutedWhileDisconnected' flag
199
     this._figureOutMutedWhileDisconnected(this.isConnectionActive() === false);
199
     this._figureOutMutedWhileDisconnected(this.isConnectionActive() === false);
200
-}
200
+};
201
 
201
 
202
 /**
202
 /**
203
  * Figures out the value of {@link #mutedWhileDisconnected} flag by taking into
203
  * Figures out the value of {@link #mutedWhileDisconnected} flag by taking into
215
     } else if (!isDisconnected && !this.isVideoMuted) {
215
     } else if (!isDisconnected && !this.isVideoMuted) {
216
         this.mutedWhileDisconnected = false;
216
         this.mutedWhileDisconnected = false;
217
     }
217
     }
218
-}
218
+};
219
 
219
 
220
 /**
220
 /**
221
  * Adds the remote video menu element for the given <tt>id</tt> in the
221
  * Adds the remote video menu element for the given <tt>id</tt> in the

+ 1
- 1
prosody-plugins/mod_token_verification.lua View File

60
 
60
 
61
 	local token = session.auth_token;
61
 	local token = session.auth_token;
62
 	local auth_room = session.jitsi_meet_room;
62
 	local auth_room = session.jitsi_meet_room;
63
-	if room ~= auth_room and disableRoomNameConstraints ~= true then
63
+	if disableRoomNameConstraints ~= true and room ~= string.lower(auth_room) then
64
 		log("error", "Token %s not allowed to join: %s",
64
 		log("error", "Token %s not allowed to join: %s",
65
 			tostring(token), tostring(auth_room));
65
 			tostring(token), tostring(auth_room));
66
 		session.send(
66
 		session.send(

Loading…
Cancel
Save