Refactoring: Resolved vendor/lib/* path by moving OmniAuth custom authentication backends to lib/omniauth/.
This commit is contained in:
parent
8d45328d32
commit
67d3f35b05
12 changed files with 11 additions and 11 deletions
|
@ -1,3 +1,9 @@
|
||||||
|
Dir[ Rails.root.join('lib', 'omniauth', '*') ].each do |file|
|
||||||
|
if File.file?(file)
|
||||||
|
require file
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
Rails.application.config.middleware.use OmniAuth::Builder do
|
Rails.application.config.middleware.use OmniAuth::Builder do
|
||||||
|
|
||||||
# twitter database connect
|
# twitter database connect
|
||||||
|
|
|
@ -1,6 +0,0 @@
|
||||||
# load all vendor/lib extentions
|
|
||||||
Dir[ Rails.root.join('vendor', 'lib', '*') ].each do |file|
|
|
||||||
if File.file?(file)
|
|
||||||
require file
|
|
||||||
end
|
|
||||||
end
|
|
|
@ -12,11 +12,11 @@ class SamlDatabase < OmniAuth::Strategies::SAML
|
||||||
assertion_consumer_service_url = "#{http_type}://#{fqdn}/auth/saml/callback"
|
assertion_consumer_service_url = "#{http_type}://#{fqdn}/auth/saml/callback"
|
||||||
|
|
||||||
config = Setting.get('auth_saml_credentials') || {}
|
config = Setting.get('auth_saml_credentials') || {}
|
||||||
options = config.reject { |k,v| v.blank? }
|
options = config.reject { |_k, v| v.blank? }
|
||||||
.merge(
|
.merge(
|
||||||
:assertion_consumer_service_url => assertion_consumer_service_url,
|
assertion_consumer_service_url: assertion_consumer_service_url,
|
||||||
:issuer => entity_id,
|
issuer: entity_id,
|
||||||
)
|
)
|
||||||
|
|
||||||
args[0] = options
|
args[0] = options
|
||||||
|
|
Loading…
Reference in a new issue