lino.jorzick/greenlight
1
0
Fork 0
forked from External/greenlight
Code Issues Pull Requests Projects Releases Wiki Activity

GRN2-xx: Users can no longer join a room whose owner is banned or pending (Fixed #902) (#922)

Browse Source 
* Users can no longer join a room whose owner is banned or pending

* Changed flash message

* rubocop fix
This commit is contained in:
Ahmad Farhat
2020-01-22 16:45:57 -05:00
committed by farhatahmad
parent df1705d9ea
commit 8cbfc3f730
3 changed files with 44 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/controllers/rooms_controller.rb
View File

@ -28,6 +28,7 @@ class RoomsController < ApplicationController
before_action :verify_room_ownership_or_admin, only: [:start, :update_settings, :destroy]
before_action :verify_room_owner_verified, only: [:show, :join],
unless: -> { !Rails.configuration.enable_email_verification }
before_action :verify_room_owner_valid, only: [:show, :join]
before_action :verify_user_not_admin, only: [:show]
# POST /
@ -242,10 +243,12 @@ class RoomsController < ApplicationController
end
def verify_room_owner_verified
unless @room.owner.activated?
flash[:alert] = t("room.unavailable")
redirect_to root_path
end
redirect_to root_path, alert: t("room.unavailable") unless @room.owner.activated?
end
# Check to make sure the room owner is not pending or banned
def verify_room_owner_valid
redirect_to root_path, alert: t("room.owner_banned") if @room.owner.has_role?(:pending) || @room.owner.has_role?(:denied)
end
def verify_user_not_admin