do not use self.class.config directly

pull/6827/head
Markus Kahl 10 years ago
parent 3a64f785aa
commit 15087abff7
  1. 10
      lib/omniauth/openid_connect/provider.rb

@ -108,11 +108,11 @@ module OmniAuth
{ {
:name => name, :name => name,
:scope => [:openid, :email, :profile], :scope => [:openid, :email, :profile],
:icon => self.class.config["icon"], :icon => config["icon"],
:display_name => self.class.config["display_name"], :display_name => config["display_name"],
:client_options => client_options.merge( # override with configuration :client_options => client_options.merge( # override with configuration
Hash[ Hash[
self.class.config.reject do |key, value| config.reject do |key, value|
["identifier", "secret", "icon", "display_name"].include? key ["identifier", "secret", "icon", "display_name"].include? key
end.map do |key, value| end.map do |key, value|
[key.to_sym, value] [key.to_sym, value]
@ -145,7 +145,9 @@ module OmniAuth
config("secret") config("secret")
end end
def config(key) def config(key = nil)
return self.class.config unless key
self.class.config[key] || error_configure(key) self.class.config[key] || error_configure(key)
end end

Loading…
Cancel
Save