Merge branch 'bn_launcher_integration' of https://github.com/bigbluebutton/greenlight2 into bn_launcher_integration

This commit is contained in:
bruckwubete
2018-07-04 15:36:06 -04:00
18 changed files with 90 additions and 59 deletions

View File

@ -24,9 +24,6 @@ Rails.application.routes.draw do
patch '/:user_uid/edit', to: 'users#update', as: :update_user
end
# Handles launches from a trusted launcher.
post '/launch', to: 'sessions#launch'
# Handles Omniauth authentication.
match '/auth/:provider/callback', to: 'sessions#omniauth', via: [:get, :post], as: :omniauth_session
get '/auth/failure', to: 'sessions#fail'
@ -39,7 +36,6 @@ Rails.application.routes.draw do
post '/', to: 'rooms#join'
post '/start', to: 'rooms#start', as: :start_room
get '/logout', to: 'rooms#logout', as: :logout_room
post '/home', to: 'rooms#home', as: :make_home
# Mange recordings.
scope '/:record_id' do