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

Fixed issue with https redirect

This commit is contained in:
farhatahmad 2019-07-17 14:05:28 -04:00
parent 31b5e96ba6
commit 347ed2bdc1
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/controllers/application_controller.rb
View File

@ -23,6 +23,9 @@ class ApplicationController < ActionController::Base
include SessionsHelper include SessionsHelper
include ThemingHelper include ThemingHelper
# Force SSL for loadbalancer configurations.
before_action :redirect_to_https
before_action :migration_error? before_action :migration_error?
before_action :set_locale before_action :set_locale
before_action :check_admin_password before_action :check_admin_password
@ -32,9 +35,6 @@ class ApplicationController < ActionController::Base
# Manually handle BigBlueButton errors # Manually handle BigBlueButton errors
rescue_from BigBlueButton::BigBlueButtonException, with: :handle_bigbluebutton_error rescue_from BigBlueButton::BigBlueButtonException, with: :handle_bigbluebutton_error
# Force SSL for loadbalancer configurations.
before_action :redirect_to_https
protect_from_forgery with: :exception protect_from_forgery with: :exception
MEETING_NAME_LIMIT = 90 MEETING_NAME_LIMIT = 90
@ -138,7 +138,7 @@ class ApplicationController < ActionController::Base
# Checks to see if the user exists # Checks to see if the user exists
begin begin
retrieve_provider_info(@user_domain, 'api2', 'getUserGreenlightCredentials') retrieve_provider_info(@user_domain + 't', 'api2', 'getUserGreenlightCredentials')
rescue => e rescue => e
if e.message.eql? "No user with that id exists" if e.message.eql? "No user with that id exists"
render "errors/not_found", locals: { message: I18n.t("errors.not_found.user_not_found.message"), render "errors/not_found", locals: { message: I18n.t("errors.not_found.user_not_found.message"),