Merge pull request #3885 from tomhughes/diary-new

[rails.git] / config / initializers / omniauth.rb

diff --git a/config/initializers/omniauth.rb b/config/initializers/omniauth.rb
index 8190a65b96fb63b4c30773a0f5b5b8aa85e86ce1..5ca4ccffa8d6dcde54f557d82ffa1612663f04e1 100644 (file)
--- a/config/initializers/omniauth.rb
+++ b/config/initializers/omniauth.rb
@@ -1,35 +1,40 @@
+require "multi_json"

 require "openid/fetchers"
 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.fetcher.ca_file = CA_BUNDLES.find { |f| File.exist?(f) }

+OpenID::Util.logger = Rails.logger

 
 OmniAuth.config.logger = Rails.logger
 OmniAuth.config.failure_raise_out_environments = []
 
 OmniAuth.config.logger = Rails.logger
 OmniAuth.config.failure_raise_out_environments = []

+OmniAuth.config.allowed_request_methods = [:post, :patch]

 
 

-if defined?(MEMCACHE_SERVERS)
+if Settings.key?(:memcache_servers)

   require "openid/store/memcache"
 
   require "openid/store/memcache"
 

-  openid_store = OpenID::Store::Memcache.new(Dalli::Client.new(MEMCACHE_SERVERS, :namespace => "rails"))
+  openid_store = OpenID::Store::Memcache.new(Dalli::Client.new(Settings.memcache_servers, :namespace => "rails"))

 else
   require "openid/store/filesystem"
 
   openid_store = OpenID::Store::Filesystem.new(Rails.root.join("tmp/openids"))
 end
 
 else
   require "openid/store/filesystem"
 
   openid_store = OpenID::Store::Filesystem.new(Rails.root.join("tmp/openids"))
 end
 

-Rails.application.config.middleware.use OmniAuth::Builder do
-  provider :openid, :name => "openid", :store => openid_store
-end
+openid_options = { :name => "openid", :store => openid_store }
+google_options = { :name => "google", :scope => "email", :access_type => "online" }
+facebook_options = { :name => "facebook", :scope => "email", :client_options => { :site => "https://graph.facebook.com/v4.0", :authorize_url => "https://www.facebook.com/v4.0/dialog/oauth" } }
+windowslive_options = { :name => "windowslive", :scope => "wl.signin,wl.emails" }
+github_options = { :name => "github", :scope => "user:email" }
+wikipedia_options = { :name => "wikipedia", :client_options => { :site => "https://meta.wikimedia.org" } }

 
 

-# Pending fix for: https://github.com/intridea/omniauth/pull/795
-module OmniAuth
-  module Strategy
-    def mock_callback_call_with_origin
-      @env["omniauth.origin"] = session["omniauth.origin"]
+google_options[:openid_realm] = Settings.google_openid_realm if Settings.key?(:google_openid_realm)

 
 

-      mock_callback_call_without_origin
-    end
-
-    alias_method_chain :mock_callback_call, :origin
-  end
+Rails.application.config.middleware.use OmniAuth::Builder do
+  provider :openid, openid_options
+  provider :google_oauth2, Settings.google_auth_id, Settings.google_auth_secret, google_options if Settings.key?(:google_auth_id)
+  provider :facebook, Settings.facebook_auth_id, Settings.facebook_auth_secret, facebook_options if Settings.key?(:facebook_auth_id)
+  provider :windowslive, Settings.windowslive_auth_id, Settings.windowslive_auth_secret, windowslive_options if Settings.key?(:windowslive_auth_id)
+  provider :github, Settings.github_auth_id, Settings.github_auth_secret, github_options if Settings.key?(:github_auth_id)
+  provider :mediawiki, Settings.wikipedia_auth_id, Settings.wikipedia_auth_secret, wikipedia_options if Settings.key?(:wikipedia_auth_id)

 end
 end