X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/eeb9866d50e35b8f8b75e59aed582caba533778f..2059c8346c9bc46173568f10058cee6988c9dc03:/config/initializers/omniauth.rb?ds=sidebyside

diff --git a/config/initializers/omniauth.rb b/config/initializers/omniauth.rb
index 6de63f6ee..610053141 100644
--- a/config/initializers/omniauth.rb
+++ b/config/initializers/omniauth.rb
@@ -1,7 +1,7 @@
 require "openid/fetchers"
 require "openid/util"
 
-CA_BUNDLES = ["/etc/ssl/certs/ca-certificates.crt", "/etc/pki/tls/cert.pem"]
+CA_BUNDLES = ["/etc/ssl/certs/ca-certificates.crt", "/etc/pki/tls/cert.pem"].freeze
 
 OpenID.fetcher.ca_file = CA_BUNDLES.find { |f| File.exist?(f) }
 OpenID::Util.logger = Rails.logger
@@ -21,6 +21,8 @@ end
 
 openid_options = { :name => "openid", :store => openid_store }
 google_options = { :name => "google", :scope => "email", :access_type => "online" }
+facebook_options = { :name => "facebook", :scope => "email" }
+windowslive_options = { :name => "windowslive", :scope => "wl.signin,wl.emails" }
 
 if defined?(GOOGLE_OPENID_REALM)
   google_options[:openid_realm] = GOOGLE_OPENID_REALM
@@ -29,6 +31,8 @@ end
 Rails.application.config.middleware.use OmniAuth::Builder do
   provider :openid, openid_options
   provider :google_oauth2, GOOGLE_AUTH_ID, GOOGLE_AUTH_SECRET, google_options if defined?(GOOGLE_AUTH_ID)
+  provider :facebook, FACEBOOK_AUTH_ID, FACEBOOK_AUTH_SECRET, facebook_options if defined?(FACEBOOK_AUTH_ID)
+  provider :windowslive, WINDOWSLIVE_AUTH_ID, WINDOWSLIVE_AUTH_SECRET, windowslive_options if defined?(WINDOWSLIVE_AUTH_ID)
 end
 
 # Pending fix for: https://github.com/intridea/omniauth/pull/795