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

fixing rubocop errors

Browse Source
This commit is contained in:
bruckwubete
2018-07-10 15:05:50 -04:00
parent 407e8ee13c
commit 91644281c4
5 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/helpers/sessions_helper.rb
View File

@ -33,11 +33,12 @@ module SessionsHelper
provider.first == 'www' ? provider.second : provider.first
end
def set_omniauth_options(env)
def omniauth_options(env)
gl_redirect_url = 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
env['omniauth.strategy'].options[:checksum] = generate_checksum parse_customer_name(env["SERVER_NAME"]), gl_redirect_url, Rails.configuration.launcher_secret
env['omniauth.strategy'].options[:checksum] = generate_checksum parse_customer_name(env["SERVER_NAME"]),
gl_redirect_url, Rails.configuration.launcher_secret
end
end

4
app/models/user.rb
View File

@ -22,8 +22,8 @@ class User < ApplicationRecord
class << self
# Generates a user from omniauth.
def from_omniauth(auth)
#Provider is the customer name if in loadbalanced config mode
provider = (auth['provider'] == "bn_launcher") ? auth['info']['customer'] : auth['provider']
# Provider is the customer name if in loadbalanced config mode
provider = auth['provider'] == "bn_launcher" ? auth['info']['customer'] : auth['provider']
find_or_initialize_by(social_uid: auth['uid'], provider: provider).tap do |u|
u.name = send("#{auth['provider']}_name", auth) unless u.name
u.username = send("#{auth['provider']}_username", auth) unless u.username