Fix style issues found by new rubocop version

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

diff --git a/config/initializers/omniauth.rb b/config/initializers/omniauth.rb
index 2f2245419dd711a9d681057af47afb9d30daef4e..ea174a83eb38e43f3e33bcc34f77d9c42fd6d813 100644 (file)
--- a/config/initializers/omniauth.rb
+++ b/config/initializers/omniauth.rb
@@ -1,3 +1,11 @@
+require "openid/fetchers"
+require "openid/util"
+
+CA_BUNDLES = ["/etc/ssl/certs/ca-certificates.crt", "/etc/pki/tls/cert.pem"]
+
+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 = []
 
@@ -14,3 +22,16 @@ end
 Rails.application.config.middleware.use OmniAuth::Builder do
   provider :openid, :name => "openid", :store => openid_store
 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