Merge pull request #8 from mdalepiane/090-guest-role

Fix NPE in the register_user_request [Bug #1462]
bigbluebutton · Feb 12, 2015 · 721663a · 721663a
2 parents 7dba55c + 5de1af4
commit 721663a
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 6 deletions.
diff --git a/...pps/src/main/java/org/bigbluebutton/conference/service/messaging/RegisterUserMessage.java b/...pps/src/main/java/org/bigbluebutton/conference/service/messaging/RegisterUserMessage.java
@@ -56,7 +56,8 @@ public static RegisterUserMessage fromJson(String message) {
 							&& payload.has(Constants.NAME)
 							&& payload.has(Constants.ROLE)
 							&& payload.has(Constants.EXT_USER_ID)
-							&& payload.has(Constants.AUTH_TOKEN)) {
+							&& payload.has(Constants.AUTH_TOKEN)
+							&& payload.has(Constants.GUEST)) {
 
 						String meetingID = payload.get(Constants.MEETING_ID).getAsString();
 						String fullname = payload.get(Constants.NAME).getAsString();

diff --git a/bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java b/bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
@@ -291,7 +291,7 @@ private void processCreateMeeting(CreateMeeting message) {
 	}
 
 	private void processRegisterUser(RegisterUser message) {
-		messagingService.registerUser(message.meetingID, message.internalUserId, message.fullname, message.role, message.externUserID, message.authToken);
+		messagingService.registerUser(message.meetingID, message.internalUserId, message.fullname, message.role, message.externUserID, message.authToken, message.guest);
 	}
 
 	public String addSubscription(String meetingId, String event, String callbackURL){

diff --git a/bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/Constants.java b/bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/Constants.java
@@ -88,4 +88,5 @@ public class Constants {
   public static final String X_PERCENT                       = "x_percent";
   public static final String Y_PERCENT                       = "y_percent";
   public static final String KEEP_ALIVE_ID                   = "keep_alive_id"; 
+  public static final String GUEST                           = "guest";
 }
diff --git a/bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MessageToJson.java b/bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MessageToJson.java
@@ -18,6 +18,7 @@ public static String registerUserToJson(RegisterUserMessage message) {
 		payload.put(Constants.ROLE, message.role);
 		payload.put(Constants.EXT_USER_ID, message.externUserID);
 		payload.put(Constants.AUTH_TOKEN, message.authToken);
+		payload.put(Constants.GUEST, message.guest);
 
 		java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(RegisterUserMessage.REGISTER_USER, message.VERSION, null);
 

diff --git a/bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MessagingService.java b/bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MessagingService.java
@@ -34,6 +34,6 @@ void createMeeting(String meetingID, String externalMeetingID, String meetingNam
 	String storeSubscription(String meetingId, String externalMeetingID, String callbackURL);
 	boolean removeSubscription(String meetingId, String subscriptionId);
 	List<Map<String,String>> listSubscriptions(String meetingId);
-	void registerUser(String meetingID, String internalUserId, String fullname, String role, String externUserID, String authToken);
+	void registerUser(String meetingID, String internalUserId, String fullname, String role, String externUserID, String authToken, String guest);
 	void sendKeepAlive(String keepAliveId);
 }
diff --git a/bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/RedisMessagingService.java b/bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/RedisMessagingService.java
@@ -58,8 +58,8 @@ public void destroyMeeting(String meetingID) {
 		sender.send(MessagingConstants.TO_MEETING_CHANNEL, json);	
 	}
 
-	public void registerUser(String meetingID, String internalUserId, String fullname, String role, String externUserID, String authToken) {
-		RegisterUserMessage msg = new RegisterUserMessage(meetingID, internalUserId, fullname, role, externUserID, authToken);
+	public void registerUser(String meetingID, String internalUserId, String fullname, String role, String externUserID, String authToken, String guest) {
+		RegisterUserMessage msg = new RegisterUserMessage(meetingID, internalUserId, fullname, role, externUserID, authToken, guest);
 		String json = MessageToJson.registerUserToJson(msg);
 		log.info("Sending register user message to bbb-apps:[{}]", json);
 		sender.send(MessagingConstants.TO_MEETING_CHANNEL, json);		

diff --git a/...web/src/java/org/bigbluebutton/api/messaging/converters/messages/RegisterUserMessage.java b/...web/src/java/org/bigbluebutton/api/messaging/converters/messages/RegisterUserMessage.java
@@ -10,13 +10,15 @@ public class RegisterUserMessage {
 	public final String role;
 	public final String externUserID;
 	public final String authToken;
+	public final String guest;
 
-	public RegisterUserMessage(String meetingID, String internalUserId, String fullname, String role, String externUserID, String authToken) {
+	public RegisterUserMessage(String meetingID, String internalUserId, String fullname, String role, String externUserID, String authToken, String guest) {
 		this.meetingID = meetingID;
 		this.internalUserId = internalUserId;
 		this.fullname = fullname;
 		this.role = role;
 		this.externUserID = externUserID;	
 		this.authToken = authToken;
+		this.guest = guest;
 	}
 }