Merge pull request #17044 from antobinary/fix-undefined-user

fix: Fix undefined user in rare end-breakout scenario
bigbluebutton · Mar 17, 2023 · c3d89ee · c3d89ee
2 parents 2f3a8f0 + 372e17c
commit c3d89ee
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/bigbluebutton-html5/imports/ui/components/audio/service.js b/bigbluebutton-html5/imports/ui/components/audio/service.js
@@ -140,7 +140,7 @@ export default {
   isEchoTest: () => AudioManager.isEchoTest,
   error: () => AudioManager.error,
   isUserModerator: () => Users.findOne({ userId: Auth.userID },
-    { fields: { role: 1 } }).role === ROLE_MODERATOR,
+    { fields: { role: 1 } })?.role === ROLE_MODERATOR,
   isVoiceUser,
   autoplayBlocked: () => AudioManager.autoplayBlocked,
   handleAllowAutoplay: () => AudioManager.handleAllowAutoplay(),

diff --git a/bigbluebutton-html5/imports/ui/components/video-provider/service.js b/bigbluebutton-html5/imports/ui/components/video-provider/service.js
@@ -642,7 +642,7 @@ class VideoService {
     const currentUser = Users.findOne({ userId: Auth.userID },
       { fields: { role: 1 } });
 
-    const isModerator = currentUser.role === 'MODERATOR';
+    const isModerator = currentUser?.role === 'MODERATOR';
     const isBreakout = meetingIsBreakout();
     const isPinEnabled = this.isPinEnabled();