Allow the OmniAuth provider args parameter to pass through as either an Array or a Hash.
This commit is contained in:
parent
6a932d0af5
commit
aec1a84042
|
@ -66,6 +66,8 @@ omniauth:
|
||||||
# Uncomment the lines and fill in the data of the auth provider you want to use
|
# Uncomment the lines and fill in the data of the auth provider you want to use
|
||||||
# If your favorite auth provider is not listed you can user others:
|
# If your favorite auth provider is not listed you can user others:
|
||||||
# see https://github.com/gitlabhq/gitlabhq/wiki/Using-Custom-Omniauth-Providers
|
# see https://github.com/gitlabhq/gitlabhq/wiki/Using-Custom-Omniauth-Providers
|
||||||
|
# The 'app_id' and 'app_secret' parameters are always passed as the first two
|
||||||
|
# arguments, followed by optional 'args' which can be either a hash or an array.
|
||||||
providers:
|
providers:
|
||||||
# - { name: 'google_oauth2', app_id: 'YOUR APP ID',
|
# - { name: 'google_oauth2', app_id: 'YOUR APP ID',
|
||||||
# app_secret: 'YOUR APP SECRET',
|
# app_secret: 'YOUR APP SECRET',
|
||||||
|
|
|
@ -217,6 +217,15 @@ Devise.setup do |config|
|
||||||
end
|
end
|
||||||
|
|
||||||
Gitlab.config.omniauth.providers.each do |provider|
|
Gitlab.config.omniauth.providers.each do |provider|
|
||||||
|
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']
|
||||||
|
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']
|
config.omniauth provider['name'].to_sym, provider['app_id'], provider['app_secret']
|
||||||
end
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in a new issue