diff --git a/akka-bbb-apps/src/main/java/org/bigbluebutton/core/api/IBigBlueButtonInGW.java b/akka-bbb-apps/src/main/java/org/bigbluebutton/core/api/IBigBlueButtonInGW.java
index 044e68da24964fb26388c3b6c6329f4f65f77790..d58295ab9045496fee6a09e14945195494a38134 100755
--- a/akka-bbb-apps/src/main/java/org/bigbluebutton/core/api/IBigBlueButtonInGW.java
+++ b/akka-bbb-apps/src/main/java/org/bigbluebutton/core/api/IBigBlueButtonInGW.java
@@ -1,6 +1,5 @@
package org.bigbluebutton.core.api;
-import java.util.Map;
import org.bigbluebutton.common.messages.*;
public interface IBigBlueButtonInGW {
@@ -14,36 +13,11 @@ public interface IBigBlueButtonInGW {
void destroyMeeting(String meetingID);
void getAllMeetings(String meetingID);
- void lockSettings(String meetingID, Boolean locked, Map<String, Boolean> lockSettigs);
void activityResponse(String meetingID);
- // Lock
- void initLockSettings(String meetingID, Map<String, Boolean> settings);
- void sendLockSettings(String meetingID, String userId, Map<String, Boolean> settings);
- void getLockSettings(String meetingId, String userId);
-
- // Users
- void validateAuthToken(String meetingId, String userId, String token, String correlationId, String sessionId);
- void registerUser(String roomName, String userid, String username, String role, String externUserID,
- String authToken, String avatarURL, Boolean guest, Boolean authed);
- void userEmojiStatus(String meetingId, String userId, String emojiStatus);
- void shareWebcam(String meetingId, String userId, String stream);
- void unshareWebcam(String meetingId, String userId, String stream);
- void setUserStatus(String meetingID, String userID, String status, Object value);
- void setUserRole(String meetingID, String userID, String role);
- void getUsers(String meetingID, String requesterID);
- void userLeft(String meetingID, String userID, String sessionId);
- void userJoin(String meetingID, String userID, String authToken);
- void getCurrentPresenter(String meetingID, String requesterID);
- void checkIfAllowedToShareDesktop(String meetingID, String userID);
- void assignPresenter(String meetingID, String newPresenterID, String newPresenterName, String assignedBy);
void setRecordingStatus(String meetingId, String userId, Boolean recording);
void getRecordingStatus(String meetingId, String userId);
- void getGuestPolicy(String meetingID, String userID);
- void setGuestPolicy(String meetingID, String guestPolicy, String setBy);
- void responseToGuest(String meetingID, String userID, Boolean response, String requesterID);
- void logoutEndMeeting(String meetingID, String userID);
-
+
// DeskShare
void deskShareStarted(String confId, String callerId, String callerIdName);
void deskShareStopped(String conferenceName, String callerId, String callerIdName);
diff --git a/akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/LockMessageReceiver.java b/akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/LockMessageReceiver.java
deleted file mode 100755
index 961162a0d2f6ce816531b889531565b39737cf85..0000000000000000000000000000000000000000
--- a/akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/LockMessageReceiver.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package org.bigbluebutton.core.pubsub.receivers;
-
-import org.bigbluebutton.common.messages.GetLockSettingsMessage;
-import org.bigbluebutton.common.messages.LockUserMessage;
-import org.bigbluebutton.common.messages.MessagingConstants;
-import org.bigbluebutton.common.messages.SendLockSettingsMessage;
-import org.bigbluebutton.core.api.IBigBlueButtonInGW;
-
-import com.google.gson.JsonParser;
-import com.google.gson.JsonObject;
-
-public class LockMessageReceiver implements MessageHandler {
-
- private IBigBlueButtonInGW bbbGW;
-
- public LockMessageReceiver(IBigBlueButtonInGW bbbGW) {
- this.bbbGW = bbbGW;
- }
-
- @Override
- public void handleMessage(String pattern, String channel, String message) {
- if (channel.equalsIgnoreCase(MessagingConstants.TO_MEETING_CHANNEL)) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
-
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (GetLockSettingsMessage.GET_LOCK_SETTINGS.equals(messageName)) {
- GetLockSettingsMessage msg = GetLockSettingsMessage.fromJson(message);
- bbbGW.getLockSettings(msg.meetingId, msg.userId);
- } else if(LockUserMessage.LOCK_USER.equals(messageName)) {
- LockUserMessage msg = LockUserMessage.fromJson(message);
- } else if(SendLockSettingsMessage.SEND_LOCK_SETTINGS.equals(messageName)) {
- SendLockSettingsMessage msg = SendLockSettingsMessage.fromJson(message);
- bbbGW.sendLockSettings(msg.meetingId, msg.userId, msg.newSettings);
- }
- }
- }
- }
- }
-}
diff --git a/akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/MeetingMessageReceiver.java b/akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/MeetingMessageReceiver.java
index d2a44c91c5bbc6a04ef98847298a6531422a1ea6..9325969418ff9c491987d253fc07a5f08fd88386 100755
--- a/akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/MeetingMessageReceiver.java
+++ b/akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/MeetingMessageReceiver.java
@@ -13,10 +13,8 @@ import org.bigbluebutton.common.messages.MessageFromJsonConverter;
import org.bigbluebutton.common.messages.MessagingConstants;
import org.bigbluebutton.common.messages.PubSubPingMessage;
-import org.bigbluebutton.common.messages.ValidateAuthTokenMessage;
import org.bigbluebutton.core.api.IBigBlueButtonInGW;
import org.bigbluebutton.messages.CreateMeetingRequest;
-import org.bigbluebutton.messages.RegisterUserMessage;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -47,12 +45,6 @@ public class MeetingMessageReceiver implements MessageHandler {
Gson gson = new Gson();
CreateMeetingRequest msg = gson.fromJson(message, CreateMeetingRequest.class);
bbbGW.handleBigBlueButtonMessage(msg);
- } else if (RegisterUserMessage.NAME.equals(messageName)) {
- Gson gson = new Gson();
- RegisterUserMessage msg = gson.fromJson(message, RegisterUserMessage.class);
- bbbGW.registerUser(msg.payload.meetingId, msg.payload.userId, msg.payload.name, msg.payload.role,
- msg.payload.extUserId, msg.payload.authToken, msg.payload.avatarUrl, msg.payload.guest,
- msg.payload.authed);
}
}
}
@@ -66,11 +58,6 @@ public class MeetingMessageReceiver implements MessageHandler {
} else if (msg instanceof DestroyMeetingMessage) {
DestroyMeetingMessage dmm = (DestroyMeetingMessage) msg;
bbbGW.destroyMeeting(dmm.meetingId);
- } else if (msg instanceof ValidateAuthTokenMessage) {
- ValidateAuthTokenMessage vam = (ValidateAuthTokenMessage) msg;
- String sessionId = "tobeimplemented";
- bbbGW.validateAuthToken(vam.meetingId, vam.userId, vam.token, vam.replyTo, sessionId);
- } else if (msg instanceof GetAllMeetingsRequest) {
GetAllMeetingsRequest gamr = (GetAllMeetingsRequest) msg;
bbbGW.getAllMeetings("no_need_of_a_meeting_id");
} else if (msg instanceof ActivityResponseMessage) {
diff --git a/akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/RedisMessageReceiver.java b/akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/RedisMessageReceiver.java
index 999c5e92db12f4d0538e27526c424774b88af0a0..bdf67ff497c466c64a3c89a32cabd46b1cde3138 100755
--- a/akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/RedisMessageReceiver.java
+++ b/akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/RedisMessageReceiver.java
@@ -31,9 +31,6 @@ public class RedisMessageReceiver {
}
private void setupReceivers() {
- LockMessageReceiver lockRx = new LockMessageReceiver(bbbGW);
- receivers.add(lockRx);
-
UsersMessageReceiver usersRx = new UsersMessageReceiver(bbbGW);
receivers.add(usersRx);
diff --git a/akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/UsersMessageReceiver.java b/akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/UsersMessageReceiver.java
index 1e0d4b5ef7af60272fcab4ae575775dcb12e885a..444dc09ae71ed0e49463bb27f028be280eebbce5 100755
--- a/akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/UsersMessageReceiver.java
+++ b/akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/UsersMessageReceiver.java
@@ -30,109 +30,18 @@ public class UsersMessageReceiver implements MessageHandler{
if (header.has("name")) {
String messageName = header.get("name").getAsString();
switch (messageName) {
- case UserLeavingMessage.USER_LEAVING:
- processUserLeavingMessage(message);
- break;
- case AllowUserToShareDesktopRequest.NAME:
- processAllowUserToShareDesktopRequest(message);
- break;
- case AssignPresenterRequestMessage.ASSIGN_PRESENTER_REQUEST:
- processAssignPresenterRequestMessage(message);
- break;
- case UserEmojiStatusMessage.USER_EMOJI_STATUS:
- processUserEmojiStatusMessage(message);
- break;
- case UserShareWebcamRequestMessage.USER_SHARE_WEBCAM_REQUEST:
- processUserShareWebcamRequestMessage(message);
- break;
- case UserUnshareWebcamRequestMessage.USER_UNSHARE_WEBCAM_REQUEST:
- processUserUnshareWebcamRequestMessage(message);
- break;
- case SetUserStatusRequestMessage.SET_USER_STATUS_REQUEST:
- processSetUserStatusRequestMessage(message);
- break;
case SetRecordingStatusRequestMessage.SET_RECORDING_STATUS_REQUEST:
processSetRecordingStatusRequestMessage(message);
break;
case GetRecordingStatusRequestMessage.GET_RECORDING_STATUS_REQUEST:
processGetRecordingStatusRequestMessage(message);
break;
- case GetUsersRequestMessage.GET_USERS_REQUEST:
- processGetUsersRequestMessage(message);
- break;
- case InitPermissionsSettingMessage.INIT_PERMISSIONS_SETTING:
- processInitPermissionsSettingMessage(message);
- break;
- case ChangeUserRoleMessage.CHANGE_USER_ROLE:
- processChangeUserRoleMessage(message);
- break;
- case GetGuestPolicyMessage.GET_GUEST_POLICY:
- processGetGuestPolicyMessage(message);
- break;
- case SetGuestPolicyMessage.SET_GUEST_POLICY:
- processSetGuestPolicyMessage(message);
- break;
- case RespondToGuestMessage.RESPOND_TO_GUEST:
- processRespondToGuestMessage(message);
- break;
- case LogoutEndMeetingRequestMessage.LOGOUT_END_MEETING_REQUEST_MESSAGE:
- processLogoutEndMeetingRequestMessage(message);
- break;
}
}
}
}
}
- private void processUserLeavingMessage(String message) {
- UserLeavingMessage ulm = UserLeavingMessage.fromJson(message);
- if (ulm != null) {
- bbbInGW.userLeft(ulm.meetingId, ulm.userId, ulm.meetingId);
- }
- }
-
- private void processAllowUserToShareDesktopRequest(String message) {
- AllowUserToShareDesktopRequest msg = AllowUserToShareDesktopRequest.fromJson(message);
- if (msg != null) {
- bbbInGW.checkIfAllowedToShareDesktop(msg.meetingId, msg.userId);
- }
- }
-
- private void processAssignPresenterRequestMessage(String message) {
- AssignPresenterRequestMessage apm = AssignPresenterRequestMessage.fromJson(message);
- if (apm != null) {
- bbbInGW.assignPresenter(apm.meetingId, apm.newPresenterId, apm.newPresenterName, apm.assignedBy);
- }
- }
-
- private void processUserEmojiStatusMessage(String message) {
- UserEmojiStatusMessage uesm = UserEmojiStatusMessage.fromJson(message);
- if (uesm != null) {
- bbbInGW.userEmojiStatus(uesm.meetingId, uesm.userId, uesm.emojiStatus);
- }
- }
-
- private void processUserShareWebcamRequestMessage(String message) {
- UserShareWebcamRequestMessage msg = UserShareWebcamRequestMessage.fromJson(message);
- if (msg != null) {
- bbbInGW.shareWebcam(msg.meetingId, msg.userId, msg.stream);
- }
- }
-
- private void processUserUnshareWebcamRequestMessage(String message) {
- UserUnshareWebcamRequestMessage msg = UserUnshareWebcamRequestMessage.fromJson(message);
- if (msg != null) {
- bbbInGW.unshareWebcam(msg.meetingId, msg.userId, msg.stream);
- }
- }
-
- private void processSetUserStatusRequestMessage(String message) {
- SetUserStatusRequestMessage msg = SetUserStatusRequestMessage.fromJson(message);
- if (msg != null) {
- bbbInGW.setUserStatus(msg.meetingId, msg.userId, msg.status, msg.value);
- }
- }
-
private void processSetRecordingStatusRequestMessage(String message) {
SetRecordingStatusRequestMessage msg = SetRecordingStatusRequestMessage.fromJson(message);
if (msg != null) {
@@ -146,53 +55,4 @@ public class UsersMessageReceiver implements MessageHandler{
bbbInGW.getRecordingStatus(msg.meetingId, msg.userId);
}
}
-
- private void processGetUsersRequestMessage(String message) {
- GetUsersRequestMessage msg = GetUsersRequestMessage.fromJson(message);
- if (msg != null) {
- bbbInGW.getUsers(msg.meetingId, msg.requesterId);
- }
- }
-
- private void processInitPermissionsSettingMessage(String message) {
- InitPermissionsSettingMessage msg = InitPermissionsSettingMessage.fromJson(message);
- if (msg != null) {
- bbbInGW.initLockSettings(msg.meetingId, msg.permissions);
- }
- }
-
- private void processChangeUserRoleMessage(String message) {
- ChangeUserRoleMessage msg = ChangeUserRoleMessage.fromJson(message);
- if (msg != null) {
- bbbInGW.setUserRole(msg.meetingId, msg.userId, msg.role);
- }
- }
-
- private void processGetGuestPolicyMessage(String message) {
- GetGuestPolicyMessage msg = GetGuestPolicyMessage.fromJson(message);
- if (msg != null) {
- bbbInGW.getGuestPolicy(msg.meetingId, msg.requesterId);
- }
- }
-
- private void processSetGuestPolicyMessage(String message) {
- SetGuestPolicyMessage msg = SetGuestPolicyMessage.fromJson(message);
- if (msg != null) {
- bbbInGW.setGuestPolicy(msg.meetingId, msg.guestPolicy, msg.setBy);
- }
- }
-
- private void processRespondToGuestMessage(String message) {
- RespondToGuestMessage msg = RespondToGuestMessage.fromJson(message);
- if (msg != null) {
- bbbInGW.responseToGuest(msg.meetingId, msg.userId, msg.response, msg.requesterId);
- }
- }
-
- private void processLogoutEndMeetingRequestMessage(String message) {
- LogoutEndMeetingRequestMessage lemm = LogoutEndMeetingRequestMessage.fromJson(message);
- if (lemm != null) {
- bbbInGW.logoutEndMeeting(lemm.meetingId, lemm.userId);
- }
- }
}
diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala
index 8448dee06881a852049d8d0345b2083952a9c02a..340475b9d4fedfad60143840c56a22bba0f99cf1 100755
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala
@@ -62,7 +62,6 @@ class BigBlueButtonActor(
// 2x messages
case msg: BbbCommonEnvCoreMsg => handleBbbCommonEnvCoreMsg(msg)
- case msg: ValidateAuthToken => handleValidateAuthToken(msg)
case _ => // do nothing
}
@@ -125,34 +124,6 @@ class BigBlueButtonActor(
})
}
- private def handleValidateAuthToken(msg: ValidateAuthToken) {
- for {
- m <- RunningMeetings.findWithId(meetings, msg.meetingID)
- } yield {
- m.actorRef forward (msg)
- }
-
- //meetings.get(msg.meetingID) foreach { m =>
- // m.actorRef ! msg
-
- // val future = m.actorRef.ask(msg)(5 seconds)
- // future onComplete {
- // case Success(result) => {
- // log.info("Validate auth token response. meetingId=" + msg.meetingID + " userId=" + msg.userId + " token=" + msg.token)
- // /**
- // * Received a reply from MeetingActor which means hasn't hung!
- // * Sometimes, the actor seems to hang and doesn't anymore accept messages. This is a simple
- // * audit to check whether the actor is still alive. (ralam feb 25, 2015)
- // */
- // }
- // case Failure(failure) => {
- // log.warning("Validate auth token timeout. meetingId=" + msg.meetingID + " userId=" + msg.userId + " token=" + msg.token)
- // outGW.send(new ValidateAuthTokenTimedOut(msg.meetingID, msg.userId, msg.token, false, msg.correlationId))
- // }
- // }
- //}
- }
-
private def handlePubSubPingSysReqMsg(msg: PubSubPingSysReqMsg): Unit = {
val event = MsgBuilder.buildPubSubPongSysRespMsg(msg.body.system, msg.body.timestamp)
outGW.send(event)
diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
index 2f46e0cb86fe6c1e550926cd56d06b0c7308f8a3..ac5ba9cef53d8d1e9da9ae84e643f20749a9371f 100755
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
@@ -10,7 +10,6 @@ import org.bigbluebutton.common.messages.PubSubPingMessage
import org.bigbluebutton.messages._
import akka.event.Logging
import org.bigbluebutton.SystemConfiguration
-import org.bigbluebutton.core.models.{ GuestPolicyType, Roles }
import scala.collection.JavaConverters
@@ -37,13 +36,13 @@ class BigBlueButtonInGW(
}
case msg: CreateMeetingRequest => {
- val policy = msg.payload.guestPolicy.toUpperCase() match {
+ /*val policy = msg.payload.guestPolicy.toUpperCase() match {
case "ALWAYS_ACCEPT" => GuestPolicyType.ALWAYS_ACCEPT
case "ALWAYS_DENY" => GuestPolicyType.ALWAYS_DENY
case "ASK_MODERATOR" => GuestPolicyType.ASK_MODERATOR
//default
case undef => GuestPolicyType.ASK_MODERATOR
- }
+ }*/
/*
val mProps = new MeetingProperties(
msg.payload.id,
@@ -93,10 +92,6 @@ class BigBlueButtonInGW(
eventBus.publish(BigBlueButtonEvent("meeting-manager", new KeepAliveMessage(aliveId)))
}
- def lockSettings(meetingID: String, locked: java.lang.Boolean,
- lockSettings: java.util.Map[String, java.lang.Boolean]) {
- }
-
def statusMeetingAudit(meetingID: String) {
}
@@ -118,73 +113,6 @@ class BigBlueButtonInGW(
* Message Interface for Users
* ***********************************************************
*/
- def validateAuthToken(meetingId: String, userId: String, token: String, correlationId: String, sessionId: String) {
- eventBus.publish(BigBlueButtonEvent(meetingId, new ValidateAuthToken(meetingId, userId, token, correlationId, sessionId)))
- }
-
- def registerUser(meetingID: String, userID: String, name: String, role: String, extUserID: String,
- authToken: String, avatarURL: String, guest: java.lang.Boolean, authed: java.lang.Boolean): Unit = {
- val userRole = if (role == "MODERATOR") Roles.MODERATOR_ROLE else Roles.VIEWER_ROLE
- eventBus.publish(BigBlueButtonEvent(meetingID, new RegisterUser(meetingID, userID, name, userRole,
- extUserID, authToken, avatarURL, guest, authed)))
- }
-
- def sendLockSettings(meetingID: String, userId: String, settings: java.util.Map[String, java.lang.Boolean]) {
- // Convert java.util.Map to scala.collection.immutable.Map
- // settings.mapValues -> convaert java Map to scala mutable Map
- // v => v.booleanValue() -> convert java Boolean to Scala Boolean
- // toMap -> converts from scala mutable map to scala immutable map
- val s = settings.mapValues(v => v.booleanValue() /* convert java Boolean to Scala Boolean */ ).toMap
- val disableCam = s.getOrElse("disableCam", false)
- val disableMic = s.getOrElse("disableMic", false)
- val disablePrivChat = s.getOrElse("disablePrivateChat", false)
- val disablePubChat = s.getOrElse("disablePublicChat", false)
- val lockedLayout = s.getOrElse("lockedLayout", false)
- val lockOnJoin = s.getOrElse("lockOnJoin", false)
- val lockOnJoinConfigurable = s.getOrElse("lockOnJoinConfigurable", false)
-
- val permissions = new Permissions(
- disableCam = disableCam,
- disableMic = disableMic,
- disablePrivChat = disablePrivChat,
- disablePubChat = disablePubChat,
- lockedLayout = lockedLayout,
- lockOnJoin = lockOnJoin,
- lockOnJoinConfigurable = lockOnJoinConfigurable
- )
-
- eventBus.publish(BigBlueButtonEvent(meetingID, new SetLockSettings(meetingID, userId, permissions)))
- }
-
- def initLockSettings(meetingID: String, settings: java.util.Map[String, java.lang.Boolean]) {
- // Convert java.util.Map to scala.collection.immutable.Map
- // settings.mapValues -> convert java Map to scala mutable Map
- // v => v.booleanValue() -> convert java Boolean to Scala Boolean
- // toMap -> converts from scala mutable map to scala immutable map
- val s = settings.mapValues(v => v.booleanValue() /* convert java Boolean to Scala Boolean */ ).toMap
- val disableCam = s.getOrElse("disableCam", false)
- val disableMic = s.getOrElse("disableMic", false)
- val disablePrivChat = s.getOrElse("disablePrivateChat", false)
- val disablePubChat = s.getOrElse("disablePublicChat", false)
- val lockedLayout = s.getOrElse("lockedLayout", false)
- val lockOnJoin = s.getOrElse("lockOnJoin", false)
- val lockOnJoinConfigurable = s.getOrElse("lockOnJoinConfigurable", false)
- val permissions = new Permissions(
- disableCam = disableCam,
- disableMic = disableMic,
- disablePrivChat = disablePrivChat,
- disablePubChat = disablePubChat,
- lockedLayout = lockedLayout,
- lockOnJoin = lockOnJoin,
- lockOnJoinConfigurable = lockOnJoinConfigurable
- )
-
- eventBus.publish(BigBlueButtonEvent(meetingID, new InitLockSettings(meetingID, permissions)))
- }
-
- def getLockSettings(meetingId: String, userId: String) {
- eventBus.publish(BigBlueButtonEvent(meetingId, new GetLockSettings(meetingId, userId)))
- }
def setRecordingStatus(meetingId: String, userId: String, recording: java.lang.Boolean) {
eventBus.publish(BigBlueButtonEvent(meetingId, new SetRecordingStatus(meetingId, userId, recording.booleanValue())))
@@ -194,87 +122,6 @@ class BigBlueButtonInGW(
eventBus.publish(BigBlueButtonEvent(meetingId, new GetRecordingStatus(meetingId, userId)))
}
- // Users
- def userEmojiStatus(meetingId: String, userId: String, emojiStatus: String) {
- eventBus.publish(BigBlueButtonEvent(meetingId, new UserEmojiStatus(meetingId, userId, emojiStatus)))
- }
-
- def ejectUserFromMeeting(meetingId: String, userId: String, ejectedBy: String) {
-
- }
-
- def logoutEndMeeting(meetingId: String, userId: String) {
- eventBus.publish(BigBlueButtonEvent(meetingId, new LogoutEndMeeting(meetingId, userId)))
- }
-
- def shareWebcam(meetingId: String, userId: String, stream: String) {
- eventBus.publish(BigBlueButtonEvent(meetingId, new UserShareWebcam(meetingId, userId, stream)))
- }
-
- def unshareWebcam(meetingId: String, userId: String, stream: String) {
- eventBus.publish(BigBlueButtonEvent(meetingId, new UserUnshareWebcam(meetingId, userId, stream)))
- }
-
- def setUserStatus(meetingID: String, userID: String, status: String, value: Object) {
- eventBus.publish(BigBlueButtonEvent(meetingID, new ChangeUserStatus(meetingID, userID, status, value)))
- }
-
- def setUserRole(meetingID: String, userID: String, role: String) {
-
- }
-
- def getUsers(meetingID: String, requesterID: String) {
- eventBus.publish(BigBlueButtonEvent(meetingID, new GetUsers(meetingID, requesterID)))
- }
-
- def userLeft(meetingID: String, userID: String, sessionId: String): Unit = {
- eventBus.publish(BigBlueButtonEvent(meetingID, new UserLeaving(meetingID, userID, sessionId)))
- }
-
- def userJoin(meetingID: String, userID: String, authToken: String): Unit = {
- eventBus.publish(BigBlueButtonEvent(meetingID, new UserJoining(meetingID, userID, authToken)))
- }
-
- def checkIfAllowedToShareDesktop(meetingID: String, userID: String): Unit = {
- eventBus.publish(BigBlueButtonEvent(meetingID, AllowUserToShareDesktop(
- meetingID: String,
- userID: String
- )))
- }
-
- def assignPresenter(meetingID: String, newPresenterID: String, newPresenterName: String, assignedBy: String): Unit = {
- eventBus.publish(BigBlueButtonEvent(meetingID, new AssignPresenter(meetingID, newPresenterID, newPresenterName, assignedBy)))
- }
-
- def getCurrentPresenter(meetingID: String, requesterID: String): Unit = {
- // do nothing
- }
-
- /**
- * ***********************************************************************
- * Message Interface for Guest
- * *******************************************************************
- */
-
- def getGuestPolicy(meetingId: String, requesterId: String) {
- eventBus.publish(BigBlueButtonEvent(meetingId, new GetGuestPolicy(meetingId, requesterId)))
- }
-
- def setGuestPolicy(meetingId: String, guestPolicy: String, requesterId: String) {
- val policy = guestPolicy.toUpperCase() match {
- case "ALWAYS_ACCEPT" => GuestPolicyType.ALWAYS_ACCEPT
- case "ALWAYS_DENY" => GuestPolicyType.ALWAYS_DENY
- case "ASK_MODERATOR" => GuestPolicyType.ASK_MODERATOR
- //default
- case undef => GuestPolicyType.ASK_MODERATOR
- }
- eventBus.publish(BigBlueButtonEvent(meetingId, new SetGuestPolicy(meetingId, policy, requesterId)))
- }
-
- def responseToGuest(meetingId: String, userId: String, response: java.lang.Boolean, requesterId: String) {
- eventBus.publish(BigBlueButtonEvent(meetingId, new RespondToGuest(meetingId, userId, response, requesterId)))
- }
-
/**
* *******************************************************************
* Message Interface for DeskShare
diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageSenderActor.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageSenderActor.scala
index b620ce86afe86019174d81b7ada97387f466cecb..d952ba77a89c46de4e29a679df10af225521a547 100755
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageSenderActor.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageSenderActor.scala
@@ -9,11 +9,9 @@ import java.io.{ PrintWriter, StringWriter }
import org.bigbluebutton.core.api._
import org.bigbluebutton.common.messages.MessagingConstants
import org.bigbluebutton.core.pubsub.senders.MeetingMessageToJsonConverter
-import org.bigbluebutton.common.messages.AllowUserToShareDesktopReply
import scala.collection.JavaConversions._
import scala.concurrent.duration._
import org.bigbluebutton.core.pubsub.senders.UsersMessageToJsonConverter
-import org.bigbluebutton.common.messages.UserEjectedFromMeetingMessage
import org.bigbluebutton.common.converters.ToJsonEncoder
import scala.collection.JavaConverters
@@ -37,51 +35,23 @@ class MessageSenderActor(val service: MessageSender)
val encoder = new ToJsonEncoder()
def receive = {
- case msg: UserEjectedFromMeeting => handleUserEjectedFromMeeting(msg)
- case msg: MeetingCreated => handleMeetingCreated(msg)
- case msg: RecordingStatusChanged => handleRecordingStatusChanged(msg)
- case msg: GetRecordingStatusReply => handleGetRecordingStatusReply(msg)
- case msg: MeetingEnding => handleMeetingEnding(msg)
- case msg: MeetingEnded => handleMeetingEnded(msg)
- case msg: MeetingHasEnded => handleMeetingHasEnded(msg)
- case msg: MeetingDestroyed => handleMeetingDestroyed(msg)
- case msg: KeepAliveMessageReply => handleKeepAliveMessageReply(msg)
- case msg: PubSubPong => handlePubSubPong(msg)
- case msg: InactivityWarning => handleInactivityWarning(msg)
- case msg: MeetingIsActive => handleMeetingIsActive(msg)
- case msg: GetAllMeetingsReply => handleGetAllMeetingsReply(msg)
- case msg: MeetingMuted => handleMeetingMuted(msg)
- case msg: MeetingState => handleMeetingState(msg)
- case msg: DisconnectAllUsers => handleDisconnectAllUsers(msg)
- case msg: AllowUserToShareDesktopOut => handleAllowUserToShareDesktopOut(msg)
- case msg: DisconnectUser => handleDisconnectUser(msg)
- case msg: PermissionsSettingInitialized => handlePermissionsSettingInitialized(msg)
- case msg: NewPermissionsSetting => handleNewPermissionsSetting(msg)
- case msg: UserLocked => handleUserLocked(msg)
- case msg: GetPermissionsSettingReply => handleGetPermissionsSettingReply(msg)
- case msg: UserRegistered => handleUserRegistered(msg)
- case msg: UserLeft => handleUserLeft(msg)
- case msg: PresenterAssigned => handlePresenterAssigned(msg)
- case msg: EndAndKickAll => handleEndAndKickAll(msg)
- case msg: GetUsersReply => handleGetUsersReply(msg)
- case msg: ValidateAuthTokenReply => handleValidateAuthTokenReply(msg)
- case msg: ValidateAuthTokenTimedOut => handleValidateAuthTokenTimedOut(msg)
- case msg: UserJoined => handleUserJoined(msg)
- case msg: UserChangedEmojiStatus => handleChangedUserEmojiStatus(msg)
- case msg: UserSharedWebcam => handleUserSharedWebcam(msg)
- case msg: UserUnsharedWebcam => handleUserUnsharedWebcam(msg)
- case msg: UserStatusChange => handleUserStatusChange(msg)
- case msg: UserRoleChange => handleUserRoleChange(msg)
-
- case msg: GetGuestPolicyReply => handleGetGuestPolicyReply(msg)
- case msg: GuestPolicyChanged => handleGuestPolicyChanged(msg)
- case msg: GuestAccessDenied => handleGuestAccessDenied(msg)
- case _ => // do nothing
- }
-
- private def handleUserEjectedFromMeeting(msg: UserEjectedFromMeeting) {
- val m = new UserEjectedFromMeetingMessage(msg.meetingID, msg.userId, msg.ejectedBy)
- service.send(MessagingConstants.FROM_USERS_CHANNEL, m.toJson)
+ case msg: MeetingCreated => handleMeetingCreated(msg)
+ case msg: RecordingStatusChanged => handleRecordingStatusChanged(msg)
+ case msg: GetRecordingStatusReply => handleGetRecordingStatusReply(msg)
+ case msg: MeetingEnding => handleMeetingEnding(msg)
+ case msg: MeetingEnded => handleMeetingEnded(msg)
+ case msg: MeetingHasEnded => handleMeetingHasEnded(msg)
+ case msg: MeetingDestroyed => handleMeetingDestroyed(msg)
+ case msg: KeepAliveMessageReply => handleKeepAliveMessageReply(msg)
+ case msg: PubSubPong => handlePubSubPong(msg)
+ case msg: InactivityWarning => handleInactivityWarning(msg)
+ case msg: MeetingIsActive => handleMeetingIsActive(msg)
+ case msg: GetAllMeetingsReply => handleGetAllMeetingsReply(msg)
+ case msg: MeetingMuted => handleMeetingMuted(msg)
+ case msg: MeetingState => handleMeetingState(msg)
+ case msg: DisconnectAllUsers => handleDisconnectAllUsers(msg)
+ case msg: DisconnectUser => handleDisconnectUser(msg)
+ case _ => // do nothing
}
private def handleMeetingDestroyed(msg: MeetingDestroyed) {
@@ -175,122 +145,4 @@ class MessageSenderActor(val service: MessageSender)
val json = UsersMessageToJsonConverter.disconnectUserToJson(msg)
service.send(MessagingConstants.FROM_MEETING_CHANNEL, json)
}
-
- private def handleAllowUserToShareDesktopOut(msg: AllowUserToShareDesktopOut): Unit = {
- val obj = new AllowUserToShareDesktopReply(msg.meetingID, msg.userID, msg.allowed,
- TimestampGenerator.generateTimestamp)
- val json = obj.toJson()
- service.send(MessagingConstants.FROM_MEETING_CHANNEL, json)
- }
-
- private def handlePermissionsSettingInitialized(msg: PermissionsSettingInitialized) {
- val json = UsersMessageToJsonConverter.permissionsSettingInitializedToJson(msg)
- service.send(MessagingConstants.FROM_MEETING_CHANNEL, json)
- }
-
- private def handleNewPermissionsSetting(msg: NewPermissionsSetting) {
- val json = UsersMessageToJsonConverter.newPermissionsSettingToJson(msg)
- service.send(MessagingConstants.FROM_MEETING_CHANNEL, json)
- }
-
- private def handleUserLocked(msg: UserLocked) {
- val json = UsersMessageToJsonConverter.userLockedToJson(msg)
- service.send(MessagingConstants.FROM_MEETING_CHANNEL, json)
- }
-
- private def handleGetPermissionsSettingReply(msg: GetPermissionsSettingReply) {
- val json = UsersMessageToJsonConverter.getPermissionsSettingReplyToJson(msg)
- service.send(MessagingConstants.FROM_MEETING_CHANNEL, json)
- }
-
- private def handleUserRegistered(msg: UserRegistered) {
- val json = UsersMessageToJsonConverter.userRegisteredToJson(msg)
- service.send(MessagingConstants.FROM_MEETING_CHANNEL, json)
- handleRegisteredUser(msg);
- }
-
- private def handleUserStatusChange(msg: UserStatusChange) {
- val json = UsersMessageToJsonConverter.userStatusChangeToJson(msg)
- service.send(MessagingConstants.FROM_USERS_CHANNEL, json)
- }
-
- private def handleUserRoleChange(msg: UserRoleChange) {
- val json = UsersMessageToJsonConverter.userRoleChangeToJson(msg)
- service.send(MessagingConstants.FROM_USERS_CHANNEL, json)
- }
-
- private def handleChangedUserEmojiStatus(msg: UserChangedEmojiStatus) {
- val json = UsersMessageToJsonConverter.userChangedEmojiStatusToJson(msg)
- service.send(MessagingConstants.FROM_USERS_CHANNEL, json)
- }
-
- private def handleUserSharedWebcam(msg: UserSharedWebcam) {
- val json = UsersMessageToJsonConverter.userSharedWebcamToJson(msg)
- service.send(MessagingConstants.FROM_USERS_CHANNEL, json)
- }
-
- private def handleUserUnsharedWebcam(msg: UserUnsharedWebcam) {
- val json = UsersMessageToJsonConverter.userUnsharedWebcamToJson(msg)
- service.send(MessagingConstants.FROM_USERS_CHANNEL, json)
- }
-
- private def handleGetUsersReply(msg: GetUsersReply) {
- val json = UsersMessageToJsonConverter.getUsersReplyToJson(msg)
- service.send(MessagingConstants.FROM_USERS_CHANNEL, json)
- }
-
- private def handleValidateAuthTokenReply(msg: ValidateAuthTokenReply) {
- println("**** handleValidateAuthTokenReply *****")
- val json = UsersMessageToJsonConverter.validateAuthTokenReplyToJson(msg)
- //println("************** Publishing [" + json + "] *******************")
- service.send(MessagingConstants.FROM_USERS_CHANNEL, json)
- }
-
- private def handleValidateAuthTokenTimedOut(msg: ValidateAuthTokenTimedOut) {
- println("**** handleValidateAuthTokenTimedOut *****")
- val json = UsersMessageToJsonConverter.validateAuthTokenTimeoutToJson(msg)
- //println("************** Publishing [" + json + "] *******************")
- service.send(MessagingConstants.FROM_USERS_CHANNEL, json)
- }
-
- private def handleUserJoined(msg: UserJoined) {
- val json = UsersMessageToJsonConverter.userJoinedToJson(msg)
- //println("************** Publishing [" + json + "] *******************")
- service.send(MessagingConstants.FROM_USERS_CHANNEL, json)
- }
-
- private def handleRegisteredUser(msg: UserRegistered) {
- val json = UsersMessageToJsonConverter.userRegisteredToJson(msg)
- service.send(MessagingConstants.FROM_USERS_CHANNEL, json)
- }
-
- private def handleUserLeft(msg: UserLeft) {
- val json = UsersMessageToJsonConverter.userLeftToJson(msg)
- service.send(MessagingConstants.FROM_USERS_CHANNEL, json)
- }
-
- private def handlePresenterAssigned(msg: PresenterAssigned) {
- val json = UsersMessageToJsonConverter.presenterAssignedToJson(msg)
- service.send(MessagingConstants.FROM_USERS_CHANNEL, json)
- }
-
- private def handleEndAndKickAll(msg: EndAndKickAll) {
- val json = UsersMessageToJsonConverter.endAndKickAllToJson(msg)
- service.send(MessagingConstants.FROM_USERS_CHANNEL, json)
- }
-
- private def handleGetGuestPolicyReply(msg: GetGuestPolicyReply) {
- val json = UsersMessageToJsonConverter.getGuestPolicyReplyToJson(msg)
- service.send(MessagingConstants.FROM_USERS_CHANNEL, json)
- }
-
- private def handleGuestPolicyChanged(msg: GuestPolicyChanged) {
- val json = UsersMessageToJsonConverter.guestPolicyChangedToJson(msg)
- service.send(MessagingConstants.FROM_USERS_CHANNEL, json)
- }
-
- private def handleGuestAccessDenied(msg: GuestAccessDenied) {
- val json = UsersMessageToJsonConverter.guestAccessDeniedToJson(msg)
- service.send(MessagingConstants.FROM_USERS_CHANNEL, json)
- }
}
diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala
index 4210b28772bf6fddb060ea7c9664875abec30708..6a72d8dca0b963696a87e916bf0786e8c48f5222 100755
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala
@@ -1,7 +1,5 @@
package org.bigbluebutton.core.api
-import org.bigbluebutton.common2.msgs.BreakoutUserVO
-import org.bigbluebutton.core.apps.Presentation
import spray.json.JsObject
case class InMessageHeader(name: String)
case class InHeaderAndJsonPayload(header: InMessageHeader, payload: JsObject)
@@ -30,46 +28,13 @@ case class EndMeeting(meetingId: String) extends InMessage
case class LockSetting(meetingID: String, locked: Boolean, settings: Map[String, Boolean]) extends InMessage
case class UpdateMeetingExpireMonitor(meetingID: String, hasUser: Boolean) extends InMessage
-////////////////////////////////////////////////////////////////////////////////////
-// Lock
-///////////////////////////////////////////////////////////////////////////////////
-
-case class LockUser(meetingID: String, userId: String, lock: Boolean) extends InMessage
-case class InitLockSettings(meetingID: String, settings: Permissions) extends InMessage
-case class SetLockSettings(meetingID: String, setByUser: String, settings: Permissions) extends InMessage
-case class GetLockSettings(meetingID: String, userId: String) extends InMessage
-
//////////////////////////////////////////////////////////////////////////////////
// Users
/////////////////////////////////////////////////////////////////////////////////
-case class ValidateAuthToken(meetingID: String, userId: String, token: String,
- correlationId: String, sessionId: String) extends InMessage
-case class RegisterUser(meetingID: String, userID: String, name: String, role: String,
- extUserID: String, authToken: String, avatarURL: String, guest: Boolean, authed: Boolean) extends InMessage
-case class UserJoining(meetingID: String, userID: String, authToken: String) extends InMessage
-case class UserLeaving(meetingID: String, userID: String, sessionId: String) extends InMessage
-case class GetUsers(meetingID: String, requesterID: String) extends InMessage
-case class UserEmojiStatus(meetingID: String, userId: String, emojiStatus: String) extends InMessage
-
-case class UserShareWebcam(meetingID: String, userId: String, stream: String) extends InMessage
-case class UserUnshareWebcam(meetingID: String, userId: String, stream: String) extends InMessage
-case class ChangeUserStatus(meetingID: String, userID: String, status: String, value: Object) extends InMessage
-
-case class AssignPresenter(meetingID: String, newPresenterID: String, newPresenterName: String, assignedBy: String) extends InMessage
case class SetRecordingStatus(meetingID: String, userId: String, recording: Boolean) extends InMessage
case class GetRecordingStatus(meetingID: String, userId: String) extends InMessage
-case class AllowUserToShareDesktop(meetingID: String, userID: String) extends InMessage
case class ActivityResponse(meetingID: String) extends InMessage
-case class LogoutEndMeeting(meetingID: String, userID: String) extends InMessage
-
-///////////////////////////////////////////////////////////////////////////////////////
-// Guest support
-///////////////////////////////////////////////////////////////////////////////////////
-
-case class GetGuestPolicy(meetingID: String, requesterID: String) extends InMessage
-case class SetGuestPolicy(meetingID: String, policy: String, setBy: String) extends InMessage
-case class RespondToGuest(meetingID: String, userId: String, response: Boolean, requesterID: String) extends InMessage
// No idea what part this is for
case class GetAllMeetingsRequest(meetingID: String /** Not used. Just to satisfy trait **/ ) extends InMessage
diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala
index f328915d5f20c8d1721ef69f8adab6b200578c6e..c94086e6dfaaf66c1e4bdb43b874c878701da5ca 100755
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala
@@ -2,8 +2,6 @@ package org.bigbluebutton.core.api
import org.bigbluebutton.core.apps._
import org.bigbluebutton.core.models._
-import org.bigbluebutton.common2.domain.UserVO
-import org.bigbluebutton.common2.msgs.{ BreakoutRoomInfo, BreakoutUserVO }
case class RecordingStatusChanged(meetingID: String, recorded: Boolean, userId: String, recording: Boolean) extends IOutMessage
case class GetRecordingStatusReply(meetingID: String, recorded: Boolean, userId: String, recording: Boolean) extends IOutMessage
@@ -23,31 +21,6 @@ case class KeepAliveMessageReply(aliveID: String) extends IOutMessage
case class PubSubPong(system: String, timestamp: Long) extends IOutMessage
case object IsAliveMessage extends IOutMessage
-// Permissions
-case class PermissionsSettingInitialized(meetingID: String, permissions: Permissions, applyTo: Array[UserVO]) extends IOutMessage
-case class NewPermissionsSetting(meetingID: String, setByUser: String, permissions: Permissions, applyTo: Vector[UserState]) extends IOutMessage
-case class UserLocked(meetingID: String, userId: String, lock: Boolean) extends IOutMessage
-case class GetPermissionsSettingReply(meetingID: String, userId: String) extends IOutMessage
-
-// Users
-case class UserRegistered(meetingID: String, recorded: Boolean, user: RegisteredUser) extends IOutMessage
-case class UserLeft(meetingID: String, recorded: Boolean, user: UserVO) extends IOutMessage
-case class UserEjectedFromMeeting(meetingID: String, recorded: Boolean, userId: String, ejectedBy: String) extends IOutMessage
-case class PresenterAssigned(meetingID: String, recorded: Boolean, presenter: Presenter) extends IOutMessage
-case class EjectAllVoiceUsers(meetingID: String, recorded: Boolean, voiceBridge: String) extends IOutMessage
-case class EndAndKickAll(meetingID: String, recorded: Boolean) extends IOutMessage
-case class GetUsersReply(meetingID: String, requesterID: String, users: Array[UserVO]) extends IOutMessage
-case class ValidateAuthTokenTimedOut(meetingID: String, requesterId: String, token: String, valid: Boolean, correlationId: String) extends IOutMessage
-case class ValidateAuthTokenReply(meetingID: String, requesterId: String, token: String, valid: Boolean, correlationId: String) extends IOutMessage
-case class UserJoined(meetingID: String, recorded: Boolean, user: UserVO) extends IOutMessage
-case class UserChangedEmojiStatus(meetingID: String, recorded: Boolean, emojiStatus: String, userID: String) extends IOutMessage
-case class UserSharedWebcam(meetingID: String, recorded: Boolean, userID: String, stream: String) extends IOutMessage
-case class UserUnsharedWebcam(meetingID: String, recorded: Boolean, userID: String, stream: String) extends IOutMessage
-case class UserStatusChange(meetingID: String, recorded: Boolean, userID: String, status: String, value: Object) extends IOutMessage
-case class UserRoleChange(meetingID: String, recorded: Boolean, userID: String, role: String) extends IOutMessage
-case class TransferUserToMeeting(voiceConfId: String, targetVoiceConfId: String, userId: String) extends IOutMessage
-case class AllowUserToShareDesktopOut(meetingID: String, userID: String, allowed: Boolean) extends IOutMessage
-
// No idea what part this is for
case class GetAllMeetingsReply(meetings: Array[MeetingInfo]) extends IOutMessage
@@ -58,10 +31,5 @@ case class DeskShareNotifyViewersRTMP(meetingID: String, streamPath: String, vid
case class DeskShareNotifyASingleViewer(meetingID: String, userID: String, streamPath: String, videoWidth: Int, videoHeight: Int, broadcasting: Boolean) extends IOutMessage
case class DeskShareHangUp(meetingID: String, fsConferenceName: String) extends IOutMessage
-// Guest
-case class GetGuestPolicyReply(meetingID: String, recorded: Boolean, requesterID: String, policy: String) extends IOutMessage
-case class GuestPolicyChanged(meetingID: String, recorded: Boolean, policy: String) extends IOutMessage
-case class GuestAccessDenied(meetingID: String, recorded: Boolean, userId: String) extends IOutMessage
-
// Value Objects
case class MeetingVO(id: String, recorded: Boolean)
diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/LogoutAndEndMeetingCmdMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/LogoutAndEndMeetingCmdMsgHdlr.scala
index 464fea9efd4df87b9d5105651ac24dea399422fe..4d93dcbee2743619222cf6775830f8d27b040cf0 100755
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/LogoutAndEndMeetingCmdMsgHdlr.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/LogoutAndEndMeetingCmdMsgHdlr.scala
@@ -2,9 +2,8 @@ package org.bigbluebutton.core.apps.users
import org.bigbluebutton.common2.msgs._
import org.bigbluebutton.core.OutMessageGateway
-import org.bigbluebutton.core.api.{ EndMeeting, LogoutEndMeeting }
import org.bigbluebutton.core.models.{ Roles, Users2x }
-import org.bigbluebutton.core.running.{ BaseMeetingActor, LiveMeeting }
+import org.bigbluebutton.core.running.LiveMeeting
import org.bigbluebutton.core2.MeetingStatus2x
trait LogoutAndEndMeetingCmdMsgHdlr {
diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/UsersMessageToJsonConverter.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/UsersMessageToJsonConverter.scala
index 93583339bcd7de6dd8d8d23d0a8f652f07ffe31e..2c894be75e22dd7098544794865157f38b74f7d3 100755
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/UsersMessageToJsonConverter.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/UsersMessageToJsonConverter.scala
@@ -2,75 +2,14 @@ package org.bigbluebutton.core.pubsub.senders
import scala.collection.JavaConverters._
-import org.bigbluebutton.common2.domain.UserVO
import org.bigbluebutton.core.api._
import org.bigbluebutton.core.messaging.Util
-import org.bigbluebutton.core.models.RegisteredUser
object UsersMessageToJsonConverter {
- private def userToMap(user: UserVO): java.util.Map[String, Any] = {
-
- val wuser = new scala.collection.mutable.HashMap[String, Any]
- wuser += "userid" -> user.id
- wuser += "extern_userid" -> user.externalId
- wuser += "name" -> user.name
- wuser += "role" -> user.role.toString()
- wuser += "guest" -> user.guest
- wuser += "waiting_for_acceptance" -> user.waitingForAcceptance
- wuser += "emoji_status" -> user.emojiStatus
- wuser += "presenter" -> user.presenter
- wuser += "has_stream" -> user.hasStream
- wuser += "locked" -> user.locked
- wuser += "webcam_stream" -> user.webcamStreams.toArray
- wuser += "phone_user" -> user.phoneUser
- wuser += "listenOnly" -> user.listenOnly
- wuser += "avatarURL" -> user.avatarURL
-
- val vuser = new scala.collection.mutable.HashMap[String, Any]
- vuser += "userid" -> user.voiceUser.userId
- vuser += "web_userid" -> user.voiceUser.webUserId
- vuser += "callername" -> user.voiceUser.callerName
- vuser += "callernum" -> user.voiceUser.callerNum
- vuser += "joined" -> user.voiceUser.joined
- vuser += "locked" -> user.voiceUser.locked
- vuser += "muted" -> user.voiceUser.muted
- vuser += "talking" -> user.voiceUser.talking
-
- wuser.put("voiceUser", mapAsJavaMapConverter(vuser).asJava)
-
- mapAsJavaMapConverter(wuser).asJava
- }
-
- private def registeredUserToMap(user: RegisteredUser): java.util.Map[String, Any] = {
- val wuser = new scala.collection.mutable.HashMap[String, Any]
- wuser += "userid" -> user.id
- wuser += "extern_userid" -> user.externId
- wuser += "name" -> user.name
- wuser += "role" -> user.role.toString()
- wuser += "authToken" -> user.authToken
- wuser += "avatarURL" -> user.avatarURL
- wuser += "guest" -> user.guest
- wuser += "waiting_for_acceptance" -> user.waitingForAcceptance
-
- mapAsJavaMapConverter(wuser).asJava
- }
-
- private def buildPermissionsHashMap(perms: Permissions): java.util.HashMap[String, java.lang.Boolean] = {
- val args = new java.util.HashMap[String, java.lang.Boolean]();
- args.put("disableCam", perms.disableCam: java.lang.Boolean);
- args.put("disableMic", perms.disableMic: java.lang.Boolean);
- args.put("disablePrivateChat", perms.disablePrivChat: java.lang.Boolean);
- args.put("disablePublicChat", perms.disablePubChat: java.lang.Boolean);
- args.put("lockedLayout", perms.lockedLayout: java.lang.Boolean);
- args.put("lockOnJoin", perms.lockOnJoin: java.lang.Boolean);
- args.put("lockOnJoinConfigurable", perms.lockOnJoinConfigurable: java.lang.Boolean);
- args
- }
def meetingState(msg: MeetingState): String = {
val payload = new java.util.HashMap[String, Any]()
payload.put(Constants.MEETING_ID, msg.meetingID)
- payload.put(Constants.PERMISSIONS, buildPermissionsHashMap(msg.permissions))
payload.put(Constants.MEETING_MUTED, msg.meetingMuted: java.lang.Boolean);
payload.put(Constants.USER_ID, msg.userId);
@@ -120,139 +59,6 @@ object UsersMessageToJsonConverter {
Util.buildJson(header, payload)
}
- def sendUserEjectedFromMeetingToJson(msg: UserEjectedFromMeeting) {
- val payload = new java.util.HashMap[String, Any]()
- payload.put(Constants.MEETING_ID, msg.meetingID)
- payload.put(Constants.USER_ID, msg.userId)
- payload.put(Constants.EJECTED_BY, msg.ejectedBy)
-
- val header = Util.buildHeader(MessageNames.USER_EJECTED_FROM_MEETING, None)
- Util.buildJson(header, payload)
- }
-
- def permissionsSettingInitializedToJson(msg: PermissionsSettingInitialized): String = {
- val payload = new java.util.HashMap[String, Any]()
- payload.put(Constants.MEETING_ID, msg.meetingID)
- payload.put(Constants.SETTINGS, msg.permissions.toString()) //#todo not tested
-
- val header = Util.buildHeader(MessageNames.PERMISSION_SETTING_INITIALIZED, None)
- Util.buildJson(header, payload)
- }
-
- def newPermissionsSettingToJson(msg: NewPermissionsSetting): String = {
- val payload = new java.util.HashMap[String, Any]()
- payload.put(Constants.MEETING_ID, msg.meetingID)
- payload.put(Constants.PERMISSIONS, buildPermissionsHashMap(msg.permissions))
-
- val users = new java.util.ArrayList[java.util.Map[String, Any]]
- //msg.applyTo.foreach(uvo => {
- // users.add(userToMap(uvo))
- //})
-
- payload.put("users", users)
-
- val header = Util.buildHeader(MessageNames.NEW_PERMISSION_SETTINGS, None)
- Util.buildJson(header, payload)
- }
-
- def userLockedToJson(msg: UserLocked): String = {
- val payload = new java.util.HashMap[String, Any]()
- payload.put(Constants.MEETING_ID, msg.meetingID)
- payload.put(Constants.USER_ID, msg.userId)
- payload.put(Constants.LOCKED, msg.lock)
-
- val header = Util.buildHeader(MessageNames.USER_LOCKED, None)
- Util.buildJson(header, payload)
- }
-
- def getPermissionsSettingReplyToJson(msg: GetPermissionsSettingReply): String = {
- val payload = new java.util.HashMap[String, Any]()
- payload.put(Constants.MEETING_ID, msg.meetingID)
- payload.put(Constants.USER_ID, msg.userId)
-
- val header = Util.buildHeader(MessageNames.GET_PERMISSION_SETTINGS_REPLY, None)
- Util.buildJson(header, payload)
- }
-
- def userRegisteredToJson(msg: UserRegistered): String = {
- val payload = new java.util.HashMap[String, Any]()
- payload.put(Constants.MEETING_ID, msg.meetingID)
- payload.put(Constants.USER, registeredUserToMap(msg.user))
- payload.put(Constants.RECORDED, msg.recorded)
-
- val header = Util.buildHeader(MessageNames.USER_REGISTERED, None)
- Util.buildJson(header, payload)
- }
-
- def userChangedEmojiStatusToJson(msg: UserChangedEmojiStatus): String = {
- val payload = new java.util.HashMap[String, Any]()
- payload.put(Constants.MEETING_ID, msg.meetingID)
- payload.put(Constants.EMOJI_STATUS, msg.emojiStatus)
- payload.put(Constants.USER_ID, msg.userID)
-
- val header = Util.buildHeader(MessageNames.USER_EMOJI_STATUS, None)
- Util.buildJson(header, payload)
- }
-
- def userStatusChangeToJson(msg: UserStatusChange): String = {
- val payload = new java.util.HashMap[String, Any]()
- payload.put(Constants.MEETING_ID, msg.meetingID)
- payload.put(Constants.USER_ID, msg.userID)
- payload.put(Constants.STATUS, msg.status)
- payload.put(Constants.VALUE, msg.value.toString)
-
- val header = Util.buildHeader(MessageNames.USER_STATUS_CHANGED, None)
- Util.buildJson(header, payload)
- }
-
- def userRoleChangeToJson(msg: UserRoleChange): String = {
- val payload = new java.util.HashMap[String, Any]()
- payload.put(Constants.MEETING_ID, msg.meetingID)
- payload.put(Constants.USER_ID, msg.userID)
- payload.put(Constants.ROLE, msg.role)
-
- val header = Util.buildHeader(MessageNames.USER_ROLE_CHANGED, None)
- Util.buildJson(header, payload)
- }
-
- def userSharedWebcamToJson(msg: UserSharedWebcam): String = {
- val payload = new java.util.HashMap[String, Any]()
- payload.put(Constants.MEETING_ID, msg.meetingID)
- payload.put(Constants.RECORDED, msg.recorded)
- payload.put(Constants.USER_ID, msg.userID)
- payload.put(Constants.STREAM, msg.stream)
-
- val header = Util.buildHeader(MessageNames.USER_SHARED_WEBCAM, None)
- Util.buildJson(header, payload)
- }
-
- def userUnsharedWebcamToJson(msg: UserUnsharedWebcam): String = {
- val payload = new java.util.HashMap[String, Any]()
- payload.put(Constants.MEETING_ID, msg.meetingID)
- payload.put(Constants.RECORDED, msg.recorded)
- payload.put(Constants.USER_ID, msg.userID)
- payload.put(Constants.STREAM, msg.stream)
-
- val header = Util.buildHeader(MessageNames.USER_UNSHARED_WEBCAM, None)
- Util.buildJson(header, payload)
- }
-
- def getUsersReplyToJson(msg: GetUsersReply): String = {
- val payload = new java.util.HashMap[String, Any]()
- payload.put(Constants.MEETING_ID, msg.meetingID)
- payload.put(Constants.REQUESTER_ID, msg.requesterID)
-
- val users = new java.util.ArrayList[java.util.Map[String, Any]];
- msg.users.foreach(uvo => {
- users.add(userToMap(uvo))
- })
-
- payload.put(Constants.USERS, users)
-
- val header = Util.buildHeader(MessageNames.GET_USERS_REPLY, None)
- Util.buildJson(header, payload)
- }
-
def recordingStatusChangedToJson(msg: RecordingStatusChanged): String = {
val payload = new java.util.HashMap[String, Any]()
payload.put(Constants.MEETING_ID, msg.meetingID)
@@ -274,124 +80,4 @@ object UsersMessageToJsonConverter {
val header = Util.buildHeader(MessageNames.GET_RECORDING_STATUS_REPLY, None)
Util.buildJson(header, payload)
}
-
- def validateAuthTokenReplyToJson(msg: ValidateAuthTokenReply): String = {
- val payload = new java.util.HashMap[String, Any]()
- payload.put(Constants.REPLY_TO, msg.correlationId)
- payload.put(Constants.VALID, msg.valid.toString)
- payload.put(Constants.USER_ID, msg.requesterId)
- payload.put(Constants.AUTH_TOKEN, msg.token)
- payload.put(Constants.MEETING_ID, msg.meetingID)
-
- val header = Util.buildHeader(MessageNames.VALIDATE_AUTH_TOKEN_REPLY, None)
- Util.buildJson(header, payload)
- }
-
- def validateAuthTokenTimeoutToJson(msg: ValidateAuthTokenTimedOut): String = {
- val payload = new java.util.HashMap[String, Any]()
- payload.put(Constants.REPLY_TO, msg.correlationId)
- payload.put(Constants.VALID, msg.valid.toString)
- payload.put(Constants.AUTH_TOKEN, msg.token)
- payload.put(Constants.USER_ID, msg.requesterId)
- payload.put(Constants.MEETING_ID, msg.meetingID)
-
- val header = Util.buildHeader(MessageNames.VALIDATE_AUTH_TOKEN_TIMEOUT, None)
- Util.buildJson(header, payload)
- }
-
- def userJoinedToJson(msg: UserJoined): String = {
- val payload = new java.util.HashMap[String, Any]()
- payload.put(Constants.MEETING_ID, msg.meetingID)
- payload.put("user", userToMap(msg.user))
-
- val header = Util.buildHeader(MessageNames.USER_JOINED, None)
- Util.buildJson(header, payload)
- }
-
- def userLeftToJson(msg: UserLeft): String = {
- val payload = new java.util.HashMap[String, Any]()
- payload.put(Constants.MEETING_ID, msg.meetingID)
- payload.put("user", userToMap(msg.user))
-
- val header = Util.buildHeader(MessageNames.USER_LEFT, None)
- Util.buildJson(header, payload)
- }
-
- def presenterAssignedToJson(msg: PresenterAssigned): String = {
- val payload = new java.util.HashMap[String, Any]()
- payload.put(Constants.MEETING_ID, msg.meetingID)
- payload.put(Constants.NEW_PRESENTER_ID, msg.presenter.presenterID);
- payload.put(Constants.NEW_PRESENTER_NAME, msg.presenter.presenterName);
- payload.put(Constants.ASSIGNED_BY, msg.presenter.assignedBy);
- payload.put(Constants.RECORDED, msg.recorded)
-
- val header = Util.buildHeader(MessageNames.PRESENTER_ASSIGNED, None)
- Util.buildJson(header, payload)
- }
-
- def endAndKickAllToJson(msg: EndAndKickAll): String = {
- val payload = new java.util.HashMap[String, Any]()
- payload.put(Constants.MEETING_ID, msg.meetingID)
- payload.put(Constants.RECORDED, msg.recorded)
-
- val header = Util.buildHeader(MessageNames.END_AND_KICK_ALL, None)
- Util.buildJson(header, payload)
- }
-
- def getGuestPolicyToJson(msg: GetGuestPolicy): String = {
- val payload = new java.util.HashMap[String, Any]()
- payload.put(Constants.MEETING_ID, msg.meetingID)
- payload.put(Constants.REQUESTER_ID, msg.requesterID)
-
- val header = Util.buildHeader(MessageNames.GET_GUEST_POLICY, None)
- Util.buildJson(header, payload)
- }
-
- def setGuestPolicyToJson(msg: SetGuestPolicy): String = {
- val payload = new java.util.HashMap[String, Any]()
- payload.put(Constants.MEETING_ID, msg.meetingID)
- payload.put(Constants.GUEST_POLICY, msg.policy.toString())
-
- val header = Util.buildHeader(MessageNames.SET_GUEST_POLICY, None)
- Util.buildJson(header, payload)
- }
-
- def respondToGuestToJson(msg: RespondToGuest): String = {
- val payload = new java.util.HashMap[String, Any]()
- payload.put(Constants.MEETING_ID, msg.meetingID)
- payload.put(Constants.USER_ID, msg.userId)
- payload.put(Constants.RESPONSE, msg.response.toString())
- payload.put(Constants.REQUESTER_ID, msg.requesterID)
-
- val header = Util.buildHeader(MessageNames.RESPOND_TO_GUEST, None)
- Util.buildJson(header, payload)
- }
-
- def getGuestPolicyReplyToJson(msg: GetGuestPolicyReply): String = {
- val payload = new java.util.HashMap[String, Any]()
- payload.put(Constants.MEETING_ID, msg.meetingID)
- payload.put(Constants.REQUESTER_ID, msg.requesterID)
- payload.put(Constants.GUEST_POLICY, msg.policy)
-
- val header = Util.buildHeader(MessageNames.GET_GUEST_POLICY_REPLY, None)
- Util.buildJson(header, payload)
- }
-
- def guestPolicyChangedToJson(msg: GuestPolicyChanged): String = {
- val payload = new java.util.HashMap[String, Any]()
- payload.put(Constants.MEETING_ID, msg.meetingID)
- payload.put(Constants.GUEST_POLICY, msg.policy)
-
- val header = Util.buildHeader(MessageNames.GUEST_POLICY_CHANGED, None)
- Util.buildJson(header, payload)
- }
-
- def guestAccessDeniedToJson(msg: GuestAccessDenied): String = {
- val payload = new java.util.HashMap[String, Any]()
- payload.put(Constants.MEETING_ID, msg.meetingID)
- payload.put(Constants.USER_ID, msg.userId)
-
- val header = Util.buildHeader(MessageNames.GUEST_ACCESS_DENIED, None)
- Util.buildJson(header, payload)
- }
}
\ No newline at end of file
diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala
index 955be5ab43bcf308566378582a808fc01149b239..97d26dee4a57024a48733fa1fc6bc3b97759c019 100755
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala
@@ -139,17 +139,12 @@ class MeetingActor(
// old messages
case msg: MonitorNumberOfUsers => handleMonitorNumberOfUsers(msg)
- case msg: AllowUserToShareDesktop => handleAllowUserToShareDesktop(msg)
case msg: ExtendMeetingDuration => handleExtendMeetingDuration(msg)
case msg: SendTimeRemainingUpdate => handleSendTimeRemainingUpdate(msg)
// Screenshare
case msg: DeskShareGetDeskShareInfoRequest => handleDeskShareGetDeskShareInfoRequest(msg)
- // Guest
- case msg: GetGuestPolicy => handleGetGuestPolicy(msg)
- case msg: SetGuestPolicy => handleSetGuestPolicy(msg)
-
case _ => // do nothing
}
@@ -307,28 +302,6 @@ class MeetingActor(
}
}
- def handleGetGuestPolicy(msg: GetGuestPolicy) {
- // outGW.send(new GetGuestPolicyReply(msg.meetingID, props.recordProp.record,
- // msg.requesterID, MeetingStatus2x.getGuestPolicy(liveMeeting.status).toString()))
- }
-
- def handleSetGuestPolicy(msg: SetGuestPolicy) {
- // MeetingStatus2x.setGuestPolicy(liveMeeting.status, msg.policy)
- // MeetingStatus2x.setGuestPolicySetBy(liveMeeting.status, msg.setBy)
- // outGW.send(new GuestPolicyChanged(msg.meetingID, props.recordProp.record,
- // MeetingStatus2x.getGuestPolicy(liveMeeting.status).toString()))
- }
-
- def handleAllowUserToShareDesktop(msg: AllowUserToShareDesktop): Unit = {
- Users2x.findPresenter(liveMeeting.users2x) match {
- case Some(curPres) => {
- val allowed = msg.userID equals (curPres.intId)
- // outGW.send(AllowUserToShareDesktopOut(msg.meetingID, msg.userID, allowed))
- }
- case None => // do nothing
- }
- }
-
def handleMonitorNumberOfUsers(msg: MonitorNumberOfUsers) {
inactivityTracker = MeetingInactivityTrackerHelper.processMeetingInactivityAudit(
props = liveMeeting.props,
diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/GetLockSettingsHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/GetLockSettingsHdlr.scala
deleted file mode 100755
index 9ba3350fe9d22f56bf786fc0a5f597116eb18b75..0000000000000000000000000000000000000000
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/GetLockSettingsHdlr.scala
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.bigbluebutton.core2.message.handlers.users
-
-import org.bigbluebutton.core.OutMessageGateway
-import org.bigbluebutton.core.api.{ GetLockSettings, NewPermissionsSetting }
-import org.bigbluebutton.core.running.MeetingActor
-import org.bigbluebutton.core2.MeetingStatus2x
-
-trait GetLockSettingsHdlr {
- this: MeetingActor =>
-
- val outGW: OutMessageGateway
-
- def handleGetLockSettings(msg: GetLockSettings) {
-
- // outGW.send(new NewPermissionsSetting(props.meetingProp.intId, msg.userId,
- // MeetingStatus2x.getPermissions(liveMeeting.status),
- // Users.getUsers(liveMeeting.users).toArray))
- }
-}
diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/InitLockSettingsHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/InitLockSettingsHdlr.scala
deleted file mode 100755
index 7c943ef9d1284a3e949323f6aad7ab975468b256..0000000000000000000000000000000000000000
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/InitLockSettingsHdlr.scala
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.bigbluebutton.core2.message.handlers.users
-
-import org.bigbluebutton.core.OutMessageGateway
-import org.bigbluebutton.core.api.{ InitLockSettings, PermissionsSettingInitialized }
-import org.bigbluebutton.core.running.MeetingActor
-import org.bigbluebutton.core2.MeetingStatus2x
-
-trait InitLockSettingsHdlr {
- this: MeetingActor =>
-
- val outGW: OutMessageGateway
-
- def handleInitLockSettings(msg: InitLockSettings) {
- if (!MeetingStatus2x.permisionsInitialized(liveMeeting.status)) {
- MeetingStatus2x.initializePermissions(liveMeeting.status)
- liveMeeting.newPermissions(msg.settings)
- }
- }
-}
diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/UserJoiningHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/UserJoiningHdlr.scala
deleted file mode 100755
index cb7f9a5f1b1459d4d37512645481ed8dcffc0df0..0000000000000000000000000000000000000000
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/UserJoiningHdlr.scala
+++ /dev/null
@@ -1,49 +0,0 @@
-package org.bigbluebutton.core2.message.handlers.users
-
-import org.bigbluebutton.common2.domain.VoiceUserVO
-import org.bigbluebutton.core.OutMessageGateway
-import org.bigbluebutton.core.api._
-import org.bigbluebutton.core.models._
-import org.bigbluebutton.core.running.MeetingActor
-import org.bigbluebutton.core2.MeetingStatus2x
-
-trait UserJoiningHdlr {
- this: MeetingActor =>
-
- val outGW: OutMessageGateway
- def handleUserJoin(msg: UserJoining): Unit = {
- log.debug("Received user joined meeting. metingId=" + props.meetingProp.intId + " userId=" + msg.userID)
-
- /*
-
- for {
- uvo <- Users.newUser(msg.userID, lockStatus, ru, waitingForAcceptance, vu, liveMeeting.users)
- } yield {
- log.info("User joined meeting. metingId=" + props.meetingProp.intId + " userId=" + uvo.id + " user=" + uvo)
-
- if (uvo.guest && MeetingStatus2x.getGuestPolicy(liveMeeting.status) == GuestPolicy.ALWAYS_DENY) {
- outGW.send(new GuestAccessDenied(props.meetingProp.intId, props.recordProp.record, uvo.id))
- } else {
- outGW.send(new UserJoined(props.meetingProp.intId, props.recordProp.record, uvo))
- outGW.send(new MeetingState(props.meetingProp.intId, props.recordProp.record, uvo.id,
- MeetingStatus2x.getPermissions(liveMeeting.status), MeetingStatus2x.isMeetingMuted(liveMeeting.status)))
-
- if (!waitingForAcceptance) {
- // Become presenter if the only moderator
- if ((Users.numModerators(liveMeeting.users) == 1) || (Users.hasNoPresenter(liveMeeting.users))) {
- if (ru.role == Roles.MODERATOR_ROLE) {
- log.info("Assigning presenter to lone moderator. metingId=" + props.meetingProp.intId + " userId=" + uvo.id)
- assignNewPresenter(msg.userID, ru.name, msg.userID)
- }
- }
- } else {
- log.info("User waiting for acceptance. metingId=" + props.meetingProp.intId + " userId=" + uvo.id)
- }
- liveMeeting.webUserJoined
- startRecordingIfAutoStart()
- }
- }
- */
-
- }
-}
diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/endpoint/redis/RedisRecorderActor.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/endpoint/redis/RedisRecorderActor.scala
index 5420909e74e92e8abb5a70dc723422a4cfcca3c2..7e86be809ccc300a769abeaf2173e3242c50bccb 100755
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/endpoint/redis/RedisRecorderActor.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/endpoint/redis/RedisRecorderActor.scala
@@ -40,19 +40,19 @@ class RedisRecorderActor(val system: ActorSystem)
def receive = {
//case msg: SendPublicMessageEvent => handleSendPublicMessageEvent(msg)
//case msg: ClearPublicChatHistoryReply => handleClearPublicChatHistoryReply(msg)
- case msg: EndAndKickAll => handleEndAndKickAll(msg)
- case msg: PresenterAssigned => handleAssignPresenter(msg)
- case msg: UserJoined => handleUserJoined(msg)
- case msg: UserLeft => handleUserLeft(msg)
- case msg: UserStatusChange => handleUserStatusChange(msg)
+ //case msg: EndAndKickAll => handleEndAndKickAll(msg)
+ //case msg: PresenterAssigned => handleAssignPresenter(msg)
+ //case msg: UserJoined => handleUserJoined(msg)
+ //case msg: UserLeft => handleUserLeft(msg)
+ //case msg: UserStatusChange => handleUserStatusChange(msg)
// case msg: UserVoiceMuted => handleUserVoiceMuted(msg)
// case msg: UserVoiceTalking => handleUserVoiceTalking(msg)
// case msg: UserJoinedVoice => handleUserJoinedVoice(msg)
// case msg: UserLeftVoice => handleUserLeftVoice(msg)
- case msg: RecordingStatusChanged => handleRecordingStatusChanged(msg)
- case msg: UserChangedEmojiStatus => handleChangedUserEmojiStatus(msg)
- case msg: UserSharedWebcam => handleUserSharedWebcam(msg)
- case msg: UserUnsharedWebcam => handleUserUnsharedWebcam(msg)
+ //case msg: RecordingStatusChanged => handleRecordingStatusChanged(msg)
+ //case msg: UserChangedEmojiStatus => handleChangedUserEmojiStatus(msg)
+ //case msg: UserSharedWebcam => handleUserSharedWebcam(msg)
+ //case msg: UserUnsharedWebcam => handleUserUnsharedWebcam(msg)
// case msg: VoiceRecordingStarted => handleVoiceRecordingStarted(msg)
// case msg: VoiceRecordingStopped => handleVoiceRecordingStopped(msg)
//case msg: ClearPresentationOutMsg => handleClearPresentationOutMsg(msg)
@@ -65,10 +65,10 @@ class RedisRecorderActor(val system: ActorSystem)
// case msg: ClearWhiteboardEvent => handleClearWhiteboardEvent(msg)
// case msg: UndoWhiteboardEvent => handleUndoWhiteboardEvent(msg)
// case msg: EditCaptionHistoryReply => handleEditCaptionHistoryReply(msg)
- case msg: DeskShareStartRTMPBroadcast => handleDeskShareStartRTMPBroadcast(msg)
- case msg: DeskShareStopRTMPBroadcast => handleDeskShareStopRTMPBroadcast(msg)
- case msg: DeskShareNotifyViewersRTMP => handleDeskShareNotifyViewersRTMP(msg)
- case _ => // do nothing
+ //case msg: DeskShareStartRTMPBroadcast => handleDeskShareStartRTMPBroadcast(msg)
+ //case msg: DeskShareStopRTMPBroadcast => handleDeskShareStopRTMPBroadcast(msg)
+ //case msg: DeskShareNotifyViewersRTMP => handleDeskShareNotifyViewersRTMP(msg)
+ case _ => // do nothing
}
/* private def handleSendPublicMessageEvent(msg: SendPublicMessageEvent) {
@@ -175,7 +175,7 @@ class RedisRecorderActor(val system: ActorSystem)
}
}
*/
-
+ /*
private def handleEndAndKickAll(msg: EndAndKickAll): Unit = {
if (msg.recorded) {
val ev = new ParticipantEndAndKickAllRecordEvent()
@@ -198,7 +198,7 @@ class RedisRecorderActor(val system: ActorSystem)
record(msg.meetingID, JavaConverters.mapAsScalaMap(ev.toMap).toMap)
}
}
-
+*/
/*
def handleVoiceRecordingStarted(msg: VoiceRecordingStarted) {
if (msg.recorded) {
@@ -277,7 +277,7 @@ class RedisRecorderActor(val system: ActorSystem)
}
}
*/
-
+ /*
def handleRecordingStatusChanged(msg: RecordingStatusChanged) {
if (msg.recorded) {
val evt = new RecordStatusRecordEvent()
@@ -354,7 +354,7 @@ class RedisRecorderActor(val system: ActorSystem)
record(msg.meetingID, JavaConverters.mapAsScalaMap(event.toMap).toMap)
}
- }
+ }*/
/*
private def getPresentationId(whiteboardId: String): String = {
@@ -473,7 +473,7 @@ class RedisRecorderActor(val system: ActorSystem)
}
}
*/
-
+ /*
private def handleDeskShareStartRTMPBroadcast(msg: DeskShareStartRTMPBroadcast) {
val event = new DeskShareStartRTMPRecordEvent()
event.setMeetingId(msg.conferenceName)
@@ -500,5 +500,5 @@ class RedisRecorderActor(val system: ActorSystem)
event.setTimestamp(TimestampGenerator.generateTimestamp())
record(msg.meetingID, JavaConverters.mapAsScalaMap(event.toMap).toMap)
- }
+ }*/
}
diff --git a/bbb-apps-common/src/main/java/org/bigbluebutton/red5/client/MeetingClientMessageSender.java b/bbb-apps-common/src/main/java/org/bigbluebutton/red5/client/MeetingClientMessageSender.java
index cd2e19214b1aa5af60cb0b0bbadfd66a7c468d59..e83644210c727c5f9fb6bebdc4a17dbe17902afa 100755
--- a/bbb-apps-common/src/main/java/org/bigbluebutton/red5/client/MeetingClientMessageSender.java
+++ b/bbb-apps-common/src/main/java/org/bigbluebutton/red5/client/MeetingClientMessageSender.java
@@ -5,7 +5,6 @@ import java.util.Map;
import org.bigbluebutton.common.messages.Constants;
import org.bigbluebutton.common.messages.DisconnectAllUsersMessage;
-import org.bigbluebutton.common.messages.DisconnectUserMessage;
import org.bigbluebutton.common.messages.InactivityWarningMessage;
import org.bigbluebutton.common.messages.MeetingEndedMessage;
import org.bigbluebutton.common.messages.MeetingEndingMessage;
@@ -13,8 +12,6 @@ import org.bigbluebutton.common.messages.MeetingHasEndedMessage;
import org.bigbluebutton.common.messages.MeetingIsActiveMessage;
import org.bigbluebutton.common.messages.MeetingMutedMessage;
import org.bigbluebutton.common.messages.MeetingStateMessage;
-import org.bigbluebutton.common.messages.NewPermissionsSettingMessage;
-import org.bigbluebutton.common.messages.UserLockedMessage;
import org.bigbluebutton.red5.client.messaging.BroadcastClientMessage;
import org.bigbluebutton.red5.client.messaging.IConnectionInvokerService;
import org.bigbluebutton.red5.client.messaging.DirectClientMessage;
@@ -43,12 +40,6 @@ public class MeetingClientMessageSender {
if (header.has("name")) {
String messageName = header.get("name").getAsString();
switch (messageName) {
- case DisconnectUserMessage.DISCONNECT_USER:
- DisconnectUserMessage m = DisconnectUserMessage.fromJson(message);
- if (m != null) {
- processDisconnectUserMessage(m);
- }
- break;
case DisconnectAllUsersMessage.DISCONNECT_All_USERS:
DisconnectAllUsersMessage daum = DisconnectAllUsersMessage.fromJson(message);
if (daum != null) {
@@ -79,24 +70,12 @@ public class MeetingClientMessageSender {
processMeetingStateMessage(msm);
}
break;
- case NewPermissionsSettingMessage.NEW_PERMISSIONS_SETTING:
- NewPermissionsSettingMessage npsm = NewPermissionsSettingMessage.fromJson(message);
- if (npsm != null) {
- processNewPermissionsSettingMessage(npsm);
- }
- break;
case MeetingMutedMessage.MEETING_MUTED:
MeetingMutedMessage mmm = MeetingMutedMessage.fromJson(message);
if (mmm != null) {
processMeetingMutedMessage(mmm);
}
break;
- case UserLockedMessage.USER_LOCKED:
- UserLockedMessage ulm = UserLockedMessage.fromJson(message);
- if (ulm != null) {
- processUserLockedMessage(ulm);
- }
- break;
case InactivityWarningMessage.INACTIVITY_WARNING:
InactivityWarningMessage iwm = InactivityWarningMessage.fromJson(message);
if (iwm != null) {
@@ -137,26 +116,6 @@ public class MeetingClientMessageSender {
DirectClientMessage m = new DirectClientMessage(msg.meetingId, msg.userId, "meetingState", message);
service.sendMessage(m);
- }
-
- private void processNewPermissionsSettingMessage(NewPermissionsSettingMessage msg) {
- Map<String, Object> args = new HashMap<String, Object>();
- args.put("disableCam", msg.permissions.get(Constants.PERM_DISABLE_CAM));
- args.put("disableMic", msg.permissions.get(Constants.PERM_DISABLE_MIC));
- args.put("disablePrivateChat", msg.permissions.get(Constants.PERM_DISABLE_PRIVCHAT));
- args.put("disablePublicChat", msg.permissions.get(Constants.PERM_DISABLE_PUBCHAT));
- args.put("lockedLayout", msg.permissions.get(Constants.PERM_LOCKED_LAYOUT));
- args.put("lockOnJoin", msg.permissions.get(Constants.PERM_LOCK_ON_JOIN));
- args.put("lockOnJoinConfigurable", msg.permissions.get(Constants.PERM_LOCK_ON_JOIN_CONFIG));
-
- args.put("users", msg.users);
-
- Map<String, Object> message = new HashMap<String, Object>();
- Gson gson = new Gson();
- message.put("msg", gson.toJson(args));
-
- BroadcastClientMessage m = new BroadcastClientMessage(msg.meetingId, "permissionsSettingsChanged", message);
- service.sendMessage(m);
}
private void processMeetingMutedMessage(MeetingMutedMessage msg) {
@@ -199,25 +158,6 @@ public class MeetingClientMessageSender {
DisconnectAllClientsMessage dm = new DisconnectAllClientsMessage(msg.meetingId);
service.sendMessage(dm);
}
-
- private void processDisconnectUserMessage(DisconnectUserMessage msg) {
- DisconnectClientMessage m = new DisconnectClientMessage(msg.meetingId, msg.userId);
- service.sendMessage(m);
- }
-
- private void processUserLockedMessage(UserLockedMessage msg) {
- Map<String, Object> args = new HashMap<String, Object>();
- args.put("meetingID", msg.meetingId);
- args.put("user", msg.userId);
- args.put("lock", msg.locked);
-
- Map<String, Object> message = new HashMap<String, Object>();
- Gson gson = new Gson();
- message.put("msg", gson.toJson(args));
-
- BroadcastClientMessage m = new BroadcastClientMessage(msg.meetingId, "userLocked", message);
- service.sendMessage(m);
- }
private void processInactivityWarningMessage(InactivityWarningMessage msg) {
Map<String, Object> args = new HashMap<String, Object>();
diff --git a/bbb-apps-common/src/main/java/org/bigbluebutton/red5/client/UserClientMessageSender.java b/bbb-apps-common/src/main/java/org/bigbluebutton/red5/client/UserClientMessageSender.java
index 3ec8e85c6476a011fc0d7f484273ec7c2f5bae95..2ed9907e44894de5b8b0c1cb1fc34892cdefb9fb 100755
--- a/bbb-apps-common/src/main/java/org/bigbluebutton/red5/client/UserClientMessageSender.java
+++ b/bbb-apps-common/src/main/java/org/bigbluebutton/red5/client/UserClientMessageSender.java
@@ -1,28 +1,10 @@
package org.bigbluebutton.red5.client;
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.Map;
-import org.bigbluebutton.common.messages.GuestPolicyChangedMessage;
-import org.bigbluebutton.common.messages.GetGuestPolicyReplyMessage;
import org.bigbluebutton.common.messages.GetRecordingStatusReplyMessage;
-import org.bigbluebutton.common.messages.GetUsersReplyMessage;
-import org.bigbluebutton.common.messages.GuestAccessDeniedMessage;
-import org.bigbluebutton.common.messages.PresenterAssignedMessage;
import org.bigbluebutton.common.messages.RecordingStatusChangedMessage;
-import org.bigbluebutton.common.messages.UserEmojiStatusMessage;
-import org.bigbluebutton.common.messages.UserJoinedMessage;
-import org.bigbluebutton.common.messages.UserLeftMessage;
-import org.bigbluebutton.common.messages.UserSharedWebcamMessage;
-import org.bigbluebutton.common.messages.UserStatusChangedMessage;
-import org.bigbluebutton.common.messages.UserRoleChangeMessage;
-import org.bigbluebutton.common.messages.UserUnsharedWebcamMessage;
-import org.bigbluebutton.common.messages.ValidateAuthTokenReplyMessage;
-import org.bigbluebutton.common.messages.ValidateAuthTokenTimeoutMessage;
-import org.bigbluebutton.common.messages.UserEjectedFromMeetingMessage;
import org.bigbluebutton.red5.client.messaging.BroadcastClientMessage;
import org.bigbluebutton.red5.client.messaging.IConnectionInvokerService;
import org.bigbluebutton.red5.client.messaging.DirectClientMessage;
@@ -49,69 +31,9 @@ public class UserClientMessageSender {
if (header.has("name")) {
// Used for JSON unmarshalling
- Gson gson = new Gson();
-
+
String messageName = header.get("name").getAsString();
switch (messageName) {
- case ValidateAuthTokenReplyMessage.VALIDATE_AUTH_TOKEN_REPLY:
- ValidateAuthTokenReplyMessage m = ValidateAuthTokenReplyMessage.fromJson(message);
- if (m != null) {
- processValidateAuthTokenReply(m);
- }
- break;
- case ValidateAuthTokenTimeoutMessage.VALIDATE_AUTH_TOKEN_TIMEOUT:
- ValidateAuthTokenTimeoutMessage vattm = ValidateAuthTokenTimeoutMessage.fromJson(message);
- if (vattm != null) {
- processValidateAuthTokenTimeoutMessage(vattm);
- }
- break;
- case UserLeftMessage.USER_LEFT:
- UserLeftMessage ulm = UserLeftMessage.fromJson(message);
- if (ulm != null) {
- processUserLeftMessage(ulm);
- }
- break;
- case UserJoinedMessage.USER_JOINED:
- UserJoinedMessage ujm = UserJoinedMessage.fromJson(message);
- if (ujm != null) {
- processUserJoinedMessage(ujm);
- }
- break;
- case PresenterAssignedMessage.PRESENTER_ASSIGNED:
- PresenterAssignedMessage pam = PresenterAssignedMessage.fromJson(message);
- if (pam != null) {
- processPresenterAssignedMessage(pam);
- }
- break;
- case UserStatusChangedMessage.USER_STATUS_CHANGED:
- UserStatusChangedMessage usm = UserStatusChangedMessage.fromJson(message);
- if (usm != null) {
- processUserStatusChangedMessage(usm);
- }
- case UserRoleChangeMessage.USER_ROLE_CHANGE:
- UserRoleChangeMessage urcm = UserRoleChangeMessage.fromJson(message);
- if (urcm != null) {
- processUserRoleChangeMessage(urcm);
- }
- break;
- case UserEmojiStatusMessage.USER_EMOJI_STATUS:
- UserEmojiStatusMessage urhm = UserEmojiStatusMessage.fromJson(message);
- if (urhm != null) {
- processUserEmojiStatusMessage(urhm);
- }
- break;
- case UserSharedWebcamMessage.USER_SHARED_WEBCAM:
- UserSharedWebcamMessage uswm = UserSharedWebcamMessage.fromJson(message);
- if (uswm != null) {
- processUserSharedWebcamMessage(uswm);
- }
- break;
- case UserUnsharedWebcamMessage.USER_UNSHARED_WEBCAM:
- UserUnsharedWebcamMessage uuwm = UserUnsharedWebcamMessage.fromJson(message);
- if (uuwm != null) {
- processUserUnsharedWebcamMessage(uuwm);
- }
- break;
case RecordingStatusChangedMessage.RECORDING_STATUS_CHANGED:
RecordingStatusChangedMessage rscm = RecordingStatusChangedMessage.fromJson(message);
if (rscm != null) {
@@ -124,187 +46,11 @@ public class UserClientMessageSender {
processGetRecordingStatusReplyMessage(grsrm);
}
break;
- case GetUsersReplyMessage.GET_USERS_REPLY:
- GetUsersReplyMessage gurm = GetUsersReplyMessage.fromJson(message);
- if (gurm != null) {
- processGetUsersReplyMessage(gurm);
- }
- break;
- case GetGuestPolicyReplyMessage.GET_GUEST_POLICY_REPLY:
- GetGuestPolicyReplyMessage ggprm = GetGuestPolicyReplyMessage.fromJson(message);
- if (ggprm != null) {
- processGetGuestPolicyReplyMessage(ggprm);
- }
- break;
- case GuestPolicyChangedMessage.GUEST_POLICY_CHANGED:
- GuestPolicyChangedMessage gpcm = GuestPolicyChangedMessage.fromJson(message);
- if (gpcm != null) {
- processGuestPolicyChangedMessage(gpcm);
- }
- break;
- case GuestAccessDeniedMessage.GUEST_ACCESS_DENIED:
- GuestAccessDeniedMessage gadm = GuestAccessDeniedMessage.fromJson(message);
- if (gadm != null) {
- processGuestAccessDeniedMessage(gadm);
- }
- break;
- case UserEjectedFromMeetingMessage.USER_EJECTED_FROM_MEETING:
- processUserEjectedFromMeetingMessage(message);
- break;
}
}
}
}
- private void processUserEjectedFromMeetingMessage(String message) {
- UserEjectedFromMeetingMessage msg = UserEjectedFromMeetingMessage.fromJson(message);
- if (msg != null) {
- Map<String, Object> args = new HashMap<String, Object>();
- args.put("ejectedBy", msg.ejectedBy);
- System.out.println("**** User [" + msg.userId + "] was ejected by [" + msg.ejectedBy + "]");
- DirectClientMessage m = new DirectClientMessage(msg.meetingId, msg.userId, "userEjectedFromMeeting", args);
- service.sendMessage(m);
- }
- }
-
- private void processValidateAuthTokenReply(ValidateAuthTokenReplyMessage msg) {
- Map<String, Object> args = new HashMap<String, Object>();
- args.put("userId", msg.userId);
- args.put("valid", msg.valid);
-
- Map<String, Object> message = new HashMap<String, Object>();
- Gson gson = new Gson();
- message.put("msg", gson.toJson(args));
-
- DirectClientMessage m = new DirectClientMessage(msg.meetingId, msg.userId, "validateAuthTokenReply", message);
- service.sendMessage(m);
- }
-
- private void processValidateAuthTokenTimeoutMessage(ValidateAuthTokenTimeoutMessage msg) {
- Map<String, Object> args = new HashMap<String, Object>();
- args.put("userId", msg.userId);
- args.put("valid", msg.valid);
-
- Map<String, Object> message = new HashMap<String, Object>();
- Gson gson = new Gson();
- message.put("msg", gson.toJson(args));
-
- DirectClientMessage m = new DirectClientMessage(msg.meetingId, msg.userId, "validateAuthTokenTimedOut", message);
- service.sendMessage(m);
- }
-
- private void processUserLeftMessage(UserLeftMessage msg) {
- Map<String, Object> args = new HashMap<String, Object>();
- args.put("user", msg.user);
-
- Map<String, Object> message = new HashMap<String, Object>();
- Gson gson = new Gson();
- message.put("msg", gson.toJson(args));
-
- BroadcastClientMessage m = new BroadcastClientMessage(msg.meetingId, "participantLeft", message);
- service.sendMessage(m);
- }
-
- private void processUserJoinedMessage(UserJoinedMessage msg) {
- Map<String, Object> args = new HashMap<String, Object>();
- args.put("user", msg.user);
-
- Map<String, Object> message = new HashMap<String, Object>();
- Gson gson = new Gson();
- message.put("msg", gson.toJson(args));
-
- String userId = msg.user.get("userId").toString();
-
- DirectClientMessage jmr = new DirectClientMessage(msg.meetingId, userId, "joinMeetingReply", message);
- service.sendMessage(jmr);
-
- BroadcastClientMessage m = new BroadcastClientMessage(msg.meetingId, "participantJoined", message);
- service.sendMessage(m);
- }
-
- private void processPresenterAssignedMessage(PresenterAssignedMessage msg) {
- Map<String, Object> args = new HashMap<String, Object>();
- args.put("newPresenterID", msg.newPresenterId);
- args.put("newPresenterName", msg.newPresenterName);
- args.put("assignedBy", msg.assignedBy);
-
- Map<String, Object> message = new HashMap<String, Object>();
- Gson gson = new Gson();
- message.put("msg", gson.toJson(args));
-
- BroadcastClientMessage m = new BroadcastClientMessage(msg.meetingId, "assignPresenterCallback", message);
- service.sendMessage(m);
- }
-
- private void processUserEmojiStatusMessage(UserEmojiStatusMessage msg) {
- Map<String, Object> args = new HashMap<String, Object>();
- args.put("userId", msg.userId);
- args.put("emojiStatus", msg.emojiStatus);
-
- Map<String, Object> message = new HashMap<String, Object>();
- Gson gson = new Gson();
- message.put("msg", gson.toJson(args));
-
- BroadcastClientMessage m = new BroadcastClientMessage(msg.meetingId, "userEmojiStatus", message);
- service.sendMessage(m);
- }
-
- private void processUserStatusChangedMessage(UserStatusChangedMessage msg) {
- Map<String, Object> args = new HashMap<String, Object>();
- args.put("userID", msg.userId);
- args.put("status", msg.status);
- args.put("value", msg.value);
-
- Map<String, Object> message = new HashMap<String, Object>();
- Gson gson = new Gson();
- message.put("msg", gson.toJson(args));
-
- BroadcastClientMessage m = new BroadcastClientMessage(msg.meetingId, "participantStatusChange", message);
- service.sendMessage(m);
- }
-
- private void processUserRoleChangeMessage(UserRoleChangeMessage msg) {
- Map<String, Object> args = new HashMap<String, Object>();
- args.put("userID", msg.userId);
- args.put("role", msg.role);
-
- Map<String, Object> message = new HashMap<String, Object>();
- Gson gson = new Gson();
- message.put("msg", gson.toJson(args));
-
- BroadcastClientMessage m = new BroadcastClientMessage(msg.meetingId, "participantRoleChange", message);
- service.sendMessage(m);
- }
-
- private void processUserSharedWebcamMessage(UserSharedWebcamMessage msg) {
- Map<String, Object> args = new HashMap<String, Object>();
- args.put("userId", msg.userId);
- args.put("webcamStream", msg.stream);
-
- Map<String, Object> message = new HashMap<String, Object>();
- Gson gson = new Gson();
- message.put("msg", gson.toJson(args));
-
- BroadcastClientMessage m = new BroadcastClientMessage(msg.meetingId, "userSharedWebcam", message);
- service.sendMessage(m);
- }
-
- private void processUserUnsharedWebcamMessage(UserUnsharedWebcamMessage msg) {
- Map<String, Object> args = new HashMap<String, Object>();
- args.put("userId", msg.userId);
- args.put("webcamStream", msg.stream);
-
- String timeStamp = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ").format(Calendar.getInstance().getTime());
- args.put("serverTimestamp", timeStamp );
-
- Map<String, Object> message = new HashMap<String, Object>();
- Gson gson = new Gson();
- message.put("msg", gson.toJson(args));
-
- BroadcastClientMessage m = new BroadcastClientMessage(msg.meetingId, "userUnsharedWebcam", message);
- service.sendMessage(m);
- }
-
private void processRecordingStatusChangedMessage(RecordingStatusChangedMessage msg) {
Map<String, Object> args = new HashMap<String, Object>();
args.put("userId", msg.userId);
@@ -330,53 +76,4 @@ public class UserClientMessageSender {
DirectClientMessage m = new DirectClientMessage(msg.meetingId, msg.userId, "getRecordingStatusReply", message);
service.sendMessage(m);
}
-
- private void processGetUsersReplyMessage(GetUsersReplyMessage msg) {
- Map<String, Object> args = new HashMap<String, Object>();
- args.put("count", msg.users.size());
- args.put("users", msg.users);
-
- Map<String, Object> message = new HashMap<String, Object>();
- Gson gson = new Gson();
- message.put("msg", gson.toJson(args));
-
- DirectClientMessage m = new DirectClientMessage(msg.meetingId, msg.requesterId, "getUsersReply", message);
- service.sendMessage(m);
- }
-
- private void processGetGuestPolicyReplyMessage(GetGuestPolicyReplyMessage msg) {
- Map<String, Object> args = new HashMap<String, Object>();
- args.put("guestPolicy", msg.guestPolicy.toString());
-
- Map<String, Object> message = new HashMap<String, Object>();
- Gson gson = new Gson();
- message.put("msg", gson.toJson(args));
-
- DirectClientMessage m = new DirectClientMessage(msg.meetingId, msg.requesterId, "get_guest_policy_reply", message);
- service.sendMessage(m);
- }
-
- private void processGuestPolicyChangedMessage(GuestPolicyChangedMessage msg) {
- Map<String, Object> args = new HashMap<String, Object>();
- args.put("guestPolicy", msg.guestPolicy.toString());
-
- Map<String, Object> message = new HashMap<String, Object>();
- Gson gson = new Gson();
- message.put("msg", gson.toJson(args));
-
- BroadcastClientMessage m = new BroadcastClientMessage(msg.meetingId, "guest_policy_changed", message);
- service.sendMessage(m);
- }
-
- private void processGuestAccessDeniedMessage(GuestAccessDeniedMessage msg) {
- Map<String, Object> args = new HashMap<String, Object>();
- args.put("userId", msg.userId);
-
- Map<String, Object> message = new HashMap<String, Object>();
- Gson gson = new Gson();
- message.put("msg", gson.toJson(args));
-
- DirectClientMessage m = new DirectClientMessage(msg.meetingId, msg.userId, "guest_access_denied", message);
- service.sendMessage(m);
- }
}
diff --git a/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/AllowUserToShareDesktopReply.java b/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/AllowUserToShareDesktopReply.java
deleted file mode 100644
index cbe769de7d684c5a052c2ecfc824c8ee6d0cf058..0000000000000000000000000000000000000000
--- a/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/AllowUserToShareDesktopReply.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.HashMap;
-
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-public class AllowUserToShareDesktopReply implements ISubscribedMessage {
- public static final String NAME = "AllowUserToShareDesktopReply";
- public static final String VERSION = "0.0.1";
-
- public static final String TIMESTAMP = "timestamp";
- public static final String MEETING_ID = "meeting_id";
- public static final String USER_ID = "user_id";
- public static final String ALLOWED = "allowed";
-
- public final Long timestamp;
- public final String userId;
- public final String meetingId;
- public final Boolean allowed;
-
- public AllowUserToShareDesktopReply(String meetingId, String userId,
- Boolean allowed, Long timestamp) {
- this.meetingId = meetingId;
- this.userId = userId;
- this.allowed = allowed;
- this.timestamp = timestamp;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
- payload.put(TIMESTAMP, timestamp);
- payload.put(MEETING_ID, meetingId);
- payload.put(USER_ID, userId);
- payload.put(ALLOWED, allowed);
-
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(NAME, VERSION, null);
- return MessageBuilder.buildJson(header, payload);
- }
-
- public static AllowUserToShareDesktopReply fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (NAME.equals(messageName)) {
-
- if (payload.has(TIMESTAMP) && payload.has(MEETING_ID)
- && payload.has(USER_ID) && payload.has(ALLOWED)) {
- Long timestamp = payload.get(TIMESTAMP).getAsLong();
- String meetingId = payload.get(MEETING_ID).getAsString();
- String userId = payload.get(USER_ID).getAsString();
- Boolean allowed = payload.get(ALLOWED).getAsBoolean();
- return new AllowUserToShareDesktopReply(meetingId, userId, allowed,
- timestamp);
- }
- }
- }
- }
- return null;
- }
-}
diff --git a/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/AllowUserToShareDesktopRequest.java b/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/AllowUserToShareDesktopRequest.java
deleted file mode 100644
index f35fb98cc12114c109b3d6cce9c5e221dff61f48..0000000000000000000000000000000000000000
--- a/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/AllowUserToShareDesktopRequest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.HashMap;
-
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-public class AllowUserToShareDesktopRequest implements ISubscribedMessage {
- public static final String NAME = "AllowUserToShareDesktopRequest";
- public static final String VERSION = "0.0.1";
-
- public static final String TIMESTAMP = "timestamp";
- public static final String MEETING_ID = "meeting_id";
- public static final String USER_ID = "user_id";
-
- public final Long timestamp;
- public final String userId;
- public final String meetingId;
-
- public AllowUserToShareDesktopRequest(String meetingId, String userId, Long timestamp) {
- this.meetingId = meetingId;
- this.userId = userId;
- this.timestamp = timestamp;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
- payload.put(TIMESTAMP, timestamp);
- payload.put(MEETING_ID, meetingId);
- payload.put(USER_ID, userId);
-
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(NAME, VERSION, null);
- return MessageBuilder.buildJson(header, payload);
- }
-
- public static AllowUserToShareDesktopRequest fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (NAME.equals(messageName)) {
-
- if (payload.has(TIMESTAMP) && payload.has(MEETING_ID) && payload.has(USER_ID)) {
- Long timestamp = payload.get(TIMESTAMP).getAsLong();
- String meetingId = payload.get(MEETING_ID).getAsString();
- String userId = payload.get(USER_ID).getAsString();
- return new AllowUserToShareDesktopRequest(meetingId, userId, timestamp);
- }
- }
- }
- }
- return null;
- }
-}
diff --git a/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/AssignPresenterRequestMessage.java b/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/AssignPresenterRequestMessage.java
deleted file mode 100755
index c26f165335ce7d36116f05f754c4a2ccb75f5e89..0000000000000000000000000000000000000000
--- a/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/AssignPresenterRequestMessage.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.HashMap;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-public class AssignPresenterRequestMessage implements IBigBlueButtonMessage {
- public static final String ASSIGN_PRESENTER_REQUEST = "assign_presenter_request_message";
- public final String VERSION = "0.0.1";
-
- public final String meetingId;
- public final String newPresenterId;
- public final String newPresenterName;
- public final String assignedBy;
-
- public AssignPresenterRequestMessage(String meetingID, String newPresenterId, String newPresenterName, String assignedBy) {
- this.meetingId = meetingID;
- this.newPresenterId = newPresenterId;
- this.newPresenterName = newPresenterName;
- this.assignedBy = assignedBy;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
- payload.put(Constants.MEETING_ID, meetingId);
- payload.put(Constants.NEW_PRESENTER_ID, newPresenterId);
- payload.put(Constants.NEW_PRESENTER_NAME, newPresenterName);
- payload.put(Constants.ASSIGNED_BY, assignedBy);
-
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(ASSIGN_PRESENTER_REQUEST, VERSION, null);
-
- return MessageBuilder.buildJson(header, payload);
- }
-
- public static AssignPresenterRequestMessage fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
-
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (ASSIGN_PRESENTER_REQUEST.equals(messageName)) {
- if (payload.has(Constants.MEETING_ID)
- && payload.has(Constants.NEW_PRESENTER_ID)
- && payload.has(Constants.NEW_PRESENTER_NAME)
- && payload.has(Constants.ASSIGNED_BY)) {
- String meetingId = payload.get(Constants.MEETING_ID).getAsString();
- String newPresenterId = payload.get(Constants.NEW_PRESENTER_ID).getAsString();
- String newPresenterName = payload.get(Constants.NEW_PRESENTER_NAME).getAsString();
- String assignedBy = payload.get(Constants.ASSIGNED_BY).getAsString();
-
- return new AssignPresenterRequestMessage(meetingId, newPresenterId, newPresenterName, assignedBy);
- }
- }
- }
- }
-
- return null;
- }
-}
diff --git a/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/ChangeUserRoleMessage.java b/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/ChangeUserRoleMessage.java
deleted file mode 100644
index aef2845b57930337244ba0d08f516a62d077b9ba..0000000000000000000000000000000000000000
--- a/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/ChangeUserRoleMessage.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.HashMap;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-public class ChangeUserRoleMessage implements IBigBlueButtonMessage {
- public static final String CHANGE_USER_ROLE = "change_user_role";
- public static final String VERSION = "0.0.1";
-
- public final String meetingId;
- public final String userId;
- public final String role;
-
- public ChangeUserRoleMessage(String meetingId, String userId, String role) {
- this.meetingId = meetingId;
- this.userId = userId;
- this.role = role;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
- payload.put(Constants.MEETING_ID, meetingId);
- payload.put(Constants.USER_ID, userId);
- payload.put(Constants.ROLE, role);
-
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(CHANGE_USER_ROLE, VERSION, null);
- return MessageBuilder.buildJson(header, payload);
- }
-
- public static ChangeUserRoleMessage fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (CHANGE_USER_ROLE.equals(messageName)) {
- if (payload.has(Constants.MEETING_ID)
- && payload.has(Constants.USER_ID)
- && payload.has(Constants.ROLE)) {
- String meetingId = payload.get(Constants.MEETING_ID).getAsString();
- String userId = payload.get(Constants.USER_ID).getAsString();
- String role = payload.get(Constants.ROLE).getAsString();
-
- return new ChangeUserRoleMessage(meetingId, userId, role);
- }
- }
- }
- }
- return null;
- }
-}
diff --git a/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/DisconnectUserMessage.java b/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/DisconnectUserMessage.java
deleted file mode 100755
index b0078b275e97ad5401d4d1dc596c4489da1538f4..0000000000000000000000000000000000000000
--- a/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/DisconnectUserMessage.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.HashMap;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-public class DisconnectUserMessage implements IBigBlueButtonMessage {
- public static final String DISCONNECT_USER = "disconnect_user_message";
- public final String VERSION = "0.0.1";
-
- public final String meetingId;
- public final String userId;
-
- public DisconnectUserMessage(String meetingID, String userId) {
- this.meetingId = meetingID;
- this.userId = userId;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
- payload.put(Constants.MEETING_ID, meetingId);
-
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(DISCONNECT_USER, VERSION, null);
-
- return MessageBuilder.buildJson(header, payload);
- }
- public static DisconnectUserMessage fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
-
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (DISCONNECT_USER.equals(messageName)) {
- if (payload.has(Constants.MEETING_ID)
- && payload.has(Constants.USER_ID)) {
- String meetingId = payload.get(Constants.MEETING_ID).getAsString();
- String userId = payload.get(Constants.USER_ID).getAsString();
-
- return new DisconnectUserMessage(meetingId, userId);
- }
- }
- }
- }
-
- return null;
- }
-}
diff --git a/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/EjectUserFromMeetingRequestMessage.java b/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/EjectUserFromMeetingRequestMessage.java
deleted file mode 100755
index 43c998f9c85c82b16ded5d34945761cfc64c76d6..0000000000000000000000000000000000000000
--- a/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/EjectUserFromMeetingRequestMessage.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.HashMap;
-
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-
-public class EjectUserFromMeetingRequestMessage implements ISubscribedMessage {
- public static final String EJECT_USER_FROM_MEETING_REQUEST = "eject_user_from_meeting_request_message";
- public static final String VERSION = "0.0.1";
-
- public final String meetingId;
- public final String userId;
- public final String ejectedBy;
-
- private static final String EJECTED_BY = "ejected_by";
-
- public EjectUserFromMeetingRequestMessage(String meetingId, String userId, String ejectedBy) {
- this.meetingId = meetingId;
- this.userId = userId;
- this.ejectedBy = ejectedBy;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
- payload.put(Constants.MEETING_ID, meetingId);
- payload.put(Constants.USER_ID, userId);
- payload.put(EJECTED_BY, ejectedBy);
-
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(EJECT_USER_FROM_MEETING_REQUEST, VERSION, null);
-
- return MessageBuilder.buildJson(header, payload);
- }
-
- public static EjectUserFromMeetingRequestMessage fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
-
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (EJECT_USER_FROM_MEETING_REQUEST.equals(messageName)) {
- if (payload.has(Constants.MEETING_ID)
- && payload.has(Constants.USER_ID)
- && payload.has(EJECTED_BY)) {
- String id = payload.get(Constants.MEETING_ID).getAsString();
- String userid = payload.get(Constants.USER_ID).getAsString();
- String ejectedBy = payload.get(EJECTED_BY).getAsString();
- return new EjectUserFromMeetingRequestMessage(id, userid, ejectedBy);
- }
- }
- }
- }
- return null;
- }
-}
diff --git a/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/GetGuestPolicyMessage.java b/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/GetGuestPolicyMessage.java
deleted file mode 100644
index 8a8ebade5c5d7130bf9f7de79fe2b777cf46cedf..0000000000000000000000000000000000000000
--- a/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/GetGuestPolicyMessage.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.HashMap;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-public class GetGuestPolicyMessage implements IBigBlueButtonMessage {
- public static final String GET_GUEST_POLICY = "get_guest_policy";
- public static final String VERSION = "0.0.1";
-
- public final String meetingId;
- public final String requesterId;
-
- public GetGuestPolicyMessage(String meetingId, String requesterId) {
- this.meetingId = meetingId;
- this.requesterId = requesterId;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
- payload.put(Constants.MEETING_ID, meetingId);
- payload.put(Constants.REQUESTER_ID, requesterId);
-
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(GET_GUEST_POLICY, VERSION, null);
- return MessageBuilder.buildJson(header, payload);
- }
-
- public static GetGuestPolicyMessage fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (GET_GUEST_POLICY.equals(messageName)) {
- if (payload.has(Constants.MEETING_ID)
- && payload.has(Constants.REQUESTER_ID)) {
- String meetingId = payload.get(Constants.MEETING_ID).getAsString();
- String requesterId = payload.get(Constants.REQUESTER_ID).getAsString();
-
- return new GetGuestPolicyMessage(meetingId, requesterId);
- }
- }
- }
- }
- return null;
- }
-}
diff --git a/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/GetGuestPolicyReplyMessage.java b/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/GetGuestPolicyReplyMessage.java
deleted file mode 100644
index 990a4584a78b172b80485547b3a96b09d1ec0b14..0000000000000000000000000000000000000000
--- a/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/GetGuestPolicyReplyMessage.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.HashMap;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-public class GetGuestPolicyReplyMessage implements IBigBlueButtonMessage {
- public static final String GET_GUEST_POLICY_REPLY = "get_guest_policy_reply";
- public static final String VERSION = "0.0.1";
-
- public final String meetingId;
- public final String requesterId;
- public final String guestPolicy;
-
- public GetGuestPolicyReplyMessage(String meetingId, String requesterId, String guestPolicy) {
- this.meetingId = meetingId;
- this.requesterId = requesterId;
- this.guestPolicy = guestPolicy;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
- payload.put(Constants.MEETING_ID, meetingId);
- payload.put(Constants.REQUESTER_ID, requesterId);
- payload.put(Constants.GUEST_POLICY, guestPolicy);
-
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(GET_GUEST_POLICY_REPLY, VERSION, null);
- return MessageBuilder.buildJson(header, payload);
- }
-
- public static GetGuestPolicyReplyMessage fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
-
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (GET_GUEST_POLICY_REPLY.equals(messageName)) {
- if (payload.has(Constants.MEETING_ID)
- && payload.has(Constants.REQUESTER_ID)
- && payload.has(Constants.GUEST_POLICY)) {
- String meetingId = payload.get(Constants.MEETING_ID).getAsString();
- String requesterId = payload.get(Constants.REQUESTER_ID).getAsString();
- String guestPolicy = payload.get(Constants.GUEST_POLICY).getAsString();
-
- return new GetGuestPolicyReplyMessage(meetingId, requesterId, guestPolicy);
- }
- }
- }
- }
- return null;
- }
-}
diff --git a/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/GetLockSettingsMessage.java b/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/GetLockSettingsMessage.java
deleted file mode 100755
index 0f4c711012f8a2873eaa609b5446aa1fc9f65932..0000000000000000000000000000000000000000
--- a/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/GetLockSettingsMessage.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.HashMap;
-
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-public class GetLockSettingsMessage implements IBigBlueButtonMessage {
- public static final String GET_LOCK_SETTINGS = "get_lock_settings";
- public static final String VERSION = "0.0.1";
-
- public final String meetingId;
- public final String userId;
-
- public GetLockSettingsMessage(String meetingId, String userId) {
- this.meetingId = meetingId;
- this.userId = userId;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
- payload.put(Constants.MEETING_ID, meetingId);
- payload.put(Constants.USER_ID, userId);
-
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(GET_LOCK_SETTINGS, VERSION, null);
- return MessageBuilder.buildJson(header, payload);
- }
-
- public static GetLockSettingsMessage fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
-
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (GET_LOCK_SETTINGS.equals(messageName)) {
- if (payload.has(Constants.MEETING_ID)
- && payload.has(Constants.USER_ID)) {
- String meetingId = payload.get(Constants.MEETING_ID).getAsString();
- String userId = payload.get(Constants.USER_ID).getAsString();
-
- return new GetLockSettingsMessage(meetingId, userId);
- }
- }
- }
- }
- return null;
- }
-}
diff --git a/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/GetUsersReplyMessage.java b/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/GetUsersReplyMessage.java
deleted file mode 100755
index d10914b126f62523303da3b4bf58040c368e139a..0000000000000000000000000000000000000000
--- a/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/GetUsersReplyMessage.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
-
-import com.google.gson.JsonArray;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-public class GetUsersReplyMessage implements ISubscribedMessage {
- public static final String GET_USERS_REPLY = "get_users_reply";
- public final String VERSION = "0.0.1";
-
- public final String meetingId;
- public final String requesterId;
- public final ArrayList<Map<String, Object>> users;
-
- public GetUsersReplyMessage(String meetingID, String requesterId, ArrayList<Map<String, Object>> users) {
- this.meetingId = meetingID;
- this.requesterId = requesterId;
- this.users = users;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
- payload.put(Constants.MEETING_ID, meetingId);
-
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(GET_USERS_REPLY, VERSION, null);
-
- return MessageBuilder.buildJson(header, payload);
- }
-
- public static GetUsersReplyMessage fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
-
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (GET_USERS_REPLY.equals(messageName)) {
- if (payload.has(Constants.MEETING_ID)
- && payload.has(Constants.REQUESTER_ID)
- && payload.has(Constants.USERS)) {
- String meetingID = payload.get(Constants.MEETING_ID).getAsString();
- String requesterId = payload.get(Constants.REQUESTER_ID).getAsString();
-
- JsonArray users = (JsonArray) payload.get(Constants.USERS);
-
- Util util = new Util();
- ArrayList<Map<String, Object>> usersList = util.extractUsers(users);
-
- if (usersList != null) {
- return new GetUsersReplyMessage(meetingID, requesterId, usersList);
- }
- }
- }
- }
- }
-
- return null;
- }
-}
diff --git a/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/GetUsersRequestMessage.java b/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/GetUsersRequestMessage.java
deleted file mode 100755
index eb9b2afc4e248bc2754aab388b4d04709b56a7da..0000000000000000000000000000000000000000
--- a/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/GetUsersRequestMessage.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.HashMap;
-
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-public class GetUsersRequestMessage implements IBigBlueButtonMessage {
- public static final String GET_USERS_REQUEST = "get_users_request_message";
- public static final String VERSION = "0.0.1";
-
- public final String meetingId;
- public final String requesterId;
-
-
- public GetUsersRequestMessage(String meetingId, String requesterId) {
- this.meetingId = meetingId;
- this.requesterId = requesterId;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
- payload.put(Constants.MEETING_ID, meetingId);
- payload.put(Constants.REQUESTER_ID, requesterId);
-
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(GET_USERS_REQUEST, VERSION, null);
- return MessageBuilder.buildJson(header, payload);
- }
-
- public static GetUsersRequestMessage fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
-
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (GET_USERS_REQUEST.equals(messageName)) {
- if (payload.has(Constants.MEETING_ID)
- && payload.has(Constants.REQUESTER_ID)) {
- String meetingId = payload.get(Constants.MEETING_ID).getAsString();
- String requesterId = payload.get(Constants.REQUESTER_ID).getAsString();
-
- return new GetUsersRequestMessage(meetingId, requesterId);
- }
- }
- }
- }
- return null;
- }
-}
diff --git a/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/GuestAccessDeniedMessage.java b/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/GuestAccessDeniedMessage.java
deleted file mode 100644
index 6fa50085b4462ba48df90e43b5632b176f78ccc5..0000000000000000000000000000000000000000
--- a/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/GuestAccessDeniedMessage.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.HashMap;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-public class GuestAccessDeniedMessage implements IBigBlueButtonMessage {
- public static final String GUEST_ACCESS_DENIED = "guest_access_denied";
- public static final String VERSION = "0.0.1";
-
- public final String meetingId;
- public final String userId;
-
- public GuestAccessDeniedMessage(String meetingId, String userId) {
- this.meetingId = meetingId;
- this.userId = userId;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
- payload.put(Constants.MEETING_ID, meetingId);
- payload.put(Constants.USER_ID, userId);
-
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(GUEST_ACCESS_DENIED, VERSION, null);
- return MessageBuilder.buildJson(header, payload);
- }
-
- public static GuestAccessDeniedMessage fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (GUEST_ACCESS_DENIED.equals(messageName)) {
-
- if (payload.has(Constants.MEETING_ID)
- && payload.has(Constants.USER_ID)) {
- String meetingId = payload.get(Constants.MEETING_ID).getAsString();
- String userId = payload.get(Constants.USER_ID).getAsString();
-
- return new GuestAccessDeniedMessage(meetingId, userId);
- }
- }
- }
- }
- return null;
- }
-}
diff --git a/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/GuestPolicyChangedMessage.java b/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/GuestPolicyChangedMessage.java
deleted file mode 100644
index d6de259452dfdccab223bc9a1cb21090aa8961db..0000000000000000000000000000000000000000
--- a/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/GuestPolicyChangedMessage.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.HashMap;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-public class GuestPolicyChangedMessage implements IBigBlueButtonMessage {
- public static final String GUEST_POLICY_CHANGED = "guest_policy_changed";
- public static final String VERSION = "0.0.1";
-
- public final String meetingId;
- public final String guestPolicy;
-
- public GuestPolicyChangedMessage(String meetingId, String guestPolicy) {
- this.meetingId = meetingId;
- this.guestPolicy = guestPolicy;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
- payload.put(Constants.MEETING_ID, meetingId);
- payload.put(Constants.GUEST_POLICY, guestPolicy);
-
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(GUEST_POLICY_CHANGED, VERSION, null);
- return MessageBuilder.buildJson(header, payload);
- }
-
- public static GuestPolicyChangedMessage fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (GUEST_POLICY_CHANGED.equals(messageName)) {
- if (payload.has(Constants.MEETING_ID)
- && payload.has(Constants.GUEST_POLICY)) {
- String meetingId = payload.get(Constants.MEETING_ID).getAsString();
- String guestPolicy = payload.get(Constants.GUEST_POLICY).getAsString();
-
- return new GuestPolicyChangedMessage(meetingId, guestPolicy);
- }
- }
- }
- }
- return null;
- }
-}
diff --git a/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/InitPermissionsSettingMessage.java b/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/InitPermissionsSettingMessage.java
deleted file mode 100755
index 1a770e32559c823df9448193d3e1ba72be973e66..0000000000000000000000000000000000000000
--- a/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/InitPermissionsSettingMessage.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-public class InitPermissionsSettingMessage implements ISubscribedMessage {
- public static final String INIT_PERMISSIONS_SETTING = "init_permission_settings_message";
- public final String VERSION = "0.0.1";
-
- public final String meetingId;
- public final Map<String, Boolean> permissions;
-
- public InitPermissionsSettingMessage(String meetingID, Map<String, Boolean> permissions) {
- this.meetingId = meetingID;
- this.permissions = permissions;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
- payload.put(Constants.MEETING_ID, meetingId);
- payload.put(Constants.PERMISSIONS, permissions);
-
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(INIT_PERMISSIONS_SETTING, VERSION, null);
-
- return MessageBuilder.buildJson(header, payload);
- }
- public static InitPermissionsSettingMessage fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (INIT_PERMISSIONS_SETTING.equals(messageName)) {
- if (payload.has(Constants.MEETING_ID)
- && payload.has(Constants.PERMISSIONS)) {
-
- String meetingID = payload.get(Constants.MEETING_ID).getAsString();
-
- JsonObject permissions = (JsonObject) payload.get(Constants.PERMISSIONS);
-
- Util util = new Util();
- Map<String, Boolean> permissionsMap = util.extractPermission(permissions);
-
- if (permissionsMap != null) {
- return new InitPermissionsSettingMessage(meetingID, permissionsMap);
- }
- }
- }
- }
- }
-
- return null;
- }
-}
diff --git a/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/LockMuteUserRequestMessage.java b/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/LockMuteUserRequestMessage.java
deleted file mode 100755
index 7276ead27f29827d8cf5da7c1886b34ed2dc0727..0000000000000000000000000000000000000000
--- a/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/LockMuteUserRequestMessage.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.HashMap;
-
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-
-public class LockMuteUserRequestMessage implements ISubscribedMessage {
- public static final String LOCK_MUTE_USER_REQUEST = "lock_mute_user_request_message";
- public static final String VERSION = "0.0.1";
-
- public static final String MEETING_ID = "meeting_id";
- public static final String REQUESTER_ID = "requester_id";
- public static final String USER_ID = "user_id";
- public static final String LOCK = "lock";
-
- public final String meetingId;
- public final String requesterId;
- public final String userId;
- public final Boolean lock;
-
- public LockMuteUserRequestMessage(String meetingId, String requesterId, String userId, Boolean lock) {
- this.meetingId = meetingId;
- this.requesterId = requesterId;
- this.userId = userId;
- this.lock = lock;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
- payload.put(MEETING_ID, meetingId);
- payload.put(REQUESTER_ID, requesterId);
- payload.put(USER_ID, userId);
- payload.put(LOCK, lock);
-
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(LOCK_MUTE_USER_REQUEST, VERSION, null);
-
- return MessageBuilder.buildJson(header, payload);
- }
-
- public static LockMuteUserRequestMessage fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
-
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (LOCK_MUTE_USER_REQUEST.equals(messageName)) {
- if (payload.has(MEETING_ID)
- && payload.has(REQUESTER_ID)
- && payload.has(USER_ID)
- && payload.has(LOCK)) {
- String id = payload.get(MEETING_ID).getAsString();
- String requesterId = payload.get(REQUESTER_ID).getAsString();
- String userId = payload.get(USER_ID).getAsString();
- Boolean lock = payload.get(LOCK).getAsBoolean();
- return new LockMuteUserRequestMessage(id, requesterId, userId, lock);
- }
- }
- }
- }
- return null;
-
- }
-}
diff --git a/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/LockUserMessage.java b/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/LockUserMessage.java
deleted file mode 100755
index 2c5fcffa1bbeb73a5e15a769edf686b48b8b5ba2..0000000000000000000000000000000000000000
--- a/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/LockUserMessage.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.HashMap;
-
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-public class LockUserMessage implements IBigBlueButtonMessage {
- public static final String LOCK_USER = "lock_user";
- public static final String VERSION = "0.0.1";
-
- public final String meetingId;
- public final String requesterId;
- public final boolean lock;
- public final String internalUserId;
-
-
- public LockUserMessage(String meetingId, String requesterId, boolean lock, String internalUserId) {
- this.meetingId = meetingId;
- this.requesterId = requesterId;
- this.lock = lock;
- this.internalUserId = internalUserId;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
- payload.put(Constants.MEETING_ID, meetingId);
- payload.put(Constants.REQUESTER_ID, requesterId);
- payload.put(Constants.LOCK, lock);
- payload.put(Constants.INTERNAL_USER_ID, internalUserId);
-
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(LOCK_USER, VERSION, null);
- return MessageBuilder.buildJson(header, payload);
- }
-
- public static LockUserMessage fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
-
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (LOCK_USER.equals(messageName)) {
- if (payload.has(Constants.MEETING_ID)
- && payload.has(Constants.REQUESTER_ID)
- && payload.has(Constants.LOCK)
- && payload.has(Constants.INTERNAL_USER_ID)) {
- String meetingId = payload.get(Constants.MEETING_ID).getAsString();
- String requesterId = payload.get(Constants.REQUESTER_ID).getAsString();
- boolean lock = payload.get(Constants.LOCK).getAsBoolean();
- String internalUserId = payload.get(Constants.INTERNAL_USER_ID).getAsString();
-
- return new LockUserMessage(meetingId, requesterId, lock, internalUserId);
- }
- }
- }
- }
- return null;
- }
-}
diff --git a/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/LogoutEndMeetingRequestMessage.java b/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/LogoutEndMeetingRequestMessage.java
deleted file mode 100644
index 9da3d6b51e62fadf26ca48485f09ad7b04815200..0000000000000000000000000000000000000000
--- a/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/LogoutEndMeetingRequestMessage.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.HashMap;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-public class LogoutEndMeetingRequestMessage implements ISubscribedMessage {
- public static final String LOGOUT_END_MEETING_REQUEST_MESSAGE = "logout_end_meeting_request_message";
- public static final String VERSION = "0.0.1";
-
- public final String meetingId;
- public final String userId;
-
- public LogoutEndMeetingRequestMessage(String meetingId, String userId) {
- this.meetingId = meetingId;
- this.userId = userId;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
- payload.put(Constants.MEETING_ID, meetingId);
- payload.put(Constants.USER_ID, userId);
-
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(LOGOUT_END_MEETING_REQUEST_MESSAGE, VERSION, null);
- return MessageBuilder.buildJson(header, payload);
- }
-
- public static LogoutEndMeetingRequestMessage fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
-
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (LOGOUT_END_MEETING_REQUEST_MESSAGE.equals(messageName)) {
- if (payload.has(Constants.MEETING_ID)
- && payload.has(Constants.USER_ID)) {
- String id = payload.get(Constants.MEETING_ID).getAsString();
- String userid = payload.get(Constants.USER_ID).getAsString();
-
- return new LogoutEndMeetingRequestMessage(id, userid);
- }
- }
- }
- }
- return null;
- }
-}
diff --git a/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/MeetingStateMessage.java b/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/MeetingStateMessage.java
index 80e7a273e683afa26cc5a72db8ae7fdd9b645509..d9d8c780d72bde246e24fd63407ae955e6fce8d5 100755
--- a/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/MeetingStateMessage.java
+++ b/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/MeetingStateMessage.java
@@ -48,10 +48,8 @@ public class MeetingStateMessage implements ISubscribedMessage {
String meetingID = payload.get(Constants.MEETING_ID).getAsString();
String userId = payload.get(Constants.USER_ID).getAsString();
Boolean muted = payload.get(Constants.MEETING_MUTED).getAsBoolean();
- JsonObject premissions = (JsonObject) payload.get(Constants.PERMISSIONS);
- Util util = new Util();
- Map<String, Boolean> premissionsMap = util.extractPermission(premissions);
+ Map<String, Boolean> premissionsMap = new HashMap<String, Boolean>();
if (premissionsMap != null) {
return new MeetingStateMessage(meetingID, userId, premissionsMap, muted);
diff --git a/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/MessageFromJsonConverter.java b/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/MessageFromJsonConverter.java
index 39d3c98f99e2b0afe9ba411ce079102504bc61f1..5de9dca1a901a65fdac89069636f96fce7d1b2cc 100755
--- a/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/MessageFromJsonConverter.java
+++ b/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/MessageFromJsonConverter.java
@@ -28,9 +28,6 @@ public class MessageFromJsonConverter {
return processKeepAlive(payload);
case ActivityResponseMessage.ACTIVITY_RESPONSE:
return processActivityResponseMessage(payload);
- case ValidateAuthTokenMessage.VALIDATE_AUTH_TOKEN:
- return processValidateAuthTokenMessage(header, payload);
- // return ValidateAuthTokenMessage.fromJson(message);
case GetAllMeetingsRequest.GET_ALL_MEETINGS_REQUEST_EVENT:
return new GetAllMeetingsRequest("the_string_is_not_used_anywhere");
}
@@ -38,16 +35,6 @@ public class MessageFromJsonConverter {
}
return null;
}
-
- private static IBigBlueButtonMessage processValidateAuthTokenMessage(JsonObject header, JsonObject payload) {
- String id = payload.get(Constants.MEETING_ID).getAsString();
- String userid = payload.get(Constants.USER_ID).getAsString();
- String authToken = payload.get(Constants.AUTH_TOKEN).getAsString();
- String replyTo = header.get(Constants.REPLY_TO).getAsString();
- String sessionId = "tobeimplemented";
- return new ValidateAuthTokenMessage(id, userid, authToken, replyTo,
- sessionId);
- }
private static IBigBlueButtonMessage processCreateMeeting(JsonObject payload) {
String id = payload.get(Constants.MEETING_ID).getAsString();
diff --git a/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/NewPermissionsSettingMessage.java b/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/NewPermissionsSettingMessage.java
deleted file mode 100755
index 27c8fffa0a4b00f65096bf32d936bb0a6562655a..0000000000000000000000000000000000000000
--- a/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/NewPermissionsSettingMessage.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
-
-import com.google.gson.JsonArray;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-public class NewPermissionsSettingMessage implements ISubscribedMessage {
- public static final String NEW_PERMISSIONS_SETTING = "new_permission_settings";
- public final String VERSION = "0.0.1";
-
- public final String meetingId;
- public final ArrayList<Map<String, Object>> users;
- public final Map<String, Boolean> permissions;
-
- public NewPermissionsSettingMessage(String meetingID, Map<String, Boolean> permissions, ArrayList<Map<String, Object>> users) {
- this.meetingId = meetingID;
- this.users = users;
- this.permissions = permissions;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
- payload.put(Constants.MEETING_ID, meetingId);
-
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(NEW_PERMISSIONS_SETTING, VERSION, null);
-
- return MessageBuilder.buildJson(header, payload);
- }
-
- public static NewPermissionsSettingMessage fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
-
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (NEW_PERMISSIONS_SETTING.equals(messageName)) {
- if (payload.has(Constants.MEETING_ID)
- && payload.has(Constants.USERS)
- && payload.has(Constants.PERMISSIONS)) {
- String meetingID = payload.get(Constants.MEETING_ID).getAsString();
-
- JsonObject permissions = (JsonObject) payload.get(Constants.PERMISSIONS);
-
- Util util = new Util();
- Map<String, Boolean> permissionsMap = util.extractPermission(permissions);
-
- JsonArray users = (JsonArray) payload.get(Constants.USERS);
-
- ArrayList<Map<String, Object>> usersList = util.extractUsers(users);
-
- if (usersList != null && permissionsMap != null) {
- return new NewPermissionsSettingMessage(meetingID, permissionsMap, usersList);
- }
- }
- }
- }
- }
-
- return null;
- }
-}
diff --git a/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/PresenterAssignedMessage.java b/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/PresenterAssignedMessage.java
deleted file mode 100755
index 38a8f2dc72860c2858ff47d867e6ad064bf5f622..0000000000000000000000000000000000000000
--- a/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/PresenterAssignedMessage.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.HashMap;
-
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-public class PresenterAssignedMessage implements ISubscribedMessage {
- public static final String PRESENTER_ASSIGNED = "presenter_assigned_message";
- public static final String VERSION = "0.0.1";
-
- public final String meetingId;
- public final String newPresenterId;
- public final String newPresenterName;
- public final String assignedBy;
-
- public PresenterAssignedMessage(String meetingId, String newPresenterId, String newPresenterName,
- String assignedBy) {
- this.meetingId = meetingId;
- this.newPresenterId = newPresenterId;
- this.newPresenterName = newPresenterName;
- this.assignedBy = assignedBy;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
- payload.put(Constants.MEETING_ID, meetingId);
- payload.put(Constants.NEW_PRESENTER_ID, newPresenterId);
- payload.put(Constants.NEW_PRESENTER_NAME, newPresenterName);
- payload.put(Constants.ASSIGNED_BY, assignedBy);
-
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(PRESENTER_ASSIGNED, VERSION, null);
-
- return MessageBuilder.buildJson(header, payload);
- }
-
- public static PresenterAssignedMessage fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
-
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (PRESENTER_ASSIGNED.equals(messageName)) {
- if (payload.has(Constants.MEETING_ID)
- && payload.has(Constants.NEW_PRESENTER_ID)
- && payload.has(Constants.NEW_PRESENTER_NAME)
- && payload.has(Constants.ASSIGNED_BY)) {
- String id = payload.get(Constants.MEETING_ID).getAsString();
- String presenterId = payload.get(Constants.NEW_PRESENTER_ID).getAsString();
- String presenterName = payload.get(Constants.NEW_PRESENTER_NAME).getAsString();
- String assignedBy = payload.get(Constants.ASSIGNED_BY).getAsString();
- return new PresenterAssignedMessage(id, presenterId, presenterName, assignedBy);
- }
- }
- }
- }
- return null;
-
- }
-}
diff --git a/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/RespondToGuestMessage.java b/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/RespondToGuestMessage.java
deleted file mode 100644
index 2da32de6b8006f4b9ad1aa198663834f2691a392..0000000000000000000000000000000000000000
--- a/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/RespondToGuestMessage.java
+++ /dev/null
@@ -1,64 +0,0 @@
-
-package org.bigbluebutton.common.messages;
-
-import java.util.HashMap;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-public class RespondToGuestMessage implements IBigBlueButtonMessage {
- public static final String RESPOND_TO_GUEST = "respond_to_guest";
- public static final String VERSION = "0.0.1";
-
- public final String meetingId;
- public final String userId;
- public final Boolean response;
- public final String requesterId;
-
- public RespondToGuestMessage(String meetingId, String userId, Boolean response, String requesterId) {
- this.meetingId = meetingId;
- this.userId = userId;
- this.response = response;
- this.requesterId = requesterId;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
- payload.put(Constants.MEETING_ID, meetingId);
- payload.put(Constants.USER_ID, userId);
- payload.put(Constants.RESPONSE, response);
- payload.put(Constants.REQUESTER_ID, requesterId);
-
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(RESPOND_TO_GUEST, VERSION, null);
- return MessageBuilder.buildJson(header, payload);
- }
-
- public static RespondToGuestMessage fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (RESPOND_TO_GUEST.equals(messageName)) {
- if (payload.has(Constants.MEETING_ID)
- && payload.has(Constants.RESPONSE)
- && payload.has(Constants.REQUESTER_ID)) {
- String meetingId = payload.get(Constants.MEETING_ID).getAsString();
- String userId = null;
- Boolean response = payload.get(Constants.RESPONSE).getAsBoolean();
- String requesterId = payload.get(Constants.REQUESTER_ID).getAsString();
-
- if (payload.has(Constants.USER_ID)) {
- userId = payload.get(Constants.USER_ID).getAsString();
- }
-
- return new RespondToGuestMessage(meetingId, userId, response, requesterId);
- }
- }
- }
- }
- return null;
- }
-}
diff --git a/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/SendLockSettingsMessage.java b/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/SendLockSettingsMessage.java
deleted file mode 100755
index 82000311a239337b055af7eca67a4963f42844fd..0000000000000000000000000000000000000000
--- a/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/SendLockSettingsMessage.java
+++ /dev/null
@@ -1,91 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-public class SendLockSettingsMessage implements IBigBlueButtonMessage {
- public static final String SEND_LOCK_SETTINGS = "send_lock_settings";
- public static final String VERSION = "0.0.1";
-
- public final String meetingId;
- public final String userId;
- public final Map<String, Boolean> newSettings;
-
-
- public SendLockSettingsMessage(String meetingId, String userId, Map<String, Boolean> newSettings) {
- this.meetingId = meetingId;
- this.userId = userId;
- this.newSettings = newSettings;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
-
- Map<String, Boolean> settingsMap = new HashMap<String, Boolean>();
-
- settingsMap.put(Constants.DISABLE_CAMERA, newSettings.get("disableCam"));
- settingsMap.put(Constants.DISABLE_MICROPHONE, newSettings.get("disableMic"));
- settingsMap.put(Constants.DISABLE_PRIVATE_CHAT, newSettings.get("disablePrivateChat"));
- settingsMap.put(Constants.DISABLE_PUBLIC_CHAT, newSettings.get("disablePublicChat"));
- settingsMap.put(Constants.LOCKED_LAYOUT, newSettings.get("lockedLayout"));
- settingsMap.put(Constants.LOCK_ON_JOIN, newSettings.get("lockOnJoin"));
- settingsMap.put(Constants.LOCK_ON_JOIN_CONFIGURABLE, newSettings.get("lockOnJoinConfigurable"));
-
- payload.put(Constants.MEETING_ID, meetingId);
- payload.put(Constants.USER_ID, userId);
- payload.put(Constants.SETTINGS, settingsMap);
-
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(SEND_LOCK_SETTINGS, VERSION, null);
- return MessageBuilder.buildJson(header, payload);
- }
-
- public static SendLockSettingsMessage fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
-
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (SEND_LOCK_SETTINGS.equals(messageName)) {
- if (payload.has(Constants.MEETING_ID)
- && payload.has(Constants.USER_ID)
- && payload.has(Constants.SETTINGS)) {
-
- JsonObject settingsObj = (JsonObject) payload.get(Constants.SETTINGS).getAsJsonObject();
- if (settingsObj.has(Constants.DISABLE_CAMERA)
- && settingsObj.has(Constants.DISABLE_CAMERA)
- && settingsObj.has(Constants.DISABLE_MICROPHONE)
- && settingsObj.has(Constants.DISABLE_PRIVATE_CHAT)
- && settingsObj.has(Constants.DISABLE_PUBLIC_CHAT)
- && settingsObj.has(Constants.LOCKED_LAYOUT)
- && settingsObj.has(Constants.LOCK_ON_JOIN)
- && settingsObj.has(Constants.LOCK_ON_JOIN_CONFIGURABLE)) {
-
- Map<String, Boolean> settingsMap = new HashMap<String, Boolean>();
-
- settingsMap.put("disableCam", settingsObj.get(Constants.DISABLE_CAMERA).getAsBoolean());
- settingsMap.put("disableMic", settingsObj.get(Constants.DISABLE_MICROPHONE).getAsBoolean());
- settingsMap.put("disablePrivateChat", settingsObj.get(Constants.DISABLE_PRIVATE_CHAT).getAsBoolean());
- settingsMap.put("disablePublicChat", settingsObj.get(Constants.DISABLE_PUBLIC_CHAT).getAsBoolean());
- settingsMap.put("lockedLayout", settingsObj.get(Constants.LOCKED_LAYOUT).getAsBoolean());
- settingsMap.put("lockOnJoin", settingsObj.get(Constants.LOCK_ON_JOIN).getAsBoolean());
- settingsMap.put("lockOnJoinConfigurable", settingsObj.get(Constants.LOCK_ON_JOIN_CONFIGURABLE).getAsBoolean());
-
- String meetingId = payload.get(Constants.MEETING_ID).getAsString();
- String userId = payload.get(Constants.USER_ID).getAsString();
-
- return new SendLockSettingsMessage(meetingId, userId, settingsMap);
- }
- }
- }
- }
- }
- return null;
- }
-}
diff --git a/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/SetGuestPolicyMessage.java b/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/SetGuestPolicyMessage.java
deleted file mode 100644
index b56ea59abbe0e582ef4bb04f6bfe9d2ffe2eddde..0000000000000000000000000000000000000000
--- a/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/SetGuestPolicyMessage.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.HashMap;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-public class SetGuestPolicyMessage implements IBigBlueButtonMessage {
- public static final String SET_GUEST_POLICY = "set_guest_policy";
- public static final String VERSION = "0.0.1";
-
- public final String meetingId;
- public final String guestPolicy;
- public final String setBy;
-
- public SetGuestPolicyMessage(String meetingId, String guestPolicy, String setBy) {
- this.meetingId = meetingId;
- this.guestPolicy = guestPolicy;
- this.setBy = setBy;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
- payload.put(Constants.MEETING_ID, meetingId);
- payload.put(Constants.GUEST_POLICY, guestPolicy);
- payload.put(Constants.SET_BY, setBy);
-
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(SET_GUEST_POLICY, VERSION, null);
- return MessageBuilder.buildJson(header, payload);
- }
-
- public static SetGuestPolicyMessage fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (SET_GUEST_POLICY.equals(messageName)) {
- if (payload.has(Constants.MEETING_ID)
- && payload.has(Constants.GUEST_POLICY)
- && payload.has(Constants.SET_BY)) {
- String meetingId = payload.get(Constants.MEETING_ID).getAsString();
- String guestPolicy = payload.get(Constants.GUEST_POLICY).getAsString();
- String setBy = payload.get(Constants.SET_BY).getAsString();
-
- return new SetGuestPolicyMessage(meetingId, guestPolicy, setBy);
- }
- }
- }
- }
- return null;
- }
-}
diff --git a/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/SetUserStatusRequestMessage.java b/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/SetUserStatusRequestMessage.java
deleted file mode 100755
index e338a1b41a8185a61e496c803651db1822636e58..0000000000000000000000000000000000000000
--- a/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/SetUserStatusRequestMessage.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.HashMap;
-
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-
-public class SetUserStatusRequestMessage implements ISubscribedMessage {
- public static final String SET_USER_STATUS_REQUEST = "set_user_status_request_message";
- public static final String VERSION = "0.0.1";
-
- public final String meetingId;
- public final String userId;
- public final String status;
- public final String value;
-
- public SetUserStatusRequestMessage(String meetingId, String userId, String status, String value) {
- this.meetingId = meetingId;
- this.userId = userId;
- this.status = status;
- this.value = value;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
- payload.put(Constants.MEETING_ID, meetingId);
- payload.put(Constants.USER_ID, userId);
- payload.put(Constants.STATUS, status);
- payload.put(Constants.VALUE, value);
-
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(SET_USER_STATUS_REQUEST, VERSION, null);
-
- return MessageBuilder.buildJson(header, payload);
- }
-
- public static SetUserStatusRequestMessage fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
-
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (SET_USER_STATUS_REQUEST.equals(messageName)) {
- if (payload.has(Constants.MEETING_ID)
- && payload.has(Constants.USER_ID)
- && payload.has(Constants.STATUS)
- && payload.has(Constants.VALUE)) {
- String id = payload.get(Constants.MEETING_ID).getAsString();
- String userid = payload.get(Constants.USER_ID).getAsString();
- String status = payload.get(Constants.STATUS).getAsString();
- String value = payload.get(Constants.VALUE).getAsString();
- return new SetUserStatusRequestMessage(id, userid, status, value);
- }
- }
- }
- }
- return null;
-
- }
-}
diff --git a/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/UserEjectedFromMeetingMessage.java b/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/UserEjectedFromMeetingMessage.java
deleted file mode 100755
index 90fcb00c9c8a246128e6a5ba72f617c8c4a8b0eb..0000000000000000000000000000000000000000
--- a/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/UserEjectedFromMeetingMessage.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.HashMap;
-
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-public class UserEjectedFromMeetingMessage implements ISubscribedMessage {
- public static final String USER_EJECTED_FROM_MEETING = "user_eject_from_meeting";
- public static final String VERSION = "0.0.1";
-
- public final String meetingId;
- public final String userId;
- public final String ejectedBy;
-
-
- public UserEjectedFromMeetingMessage(String meetingId, String userId, String ejectedBy) {
- this.meetingId = meetingId;
- this.userId = userId;
- this.ejectedBy = ejectedBy;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
- payload.put(Constants.MEETING_ID, meetingId);
- payload.put(Constants.USER_ID, userId);
- payload.put(Constants.EJECTED_BY, ejectedBy);
-
-
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(USER_EJECTED_FROM_MEETING, VERSION, null);
-
- return MessageBuilder.buildJson(header, payload);
- }
-
- public static UserEjectedFromMeetingMessage fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
-
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (USER_EJECTED_FROM_MEETING.equals(messageName)) {
- if (payload.has(Constants.MEETING_ID)
- && payload.has(Constants.USER_ID)
- && payload.has(Constants.EJECTED_BY)) {
- String id = payload.get(Constants.MEETING_ID).getAsString();
- String userid = payload.get(Constants.USER_ID).getAsString();
- String ejectedBy = payload.get(Constants.EJECTED_BY).getAsString();
- return new UserEjectedFromMeetingMessage(id, userid, ejectedBy);
- }
- }
- }
- }
- return null;
-
- }
-}
diff --git a/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/UserEmojiStatusMessage.java b/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/UserEmojiStatusMessage.java
deleted file mode 100755
index f3e657cbea0ea5589939531b9dbf578a329fe7aa..0000000000000000000000000000000000000000
--- a/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/UserEmojiStatusMessage.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.HashMap;
-
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-
-public class UserEmojiStatusMessage implements ISubscribedMessage {
- public static final String USER_EMOJI_STATUS = "user_emoji_status_message";
- public static final String VERSION = "0.0.1";
-
- public final String meetingId;
- public final String userId;
- public final String emojiStatus;
-
- public UserEmojiStatusMessage(String meetingId, String userId, String emojiStatus) {
- this.meetingId = meetingId;
- this.userId = userId;
- this.emojiStatus = emojiStatus;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
- payload.put(Constants.MEETING_ID, meetingId);
- payload.put(Constants.USER_ID, userId);
- payload.put(Constants.EMOJI_STATUS, emojiStatus);
-
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(USER_EMOJI_STATUS, VERSION, null);
-
- return MessageBuilder.buildJson(header, payload);
- }
-
- public static UserEmojiStatusMessage fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
-
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (USER_EMOJI_STATUS.equals(messageName)) {
- if (payload.has(Constants.MEETING_ID)
- && payload.has(Constants.USER_ID)
- && payload.has(Constants.EMOJI_STATUS)) {
- String id = payload.get(Constants.MEETING_ID).getAsString();
- String userid = payload.get(Constants.USER_ID).getAsString();
- String emojiStatus = payload.get(Constants.EMOJI_STATUS).getAsString();
- return new UserEmojiStatusMessage(id, userid, emojiStatus);
- }
- }
- }
- }
- return null;
-
- }
-}
diff --git a/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/UserJoinedMessage.java b/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/UserJoinedMessage.java
deleted file mode 100755
index 0cd267bc9ee9ff742bcc25da80d13f63aac6aead..0000000000000000000000000000000000000000
--- a/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/UserJoinedMessage.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-public class UserJoinedMessage implements ISubscribedMessage {
- public static final String USER_JOINED = "user_joined_message";
- public final String VERSION = "0.0.1";
-
- public final String meetingId;
- public final Map<String, Object> user;
-
- public UserJoinedMessage(String meetingID, Map<String, Object> user) {
- this.meetingId = meetingID;
- this.user = user;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
- payload.put(Constants.MEETING_ID, meetingId);
-
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(USER_JOINED, VERSION, null);
-
- return MessageBuilder.buildJson(header, payload);
- }
- public static UserJoinedMessage fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
-
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (USER_JOINED.equals(messageName)) {
- if (payload.has(Constants.MEETING_ID)
- && payload.has(Constants.USER)) {
- String meetingID = payload.get(Constants.MEETING_ID).getAsString();
-
- JsonObject user = (JsonObject) payload.get(Constants.USER);
-
- Util util = new Util();
- Map<String, Object> userMap = util.extractUser(user);
-
- if (userMap != null) {
- return new UserJoinedMessage(meetingID, userMap);
- }
- }
- }
- }
- }
-
- return null;
- }
-}
diff --git a/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/UserLeavingMessage.java b/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/UserLeavingMessage.java
deleted file mode 100755
index 8945520836809da4fda1a175c7f2010993c58fb6..0000000000000000000000000000000000000000
--- a/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/UserLeavingMessage.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.HashMap;
-
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-public class UserLeavingMessage implements ISubscribedMessage {
- public static final String USER_LEAVING = "user_leaving_request";
- public final String VERSION = "0.0.1";
-
- public final String meetingId;
- public final String userId;
-
- public UserLeavingMessage(String meetingID, String internalUserId) {
- this.meetingId = meetingID;
- this.userId = internalUserId;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
- payload.put(Constants.MEETING_ID, meetingId);
- payload.put(Constants.USER_ID, userId);
-
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(USER_LEAVING, VERSION, null);
-
- return MessageBuilder.buildJson(header, payload);
- }
- public static UserLeavingMessage fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
-
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (USER_LEAVING.equals(messageName)) {
- if (payload.has(Constants.MEETING_ID)
- && payload.has(Constants.USER_ID)) {
- String meetingID = payload.get(Constants.MEETING_ID).getAsString();
- String userid = payload.get(Constants.USER_ID).getAsString();
- return new UserLeavingMessage(meetingID, userid);
- }
- }
- }
- }
-
- return null;
- }
-}
diff --git a/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/UserLeftMessage.java b/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/UserLeftMessage.java
deleted file mode 100755
index 037d4681fdbdd145db68a5fa0db98ffd5bc0890f..0000000000000000000000000000000000000000
--- a/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/UserLeftMessage.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-public class UserLeftMessage implements ISubscribedMessage {
- public static final String USER_LEFT = "user_left_message";
- public final String VERSION = "0.0.1";
-
- public final String meetingId;
- public final Map<String, Object> user;
-
- public UserLeftMessage(String meetingID, Map<String, Object> user) {
- this.meetingId = meetingID;
- this.user = user;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
- payload.put(Constants.MEETING_ID, meetingId);
-
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(USER_LEFT, VERSION, null);
-
- return MessageBuilder.buildJson(header, payload);
- }
- public static UserLeftMessage fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
-
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (USER_LEFT.equals(messageName)) {
- if (payload.has(Constants.MEETING_ID)
- && payload.has(Constants.USER)) {
- String meetingID = payload.get(Constants.MEETING_ID).getAsString();
-
- JsonObject user = (JsonObject) payload.get(Constants.USER);
-
- Util util = new Util();
- Map<String, Object> userMap = util.extractUser(user);
-
- if (userMap != null) {
- return new UserLeftMessage(meetingID, userMap);
- }
- }
- }
- }
- }
-
- return null;
- }
-}
diff --git a/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/UserLockedMessage.java b/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/UserLockedMessage.java
deleted file mode 100755
index c9c6aa8f3b06d4210c211687701e294ac54fbb32..0000000000000000000000000000000000000000
--- a/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/UserLockedMessage.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.HashMap;
-
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-
-public class UserLockedMessage implements ISubscribedMessage {
- public static final String USER_LOCKED = "user_locked_message";
- public static final String VERSION = "0.0.1";
-
- public final String meetingId;
- public final String userId;
- public final Boolean locked;
-
- public UserLockedMessage(String meetingId, String userId, Boolean locked) {
- this.meetingId = meetingId;
- this.userId = userId;
- this.locked = locked;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
- payload.put(Constants.MEETING_ID, meetingId);
- payload.put(Constants.USER_ID, userId);
- payload.put(Constants.LOCKED, locked);
-
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(USER_LOCKED, VERSION, null);
-
- return MessageBuilder.buildJson(header, payload);
- }
-
- public static UserLockedMessage fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
-
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (USER_LOCKED.equals(messageName)) {
- if (payload.has(Constants.MEETING_ID)
- && payload.has(Constants.USER_ID)
- && payload.has(Constants.LOCKED)) {
- String id = payload.get(Constants.MEETING_ID).getAsString();
- String userid = payload.get(Constants.USER_ID).getAsString();
- Boolean locked = payload.get(Constants.LOCKED).getAsBoolean();
- return new UserLockedMessage(id, userid, locked);
- }
- }
- }
- }
- return null;
-
- }
-}
diff --git a/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/UserRoleChangeMessage.java b/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/UserRoleChangeMessage.java
deleted file mode 100644
index 0d6d76bde13df24c035ef97d840f30de7767d0d9..0000000000000000000000000000000000000000
--- a/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/UserRoleChangeMessage.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.HashMap;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-public class UserRoleChangeMessage implements IBigBlueButtonMessage {
- public static final String USER_ROLE_CHANGE = "user_role_change";
- public static final String VERSION = "0.0.1";
-
- public final String meetingId;
- public final String userId;
- public final String role;
-
- public UserRoleChangeMessage(String meetingId, String userId, String role) {
- this.meetingId = meetingId;
- this.userId = userId;
- this.role = role;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
- payload.put(Constants.MEETING_ID, meetingId);
- payload.put(Constants.USER_ID, userId);
- payload.put(Constants.ROLE, role);
-
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(USER_ROLE_CHANGE, VERSION, null);
- return MessageBuilder.buildJson(header, payload);
- }
-
- public static UserRoleChangeMessage fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (USER_ROLE_CHANGE.equals(messageName)) {
- if (payload.has(Constants.MEETING_ID)
- && payload.has(Constants.USER_ID)
- && payload.has(Constants.ROLE)) {
- String meetingId = payload.get(Constants.MEETING_ID).getAsString();
- String userId = payload.get(Constants.USER_ID).getAsString();
- String role = payload.get(Constants.ROLE).getAsString();
-
- return new UserRoleChangeMessage(meetingId, userId, role);
- }
- }
- }
- }
- return null;
- }
-}
diff --git a/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/UserShareWebcamRequestMessage.java b/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/UserShareWebcamRequestMessage.java
deleted file mode 100755
index 225580e1aa4fd6b60eefeeb2e93d680ee8e2d8a7..0000000000000000000000000000000000000000
--- a/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/UserShareWebcamRequestMessage.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.HashMap;
-
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-
-public class UserShareWebcamRequestMessage implements ISubscribedMessage {
- public static final String USER_SHARE_WEBCAM_REQUEST = "user_share_webcam_request_message";
- public static final String VERSION = "0.0.1";
-
- public final String meetingId;
- public final String userId;
- public final String stream;
-
- public UserShareWebcamRequestMessage(String meetingId, String userId, String stream) {
- this.meetingId = meetingId;
- this.userId = userId;
- this.stream = stream;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
- payload.put(Constants.MEETING_ID, meetingId);
- payload.put(Constants.USER_ID, userId);
- payload.put(Constants.STREAM, stream);
-
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(USER_SHARE_WEBCAM_REQUEST, VERSION, null);
-
- return MessageBuilder.buildJson(header, payload);
- }
-
- public static UserShareWebcamRequestMessage fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
-
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (USER_SHARE_WEBCAM_REQUEST.equals(messageName)) {
- if (payload.has(Constants.MEETING_ID)
- && payload.has(Constants.USER_ID)
- && payload.has(Constants.STREAM)) {
- String id = payload.get(Constants.MEETING_ID).getAsString();
- String userid = payload.get(Constants.USER_ID).getAsString();
- String stream = payload.get(Constants.STREAM).getAsString();
- return new UserShareWebcamRequestMessage(id, userid, stream);
- }
- }
- }
- }
- return null;
-
- }
-}
diff --git a/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/UserSharedWebcamMessage.java b/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/UserSharedWebcamMessage.java
deleted file mode 100755
index 5789b3942de756f162c4afaeb39a7a7f1f98c859..0000000000000000000000000000000000000000
--- a/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/UserSharedWebcamMessage.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.HashMap;
-
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-
-public class UserSharedWebcamMessage implements ISubscribedMessage {
- public static final String USER_SHARED_WEBCAM = "user_shared_webcam_message";
- public static final String VERSION = "0.0.1";
-
- public final String meetingId;
- public final String userId;
- public final String stream;
-
- public UserSharedWebcamMessage(String meetingId, String userId, String stream) {
- this.meetingId = meetingId;
- this.userId = userId;
- this.stream = stream;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
- payload.put(Constants.MEETING_ID, meetingId);
- payload.put(Constants.USER_ID, userId);
- payload.put(Constants.STREAM, stream);
-
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(USER_SHARED_WEBCAM, VERSION, null);
-
- return MessageBuilder.buildJson(header, payload);
- }
-
- public static UserSharedWebcamMessage fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
-
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (USER_SHARED_WEBCAM.equals(messageName)) {
- if (payload.has(Constants.MEETING_ID)
- && payload.has(Constants.USER_ID)
- && payload.has(Constants.STREAM)) {
- String id = payload.get(Constants.MEETING_ID).getAsString();
- String userid = payload.get(Constants.USER_ID).getAsString();
- String stream = payload.get(Constants.STREAM).getAsString();
- return new UserSharedWebcamMessage(id, userid, stream);
- }
- }
- }
- }
- return null;
-
- }
-}
diff --git a/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/UserStatusChangedMessage.java b/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/UserStatusChangedMessage.java
deleted file mode 100755
index f643e72eb4ca697e05be0bdfc27a3f5be1f89ee7..0000000000000000000000000000000000000000
--- a/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/UserStatusChangedMessage.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.HashMap;
-
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-
-public class UserStatusChangedMessage implements ISubscribedMessage {
- public static final String USER_STATUS_CHANGED = "user_status_changed_message";
- public static final String VERSION = "0.0.1";
-
- public final String meetingId;
- public final String userId;
- public final String status;
- public final String value;
-
- public UserStatusChangedMessage(String meetingId, String userId, String status,
- String value) {
- this.meetingId = meetingId;
- this.userId = userId;
- this.status = status;
- this.value = value;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
- payload.put(Constants.MEETING_ID, meetingId);
- payload.put(Constants.USER_ID, userId);
- payload.put(Constants.STATUS, status);
- payload.put(Constants.VALUE, value);
-
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(USER_STATUS_CHANGED, VERSION, null);
-
- return MessageBuilder.buildJson(header, payload);
- }
-
- public static UserStatusChangedMessage fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
-
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (USER_STATUS_CHANGED.equals(messageName)) {
- if (payload.has(Constants.MEETING_ID)
- && payload.has(Constants.USER_ID)
- && payload.has(Constants.STATUS)
- && payload.has(Constants.VALUE)) {
- String id = payload.get(Constants.MEETING_ID).getAsString();
- String userid = payload.get(Constants.USER_ID).getAsString();
- String status = payload.get(Constants.STATUS).getAsString();
- String value = payload.get(Constants.VALUE).getAsString();
- return new UserStatusChangedMessage(id, userid, status, value);
- }
- }
- }
- }
- return null;
-
- }
-}
diff --git a/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/UserUnshareWebcamRequestMessage.java b/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/UserUnshareWebcamRequestMessage.java
deleted file mode 100755
index 051b91db0204ae731bfa25c7d96418237fd57b53..0000000000000000000000000000000000000000
--- a/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/UserUnshareWebcamRequestMessage.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.HashMap;
-
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-
-public class UserUnshareWebcamRequestMessage implements ISubscribedMessage {
- public static final String USER_UNSHARE_WEBCAM_REQUEST = "user_unshare_webcam_request_message";
- public static final String VERSION = "0.0.1";
-
- public final String meetingId;
- public final String userId;
- public final String stream;
-
- public UserUnshareWebcamRequestMessage(String meetingId, String userId, String stream) {
- this.meetingId = meetingId;
- this.userId = userId;
- this.stream = stream;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
- payload.put(Constants.MEETING_ID, meetingId);
- payload.put(Constants.USER_ID, userId);
- payload.put(Constants.STREAM, stream);
-
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(USER_UNSHARE_WEBCAM_REQUEST, VERSION, null);
-
- return MessageBuilder.buildJson(header, payload);
- }
-
- public static UserUnshareWebcamRequestMessage fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
-
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (USER_UNSHARE_WEBCAM_REQUEST.equals(messageName)) {
- if (payload.has(Constants.MEETING_ID)
- && payload.has(Constants.USER_ID)
- && payload.has(Constants.STREAM)) {
- String id = payload.get(Constants.MEETING_ID).getAsString();
- String userid = payload.get(Constants.USER_ID).getAsString();
- String stream = payload.get(Constants.STREAM).getAsString();
- return new UserUnshareWebcamRequestMessage(id, userid, stream);
- }
- }
- }
- }
- return null;
-
- }
-}
diff --git a/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/UserUnsharedWebcamMessage.java b/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/UserUnsharedWebcamMessage.java
deleted file mode 100755
index 8ae89d0348e8981781f284fd6e2d13cd121f2baf..0000000000000000000000000000000000000000
--- a/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/UserUnsharedWebcamMessage.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.HashMap;
-
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-
-public class UserUnsharedWebcamMessage implements ISubscribedMessage {
- public static final String USER_UNSHARED_WEBCAM = "user_unshared_webcam_message";
- public static final String VERSION = "0.0.1";
-
- public final String meetingId;
- public final String userId;
- public final String stream;
-
- public UserUnsharedWebcamMessage(String meetingId, String userId, String stream) {
- this.meetingId = meetingId;
- this.userId = userId;
- this.stream = stream;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
- payload.put(Constants.MEETING_ID, meetingId);
- payload.put(Constants.USER_ID, userId);
- payload.put(Constants.STREAM, stream);
-
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(USER_UNSHARED_WEBCAM, VERSION, null);
-
- return MessageBuilder.buildJson(header, payload);
- }
-
- public static UserUnsharedWebcamMessage fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
-
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (USER_UNSHARED_WEBCAM.equals(messageName)) {
- if (payload.has(Constants.MEETING_ID)
- && payload.has(Constants.USER_ID)
- && payload.has(Constants.STREAM)) {
- String id = payload.get(Constants.MEETING_ID).getAsString();
- String userid = payload.get(Constants.USER_ID).getAsString();
- String stream = payload.get(Constants.STREAM).getAsString();
- return new UserUnsharedWebcamMessage(id, userid, stream);
- }
- }
- }
- }
- return null;
-
- }
-}
diff --git a/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Util.java b/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Util.java
index 6f0f768424c5f6fd3ab6cf3dda313376b706b69d..7ea654f6f751ebfc2d4070b295fe9a226c39bc5b 100755
--- a/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Util.java
+++ b/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Util.java
@@ -10,86 +10,6 @@ import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
public class Util {
- public Map<String, Boolean> extractPermission(JsonObject vu) {
- if (vu.has(Constants.PERM_DISABLE_CAM) && vu.has(Constants.PERM_DISABLE_MIC)
- && vu.has(Constants.PERM_DISABLE_PRIVCHAT) && vu.has(Constants.PERM_DISABLE_PUBCHAT)
- && vu.has(Constants.PERM_LOCKED_LAYOUT) && vu.has(Constants.PERM_LOCK_ON_JOIN)
- && vu.has(Constants.PERM_LOCK_ON_JOIN_CONFIG)){
-
- Map<String, Boolean> vuMap = new HashMap<String, Boolean>();
- Boolean disableCam = vu.get(Constants.PERM_DISABLE_CAM).getAsBoolean();
- Boolean disableMic = vu.get(Constants.PERM_DISABLE_MIC).getAsBoolean();
- Boolean disablePrivChat = vu.get(Constants.PERM_DISABLE_PRIVCHAT).getAsBoolean();
- Boolean disablePubChat = vu.get(Constants.PERM_DISABLE_PUBCHAT).getAsBoolean();
- Boolean lockedLayout = vu.get(Constants.PERM_LOCKED_LAYOUT).getAsBoolean();
- Boolean lockOnJoin = vu.get(Constants.PERM_LOCK_ON_JOIN).getAsBoolean();
- Boolean lockOnJoinConfig = vu.get(Constants.PERM_LOCK_ON_JOIN_CONFIG).getAsBoolean();
-
- vuMap.put(Constants.PERM_DISABLE_CAM, disableCam);
- vuMap.put(Constants.PERM_DISABLE_MIC, disableMic);
- vuMap.put(Constants.PERM_DISABLE_PRIVCHAT, disablePrivChat);
- vuMap.put(Constants.PERM_DISABLE_PUBCHAT, disablePubChat);
- vuMap.put(Constants.PERM_LOCKED_LAYOUT, lockedLayout);
- vuMap.put(Constants.PERM_LOCK_ON_JOIN, lockOnJoin);
- vuMap.put(Constants.PERM_LOCK_ON_JOIN_CONFIG, lockOnJoinConfig);
-
- return vuMap;
- }
- return null;
- }
-
- public Map<String, Object> extractUser(JsonObject user) {
- if (user.has(Constants.USER_ID) && user.has(Constants.NAME)
- && user.has(Constants.HAS_STREAM) && user.has(Constants.LISTENONLY)
- && user.has(Constants.EMOJI_STATUS) && user.has(Constants.PHONE_USER)
- && user.has(Constants.PRESENTER) && user.has(Constants.LOCKED)
- && user.has(Constants.EXTERN_USERID) && user.has(Constants.ROLE)
- && user.has(Constants.VOICEUSER) && user.has(Constants.WEBCAM_STREAM)
- && user.has(Constants.GUEST) && user.has(Constants.WAITING_FOR_ACCEPTANCE)){
-
- Map<String, Object> userMap = new HashMap<String, Object>();
-
- String userid = user.get(Constants.USER_ID).getAsString();
- String username = user.get(Constants.NAME).getAsString();
- Boolean hasStream = user.get(Constants.HAS_STREAM).getAsBoolean();
- Boolean listenOnly = user.get(Constants.LISTENONLY).getAsBoolean();
- String emojiStatus = user.get(Constants.EMOJI_STATUS).getAsString();
- Boolean phoneUser = user.get(Constants.PHONE_USER).getAsBoolean();
- Boolean presenter = user.get(Constants.PRESENTER).getAsBoolean();
- Boolean locked = user.get(Constants.LOCKED).getAsBoolean();
- String extUserId = user.get(Constants.EXTERN_USERID).getAsString();
- String role = user.get(Constants.ROLE).getAsString();
- String avatarURL = user.get(Constants.AVATAR_URL).getAsString();
- Boolean guest = user.get(Constants.GUEST).getAsBoolean();
- Boolean waitingForAcceptance = user.get(Constants.WAITING_FOR_ACCEPTANCE).getAsBoolean();
-
- JsonArray webcamStreamJArray = user.get(Constants.WEBCAM_STREAM).getAsJsonArray();
- ArrayList<String> webcamStreams = extractWebcamStreams(webcamStreamJArray);
-
- userMap.put("userId", userid);
- userMap.put("name", username);
- userMap.put("listenOnly", listenOnly);
- userMap.put("hasStream", hasStream);
- userMap.put("webcamStream", webcamStreams);
- userMap.put("emojiStatus", emojiStatus);
- userMap.put("externUserID", extUserId);
- userMap.put("phoneUser", phoneUser);
- userMap.put("locked", locked);
- userMap.put("role", role);
- userMap.put("guest", guest);
- userMap.put("waitingForAcceptance", waitingForAcceptance);
- userMap.put("presenter", presenter);
- userMap.put("avatarURL", avatarURL);
-
- JsonObject vu = (JsonObject) user.get(Constants.VOICEUSER);
-
- }
-
- return null;
-
- }
-
-
public ArrayList<String> extractStuns(JsonArray stunsArray) {
ArrayList<String> collection = new ArrayList<String>();
Iterator<JsonElement> stunIter = stunsArray.iterator();
@@ -135,106 +55,6 @@ public class Util {
return null;
}
- public ArrayList<Map<String, Object>> extractUsers(JsonArray users) {
- ArrayList<Map<String, Object>> collection = new ArrayList<Map<String, Object>>();
-
- Iterator<JsonElement> usersIter = users.iterator();
- while (usersIter.hasNext()){
- JsonElement user = usersIter.next();
- Map<String, Object> userMap = extractUser((JsonObject)user);
- if (userMap != null) {
- collection.add(userMap);
- }
- }
-
- return collection;
-
- }
-
- public ArrayList<String> extractWebcamStreams(JsonArray webcamStreams) {
- ArrayList<String> collection = new ArrayList<String>();
-
- Iterator<JsonElement> webcamStreamsIter = webcamStreams.iterator();
- while (webcamStreamsIter.hasNext()){
- JsonElement stream = webcamStreamsIter.next();
- collection.add(stream.getAsString());
- }
-
- return collection;
-
- }
-
- public ArrayList<String> extractUserids(JsonArray users) {
- ArrayList<String> collection = new ArrayList<String>();
-
- Iterator<JsonElement> usersIter = users.iterator();
- while (usersIter.hasNext()){
- JsonElement user = usersIter.next();
- collection.add(user.getAsString());
- }
-
- return collection;
-
- }
-
- public Map<String, Object> extractCurrentPresenter(JsonObject vu) {
- if (vu.has(Constants.USER_ID) && vu.has(Constants.NAME)
- && vu.has(Constants.ASSIGNED_BY)){
-
- Map<String, Object> vuMap = new HashMap<String, Object>();
- String presenterUserId = vu.get(Constants.USER_ID).getAsString();
- String presenterName = vu.get(Constants.NAME).getAsString();
- String assignedBy = vu.get(Constants.ASSIGNED_BY).getAsString();
-
- vuMap.put("userId", presenterUserId);
- vuMap.put("name", presenterName);
- vuMap.put("assignedBy", assignedBy);
-
- return vuMap;
- }
- return null;
- }
-
- class Note {
- String name = "";
- String document = "";
- Integer patchCounter = 0;
- Boolean undo = false;
- Boolean redo = false;
-
- public Note(String name, String document, Integer patchCounter, Boolean undo, Boolean redo) {
- this.name = name;
- this.document = document;
- this.patchCounter = patchCounter;
- this.undo = undo;
- this.redo = redo;
- }
- }
-
- public Object extractNote(JsonObject noteObject) {
- String name = noteObject.get("name").getAsString();
- String document = noteObject.get("document").getAsString();
- Integer patchCounter = noteObject.get("patchCounter").getAsInt();
- Boolean undo = noteObject.get("undo").getAsBoolean();
- Boolean redo = noteObject.get("redo").getAsBoolean();
-
- Note note = new Note(name, document, patchCounter, undo, redo);
-
- return (Object) note;
- }
-
- public Map<String, Object> extractNotes(JsonObject notes) {
- Map<String, Object> notesMap = new HashMap<String, Object>();
-
- for (Map.Entry<String, JsonElement> entry : notes.entrySet()) {
- JsonObject obj = entry.getValue().getAsJsonObject();
- Object note = extractNote(obj);
- notesMap.put(entry.getKey(), note);
- }
-
- return notesMap;
- }
-
public Map<String, String> extractMetadata(JsonObject metadata) {
Map<String, String> metadataMap = new HashMap<String, String>();
diff --git a/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/ValidateAuthTokenMessage.java b/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/ValidateAuthTokenMessage.java
deleted file mode 100755
index 997e940b4bc0ef6f9cd769d7f9d87ab08e9fdf33..0000000000000000000000000000000000000000
--- a/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/ValidateAuthTokenMessage.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.HashMap;
-
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-public class ValidateAuthTokenMessage implements IBigBlueButtonMessage {
- public static final String VALIDATE_AUTH_TOKEN = "validate_auth_token";
- public static final String VERSION = "0.0.1";
-
- public final String meetingId;
- public final String userId;
- public final String token;
- public final String replyTo;
- public final String sessionId;
-
- public ValidateAuthTokenMessage(String meetingId, String userId, String token, String replyTo, String sessionId) {
- this.meetingId = meetingId;
- this.userId = userId;
- this.token = token;
- this.replyTo = replyTo;
- this.sessionId = sessionId;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
- payload.put(Constants.MEETING_ID, meetingId);
- payload.put(Constants.USER_ID, userId);
- payload.put(Constants.AUTH_TOKEN, token);
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(VALIDATE_AUTH_TOKEN, VERSION, replyTo);
-
- return MessageBuilder.buildJson(header, payload);
- }
-
- public static ValidateAuthTokenMessage fromJson(String message) {
-
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
-
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (VALIDATE_AUTH_TOKEN.equals(messageName)) {
-
- if (payload.has(Constants.MEETING_ID)
- && payload.has(Constants.USER_ID)
- && payload.has(Constants.AUTH_TOKEN)
- && header.has(Constants.REPLY_TO)) {
-
- String id = payload.get(Constants.MEETING_ID).getAsString();
- String userid = payload.get(Constants.USER_ID).getAsString();
- String authToken = payload.get(Constants.AUTH_TOKEN).getAsString();
- String replyTo = header.get(Constants.REPLY_TO).getAsString();
- String sessionId = "tobeimplemented";
- return new ValidateAuthTokenMessage(id, userid, authToken, replyTo,
- sessionId);
- }
- }
- }
- }
-
- return null;
-
- }
-}
diff --git a/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/ValidateAuthTokenReplyMessage.java b/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/ValidateAuthTokenReplyMessage.java
deleted file mode 100755
index 01b16000e9583f5f919075396bf3030682cccbc6..0000000000000000000000000000000000000000
--- a/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/ValidateAuthTokenReplyMessage.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.HashMap;
-
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-public class ValidateAuthTokenReplyMessage implements ISubscribedMessage {
- public static final String VALIDATE_AUTH_TOKEN_REPLY = "validate_auth_token_reply";
- public static final String VERSION = "0.0.1";
-
- public final String meetingId;
- public final String userId;
- public final String token;
- public final String replyTo;
- public final Boolean valid;
-
- public ValidateAuthTokenReplyMessage(String meetingId, String userId, String token,
- Boolean valid, String replyTo) {
- this.meetingId = meetingId;
- this.userId = userId;
- this.token = token;
- this.replyTo = replyTo;
- this.valid = valid;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
- payload.put(Constants.REPLY_TO, replyTo);
- payload.put(Constants.VALID, valid);
- payload.put(Constants.USER_ID, userId);
- payload.put(Constants.AUTH_TOKEN, token);
- payload.put(Constants.MEETING_ID, meetingId);
-
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(VALIDATE_AUTH_TOKEN_REPLY, VERSION, replyTo);
-
- return MessageBuilder.buildJson(header, payload);
- }
-
- public static ValidateAuthTokenReplyMessage fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
-
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (VALIDATE_AUTH_TOKEN_REPLY.equals(messageName)) {
- if (payload.has(Constants.MEETING_ID)
- && payload.has(Constants.USER_ID)
- && payload.has(Constants.AUTH_TOKEN)
- && payload.has(Constants.VALID)
- && payload.has(Constants.REPLY_TO)) {
- String id = payload.get(Constants.MEETING_ID).getAsString();
- String userid = payload.get(Constants.USER_ID).getAsString();
- String authToken = payload.get(Constants.AUTH_TOKEN).getAsString();
- String replyTo = payload.get(Constants.REPLY_TO).getAsString();
- Boolean valid = payload.get(Constants.VALID).getAsBoolean();
- return new ValidateAuthTokenReplyMessage(id, userid, authToken, valid, replyTo);
- }
- }
- }
- }
- return null;
-
- }
-}
diff --git a/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/ValidateAuthTokenTimeoutMessage.java b/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/ValidateAuthTokenTimeoutMessage.java
deleted file mode 100755
index f8fdd31f545a1f40519db844ce4a54f0b839d721..0000000000000000000000000000000000000000
--- a/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/ValidateAuthTokenTimeoutMessage.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.HashMap;
-
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-public class ValidateAuthTokenTimeoutMessage implements ISubscribedMessage {
- public static final String VALIDATE_AUTH_TOKEN_TIMEOUT = "validate_auth_token_timeout";
- public static final String VERSION = "0.0.1";
-
- public final String meetingId;
- public final String userId;
- public final String token;
- public final String replyTo;
- public final Boolean valid;
-
- public ValidateAuthTokenTimeoutMessage(String meetingId, String userId, String token,
- Boolean valid, String replyTo) {
- this.meetingId = meetingId;
- this.userId = userId;
- this.token = token;
- this.replyTo = replyTo;
- this.valid = valid;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
- payload.put(Constants.REPLY_TO, replyTo);
- payload.put(Constants.VALID, valid);
- payload.put(Constants.USER_ID, userId);
- payload.put(Constants.AUTH_TOKEN, token);
- payload.put(Constants.MEETING_ID, meetingId);
-
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(VALIDATE_AUTH_TOKEN_TIMEOUT, VERSION, replyTo);
-
- return MessageBuilder.buildJson(header, payload);
- }
-
- public static ValidateAuthTokenTimeoutMessage fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
-
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (VALIDATE_AUTH_TOKEN_TIMEOUT.equals(messageName)) {
- if (payload.has(Constants.MEETING_ID)
- && payload.has(Constants.USER_ID)
- && payload.has(Constants.AUTH_TOKEN)
- && payload.has(Constants.VALID)
- && payload.has(Constants.REPLY_TO)) {
- String id = payload.get(Constants.MEETING_ID).getAsString();
- String userid = payload.get(Constants.USER_ID).getAsString();
- String authToken = payload.get(Constants.AUTH_TOKEN).getAsString();
- String replyTo = payload.get(Constants.REPLY_TO).getAsString();
- Boolean valid = payload.get(Constants.VALID).getAsBoolean();
- return new ValidateAuthTokenTimeoutMessage(id, userid, authToken, valid, replyTo);
- }
- }
- }
- }
- return null;
-
- }
-}
diff --git a/bbb-common-message/src/main/java/org/bigbluebutton/messages/RegisterUserMessage.java b/bbb-common-message/src/main/java/org/bigbluebutton/messages/RegisterUserMessage.java
deleted file mode 100755
index 42f956ea09117f421988a5d442d5e6a67f5ff0c2..0000000000000000000000000000000000000000
--- a/bbb-common-message/src/main/java/org/bigbluebutton/messages/RegisterUserMessage.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.bigbluebutton.messages;
-
-import org.bigbluebutton.common.messages.IBigBlueButtonMessage;
-
-public class RegisterUserMessage implements IBigBlueButtonMessage {
- public static final String NAME = "register_user_request";
- public final Header header;
- public final RegisterUserMessagePayload payload;
-
- public RegisterUserMessage(RegisterUserMessagePayload payload) {
- this.header = new Header(NAME);
- this.payload = payload;
- }
-}
diff --git a/bbb-common-message/src/main/java/org/bigbluebutton/messages/RegisterUserMessagePayload.java b/bbb-common-message/src/main/java/org/bigbluebutton/messages/RegisterUserMessagePayload.java
deleted file mode 100755
index 430f7b3d16d848a3d61458df3a5f8de6995c635a..0000000000000000000000000000000000000000
--- a/bbb-common-message/src/main/java/org/bigbluebutton/messages/RegisterUserMessagePayload.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package org.bigbluebutton.messages;
-
-
-public class RegisterUserMessagePayload {
- public final String meetingId;
- public final String userId;
- public final String name;
- public final String role;
- public final String extUserId;
- public final String authToken;
- public final String avatarUrl;
- public final Boolean guest;
- public final Boolean authed;
-
- public RegisterUserMessagePayload(String meetingId, String userId, String name, String role,
- String extUserId, String authToken, String avatarUrl, Boolean guest, Boolean authed) {
- this.meetingId = meetingId;
- this.userId = userId;
- this.name = name;
- this.role = role;
- this.extUserId = extUserId;
- this.authToken = authToken;
- this.avatarUrl = avatarUrl;
- this.guest = guest;
- this.authed = authed;
- }
-}
diff --git a/bbb-common-message/src/main/java/org/bigbluebutton/messages/ValidateAuthTokenReply.java b/bbb-common-message/src/main/java/org/bigbluebutton/messages/ValidateAuthTokenReply.java
deleted file mode 100755
index 2ebf081d5bcebbc5748ba1a1e6fadddc56f809d4..0000000000000000000000000000000000000000
--- a/bbb-common-message/src/main/java/org/bigbluebutton/messages/ValidateAuthTokenReply.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.bigbluebutton.messages;
-
-import org.bigbluebutton.common.messages.IBigBlueButtonMessage;
-
-public class ValidateAuthTokenReply implements IBigBlueButtonMessage {
- public final static String NAME = "ValidateAuthTokenReply";
-
- public final Header header;
- public final ValidateAuthTokenReplyPayload payload;
-
- public ValidateAuthTokenReply(MessageType type, ValidateAuthTokenReplyPayload payload) {
- this.header = new Header(NAME);
- this.payload = payload;
- }
-}
diff --git a/bbb-common-message/src/main/java/org/bigbluebutton/messages/ValidateAuthTokenReplyPayload.java b/bbb-common-message/src/main/java/org/bigbluebutton/messages/ValidateAuthTokenReplyPayload.java
deleted file mode 100755
index 50c81d7e9bb713387af7b2dfb6189e82c44cae1e..0000000000000000000000000000000000000000
--- a/bbb-common-message/src/main/java/org/bigbluebutton/messages/ValidateAuthTokenReplyPayload.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.bigbluebutton.messages;
-
-
-public class ValidateAuthTokenReplyPayload {
- public final String meetingId;
- public final String userId;
- public final String token;
- public final Boolean valid;
-
- public ValidateAuthTokenReplyPayload(String meetingId, String userId, String token, Boolean valid) {
- this.meetingId = meetingId;
- this.userId = userId;
- this.token = token;
- this.valid = valid;
- }
-}
diff --git a/bbb-common-message/src/main/java/org/bigbluebutton/messages/ValidateAuthTokenRequest.java b/bbb-common-message/src/main/java/org/bigbluebutton/messages/ValidateAuthTokenRequest.java
deleted file mode 100755
index 1eb0c4f3f58ecabbafdd1db4c37038aa0753eb9b..0000000000000000000000000000000000000000
--- a/bbb-common-message/src/main/java/org/bigbluebutton/messages/ValidateAuthTokenRequest.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.bigbluebutton.messages;
-
-import org.bigbluebutton.common.messages.IBigBlueButtonMessage;
-
-public class ValidateAuthTokenRequest implements IBigBlueButtonMessage {
- public final static String NAME = "ValidateAuthTokenRequest";
-
- public final Header header;
- public final ValidateAuthTokenRequestPayload payload;
-
- public ValidateAuthTokenRequest(MessageType type, ValidateAuthTokenRequestPayload payload) {
- this.header = new Header(NAME);
- this.payload = payload;
- }
-}
diff --git a/bbb-common-message/src/main/java/org/bigbluebutton/messages/ValidateAuthTokenRequestPayload.java b/bbb-common-message/src/main/java/org/bigbluebutton/messages/ValidateAuthTokenRequestPayload.java
deleted file mode 100755
index 042054cd03116acee2a47700d35dfe25c979bfac..0000000000000000000000000000000000000000
--- a/bbb-common-message/src/main/java/org/bigbluebutton/messages/ValidateAuthTokenRequestPayload.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.bigbluebutton.messages;
-
-public class ValidateAuthTokenRequestPayload {
- public final String meetingId;
- public final String userId;
- public final String token;
-
- public ValidateAuthTokenRequestPayload(String meetingId, String userId, String token) {
- this.meetingId = meetingId;
- this.userId = userId;
- this.token = token;
- }
-}
diff --git a/bbb-common-message/src/main/java/org/bigbluebutton/messages/ValidateAuthTokenRequestTimedout.java b/bbb-common-message/src/main/java/org/bigbluebutton/messages/ValidateAuthTokenRequestTimedout.java
deleted file mode 100755
index 6bd15a0b239d6f75b8c6bd68702e1ad6549aa9db..0000000000000000000000000000000000000000
--- a/bbb-common-message/src/main/java/org/bigbluebutton/messages/ValidateAuthTokenRequestTimedout.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.bigbluebutton.messages;
-
-import org.bigbluebutton.common.messages.IBigBlueButtonMessage;
-
-
-public class ValidateAuthTokenRequestTimedout implements IBigBlueButtonMessage {
- public final static String NAME = "ValidateAuthTokenRequestTimedout";
-
- public final Header header;
- public final ValidateAuthTokenRequestTimedoutPayload payload;
-
- public ValidateAuthTokenRequestTimedout(MessageType type, ValidateAuthTokenRequestTimedoutPayload payload) {
- this.header = new Header(NAME);
- this.payload = payload;
- }
-}
diff --git a/bbb-common-message/src/main/java/org/bigbluebutton/messages/ValidateAuthTokenRequestTimedoutPayload.java b/bbb-common-message/src/main/java/org/bigbluebutton/messages/ValidateAuthTokenRequestTimedoutPayload.java
deleted file mode 100755
index 888d2445ea0e255232a63d5e9c5a1bd7cc797b21..0000000000000000000000000000000000000000
--- a/bbb-common-message/src/main/java/org/bigbluebutton/messages/ValidateAuthTokenRequestTimedoutPayload.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.bigbluebutton.messages;
-
-public class ValidateAuthTokenRequestTimedoutPayload {
- public final String meetingId;
- public final String userId;
- public final String token;
-
- public ValidateAuthTokenRequestTimedoutPayload(String meetingId, String userId, String token) {
- this.meetingId = meetingId;
- this.userId = userId;
- this.token = token;
- }
-}
diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/BigBlueButtonApplication.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/BigBlueButtonApplication.java
index 307c8aa253f5bc8d166420caa0a9365ece396b75..dbada54328be8f323e594c8c013139eea73fdc92 100755
--- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/BigBlueButtonApplication.java
+++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/BigBlueButtonApplication.java
@@ -154,15 +154,6 @@ public class BigBlueButtonApplication extends MultiThreadedApplicationAdapter {
if (params.length >= 7 && ((Boolean) params[7])) {
muted = true;
}
-
- Map<String, Boolean> lsMap = null;
- if (params.length >= 8) {
- try {
- lsMap = (Map<String, Boolean> ) params[8];
- } catch(Exception e){
- lsMap = new HashMap<String, Boolean>();
- }
- }
Boolean guest = false;
if (params.length >= 9 && ((Boolean) params[9])) {
@@ -214,8 +205,6 @@ public class BigBlueButtonApplication extends MultiThreadedApplicationAdapter {
connection.setAttribute("USER_SESSION_ID", sessionId);
connection.setAttribute("TIMESTAMP", System.currentTimeMillis());
- red5InGW.initLockSettings(room, lsMap);
-
String meetingId = bbbSession.getRoom();
String userFullname = bbbSession.getUsername();
@@ -301,7 +290,7 @@ public class BigBlueButtonApplication extends MultiThreadedApplicationAdapter {
if (removeUser) {
// log.info("User leaving bbb-apps: data={}", logStr);
System.out.println("User leaving bbb-apps: data=" + logStr);
- red5InGW.userLeft(bbbSession.getRoom(), getBbbSession().getInternalUserID(), sessionId);
+ //red5InGW.userLeft(bbbSession.getRoom(), getBbbSession().getInternalUserID(), sessionId);
} else {
log.info("User not leaving bbb-apps but just disconnected: data={}", logStr);
}
@@ -328,37 +317,7 @@ public class BigBlueButtonApplication extends MultiThreadedApplicationAdapter {
String token = bbbSession.getAuthToken();
return new ConnInfo(meetingId, userId, token, connId, sessionId);
}
-
- public void validateToken(Map<String, String> msg) {
- String token = (String) msg.get("authToken");
-
- BigBlueButtonSession bbbSession = (BigBlueButtonSession) Red5.getConnectionLocal().getAttribute(Constants.SESSION);
- assert bbbSession != null;
- String userId = bbbSession.getInternalUserID();
- String meetingId = Red5.getConnectionLocal().getScope().getName();
- String connId = Red5.getConnectionLocal().getSessionId();
- String sessionId = CONN + connId + "-" + userId;
-
- Map<String, Object> logData = new HashMap<String, Object>();
- logData.put("meetingId", meetingId);
- logData.put("connId", connId);
- logData.put("sessionId", sessionId);
- logData.put("userId", userId);
- logData.put("token", token);
- logData.put("event", "user_validate_token_bbb_apps");
- logData.put("description", "User validate token BBB Apps.");
-
- Gson gson = new Gson();
- String logStr = gson.toJson(logData);
-
- // log.info("User validate token bbb-apps: data={}", logStr);
- System.out.println("User validate token bbb-apps: data=" + logStr);
- System.out.println("User validate token bbb-apps: data=" + logStr);
- red5InGW.validateAuthToken(meetingId, userId, token, meetingId + "/" + userId, sessionId);
- }
-
-
private BigBlueButtonSession getBbbSession() {
return (BigBlueButtonSession) Red5.getConnectionLocal().getAttribute(Constants.SESSION);
}
diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/MessagePublisher.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/MessagePublisher.java
index 72f9767e28dfef63a7ab7bd3def7d9725cf3ac8f..e4674eff8fafffdabae0bfd4ce997bcb8b2eda1d 100755
--- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/MessagePublisher.java
+++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/MessagePublisher.java
@@ -1,7 +1,5 @@
package org.bigbluebutton.red5.pubsub;
-import java.util.Map;
-
import org.bigbluebutton.common.messages.*;
import org.bigbluebutton.client.IClientInGW;
@@ -12,66 +10,6 @@ public class MessagePublisher {
public void setMessageSender(IClientInGW sender) {
this.sender = sender;
}
-
- public void initLockSettings(String meetingID, Map<String, Boolean> permissions) {
- InitPermissionsSettingMessage msg = new InitPermissionsSettingMessage(meetingID, permissions);
- sender.send(MessagingConstants.TO_USERS_CHANNEL, msg.toJson());
- }
-
- public void sendLockSettings(String meetingID, String userId, Map<String, Boolean> settings) {
- SendLockSettingsMessage msg = new SendLockSettingsMessage(meetingID, userId, settings);
- sender.send(MessagingConstants.TO_MEETING_CHANNEL, msg.toJson());
- }
-
- public void getLockSettings(String meetingId, String userId) {
- GetLockSettingsMessage msg = new GetLockSettingsMessage(meetingId, userId);
- sender.send(MessagingConstants.TO_MEETING_CHANNEL, msg.toJson());
- }
-
- public void lockUser(String meetingId, String requesterID, boolean lock, String internalUserID) {
- LockUserMessage msg = new LockUserMessage(meetingId, requesterID, lock, internalUserID);
- sender.send(MessagingConstants.TO_MEETING_CHANNEL, msg.toJson());
- }
-
- public void validateAuthToken(String meetingId, String userId, String token, String correlationId, String sessionId) {
- ValidateAuthTokenMessage msg = new ValidateAuthTokenMessage(meetingId, userId, token, correlationId, sessionId);
- sender.send(MessagingConstants.TO_MEETING_CHANNEL, msg.toJson());
- }
-
- public void userEmojiStatus(String meetingId, String userId, String emojiStatus) {
- UserEmojiStatusMessage msg = new UserEmojiStatusMessage(meetingId, userId, emojiStatus);
- sender.send(MessagingConstants.TO_USERS_CHANNEL, msg.toJson());
- }
-
- public void shareWebcam(String meetingId, String userId, String stream) {
- UserShareWebcamRequestMessage msg = new UserShareWebcamRequestMessage(meetingId, userId, stream);
- sender.send(MessagingConstants.TO_USERS_CHANNEL, msg.toJson());
- }
-
- public void unshareWebcam(String meetingId, String userId, String stream) {
- UserUnshareWebcamRequestMessage msg = new UserUnshareWebcamRequestMessage(meetingId, userId, stream);
- sender.send(MessagingConstants.TO_USERS_CHANNEL, msg.toJson());
- }
-
- public void setUserStatus(String meetingId, String userId, String status, Object value) {
- SetUserStatusRequestMessage msg = new SetUserStatusRequestMessage(meetingId, userId, status, value.toString());
- sender.send(MessagingConstants.TO_USERS_CHANNEL, msg.toJson());
- }
-
- public void getUsers(String meetingId, String requesterId) {
- GetUsersRequestMessage msg = new GetUsersRequestMessage(meetingId, requesterId);
- sender.send(MessagingConstants.TO_USERS_CHANNEL, msg.toJson());
- }
-
- public void userLeft(String meetingId, String userId, String sessionId) {
- UserLeavingMessage msg = new UserLeavingMessage(meetingId, userId);
- sender.send(MessagingConstants.TO_USERS_CHANNEL, msg.toJson());
- }
-
- public void assignPresenter(String meetingId, String newPresenterID, String newPresenterName, String assignedBy) {
- AssignPresenterRequestMessage msg = new AssignPresenterRequestMessage(meetingId, newPresenterID, newPresenterName, assignedBy);
- sender.send(MessagingConstants.TO_USERS_CHANNEL, msg.toJson());
- }
public void setRecordingStatus(String meetingId, String userId, Boolean recording) {
SetRecordingStatusRequestMessage msg = new SetRecordingStatusRequestMessage(meetingId, userId, recording);
@@ -83,41 +21,6 @@ public class MessagePublisher {
sender.send(MessagingConstants.TO_USERS_CHANNEL, msg.toJson());
}
- public void getGuestPolicy(String meetingID, String userID) {
- GetGuestPolicyMessage msg = new GetGuestPolicyMessage(meetingID, userID);
- sender.send(MessagingConstants.TO_USERS_CHANNEL, msg.toJson());
- }
-
- public void newGuestPolicy(String meetingID, String guestPolicy, String setBy) {
- SetGuestPolicyMessage msg = new SetGuestPolicyMessage(meetingID, guestPolicy, setBy);
- sender.send(MessagingConstants.TO_USERS_CHANNEL, msg.toJson());
- }
-
- public void responseToGuest(String meetingID, String userID, Boolean response, String requesterID) {
- RespondToGuestMessage msg = new RespondToGuestMessage(meetingID, userID, response, requesterID);
- sender.send(MessagingConstants.TO_USERS_CHANNEL, msg.toJson());
- }
-
- public void setParticipantRole(String meetingID, String userID, String role) {
- ChangeUserRoleMessage msg = new ChangeUserRoleMessage(meetingID, userID, role);
- sender.send(MessagingConstants.TO_USERS_CHANNEL, msg.toJson());
- }
-
- public void lockMuteUser(String meetingID, String requesterID, String userID, Boolean lock) {
- LockMuteUserRequestMessage msg = new LockMuteUserRequestMessage(meetingID, requesterID, userID, lock);
- sender.send(MessagingConstants.TO_USERS_CHANNEL, msg.toJson());
- }
-
- public void ejectUserFromMeeting(String meetingId, String userId, String ejectedBy) {
- EjectUserFromMeetingRequestMessage msg = new EjectUserFromMeetingRequestMessage(meetingId, userId, ejectedBy);
- sender.send(MessagingConstants.TO_USERS_CHANNEL, msg.toJson());
- }
-
- public void logoutEndMeeting(String meetingId, String userId) {
- LogoutEndMeetingRequestMessage msg = new LogoutEndMeetingRequestMessage(meetingId, userId);
- sender.send(MessagingConstants.TO_USERS_CHANNEL, msg.toJson());
- }
-
public void activityResponse(String meetingID) {
ActivityResponseMessage msg = new ActivityResponseMessage(meetingID);
sender.send(MessagingConstants.TO_MEETING_CHANNEL, msg.toJson());
diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/service/LockService.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/service/LockService.java
deleted file mode 100755
index d0408cb53ea40d75a7df1221509ab2ef82c95c95..0000000000000000000000000000000000000000
--- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/service/LockService.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/**
-* BigBlueButton open source conferencing system - http://www.bigbluebutton.org/
-*
-* Copyright (c) 2012 BigBlueButton Inc. and by respective authors (see below).
-*
-* This program is free software; you can redistribute it and/or modify it under the
-* terms of the GNU Lesser General Public License as published by the Free Software
-* Foundation; either version 3.0 of the License, or (at your option) any later
-* version.
-*
-* BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY
-* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-* PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public License along
-* with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
-*
-*/
-package org.bigbluebutton.red5.service;
-
-import java.util.ArrayList;
-import java.util.Map;
-
-import org.bigbluebutton.red5.BigBlueButtonSession;
-import org.bigbluebutton.red5.Constants;
-import org.bigbluebutton.red5.pubsub.MessagePublisher;
-import org.red5.server.api.Red5;
-
-public class LockService {
-
- private MessagePublisher red5BBBInGW;
-
- /**
- * Internal function used to get the session
- * */
- private BigBlueButtonSession getBbbSession() {
- return (BigBlueButtonSession) Red5.getConnectionLocal().getAttribute(Constants.SESSION);
- }
-
- public void setRed5Publisher(MessagePublisher inGW) {
- red5BBBInGW = inGW;
- }
-
- /**
- * Called from client to get lock settings for this room.
- * */
- public void getLockSettings(){
- String meetingId = getBbbSession().getRoom();
- String userId = getMyUserId();
-
- red5BBBInGW.getLockSettings(meetingId, userId);
- }
-
- /**
- * Called from client to get lock settings for this room.
- *
- * If room don't have any lock settings, it applies the defaultSettings
- * sent from client (came from config.xml).
- *
- * Returns the new lock settings for the room.
- * */
- public void setLockSettings(Map<String, Boolean> newSettings){
- String meetingId = getBbbSession().getRoom();
- String userId = getMyUserId();
- red5BBBInGW.sendLockSettings(meetingId, userId, newSettings);
- }
-
- /**
- * This method locks (or unlocks), based on lock parameter
- * all users but the users listed in array dontLockTheseUsers
- * */
- public void setAllUsersLock(Boolean lock, ArrayList<String> dontLockTheseUsers){
-
- }
-
- /**
- * This method locks or unlocks a specific user
- * */
- public void setUserLock(Map<String, Object> msg) {
- String meetingID = Red5.getConnectionLocal().getScope().getName();
- String requesterID = getBbbSession().getInternalUserID();
-
- Boolean lock = (Boolean) msg.get("lock");
- String userId = (String) msg.get("userId");
-
- red5BBBInGW.lockUser(meetingID, requesterID, lock, userId);
- }
-
- public String getMyUserId() {
- BigBlueButtonSession bbbSession = (BigBlueButtonSession) Red5.getConnectionLocal().getAttribute(Constants.SESSION);
- assert bbbSession != null;
- return bbbSession.getInternalUserID();
- }
-}
diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/service/ParticipantsService.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/service/ParticipantsService.java
index 9aa8d0710b53c6a037dab17a576688fee8018cd1..953aedb4fe3c7c31a0abf8e4da90880b03c4d109 100755
--- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/service/ParticipantsService.java
+++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/service/ParticipantsService.java
@@ -21,100 +21,20 @@ package org.bigbluebutton.red5.service;
import org.red5.server.api.Red5;
import org.red5.server.api.scope.IScope;
-import java.util.HashMap;
import java.util.Map;
-import org.apache.commons.lang3.StringUtils;
import org.bigbluebutton.red5.BigBlueButtonSession;
import org.bigbluebutton.red5.Constants;
import org.bigbluebutton.red5.pubsub.MessagePublisher;
-import com.google.gson.Gson;
-
public class ParticipantsService {
private MessagePublisher red5InGW;
- public void assignPresenter(Map<String, String> msg) {
- IScope scope = Red5.getConnectionLocal().getScope();
- String meetingId = scope.getName();
- String newPresenterID = (String) msg.get("newPresenterID");
- String newPresenterName = (String) msg.get("newPresenterName");
- String assignedBy = (String) msg.get("assignedBy");
-
- red5InGW.assignPresenter(meetingId, newPresenterID, newPresenterName, assignedBy);
- }
-
- public void getParticipants() {
- IScope scope = Red5.getConnectionLocal().getScope();
- String meetingId = scope.getName();
- String userId = getBbbSession().getInternalUserID();
- red5InGW.getUsers(meetingId, userId);
- }
-
public void activityResponse() {
IScope scope = Red5.getConnectionLocal().getScope();
String meetingId = scope.getName();
red5InGW.activityResponse(meetingId);
}
-
- public void userEmojiStatus(Map<String, String> msg) {
- IScope scope = Red5.getConnectionLocal().getScope();
- String meetingId = scope.getName();
- String userId = (String) msg.get("userId");
- String emojiStatus = (String) msg.get("emojiStatus");
-
- if (StringUtils.isEmpty(emojiStatus)) {
- //log.warn("Invalid EmojiStatus from client: meetingId=" + meetingId + ", userId=" + userId + ",emoji=" + emojiStatus);
- // Set emojiStatus=none if passed is null.
- emojiStatus = "none";
- }
- red5InGW.userEmojiStatus(meetingId, userId, emojiStatus);
- }
-
- public void ejectUserFromMeeting(Map<String, String> msg) {
- IScope scope = Red5.getConnectionLocal().getScope();
- String meetingId = scope.getName();
- String userId = (String) msg.get("userId");
- String ejectedBy = (String) msg.get("ejectedBy");
-
- red5InGW.ejectUserFromMeeting(meetingId, userId, ejectedBy);
- }
-
- public void shareWebcam(String stream) {
- IScope scope = Red5.getConnectionLocal().getScope();
- String meetingId = scope.getName();
- String userId = getBbbSession().getInternalUserID();
-
- red5InGW.shareWebcam(meetingId, userId, stream);
- }
-
- public void unshareWebcam(String stream) {
- IScope scope = Red5.getConnectionLocal().getScope();
- String meetingId = scope.getName();
- String userId = getBbbSession().getInternalUserID();
-
- Map<String, Object> logData = new HashMap<String, Object>();
- logData.put("meetingId", scope.getName());
- logData.put("userId", userId);
- logData.put("stream", stream);
-
- Gson gson = new Gson();
- String logStr = gson.toJson(logData);
-
- // log.warn("User unshared webcam. data={}", logStr );
-
- red5InGW.unshareWebcam(meetingId, userId, stream);
- }
-
- public void setParticipantStatus(Map<String, Object> msg) {
- IScope scope = Red5.getConnectionLocal().getScope();
- String meetingId = scope.getName();
- String userId = (String) msg.get("userID");
- String status = (String) msg.get("status");
- Object value = (Object) msg.get("value");
-
- red5InGW.setUserStatus(meetingId, userId, status, value);
- }
public void setRecordingStatus(Map<String, Object> msg) {
IScope scope = Red5.getConnectionLocal().getScope();
@@ -137,43 +57,6 @@ public class ParticipantsService {
assert bbbSession != null;
return bbbSession.getInternalUserID();
}
-
- private BigBlueButtonSession getBbbSession() {
- return (BigBlueButtonSession) Red5.getConnectionLocal().getAttribute(Constants.SESSION);
- }
-
- public void getGuestPolicy() {
- String requesterId = getBbbSession().getInternalUserID();
- String roomName = Red5.getConnectionLocal().getScope().getName();
- red5InGW.getGuestPolicy(roomName, requesterId);
- }
-
- public void setGuestPolicy(String guestPolicy) {
- String requesterId = getBbbSession().getInternalUserID();
- String roomName = Red5.getConnectionLocal().getScope().getName();
- red5InGW.newGuestPolicy(roomName, guestPolicy, requesterId);
- }
-
- public void responseToGuest(Map<String, Object> msg) {
- String requesterId = getBbbSession().getInternalUserID();
- String roomName = Red5.getConnectionLocal().getScope().getName();
- red5InGW.responseToGuest(roomName, (String) msg.get("userId"), (Boolean) msg.get("response"), requesterId);
- }
-
- public void setParticipantRole(Map<String, String> msg) {
- String roomName = Red5.getConnectionLocal().getScope().getName();
- String userId = (String) msg.get("userId");
- String role = (String) msg.get("role");
- //log.debug("Setting participant role " + roomName + " " + userId + " " + role);
- red5InGW.setParticipantRole(roomName, userId, role);
- }
-
- public void logoutEndMeeting(Map<String, Object> msg) {
- IScope scope = Red5.getConnectionLocal().getScope();
- String meetingId = scope.getName();
- String userId = (String) msg.get("userId");
- red5InGW.logoutEndMeeting(meetingId, userId);
- }
public void setRed5Publisher(MessagePublisher red5InGW) {
this.red5InGW = red5InGW;
diff --git a/bigbluebutton-apps/src/main/webapp/WEB-INF/red5-web.xml b/bigbluebutton-apps/src/main/webapp/WEB-INF/red5-web.xml
index 483a602e770aece61465eafcb0a62935315fe008..eea15aa4c168873a7465e85b05d92d1d7b99bb35 100755
--- a/bigbluebutton-apps/src/main/webapp/WEB-INF/red5-web.xml
+++ b/bigbluebutton-apps/src/main/webapp/WEB-INF/red5-web.xml
@@ -78,10 +78,6 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
<property name="red5Publisher"><ref bean="red5Publisher"/></property>
</bean>
- <bean id="lock.service" class="org.bigbluebutton.red5.service.LockService">
- <property name="red5Publisher"><ref bean="red5Publisher"/></property>
- </bean>
-
<bean id="participants.service" class="org.bigbluebutton.red5.service.ParticipantsService">
<property name="red5Publisher"> <ref bean="red5Publisher"/> </property>
</bean>