BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

include permissions info in the reply for GetAllMeetingsRequest

Browse Source
This commit is contained in:
Anton Georgiev 2015-04-24 21:21:10 +00:00
parent 1333856c9b
commit 70d3c00e74
4 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/WhiteboardListener.java
View File

@ -20,7 +20,6 @@ public class WhiteboardListener implements MessageHandler{
@Override @Override
public void handleMessage(String pattern, String channel, String message) { public void handleMessage(String pattern, String channel, String message) {
if (channel.equalsIgnoreCase(MessagingConstants.TO_WHITEBOARD_CHANNEL)) { if (channel.equalsIgnoreCase(MessagingConstants.TO_WHITEBOARD_CHANNEL)) {
System.out.println("AntonChannel=(whiteboard)" + channel);
JsonParser parser = new JsonParser(); JsonParser parser = new JsonParser();
JsonObject obj = (JsonObject) parser.parse(message); JsonObject obj = (JsonObject) parser.parse(message);
@ -44,7 +43,7 @@ public class WhiteboardListener implements MessageHandler{
else { else {
System.out.println("\n DID NOT FIND A whiteboardID \n"); System.out.println("\n DID NOT FIND A whiteboardID \n");
} }
System.out.println("\n\n\n user<" + requesterID + "> requested the shapes.\n\n"); System.out.println("\n user<" + requesterID + "> requested the shapes.\n");
} }
} }
} }

3
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala
View File

@ -158,6 +158,9 @@ class BigBlueButtonActor(outGW: MessageOutGateway) extends Actor with LogHelper
//send chat history //send chat history
this ! (new GetChatHistoryRequest(id, "nodeJSapp", "nodeJSapp")) this ! (new GetChatHistoryRequest(id, "nodeJSapp", "nodeJSapp"))
//send lock settings
this ! (new GetLockSettings(id, "nodeJSapp"))
} }
outGW.send(new GetAllMeetingsReply(resultArray)) outGW.send(new GetAllMeetingsReply(resultArray))

2
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
View File

@ -2,7 +2,6 @@ package org.bigbluebutton.core
import scala.actors.Actor import scala.actors.Actor
import scala.actors.Actor._ import scala.actors.Actor._
import org.bigbluebutton.core.apps.poll.PollApp
import org.bigbluebutton.core.apps.poll.Poll import org.bigbluebutton.core.apps.poll.Poll
import org.bigbluebutton.core.apps.poll.PollApp import org.bigbluebutton.core.apps.poll.PollApp
import org.bigbluebutton.core.apps.users.UsersApp import org.bigbluebutton.core.apps.users.UsersApp
@ -90,6 +89,7 @@ class MeetingActor(val meetingID: String, val externalMeetingID: String, val mee
case msg: MuteUserRequest => handleMuteUserRequest(msg) case msg: MuteUserRequest => handleMuteUserRequest(msg)
case msg: EjectUserFromVoiceRequest => handleEjectUserRequest(msg) case msg: EjectUserFromVoiceRequest => handleEjectUserRequest(msg)
case msg: SetLockSettings => handleSetLockSettings(msg) case msg: SetLockSettings => handleSetLockSettings(msg)
case msg: GetLockSettings => handleGetLockSettings(msg)
case msg: LockUserRequest => handleLockUserRequest(msg) case msg: LockUserRequest => handleLockUserRequest(msg)
case msg: InitLockSettings => handleInitLockSettings(msg) case msg: InitLockSettings => handleInitLockSettings(msg)
case msg: InitAudioSettings => handleInitAudioSettings(msg) case msg: InitAudioSettings => handleInitAudioSettings(msg)

16
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
View File

@ -81,18 +81,11 @@ trait UsersApp {
//send the reply //send the reply
outGW.send(new ValidateAuthTokenReply(meetingID, msg.userId, msg.token, true, msg.correlationId, msg.sessionId)) outGW.send(new ValidateAuthTokenReply(meetingID, msg.userId, msg.token, true, msg.correlationId, msg.sessionId))
//send the list of users in the meeting
outGW.send(new GetUsersReply(meetingID, msg.userId, users.getUsers, msg.sessionId))
//send chat history
this ! (new GetChatHistoryRequest(meetingID, msg.userId, msg.userId))
//join the user //join the user
handleUserJoin(new UserJoining(meetingID, msg.userId, msg.token)) handleUserJoin(new UserJoining(meetingID, msg.userId, msg.token))
//send the presentation //send the presentation
logger.info("ValidateToken success: mid=[" + meetingID + "] uid=[" + msg.userId + "]") logger.info("ValidateToken success: mid=[" + meetingID + "] uid=[" + msg.userId + "]")
this ! (new GetPresentationInfo(meetingID, msg.userId, msg.userId))
} }
case None => { case None => {
logger.info("ValidateToken failed: mid=[" + meetingID + "] uid=[" + msg.userId + "]") logger.info("ValidateToken failed: mid=[" + meetingID + "] uid=[" + msg.userId + "]")
@ -153,11 +146,14 @@ trait UsersApp {
case None => // do nothing case None => // do nothing
} }
} }
def handleGetLockSettings(msg: GetLockSettings) { def handleGetLockSettings(msg: GetLockSettings) {
logger.info("Not implemented: handleGetLockSettings") //println("*************** Reply with current lock settings ********************")
//reusing the existing handle for NewPermissionsSettings to reply to the GetLockSettings request
outGW.send(new NewPermissionsSetting(meetingID, msg.userId, permissions, users.getUsers))
} }
def handleSetLockSettings(msg: SetLockSettings) { def handleSetLockSettings(msg: SetLockSettings) {
// println("*************** Received new lock settings ********************") // println("*************** Received new lock settings ********************")
if (!permissionsEqual(msg.settings)) { if (!permissionsEqual(msg.settings)) {