Cleanup from authenticated guests removal
While cherry-picking some of this work I noticed those extras.
This commit is contained in:
parent
e595d31f80
commit
7e26e78c4f
@ -28,7 +28,6 @@ trait ChangeUserRoleCmdMsgHdlr extends RightsManagementTrait {
|
||||
} yield {
|
||||
RegisteredUsers.updateUserRole(liveMeeting.registeredUsers, u, userRole)
|
||||
}
|
||||
// Mconf's guest should always be fit for promotion
|
||||
val promoteGuest = !liveMeeting.props.usersProp.authenticatedGuest
|
||||
if (msg.body.role == Roles.MODERATOR_ROLE && (!uvo.guest || promoteGuest)) {
|
||||
// Promote non-guest users.
|
||||
|
@ -372,7 +372,7 @@ public class Meeting {
|
||||
return authenticatedGuest;
|
||||
}
|
||||
|
||||
private String getUnauthenticatedGuestStatus(Boolean guest) {
|
||||
private String getUnauthenticatedGuestStatus(Boolean guest) {
|
||||
if (guest) {
|
||||
switch(guestPolicy) {
|
||||
case GuestPolicy.ALWAYS_ACCEPT:
|
||||
@ -391,7 +391,6 @@ public class Meeting {
|
||||
}
|
||||
|
||||
public String calcGuestStatus(String role, Boolean guest, Boolean authned) {
|
||||
// Good ol' Mconf guest status
|
||||
if (!authenticatedGuest) return getUnauthenticatedGuestStatus(guest);
|
||||
|
||||
// Allow moderators all the time.
|
||||
|
@ -108,6 +108,7 @@ class App extends Component {
|
||||
|
||||
this.handleWindowResize = throttle(this.handleWindowResize).bind(this);
|
||||
this.shouldAriaHide = this.shouldAriaHide.bind(this);
|
||||
this.renderMedia = withDraggableContext(this.renderMedia.bind(this));
|
||||
}
|
||||
|
||||
componentDidMount() {
|
||||
|
Loading…
Reference in New Issue
Block a user