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

[rails.git] / lib / auth.rb

diff --git a/lib/auth.rb b/lib/auth.rb
index 6361739288aee738b1e874234969b518197edb91..2c6d0c1d7036ad5f4f2d4f1e6a53593f3048b65d 100644 (file)
--- a/lib/auth.rb
+++ b/lib/auth.rb
@@ -1,6 +1,13 @@
 module Auth
-  PROVIDERS = { "None" => "", "OpenID" => "openid" }
-  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 = ["openid"]
+  @providers << "google" if Settings.key?(:google_auth_id)
+  @providers << "facebook" if Settings.key?(:facebook_auth_id)
+  @providers << "microsoft" if Settings.key?(:microsoft_auth_id)
+  @providers << "github" if Settings.key?(:github_auth_id)
+  @providers << "wikipedia" if Settings.key?(:wikipedia_auth_id)
+  @providers.freeze
+
+  def self.providers
+    @providers
+  end
 end