Commit 60b480fe authored by James Edwards-Jones's avatar James Edwards-Jones

OmniauthInitializer refactoring

parent 97cf5d73
...@@ -4,51 +4,49 @@ module Gitlab ...@@ -4,51 +4,49 @@ module Gitlab
@devise_config = devise_config @devise_config = devise_config
end end
def config
@devise_config
end
def execute(providers) def execute(providers)
initialize_providers(providers) providers.each do |provider|
add_provider(provider['name'].to_sym, *arguments_for(provider))
end
end end
private private
def initialize_providers(providers) def add_provider(*args)
providers.each do |provider| @devise_config.omniauth(*args)
provider_arguments = [] end
%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.
provider_arguments.concat provider['args']
when Hash
set_provider_specific_defaults(provider)
# A Hash from the configuration will be passed as is. def arguments_for(provider)
provider_arguments << provider['args'].symbolize_keys provider_arguments = []
end
config.omniauth provider['name'].to_sym, *provider_arguments %w[app_id app_secret].each do |argument|
provider_arguments << provider[argument] if provider[argument]
end end
end
def set_provider_specific_defaults(provider) case provider['args']
# Add procs for handling SLO when Array
if provider['name'] == 'cas3' # An Array from the configuration will be expanded.
provider['args'][:on_single_sign_out] = cas3_signout_handler provider_arguments.concat provider['args']
end when Hash
hash_arguments = provider['args'].merge(provider_defaults(provider))
if provider['name'] == 'authentiq' # A Hash from the configuration will be passed as is.
provider['args'][:remote_sign_out_handler] = authentiq_signout_handler provider_arguments << hash_arguments.symbolize_keys
end end
if provider['name'] == 'shibboleth' provider_arguments
provider['args'][:fail_with_empty_uid] = true end
def provider_defaults(provider)
case provider['name']
when 'cas3'
{ on_single_sign_out: cas3_signout_handler }
when 'authentiq'
{ remote_sign_out_handler: authentiq_signout_handler }
when 'shibboleth'
{ fail_with_empty_uid: true }
else
{}
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