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

refactor omniauth configuration method

Merge pull request #5957 from ninech/dont-depend-on-appid-and-appsecret
refactor omniauth configuration method
Dmitriy Zaporozhets
2 parents 5e004719 7863319b
Showing 1 changed file with 10 additions and 4 deletions Show diff stats
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
...	...	@@ -227,15 +227,21 @@ Devise.setup do \|config\|
227	227	end
228	228
229	229	Gitlab.config.omniauth.providers.each do \|provider\|
	230	+ provider_arguments = []
	231	+
	232	+ %w[app_id app_secret].each do \|argument\|
	233	+ provider_arguments << provider[argument] if provider[argument]
	234	+ end
	235	+
230	236	case provider['args']
231	237	when Array
232	238	# An Array from the configuration will be expanded.
233		- config.omniauth provider['name'].to_sym, provider['app_id'], provider['app_secret'], *provider['args']
	239	+ provider_arguments.concat provider['args']
234	240	when Hash
235	241	# A Hash from the configuration will be passed as is.
236		- config.omniauth provider['name'].to_sym, provider['app_id'], provider['app_secret'], provider['args']
237		- else
238		- config.omniauth provider['name'].to_sym, provider['app_id'], provider['app_secret']
	242	+ provider_arguments << provider['args']
239	243	end
	244	+
	245	+ config.omniauth provider['name'].to_sym, *provider_arguments
240	246	end
241	247	end
...	...