fix for when user does not have can create room permissions rooms pag…

…e loads and doesnt error out (#5602) Co-authored-by: Ahmad Farhat <[email protected]>
bigbluebutton · Dec 13, 2023 · 4554909 · 4554909
1 parent 98485dd
commit 4554909
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 20 deletions.
diff --git a/app/controllers/api/v1/recordings_controller.rb b/app/controllers/api/v1/recordings_controller.rb
@@ -28,9 +28,6 @@ class RecordingsController < ApiController
       before_action only: %i[update update_visibility recording_url] do
         ensure_authorized(%w[ManageRecordings SharedRoom PublicRecordings], record_id: params[:id])
       end
-      before_action only: %i[index recordings_count] do
-        ensure_authorized('CreateRoom')
-      end
 
       # GET /api/v1/recordings.json
       # Returns all of the current_user's recordings

diff --git a/app/controllers/api/v1/rooms_controller.rb b/app/controllers/api/v1/rooms_controller.rb
@@ -23,7 +23,7 @@ class RoomsController < ApiController
 
       before_action :find_room, only: %i[show update destroy recordings recordings_processing purge_presentation public_show public_recordings]
 
-      before_action only: %i[create index] do
+      before_action only: %i[create] do
         ensure_authorized('CreateRoom')
       end
       before_action only: %i[create] do

diff --git a/app/javascript/components/rooms/EmptyRoomsList.jsx b/app/javascript/components/rooms/EmptyRoomsList.jsx
@@ -26,6 +26,7 @@ import UserBoardIcon from './UserBoardIcon';
 export default function EmptyRoomsList() {
   const { t } = useTranslation();
   const currentUser = useAuth();
+  const canCreate = currentUser?.permissions.CreateRoom;
   const mutationWrapper = (args) => useCreateRoom({ userId: currentUser.id, ...args });
 
   return (
@@ -39,11 +40,13 @@ export default function EmptyRoomsList() {
           <Card.Text>
             { t('room.rooms_list_empty_create_room') }
           </Card.Text>
-          <Modal
-            modalButton={<Button variant="brand" className="ms-auto me-xxl-1">{ t('room.add_new_room') }</Button>}
-            title={t('room.create_new_room')}
-            body={<CreateRoomForm mutation={mutationWrapper} userId={currentUser.id} />}
-          />
+          { (canCreate === 'true') && (
+            <Modal
+              modalButton={<Button variant="brand" className="ms-auto me-xxl-1">{ t('room.add_new_room') }</Button>}
+              title={t('room.create_new_room')}
+              body={<CreateRoomForm mutation={mutationWrapper} userId={currentUser.id} />}
+            />
+          )}
         </Card.Body>
       </Card>
     </div>

diff --git a/app/javascript/components/rooms/RoomsList.jsx b/app/javascript/components/rooms/RoomsList.jsx
@@ -35,6 +35,7 @@ export default function RoomsList() {
   const [searchInput, setSearchInput] = useState('');
   const { isLoading, data: rooms } = useRooms(searchInput);
   const currentUser = useAuth();
+  const canCreate = currentUser?.permissions.CreateRoom;
   const mutationWrapper = (args) => useCreateRoom({ userId: currentUser.id, ...args });
 
   if (!isLoading && rooms?.length === 0 && !searchInput) {
@@ -47,17 +48,19 @@ export default function RoomsList() {
         <div>
           <SearchBar searchInput={searchInput} id="rooms-search" setSearchInput={setSearchInput} />
         </div>
-        <Modal
-          modalButton={(
-            <Button
-              variant="brand"
-              className="ms-auto me-xxl-1"
-            >{t('room.add_new_room')}
-            </Button>
-          )}
-          title={t('room.create_new_room')}
-          body={<CreateRoomForm mutation={mutationWrapper} userId={currentUser.id} />}
-        />
+        { (canCreate === 'true') && (
+          <Modal
+            modalButton={(
+              <Button
+                variant="brand"
+                className="ms-auto me-xxl-1"
+              >{t('room.add_new_room')}
+              </Button>
+            )}
+            title={t('room.create_new_room')}
+            body={<CreateRoomForm mutation={mutationWrapper} userId={currentUser.id} />}
+          />
+        )}
       </Stack>
       <Row className="g-4 mt-4">
         {