Merge remote-tracking branch 'upstream/pull/2403'

[rails.git] / lib / auth.rb

diff --git a/lib/auth.rb b/lib/auth.rb
index b5ac0d2ebb58c8b64cda6f580faf8c61b0c4f30d..6190831f7ada6b8fa18c33a1c05b4036049bb351 100644 (file)
--- a/lib/auth.rb
+++ b/lib/auth.rb
@@ -1,5 +1,9 @@
 module Auth
 module Auth

-  PROVIDERS = { "None" => "", "OpenID" => "openid" }
-  PROVIDERS["Google"] = "google" if defined?(GOOGLE_AUTH_ID)
-  PROVIDERS["Facebook"] = "facebook" if defined?(FACEBOOK_AUTH_ID)
+  PROVIDERS = { "None" => "", "OpenID" => "openid" }.tap do |providers|
+    providers["Google"] = "google" if Settings.key?(:google_auth_id)
+    providers["Facebook"] = "facebook" if Settings.key?(:facebook_auth_id)
+    providers["Windows Live"] = "windowslive" if Settings.key?(:windowslive_auth_id)
+    providers["GitHub"] = "github" if Settings.key?(:github_auth_id)
+    providers["Wikipedia"] = "wikipedia" if Settings.key?(:wikipedia_auth_id)
+  end.freeze

 end
 end