X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/109e69efc186113380eccca35bfdb4bd83365db5..ce761b3193c41081182e129d4f4aa18268e69264:/config/initializers/omniauth.rb diff --git a/config/initializers/omniauth.rb b/config/initializers/omniauth.rb index 790413721..7e499c0e6 100644 --- a/config/initializers/omniauth.rb +++ b/config/initializers/omniauth.rb @@ -16,7 +16,7 @@ if defined?(MEMCACHE_SERVERS) else require "openid/store/filesystem" - openid_store = OpenID::Store::Filesystem.new(Rails.root.join("tmp/openids")) + openid_store = OpenID::Store::Filesystem.new(Rails.root.join("tmp", "openids")) end openid_options = { :name => "openid", :store => openid_store } @@ -24,11 +24,9 @@ google_options = { :name => "google", :scope => "email", :access_type => "online facebook_options = { :name => "facebook", :scope => "email" } windowslive_options = { :name => "windowslive", :scope => "wl.signin,wl.emails" } github_options = { :name => "github", :scope => "user:email" } -wikipedia_options = { :name => "wikipedia", :client_options => { :site => "https://commons.wikimedia.org" } } +wikipedia_options = { :name => "wikipedia", :client_options => { :site => "https://meta.wikimedia.org" } } -if defined?(GOOGLE_OPENID_REALM) - google_options[:openid_realm] = GOOGLE_OPENID_REALM -end +google_options[:openid_realm] = GOOGLE_OPENID_REALM if defined?(GOOGLE_OPENID_REALM) Rails.application.config.middleware.use OmniAuth::Builder do provider :openid, openid_options @@ -38,16 +36,3 @@ Rails.application.config.middleware.use OmniAuth::Builder do provider :github, GITHUB_AUTH_ID, GITHUB_AUTH_SECRET, github_options if defined?(GITHUB_AUTH_ID) provider :mediawiki, WIKIPEDIA_AUTH_ID, WIKIPEDIA_AUTH_SECRET, wikipedia_options if defined?(WIKIPEDIA_AUTH_ID) end - -# 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"] - - mock_callback_call_without_origin - end - - alias_method_chain :mock_callback_call, :origin - end -end