Fixed 404 on room join

bigbluebutton · Sep 17, 2020 · 8760e0a · 8760e0a
1 parent a278847
commit 8760e0a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/app/controllers/rooms_controller.rb b/app/controllers/rooms_controller.rb
@@ -91,6 +91,7 @@ def show
 
   # GET /rooms
   def cant_create_rooms
+    return redirect_to root_path unless current_user
     shared_rooms = current_user.shared_rooms
 
     if current_user.shared_rooms.empty?
@@ -156,11 +157,8 @@ def destroy
   def join_specific_room
     room_uid = params[:join_room][:url].split('/').last
 
-    begin
-      @room = Room.find_by!(uid: room_uid)
-    rescue ActiveRecord::RecordNotFound
-      return redirect_to current_user.main_room, alert: I18n.t("room.no_room.invalid_room_uid")
-    end
+    @room = Room.find_by(uid: room_uid)
+    return redirect_to cant_create_rooms_path, alert: I18n.t("room.no_room.invalid_room_uid") unless @room
 
     redirect_to room_path(@room)
   end

diff --git a/spec/controllers/rooms_controller_spec.rb b/spec/controllers/rooms_controller_spec.rb
@@ -683,7 +683,7 @@ def random_valid_room_params
       post :join_specific_room, params: { join_room: { url: "abc" } }
 
       expect(flash[:alert]).to eq(I18n.t("room.no_room.invalid_room_uid"))
-      expect(response).to redirect_to room_path(@user.main_room)
+      expect(response).to redirect_to cant_create_rooms_path
     end
 
     it "should redirect the user to the room uid they supplied" do