Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add access token raw attributes to strategy extra attributes #11

Merged
merged 1 commit into from
Oct 8, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion lib/omniauth/openid_connect/version.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

module OmniAuth
module OpenIDConnect
VERSION = '0.3.0'
# original version VERSION = '0.3.0'
VERSION = '0.3.1'
end
end
9 changes: 8 additions & 1 deletion lib/omniauth/strategies/openid_connect.rb
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ def uid
end

extra do
{ raw_info: user_info.raw_attributes }
{ raw_info: raw_attributes }
end

credentials do
Expand Down Expand Up @@ -304,6 +304,13 @@ def params
request.params
end

def raw_attributes
hash = {}
hash.merge! user_info.raw_attributes if user_info&.raw_attributes.present?
hash.merge! access_token.raw_attributes if access_token&.raw_attributes.present?
hash
end

class CallbackError < StandardError
attr_accessor :error, :error_reason, :error_uri

Expand Down
9 changes: 8 additions & 1 deletion test/lib/omniauth/strategies/openid_connect_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,8 @@ def test_callback_phase(session = {}, params = {})
access_token.stubs(:expires_in)
access_token.stubs(:scope)
access_token.stubs(:id_token).returns(File.read('test/fixtures/id_token.txt'))
access_token.stubs(:raw_attributes).returns(access_token_raw_attributes)

client.expects(:access_token!).at_least_once.returns(access_token)
access_token.expects(:userinfo!).returns(user_info)

Expand Down Expand Up @@ -187,6 +189,7 @@ def test_callback_phase_with_discovery
access_token.stubs(:expires_in)
access_token.stubs(:scope)
access_token.stubs(:id_token).returns(File.read('test/fixtures/id_token.txt'))
access_token.stubs(:raw_attributes).returns(access_token_raw_attributes)
client.expects(:access_token!).at_least_once.returns(access_token)
access_token.expects(:userinfo!).returns(user_info)

Expand Down Expand Up @@ -330,7 +333,10 @@ def test_info
end

def test_extra
assert_equal({ raw_info: user_info.as_json }, strategy.extra)
access_token = stub('OpenIDConnect::AccessToken')
access_token.stubs(:raw_attributes).returns(access_token_raw_attributes)
strategy.instance_variable_set(:@access_token, access_token)
assert_equal({ raw_info: user_info.as_json.merge(access_token_raw_attributes) }, strategy.extra)
end

def test_credentials
Expand All @@ -346,6 +352,7 @@ def test_credentials
access_token.stubs(:access_token).returns(SecureRandom.hex(16))
access_token.stubs(:refresh_token).returns(SecureRandom.hex(16))
access_token.stubs(:expires_in).returns(Time.now)
access_token.stubs(:raw_attributes).returns(access_token_raw_attributes)
access_token.stubs(:scope).returns('openidconnect')
access_token.stubs(:id_token).returns(File.read('test/fixtures/id_token.txt'))

Expand Down
3 changes: 3 additions & 0 deletions test/strategy_test_case.rb
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@ def user_info
phone_number: Faker::PhoneNumber.phone_number,
website: Faker::Internet.url,
)

def access_token_raw_attributes
@extra_attributes ||= { extra_attribute: 1 }
end

def request
Expand Down