Commit 5db3468d authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

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

refactor omniauth configuration method
parents 5e004719 7863319b
No related merge requests found
...@@ -227,15 +227,21 @@ Devise.setup do |config| ...@@ -227,15 +227,21 @@ Devise.setup do |config|
end end
Gitlab.config.omniauth.providers.each do |provider| 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'] case provider['args']
when Array when Array
# An Array from the configuration will be expanded. # 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 when Hash
# A Hash from the configuration will be passed as is. # A Hash from the configuration will be passed as is.
config.omniauth provider['name'].to_sym, provider['app_id'], provider['app_secret'], provider['args'] provider_arguments << provider['args']
else
config.omniauth provider['name'].to_sym, provider['app_id'], provider['app_secret']
end end
config.omniauth provider['name'].to_sym, *provider_arguments
end end
end end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment