Merge branch 'master' of github.com:bigbluebutton/greenlight

This commit is contained in:
Joshua Arts 2018-07-24 11:01:32 -04:00
commit 4e87dcbd64
1 changed files with 2 additions and 1 deletions

View File

@ -34,7 +34,8 @@ module SessionsHelper
end
def omniauth_options(env)
gl_redirect_url = env["rack.url_scheme"] + "://" + env["SERVER_NAME"] + ":" + env["SERVER_PORT"]
gl_redirect_url = (Rails.env.production? ? "https" : env["rack.url_scheme"]) + "://" + env["SERVER_NAME"] + ":" +
env["SERVER_PORT"]
env['omniauth.strategy'].options[:customer] = parse_customer_name env["SERVER_NAME"]
env['omniauth.strategy'].options[:gl_redirect_url] = gl_redirect_url
env['omniauth.strategy'].options[:default_callback_url] = Rails.configuration.gl_callback_url