Skip to content

feat: Add extra token request params for authorization code flow #199

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.

Sign up for GitHub

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

feat: Add extra token request params for authorization code flow #199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a2744d6
feat: Add extra token request params for authorization code flow
dominikklein Feb 13, 2025
b1e287c
Added client_id again, because it's needed with basic client_auth_met…
dominikklein Feb 13, 2025
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
7 changes: 7 additions & 0 deletions lib/omniauth/strategies/openid_connect.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,6 +282,13 @@ def access_token

token_request_params[:code_verifier] = params['code_verifier'] || session.delete('omniauth.pkce.verifier') if options.pkce

if configured_response_type == 'code'
token_request_params[:grant_type] = :authorization_code
token_request_params[:code] = authorization_code
token_request_params[:redirect_uri] = redirect_uri
token_request_params[:client_id] = client_options.identifier
end

@access_token = client.access_token!(token_request_params)
verify_id_token!(@access_token.id_token) if configured_response_type == 'code'

Expand Down
12 changes: 11 additions & 1 deletion test/lib/omniauth/strategies/openid_connect_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -852,10 +852,12 @@ def test_dynamic_state

def test_option_client_auth_method
state = SecureRandom.hex(16)
code = SecureRandom.hex(16)

opts = strategy.options.client_options
opts[:host] = 'foobar.com'
strategy.options.issuer = 'foobar.com'
strategy.options.client_options.redirect_uri = 'https://mysite.com/callback'
strategy.options.client_auth_method = :not_basic
strategy.options.client_signing_alg = :RS256
strategy.options.client_jwk_signing_key = jwks.to_json
Expand All @@ -867,14 +869,22 @@ def test_option_client_auth_method
}

request.stubs(:path).returns('')
request.stubs(:params).returns('code' => code, 'state' => state)
strategy.call!('rack.session' => { 'omniauth.state' => state, 'omniauth.nonce' => nonce })

id_token = stub('OpenIDConnect::ResponseObject::IdToken')
id_token.stubs(:verify!).with(issuer: strategy.options.issuer, client_id: @identifier, nonce: nonce).returns(true)
::OpenIDConnect::ResponseObject::IdToken.stubs(:decode).returns(id_token)

url = "#{ opts.scheme }://#{ opts.host }:#{ opts.port }#{ opts.token_endpoint }"
body = { scope: 'openid', grant_type: 'client_credentials', client_id: @identifier, client_secret: @secret }
body = {
scope: 'openid',
grant_type: 'authorization_code',
client_id: @identifier,
client_secret: @secret,
redirect_uri: 'https://mysite.com/callback',
code: code,
}

stub_request(:post, url).with(body: body).to_return(
body: json_response.to_json,
Expand Down