kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge pull request #5957 from ninech/dont-depend-on-appid-and-appsecret 

refactor omniauth configuration method
This commit is contained in:
Dmitriy Zaporozhets 2014-02-01 05:36:25 -08:00
parent 5e004719c4 7863319b97
commit 5db3468d7e
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
config/initializers/devise.rb
View File

@ -227,15 +227,21 @@ Devise.setup do |config|
end
Gitlab.config.omniauth.providers.each do |provider|
provider_arguments = []
%w[app_id app_secret].each do |argument|
provider_arguments << provider[argument] if provider[argument]
end
case provider['args']
when Array
# An Array from the configuration will be expanded.
config.omniauth provider['name'].to_sym, provider['app_id'], provider['app_secret'], *provider['args']
provider_arguments.concat provider['args']
when Hash
# A Hash from the configuration will be passed as is.
config.omniauth provider['name'].to_sym, provider['app_id'], provider['app_secret'], provider['args']
else
config.omniauth provider['name'].to_sym, provider['app_id'], provider['app_secret']
provider_arguments << provider['args']
end
config.omniauth provider['name'].to_sym, *provider_arguments
end
end