Merge remote-tracking branch 'openstreetmap/pull/1004'

[rails.git] / lib / auth.rb

diff --git a/lib/auth.rb b/lib/auth.rb
index b5ac0d2ebb58c8b64cda6f580faf8c61b0c4f30d..16102ed203fa1c0d15dd0a9940c8decf5b4516b0 100644 (file)
--- a/lib/auth.rb
+++ b/lib/auth.rb
@@ -1,5 +1,8 @@
 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 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)
+  end.freeze
 end