Skip to content

Commit

Permalink
Fixed issue with https redirect
Browse files Browse the repository at this point in the history
  • Loading branch information
farhatahmad committed Jul 17, 2019
1 parent 31b5e96 commit 347ed2b
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions app/controllers/application_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ class ApplicationController < ActionController::Base
include SessionsHelper
include ThemingHelper

# Force SSL for loadbalancer configurations.
before_action :redirect_to_https

before_action :migration_error?
before_action :set_locale
before_action :check_admin_password
Expand All @@ -32,9 +35,6 @@ class ApplicationController < ActionController::Base
# Manually handle BigBlueButton errors
rescue_from BigBlueButton::BigBlueButtonException, with: :handle_bigbluebutton_error

# Force SSL for loadbalancer configurations.
before_action :redirect_to_https

protect_from_forgery with: :exception

MEETING_NAME_LIMIT = 90
Expand Down Expand Up @@ -138,7 +138,7 @@ def set_user_domain

# Checks to see if the user exists
begin
retrieve_provider_info(@user_domain, 'api2', 'getUserGreenlightCredentials')
retrieve_provider_info(@user_domain + 't', 'api2', 'getUserGreenlightCredentials')
rescue => e
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"),
Expand Down

0 comments on commit 347ed2b

Please sign in to comment.