Skip to content

Commit

Permalink
At last, Attribute Exchange for OpenID worked out to properly provide…
Browse files Browse the repository at this point in the history
… names from Google.
  • Loading branch information
Michael Bleigh committed Oct 19, 2010
1 parent cc1112f commit bbc6580
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 8 deletions.
17 changes: 10 additions & 7 deletions oa-openid/lib/omniauth/strategies/open_id.rb
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ class OpenID
def initialize(app, store = nil, options = {})
super(app, options[:name] || :open_id)
@options = options
@options[:required] ||= [AX[:email], AX[:first_name], AX[:last_name], 'email', 'fullname']
@options[:required] ||= [AX[:email], AX[:name], AX[:first_name], AX[:last_name], 'email', 'fullname']
@options[:optional] ||= [AX[:nickname], AX[:city], AX[:state], AX[:website], AX[:image], 'postcode', 'nickname']
@store = store
end
Expand All @@ -48,7 +48,8 @@ def dummy_app
:identifier => identifier,
:return_to => callback_url,
:required => @options[:required],
:optional => @options[:optional]
:optional => @options[:optional],
:method => 'post'
)}, []]}
end

Expand Down Expand Up @@ -122,11 +123,13 @@ def ax_user_info(response)
ax = ::OpenID::AX::FetchResponse.from_success_response(response)
return {} unless ax
{
'email' => ax[AX[:email]],
'name' => ax[AX[:name]],
'location' => ("#{ax[AX[:city]]}, #{ax[AX[:state]]}" if Array(ax[AX[:city]]).any? && Array(ax[AX[:state]]).any?),
'nickname' => ax[AX[:nickname]],
'urls' => ({'Website' => Array(ax[AX[:website]]).first} if Array(ax[AX[:website]]).any?)
'email' => ax.get_single(AX[:email]),
'first_name' => ax.get_single(AX[:first_name]),
'last_name' => ax.get_single(AX[:last_name]),
'name' => (ax.get_single(AX[:name]) || [ax.get_single(AX[:first_name]), ax.get_single(AX[:last_name])].join(' ')),
'location' => ("#{ax.get_single(AX[:city])}, #{ax.get_single(AX[:state])}" if Array(ax.get_single(AX[:city])).any? && Array(ax.get_single(AX[:state])).any?),
'nickname' => ax.get_single(AX[:nickname]),
'urls' => ({'Website' => Array(ax.get_single(AX[:website])).first} if Array(ax.get_single(AX[:website])).any?)
}.inject({}){|h,(k,v)| h[k] = Array(v).first; h}.reject{|k,v| v.nil? || v == ''}
end
end
Expand Down
2 changes: 1 addition & 1 deletion oa-openid/oa-openid.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Gem::Specification.new do |gem|
gem.files = Dir.glob("{lib}/**/*") + %w(LICENSE.rdoc CHANGELOG.rdoc)

gem.add_dependency 'oa-core', version
gem.add_dependency 'rack-openid', '~> 1.1.1'
gem.add_dependency 'rack-openid', '~> 1.2.0'
gem.add_dependency 'ruby-openid-apps-discovery'

eval File.read(File.join(File.dirname(__FILE__), '../development_dependencies.rb'))
Expand Down

0 comments on commit bbc6580

Please sign in to comment.