refactor omniauth configuration method

This refactoring allows a user to use omniauth providers which do not use ```app_id``` and ```app_secret``` without needing to change the devise configuration.

refactor omniauth configuration method
568d1c27 · Raffael Schmid · e2dbe0fa · 568d1c27
Commit 568d1c27 authored Dec 30, 2013 by Raffael Schmid
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 4 deletions

devise.rb config/initializers/devise.rb +10 -4

No files found.
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -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