- try generating userid instead of using red5 connection id as userid

Author: ritzalam

bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/BigBlueButtonApplication.java

@@ -109,7 +109,7 @@ boolean record = (Boolean)params[5];
 		log.debug("record value - [" + record + "]"); 
 
     	String externalUserID = ((String) params[6]).toString();
-    	String internalUserID = ((String) params[6]).toString();
+    	String internalUserID = ((String) params[7]).toString();
 
 
 
@@ -127,7 +127,7 @@ boolean record = (Boolean)params[5];
 		participantsApplication.createRoom(room);
         super.roomConnect(connection, params);
 
-        connInvokerService.addConnection(Red5.getConnectionLocal().getClient().getId(), connection);
+        connInvokerService.addConnection(bbbSession.getInternalUserID(), connection);
     	return true;
 	}
 
@@ -138,7 +138,7 @@ public void roomDisconnect(IConnection conn) {
         String clientId = Red5.getConnectionLocal().getClient().getId();
     	log.info("[clientid=" + clientId + "] disconnnected from " + remoteHost + ":" + remotePort + ".");
 
-    	connInvokerService.removeConnection(Red5.getConnectionLocal().getClient().getId());
+    	connInvokerService.removeConnection(getBbbSession().getInternalUserID());
 
 		BigBlueButtonSession bbbSession = (BigBlueButtonSession) Red5.getConnectionLocal().getAttribute(Constants.SESSION);
 		log.info("User [" + bbbSession.getUsername() + "] disconnected from room [" + bbbSession.getRoom() +"]");
@@ -148,7 +148,8 @@ public void roomDisconnect(IConnection conn) {
 	public String getMyUserId() {
 		BigBlueButtonSession bbbSession = (BigBlueButtonSession) Red5.getConnectionLocal().getAttribute(Constants.SESSION);
 		assert bbbSession != null;
-		return Long.toString(bbbSession.getClientID());
+		//return Long.toString(bbbSession.getClientID());
+		return bbbSession.getInternalUserID();
 	}
 
 	public void setParticipantsApplication(ParticipantsApplication a) {

bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsHandler.java

@@ -109,7 +109,7 @@ public void roomLeave(IClient client, IScope scope) {
 		if (bbbSession == null) {
 			log.debug("roomLeave - session is null"); 
 		} else {
-			participantsApplication.participantLeft(bbbSession.getSessionName(), bbbSession.getClientID());
+			participantsApplication.participantLeft(bbbSession.getSessionName(), new Long(bbbSession.getClientID()));
 		}		
 	}
 
@@ -138,7 +138,7 @@ public boolean participantJoin() {
 		log.debug(APP + ":participantJoin - getting userid");
 		BigBlueButtonSession bbbSession = getBbbSession();
 		if (bbbSession != null) {
-			Long userid = bbbSession.getClientID();
+			Long userid = new Long(bbbSession.getInternalUserID());
 			String username = bbbSession.getUsername();
 			String role = bbbSession.getRole();
 			String room = bbbSession.getRoom();

bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/WhiteboardService.java

@@ -23,6 +23,9 @@
 
 import java.util.ArrayList;
 import java.util.Map;
+
+import org.bigbluebutton.conference.BigBlueButtonSession;
+import org.bigbluebutton.conference.Constants;
 import org.bigbluebutton.conference.service.whiteboard.shapes.Annotation;
 import org.red5.logging.Red5LoggerFactory;
 import org.red5.server.api.Red5;
@@ -78,7 +81,7 @@ public void setActivePage(Map<String, Object> message){
 
 	public void requestAnnotationHistory(Map<String, Object> message) {
 		log.info("WhiteboardApplication - requestAnnotationHistory");
-		application.sendAnnotationHistory(Red5.getConnectionLocal().getClient().getId(), 
+		application.sendAnnotationHistory(getBbbSession().getInternalUserID(), 
 				(String) message.get("presentationID"), (Integer) message.get("pageNumber"));
 	}
 
@@ -108,7 +111,11 @@ public void enableWhiteboard(Map<String, Object> message) {
 	}
 
 	public void isWhiteboardEnabled() {
-		application.isWhiteboardEnabled(Red5.getConnectionLocal().getClient().getId());
+		application.isWhiteboardEnabled(getBbbSession().getInternalUserID());
+	}
+	
+	private BigBlueButtonSession getBbbSession() {
+		return (BigBlueButtonSession) Red5.getConnectionLocal().getAttribute(Constants.SESSION);
 	}
 
 }

bigbluebutton-client/src/org/bigbluebutton/main/model/users/BBBUser.as

@@ -32,7 +32,7 @@ package org.bigbluebutton.main.model.users
 		public static const PRESENTER:String = "PRESENTER";
 
 		[Bindable] public var me:Boolean = false;
-		[Bindable] public var userid:Number;
+		[Bindable] public var userid:Number = 1935;
 		[Bindable] public var name:String;
 		[Bindable] public var hasStream:Boolean = false;
 		[Bindable] public var streamName:String = "";

bigbluebutton-client/src/org/bigbluebutton/main/model/users/Conference.as

@@ -24,17 +24,20 @@ package org.bigbluebutton.main.model.users {
 	import org.bigbluebutton.core.BBB;
 
 	public class Conference {		
-		private var _myUserid:Number;		
+//		private var _myUserid:Number;		
 		[Bindable] private var me:BBBUser = null;		
 		[Bindable] public var users:ArrayCollection = null;			
 
 		public function Conference():void {
+      LogUtil.debug("******************************************************************************* Initializing Conference");
 			me = new BBBUser();
 			users = new ArrayCollection();
 		}
 
-		public function addUser(newuser:BBBUser):void {				
-			if (! hasParticipant(newuser.userid)) {				
+		public function addUser(newuser:BBBUser):void {
+      LogUtil.debug("Adding new user [" + newuser.userid + "]");
+			if (! hasParticipant(newuser.userid)) {
+        LogUtil.debug("Am I this new user [" + newuser.userid + ", " + me.userid + "]");
 				if (newuser.userid == me.userid) {
 					newuser.me = true;
 				}						
@@ -216,8 +219,10 @@ package org.bigbluebutton.main.model.users {
 		public function getMyUserId():Number {
 			return me.userid;
 		}
-		public function setMyUserid(userid:int):void {
+    
+		public function setMyUserid(userid:Number):void {
 			me.userid = userid;
+      LogUtil.debug("Setting my userid to [" + me.userid + "]");
 		}
 
 		public function setMyName(name:String):void {

bigbluebutton-client/src/org/bigbluebutton/main/model/users/JoinService.as

@@ -69,7 +69,7 @@ package org.bigbluebutton.main.model.users
 			} else if (returncode == 'SUCCESS') {
 				LogUtil.debug("Join SUCESS = " + xml);
 				var user:Object = {username:xml.fullname, conference:xml.conference, conferenceName:xml.confname,
-										meetingID:xml.meetingID, externUserID:xml.externUserID, internalUserId:xml.internalUserId,
+										meetingID:xml.meetingID, externUserID:xml.externUserID, internalUserId:xml.internalUserID,
 										role:xml.role, room:xml.room, authToken:xml.room, record:xml.record, 
 										webvoiceconf:xml.webvoiceconf,
 										voicebridge:xml.voicebridge, mode:xml.mode, welcome:xml.welcome, logoutUrl:xml.logoutUrl};

bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.as

@@ -202,7 +202,7 @@ package org.bigbluebutton.main.model.users
 							new Responder(
 	        					// result - On successful result
 								function(result:Object):void { 
-									LogUtil.debug("Successful result: " + result); 
+									LogUtil.debug("Userid [" + result + "]"); 
 									sendConnectionSuccessEvent(result);
 								},	
 								// status - On error occurred
@@ -301,7 +301,7 @@ package org.bigbluebutton.main.model.users
 
 		private function sendConnectionSuccessEvent(userid:Object):void{
 			var useridString:String = userid as String;
-			var n:int = parseInt(useridString);
+			var n:Number = parseInt(useridString);
 
 			var e:UsersConnectionEvent = new UsersConnectionEvent(UsersConnectionEvent.CONNECTION_SUCCESS);
 			e.connection = _netConnection;

bigbluebutton-client/src/org/bigbluebutton/main/model/users/UserService.as

@@ -24,6 +24,7 @@ package org.bigbluebutton.main.model.users
 
 	import mx.collections.ArrayCollection;
 
+	import org.bigbluebutton.common.LogUtil;
 	import org.bigbluebutton.core.BBB;
 	import org.bigbluebutton.core.managers.UserConfigManager;
 	import org.bigbluebutton.core.managers.UserManager;
@@ -105,6 +106,7 @@ package org.bigbluebutton.main.model.users
 		}
 
 		public function userLoggedIn(e:UsersConnectionEvent):void{
+      LogUtil.debug("In UserService:userLoggedIn - Setting my userid to [" + e.userid + "]");
 			UserManager.getInstance().getConference().setMyUserid(e.userid);
 			_conferenceParameters.connection = e.connection;
 			_conferenceParameters.userid = e.userid;

bigbluebutton-client/src/org/bigbluebutton/main/model/users/UsersSOService.as

@@ -78,8 +78,10 @@ package org.bigbluebutton.main.model.users {
 			_participantsSO.addEventListener(AsyncErrorEvent.ASYNC_ERROR, asyncErrorHandler);
 			_participantsSO.client = this;
 			_participantsSO.connect(_connectionManager.connection);
+      LogUtil.debug("In UserSOService:join - Setting my userid to [" + userid + "]");
+      UserManager.getInstance().getConference().setMyUserid(userid);
 			queryForParticipants();					
-			UserManager.getInstance().getConference().setMyUserid(userid);
+			
 		}
 
 		private function queryForParticipants():void {
@@ -110,17 +112,24 @@ package org.bigbluebutton.main.model.users {
 		}
 
 		private function becomePresenterIfLoneModerator():void {
+      LogUtil.debug("Checking if I need to become presenter.");
 			var participants:Conference = UserManager.getInstance().getConference();
 			if (participants.hasOnlyOneModerator()) {
+        LogUtil.debug("There is only one moderator in the meeting. Is it me? ");
 				var user:BBBUser = participants.getTheOnlyModerator();
 				if (user.me) {
+          LogUtil.debug("Setting me as presenter because I'm the only moderator. My userid is [" + user.userid + "]");
 					var presenterEvent:RoleChangeEvent = new RoleChangeEvent(RoleChangeEvent.ASSIGN_PRESENTER);
 					presenterEvent.userid = user.userid;
 					presenterEvent.username = user.name;
 					var dispatcher:Dispatcher = new Dispatcher();
 					dispatcher.dispatchEvent(presenterEvent);
-				} 
-			} 
+				} else {
+          LogUtil.debug("No. It is not me. It is [" + user.userid + ", " + user.name + "]");
+        }
+			} else {
+        LogUtil.debug("No. There are more than one moderator.");
+      }
 		}
 
 		public function assignPresenter(userid:Number, name:String, assignedBy:Number):void {

bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy

@@ -299,7 +299,7 @@ class ApiController {
     }
 
 	UserSession us = new UserSession();
-	us.internalUserId = RandomStringUtils.randomAlphanumeric(12).toLowerCase()
+	us.internalUserId = System.currentTimeMillis(); //RandomStringUtils.randomAlphanumeric(12).toLowerCase()
     us.conferencename = meeting.getName()
     us.meetingID = meeting.getInternalId()
     us.externUserID = externUserID