X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/c8671c137ab09e8b93444d8a56d4a72d70014bf9..83043d6f1cd85729a3f91e5c73d78a39b8ae7d04:/config/initializers/omniauth.rb diff --git a/config/initializers/omniauth.rb b/config/initializers/omniauth.rb index d117707be..bce82b3c9 100644 --- a/config/initializers/omniauth.rb +++ b/config/initializers/omniauth.rb @@ -1,3 +1,4 @@ +require "multi_json" require "openid/fetchers" require "openid/util" @@ -8,46 +9,32 @@ OpenID::Util.logger = Rails.logger 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" - 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")) + openid_store = OpenID::Store::Filesystem.new(Rails.root.join("tmp/openids")) 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" } +facebook_options = { :name => "facebook", :scope => "email", :client_options => { :site => "https://graph.facebook.com/v17.0", :authorize_url => "https://www.facebook.com/v17.0/dialog/oauth" } } +microsoft_options = { :name => "microsoft", :scope => "openid User.Read" } github_options = { :name => "github", :scope => "user:email" } 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] = Settings.google_openid_realm if Settings.key?(:google_openid_realm) 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) - 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 + 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 :microsoft_graph, Settings.microsoft_auth_id, Settings.microsoft_auth_secret, microsoft_options if Settings.key?(:microsoft_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