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

[rails.git] / lib / auth.rb

diff --git a/lib/auth.rb b/lib/auth.rb
index edd98e4ffb6c15f4109717c66535abbeb8b53499..434994329d7b62a435335dbbeb6da5c3489ee4b5 100644 (file)
--- a/lib/auth.rb
+++ b/lib/auth.rb
@@ -1,4 +1,9 @@
 module Auth
 module Auth

-  PROVIDERS = { "None" => "", "OpenID" => "openid" }
-  PROVIDERS["Google"] = "google" if defined?(GOOGLE_AUTH_ID)
+  PROVIDERS = { "None" => "", "OpenID" => "openid" }.tap do |providers|
+    providers["Google"] = "google" if defined?(GOOGLE_AUTH_ID)
+    providers["Facebook"] = "facebook" if defined?(FACEBOOK_AUTH_ID)
+    providers["Windows Live"] = "windowslive" if defined?(WINDOWSLIVE_AUTH_ID)
+    providers["GitHub"] = "github" if defined?(GITHUB_AUTH_ID)
+    providers["Wikipedia"] = "wikipedia" if defined?(WIKIPEDIA_AUTH_ID)
+  end.freeze

 end
 end