From aec1a84042a789bc5a7926ec91b49c2b689e081d Mon Sep 17 00:00:00 2001 From: Aaron Stone Date: Sun, 23 Dec 2012 07:49:11 -0800 Subject: [PATCH] Allow the OmniAuth provider args parameter to pass through as either an Array or a Hash. --- config/gitlab.yml.example | 2 ++ config/initializers/devise.rb | 11 ++++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index f47625eb..786a32cf 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -66,6 +66,8 @@ omniauth: # 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: # 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: # - { name: 'google_oauth2', app_id: 'YOUR APP ID', # app_secret: 'YOUR APP SECRET', diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb index ed3ab718..97946c54 100644 --- a/config/initializers/devise.rb +++ b/config/initializers/devise.rb @@ -217,6 +217,15 @@ Devise.setup do |config| end Gitlab.config.omniauth.providers.each do |provider| - config.omniauth provider['name'].to_sym, provider['app_id'], provider['app_secret'] + 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'] + end end end