bugfix: info from decoded id_token is not exposed (jjbohn#61)

Author: ignatiusreza

lib/omniauth/strategies/openid_connect.rb

@@ -201,7 +201,15 @@ def discover!
       end
 
       def user_info
-        @user_info ||= access_token.userinfo!
+        return @user_info if @user_info
+
+        if access_token.id_token
+          decoded = decode_id_token(access_token.id_token).raw_attributes
+
+          @user_info = ::OpenIDConnect::ResponseObject::UserInfo.new access_token.userinfo!.raw_attributes.merge(decoded)
+        else
+          @user_info = access_token.userinfo!
+        end
       end
 
       def access_token

test/lib/omniauth/strategies/openid_connect_test.rb

@@ -187,7 +187,7 @@ def test_callback_phase(session = {}, params = {})
         id_token.stubs(:verify!).with(issuer: strategy.options.issuer, client_id: @identifier, nonce: nonce).returns(true)
         id_token.expects(:verify!)
 
-        strategy.expects(:decode_id_token).with(access_token.id_token).returns(id_token)
+        strategy.expects(:decode_id_token).twice.with(access_token.id_token).returns(id_token)
         strategy.call!('rack.session' => { 'omniauth.state' => state, 'omniauth.nonce' => nonce })
         strategy.callback_phase
       end
@@ -248,6 +248,7 @@ def test_callback_phase_with_discovery
         ::OpenIDConnect::Discovery::Provider::Config.stubs(:discover!).with('https://example.com/').returns(config)
 
         id_token = stub('OpenIDConnect::ResponseObject::IdToken')
+        id_token.stubs(:raw_attributes).returns('sub' => 'sub', 'name' => 'name', 'email' => 'email')
         id_token.stubs(:verify!).with(issuer: 'https://example.com/', client_id: @identifier, nonce: nonce).returns(true)
         ::OpenIDConnect::ResponseObject::IdToken.stubs(:decode).returns(id_token)
 
@@ -587,7 +588,7 @@ def test_id_token_auth_hash
 
         id_token = stub('OpenIDConnect::ResponseObject::IdToken')
         id_token.stubs(:verify!).returns(true)
-        id_token.stubs(:raw_attributes, :to_h).returns( 
+        id_token.stubs(:raw_attributes, :to_h).returns(
           {
             "iss": "http://server.example.com",
             "sub": "248289761001",