- treat authToken and userid differently. Before, userid and authtok…

…en had the same values.
bigbluebutton · Feb 2, 2015 · b91b708 · b91b708
1 parent fd061d8
commit b91b708
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/core/api/IBigBlueButtonInGW.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/core/api/IBigBlueButtonInGW.java
@@ -37,7 +37,7 @@ void createMeeting2(String meetingID, String externalMeetingID, String meetingNa
 	void setUserStatus(String meetingID, String userID, String status, Object value);
 	void getUsers(String meetingID, String requesterID);
 	void userLeft(String meetingID, String userID, String sessionId);
-	void userJoin(String meetingID, String userID, String sessionId);
+	void userJoin(String meetingID, String userID, String authToken);
 	void getCurrentPresenter(String meetingID, String requesterID);
 	void assignPresenter(String meetingID, String newPresenterID, String newPresenterName, String assignedBy);
 	void setRecordingStatus(String meetingId, String userId, Boolean recording);

diff --git a/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala
@@ -17,7 +17,7 @@ class BigBlueButtonActor(outGW: MessageOutGateway) extends Actor with LogHelper
 	      case msg: CreateMeeting                 => handleCreateMeeting(msg)
 	      case msg: DestroyMeeting                => handleDestroyMeeting(msg)
 	      case msg: KeepAliveMessage              => handleKeepAliveMessage(msg)
-        case msg: GetAllMeetingsRequest         => handleGetAllMeetingsRequest(msg)
+          case msg: GetAllMeetingsRequest         => handleGetAllMeetingsRequest(msg)
 	      case msg: InMessage                     => handleMeetingMessage(msg)
 	      case _ => // do nothing
 	    }

diff --git a/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
@@ -169,8 +169,8 @@ class BigBlueButtonInGW(bbbGW: BigBlueButtonGateway, presUtil: PreuploadedPresen
     bbbGW.accept(new UserLeaving(meetingID, userID, sessionId))
   }
 
-  def userJoin(meetingID: String, userID: String, sessionId: String):Unit = {
-    bbbGW.accept(new UserJoining(meetingID, userID, sessionId))
+  def userJoin(meetingID: String, userID: String, authToken: String):Unit = {
+    bbbGW.accept(new UserJoining(meetingID, userID, authToken))
   }
 
   def assignPresenter(meetingID: String, newPresenterID: String, newPresenterName: String, assignedBy: String):Unit = {