Tainan Felipe
33738d8c2e
Merge remote-tracking branch 'upstream/v2.4.x-release' into wip-new-msg-userLeftFlag
2022-01-27 09:48:14 -03:00
Ramón Souza
16cd3c4ebb
Merge remote-tracking branch 'upstream/v2.4.x-release' into dev-24-0125
2022-01-25 16:56:52 +00:00
Tainan Felipe
4946c1ff41
Backport the validationAuthToken refactor
2022-01-21 21:25:53 -03:00
Bohdan Zhemelinskyi
8582ccd6db
fixed join permission for Phone Users
2022-01-19 18:35:04 +00:00
Ramón Souza
f6e65f58c5
merge 2.4 into develop and resolve conflicts - partial
2022-01-12 16:40:45 +00:00
Tainan Felipe
a0a20e46ac
Fix typo in validate authtoken method
2022-01-10 15:29:25 -03:00
Tainan Felipe
68942d45db
Merge branch 'wip-new-msg-userLeftFlag' of github.com:Tainan404/bigbluebutton into wip-new-msg-userLeftFlag
2022-01-07 11:41:19 -03:00
Tainan Felipe
5ae5d230b8
Create util function in HandlerHelper
2022-01-07 11:37:23 -03:00
Tainan Felipe
6ed8fb304a
Merge branch 'v2.4.x-release' into wip-new-msg-userLeftFlag
2022-01-06 18:20:32 -03:00
Tainan Felipe
9c844bdd26
Add userLeftFlag message
2022-01-06 18:07:22 -03:00
Ramón Souza
1ddb15eb8a
Merge remote-tracking branch 'upstream/v2.4.x-release' into remove-user-persistent
2022-01-06 16:26:23 +00:00
Daniel Schreiber
6dcc4cab75
Fix telephone dialin
...
this fixes a crash in bbb-html5 when someone uses phone dialin. The
crash resulted in users joining the audio convference but not being
visible in the users list.
Fixed stack trace:
~~~
error: UserJoinedVoiceConfToClientEvtMsg: Error: Match error: Missing key 'pin'
at check (packages/check/match.js:36:17)
at addUser (imports/api/users/server/modifiers/addUser.js:23:3)
at addDialInUser (imports/api/users/server/modifiers/addDialInUser.js:30:10)
at EventEmitter.handleJoinVoiceUser (imports/api/voice-users/server/handlers/joinVoiceUser.js:36:5)
at EventEmitter.emitAsync (/usr/share/meteor/bundle/programs/server/npm/node_modules/eventemitter2/lib/eventemitter2.js:463:31)
at MeetingMessageQueue.handleTask (imports/startup/server/redis.js:114:10)
at imports/startup/server/redis.js:126:28
at Queue.start (/usr/share/meteor/bundle/programs/server/npm/node_modules/queue/index.js:145:17)
at Queue.<computed> [as push] (/usr/share/meteor/bundle/programs/server/npm/node_modules/queue/index.js:59:12)
at MeetingMessageQueue.add (imports/startup/server/redis.js:125:16)
at RedisPubSub.handleMessage (imports/startup/server/redis.js:327:63)
at runWithEnvironment (packages/meteor.js:1320:24)
~~~
2022-01-03 14:22:28 +01:00
Max Franke
85ad9a5e30
feat(video): webcam video pinning server side logic
...
Add the new ChangeUserPinState messages to handle the new video pinning
functionality
2021-12-21 16:58:38 -03:00
Ramón Souza
fd874aa10a
Merge remote-tracking branch 'upstream/v2.4.x-release' into remove-user-persistent
2021-12-15 18:04:02 +00:00
Ramón Souza
b10544aba5
remove user data on leave + video fix
2021-12-10 19:13:26 +00:00
Tainan Felipe
fb6aae1a02
re-implement the server-side connection close when user is removed
2021-12-10 15:38:55 -03:00
Anton Georgiev
328b3c1563
Revert "fix: Fix server side connection close on user disconnection"
2021-12-09 17:27:35 -05:00
Anton Georgiev
b6cf565ca6
Revert "refactor: Remove unused user data on leave"
2021-12-09 16:56:25 -05:00
Anton Georgiev
797fc49633
TEMP
2021-12-09 20:37:05 +00:00
Ramón Souza
304c16c519
remove voiceUsers data on leave
2021-11-29 13:59:21 +00:00
Ramón Souza
50546934c9
remove user persistent-data from collection on leave
2021-11-29 13:34:09 +00:00
Tainan Felipe
24ae9d3628
Fix server side connection close on user disconnection
2021-11-23 17:45:49 -03:00
Tainan Felipe
3e7d88586e
Enhances authToken validation to solely use Meteor.call
2021-10-28 15:16:16 -03:00
Anton Georgiev
24d672a832
Merge branch 'v2.4.x-release' of github.com:bigbluebutton/bigbluebutton into merge-24-dev
2021-10-14 15:13:17 +00:00
Tainan Felipe
1de8e0779d
Add server side reactivity to publications
2021-10-13 15:00:52 -03:00
Tainan Felipe
0a00588651
Create custom cursor for current poll and user
2021-10-04 17:01:20 -03:00
Joao Siebel
e1c825136c
Prevent a case where the setInPod get stuck on a loop. close #12284
2021-09-29 13:22:18 -03:00
Joao Siebel
4df47c08de
Fix a problem where the first moderator to join wasn't flaged as presenter
2021-08-11 16:46:26 -03:00
Joao Siebel
4cae6bb5dc
Prevent edge case where the UI show wrong info about current presenter
2021-08-04 11:02:10 -03:00
Joao Siebel
9b31ded342
Fix auto assigned presenter when previous one left the meeting. close #12679
2021-07-23 15:50:51 -03:00
Anton Georgiev
b9cc633286
Merge branch 'v2.3.x-release' of github.com:bigbluebutton/bigbluebutton into merge-2.3.5-into-develop
2021-07-06 19:36:19 +00:00
Joao Siebel
2cda889d51
Previne loggedOut property to be undefined. close #12656
2021-07-05 16:04:26 -03:00
Anton Georgiev
b5851aa152
removeUser: handle connections in frontends, db changes in backend
2021-06-30 20:08:00 +00:00
Ramon Souza
174f17bcb4
fix log message
2021-06-21 15:16:01 -03:00
Anton Georgiev
3e5214234b
Merge pull request #12469 from jfsiebel/allow-tags-meeting-user-name
...
Allow tags in meeting and user name
2021-06-15 10:28:58 -04:00
Pedro Beschorner Marin
4a5b92445a
refactor(external videos): system stop
...
Move all external video's system stop control events to akka-apps:
- on presenter change
- on presenter leave
- on screenshare start
2021-06-02 15:06:17 -03:00
Joao Siebel
f16700a8c4
Allow tags in meeting and user name. close #10221 close #12370
2021-05-31 09:59:15 -03:00
Ramon Souza
9592ca44fe
remove useless conditionals in validateAutoToken handler
2021-05-19 09:22:30 -03:00
Joao Siebel
519872cf97
Add try/catch on users methods
2021-05-05 13:47:43 -03:00
Ramon Souza
9d590a74d3
remove unused imports
2021-05-03 09:24:07 -03:00
Ramon Souza
3678348fdf
remove unused code
2021-04-29 13:52:22 -03:00
Ramon Souza
98ad9289ab
add inline comment
2021-04-16 16:32:16 -03:00
Ramon Souza
ab8cfe5109
add delay to userRemove
2021-04-16 14:58:53 -03:00
Ramon Souza
086d370428
remove returnless function use
2021-04-09 10:08:59 -03:00
Pedro Beschorner Marin
5cc213d93c
Update user persistent data on role change
2021-04-06 16:32:04 -03:00
Joao Siebel
c1503a2931
Remove banned users structure and handle reasonCode in validateAuthToken
2021-03-30 10:09:25 -03:00
Anton Georgiev
ded205e196
Merge pull request #11722 from Tainan404/issue-11081
...
Add collection user persistent data
2021-03-26 08:56:41 -04:00
Tainan Felipe
ba91dcb17c
Implements user persistent data to user context and redo users status logic on chat item
2021-03-22 17:44:53 -03:00
Joao Siebel
4d759ad63c
Prevent logged out user tp spam validateAuthToken
2021-03-22 09:37:17 -03:00
Tainan Felipe
e8f4d11446
Add collection user persistent data
2021-03-19 17:12:27 -03:00
Ramon Souza
ca345de246
add check after extractCredentials is used
2021-03-16 13:15:41 -03:00
Joao Siebel
c9650ba8f1
Inform akka that user intentionality logged out from meeting
2021-03-11 14:32:01 +00:00
Anton Georgiev
879c54981e
Merge pull request #11447 from antobinary/external-video-sync-lucas-amguirado73
...
External video events propagated through akka-apps
2021-03-02 08:53:09 -05:00
Gustavo Trott
63e00bd7ca
Adds lastAuthTokenValidatedOn to users in Akka, send it in ValidateAuthTokenRespMsg pubSub msg, makes Meteor store it as authTokenValidatedTime
2021-02-25 16:52:20 -03:00
Anton Georgiev
0eac03394c
remove duplicated logging of pengingAuth
2021-02-22 19:48:14 +00:00
Anton Georgiev
740a3a9db9
stop external video if presenter changed
2021-02-21 12:19:01 +00:00
Anton Georgiev
0b6496618c
Merge branch 'develop' of github.com:amguirado73/bigbluebutton into external-video-sync-lucas
2021-02-21 11:04:39 +00:00
Anton Georgiev
49cdf9faef
Merge pull request #11413 from gustavotrott/develop
...
Include registeredOn date in pubSub user creation messages to replace loginTime creation in Meteor
2021-02-17 16:56:53 -05:00
Gustavo Trott
91f4eba678
Replace registeredOn params to Long (timestamp) instead of String (ISO_OFFSET_DATE_TIME)
2021-02-17 09:20:55 -03:00
Gustavo Trott
12e363eb92
Removes loginTime creation from Meteor and use the registeredOn date created on Akka. Makes Akka send the registeredOn date throught PubSub messages: UserRegisteredRespMsg, GuestsWaitingForApprovalEvtMsg and ValidateAuthTokenRespMsg.
2021-02-16 14:46:30 -03:00
Anton Georgiev
e2e0b78d40
Merge branch 'develop' of github.com:bigbluebutton/bigbluebutton into split-meteor-roles-on-top-of-2.3-alpha6
2021-02-08 23:39:42 +00:00
Pedro Beschorner Marin
d7c0975b61
Fix mobile user-list identification
...
Added the missing extractCredential method and replaced the old callback strategy
with the new try-catch block.
2021-02-08 09:55:38 -03:00
Anton Georgiev
363c801338
Merge pull request #11215 from pedrobmarin/guest-draft
...
Disable authenticated guests
2021-02-05 16:13:46 -05:00
Anton Georgiev
8c0f0fdd52
Split Meteor roles backend-frontend revisit
2021-02-05 17:47:46 +00:00
Joao Siebel
09f5931d65
Keep track of active connection id for users
2021-01-29 17:29:07 -03:00
Anton Georgiev
d122639042
Merge pull request #11239 from jfsiebel/sync-with-active-connections
...
Synchronize users with active connections
2021-01-29 12:28:07 -05:00
Joao Siebel
68b2752e0d
Add flag to enable sync
2021-01-29 14:27:13 -03:00
Joao Siebel
8c7c21f936
Sync users in collection with server active connections
2021-01-26 16:22:32 -03:00
Anton Georgiev
6c27e815fc
Only publish full users to client side, no dummy users
2021-01-26 16:56:28 +00:00
Pedro Beschorner Marin
85ee3b283f
Identify mobile users at user list
2021-01-23 21:57:55 -03:00
Anton Georgiev
45c1ff6e40
Merge pull request #11175 from MaximKhlobystov/select-random-user
...
Presenter selecting a random viewer
2021-01-22 15:31:00 -05:00
Anton Georgiev
99ff801d34
remove obsolete callback from user remove
2020-12-15 22:04:26 +00:00
Anton Georgiev
244a239810
Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into 2020-12-01-merge
2020-12-01 20:02:50 +00:00
Joao Siebel
77d493792f
Prevent a case where voiceUser collection was being clean for entire server
2020-11-30 17:01:41 -03:00
Joao Siebel
11f1a1ac47
Merge remote-tracking branch 'upstream/v2.2.x-release' into remove-callbacks
2020-11-25 10:54:18 -03:00
Joao Siebel
a244fc1acf
WIP remove callback from remove operations
2020-11-24 17:44:13 -03:00
Anton Georgiev
3faabd1821
Merge 2.2.29 and 2.2.30 into 2.3.x
2020-11-24 15:13:09 +00:00
Anton Georgiev
21644a1a43
Remove string interpolation for server debug and verbose logs
2020-11-23 14:35:59 -05:00
Joao Siebel
bcc1d6c880
WIP remove callback from mongo operations
2020-11-23 10:13:46 -03:00
KDSBrowne
2f46c1fd28
Merge branch 'develop' of https://github.com/bigbluebutton/bigbluebutton into 2.3-user-rand-select
2020-11-02 16:16:29 +00:00
Joao Siebel
be8421db3c
Merge remote-tracking branch 'upstream/develop' into connection-manager
2020-10-21 13:57:17 -03:00
Anton Georgiev
0c7ead1916
Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into oct16-merge
2020-10-21 14:48:02 +00:00
Joao Siebel
109c18beb0
Improve annotations and cursor streamer logs, also add a type info for some logs in authentication process
...
and rollback some attempts to fix multiple leaving end call.
2020-10-16 10:30:50 -03:00
Joao Siebel
14388ec922
Improve logs for a better debug/understanding of problems related to authentication and log in process
2020-10-07 16:50:17 -03:00
Joao Siebel
895e82f260
Remove unused method
2020-10-01 15:32:24 -03:00
Joao Siebel
78ead44d17
Fix reconnection flow
2020-10-01 14:31:38 -03:00
Joao Siebel
db7164253d
Prevent repeated setUserId
2020-09-29 18:02:03 -03:00
Joao Siebel
6919498234
Prevent multiple attaches on socket close for the same user
2020-09-29 09:57:31 -03:00
Joao Siebel
b0f2abad8b
Prevent user who logout from meeting to join again using the same sessionToken
...
also move this and banned user check to a different method.
2020-09-29 09:33:15 -03:00
KDSBrowne
3e8eebdd1b
move random viewer selection to akka-apps
2020-09-25 19:41:30 +00:00
Joao Siebel
a3cf7cd98e
Prevent validateAuthToken spamming.
...
If an ejected user tries to enter in the meeting using the current url
html5 client keep trying to validate that user, but without success
causing a validateAuthToken message spam until the connection times out.
2020-09-21 15:50:54 -03:00
Joao Siebel
b2adffa4c2
Merge remote-tracking branch 'upstream/develop' into connection-manager
2020-09-18 16:30:20 -03:00
Anton Georgiev
377dc27a8d
Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into 09-16-merge
2020-09-17 14:37:28 +00:00
Joao Siebel
087939855e
fix some problems with using same user in multiple tabs
2020-09-16 09:52:44 -03:00
Joao Siebel
ac0a014571
WIP onClose
2020-09-10 08:49:22 -03:00
Joao Siebel
6e4e0a510a
Merge branch 'remove-user-on-exit' into connection-manager
2020-09-08 16:36:01 -03:00
Joao Siebel
96bd372f15
Fix banned users log
2020-09-08 13:56:17 -03:00
Joao Siebel
4be9bc4c94
Adjust publishers to use auth-token-validation collection
2020-09-01 13:31:11 -03:00
Joao Siebel
b8f42ac712
Create ClientConnections structure and auth-token-validation collection
2020-09-01 09:07:56 -03:00
root
851c2645ea
Committer: Antonio Guirado <amguirado73@gmail.com>
...
Changes to be committed:
new file: akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/externalvideo/ExternalVideoApp2x.scala
new file: akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/externalvideo/StartExternalVideoPubMsgHdlr.scala
new file: akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/externalvideo/StopExternalVideoPubMsgHdlr.scala
new file: akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/externalvideo/UpdateExternalVideoPubMsgHdlr.scala
modified: akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/ReceivedJsonMsgHandlerActor.scala
modified: akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala
modified: akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/FromAkkaAppsMsgSenderActor.scala
new file: bbb-common-message/src/main/scala/org/bigbluebutton/common2/msgs/ExternalVideoMsgs.scala
new file: bigbluebutton-html5/imports/api/external-videos/server/eventHandlers.js
new file: bigbluebutton-html5/imports/api/external-videos/server/handlers/startExternalVideo.js
new file: bigbluebutton-html5/imports/api/external-videos/server/handlers/stopExternalVideo.js
new file: bigbluebutton-html5/imports/api/external-videos/server/handlers/updateExternalVideo.js
modified: bigbluebutton-html5/imports/api/external-videos/server/index.js
modified: bigbluebutton-html5/imports/api/external-videos/server/methods.js
modified: bigbluebutton-html5/imports/api/external-videos/server/methods/emitExternalVideoEvent.js
modified: bigbluebutton-html5/imports/api/external-videos/server/methods/startWatchingExternalVideo.js
modified: bigbluebutton-html5/imports/api/external-videos/server/methods/stopWatchingExternalVideo.js
new file: bigbluebutton-html5/imports/api/external-videos/server/streamer.js
modified: bigbluebutton-html5/imports/api/meetings/server/handlers/meetingDestruction.js
modified: bigbluebutton-html5/imports/api/meetings/server/modifiers/addMeeting.js
modified: bigbluebutton-html5/imports/api/meetings/server/modifiers/meetingHasEnded.js
modified: bigbluebutton-html5/imports/api/users/server/handlers/validateAuthToken.js
modified: bigbluebutton-html5/imports/api/users/server/store/bannedUsers.js
modified: bigbluebutton-html5/imports/startup/server/index.js
modified: bigbluebutton-html5/imports/startup/server/redis.js
modified: bigbluebutton-html5/imports/ui/components/external-video-player/service.js
modified: bigbluebutton-html5/private/config/settings.yml
2020-08-28 12:58:55 +02:00
