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

oauth update

Browse Source
This commit is contained in:
Zachary Chai
2016-11-04 14:28:40 -04:00
parent e093ead683
commit b4e0e73692
21 changed files with 79 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/controllers/landing_controller.rb
View File

@ -16,16 +16,20 @@ class LandingController < ApplicationController
end
def session_status_refresh
@user = User.find_by(username: params[:id])
@user = User.find_by(encrypted_id: params[:id])
if @user.nil?
render head(:not_found) && return
end
@meeting_running = bbb_get_meeting_info(@user.username)[:returncode]
@meeting_running = bbb_get_meeting_info(@user.encrypted_id)[:returncode]
render layout: false
end
def auth_failure
redirect_to '/'
end
def admin?
@user && @user == current_user
end
@ -42,13 +46,13 @@ class LandingController < ApplicationController
def render_room
params[:action] = 'rooms'
@user = User.find_by(username: params[:id])
@user = User.find_by(encrypted_id: params[:id])
if @user.nil?
redirect_to root_path
return
end
@meeting_running = bbb_get_meeting_info(@user.username)[:returncode]
@meeting_running = bbb_get_meeting_info(@user.encrypted_id)[:returncode]
render :action => 'rooms'
end