BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #12875 from paultrudel/fix-guest-wait-join-error

Browse Source 
Fixed issue with guests not joining meeting after being approved
This commit is contained in:
Anton Georgiev 2021-07-30 16:08:09 -04:00 committed by GitHub
commit b5b5a67805
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bbb-common-web/src/main/java/org/bigbluebutton/api/model/request/GuestWait.java
View File

@ -23,7 +23,7 @@ public class GuestWait implements Request<GuestWait.Params> {
@NotNull(message = "You must provide the session token") @NotNull(message = "You must provide the session token")
@UserSessionConstraint @UserSessionConstraint
@MaxParticipantsConstraint // @MaxParticipantsConstraint
private String sessionToken; private String sessionToken;
@MeetingExistsConstraint @MeetingExistsConstraint

14
bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
View File

@ -735,12 +735,14 @@ class ApiController {
case GuestPolicy.ALLOW: case GuestPolicy.ALLOW:
// IF the user was allowed to join but there is no room available in // IF the user was allowed to join but there is no room available in
// the meeting we must hold his approval // the meeting we must hold his approval
meetingService.guestIsWaiting(us.meetingID, us.internalUserId) if (hasReachedMaxParticipants(meeting, us)) {
destURL = guestURL meetingService.guestIsWaiting(us.meetingID, us.internalUserId)
msgKey = "seatWait" destURL = guestURL
msgValue = "Guest waiting for a seat in the meeting." msgKey = "seatWait"
redirectClient = false msgValue = "Guest waiting for a seat in the meeting."
status = GuestPolicy.WAIT redirectClient = false
status = GuestPolicy.WAIT
}
break break
default: default:
break break