Skip to content

Fix spec compliance of upstream OAuth 2.0 client auth methods #4819

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

Merged
merged 2 commits into from
Jul 24, 2025
Merged

Fix spec compliance of upstream OAuth 2.0 client auth methods #4819

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
c61d38c
Fix spec compliance of upstream OAuth 2.0 client auth methods
sandhose Jul 24, 2025
506f162
Don't check for `client_id` in tests
sandhose Jul 24, 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
15 changes: 8 additions & 7 deletions crates/oidc-client/src/types/client_credentials.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ impl ClientCredentials {
let request = match self {
ClientCredentials::None { client_id } => request.form(&RequestWithClientCredentials {
body: form,
client_id,
client_id: Some(client_id),
client_secret: None,
client_assertion: None,
client_assertion_type: None,
Expand All @@ -159,7 +159,7 @@ impl ClientCredentials {
.basic_auth(username, Some(password))
.form(&RequestWithClientCredentials {
body: form,
client_id,
client_id: None,
client_secret: None,
client_assertion: None,
client_assertion_type: None,
Expand All @@ -171,7 +171,7 @@ impl ClientCredentials {
client_secret,
} => request.form(&RequestWithClientCredentials {
body: form,
client_id,
client_id: Some(client_id),
client_secret: Some(client_secret),
client_assertion: None,
client_assertion_type: None,
Expand All @@ -195,7 +195,7 @@ impl ClientCredentials {

request.form(&RequestWithClientCredentials {
body: form,
client_id,
client_id: None,
client_secret: None,
client_assertion: Some(jwt.as_str()),
client_assertion_type: Some(JwtBearerClientAssertionType),
Expand Down Expand Up @@ -228,7 +228,7 @@ impl ClientCredentials {

request.form(&RequestWithClientCredentials {
body: form,
client_id,
client_id: None,
client_secret: None,
client_assertion: Some(client_assertion.as_str()),
client_assertion_type: Some(JwtBearerClientAssertionType),
Expand Down Expand Up @@ -260,7 +260,7 @@ impl ClientCredentials {

request.form(&RequestWithClientCredentials {
body: form,
client_id,
client_id: Some(client_id),
client_secret: Some(client_secret.as_str()),
client_assertion: None,
client_assertion_type: None,
Expand Down Expand Up @@ -359,7 +359,8 @@ struct RequestWithClientCredentials<'a, T> {
#[serde(flatten)]
body: T,

client_id: &'a str,
#[serde(skip_serializing_if = "Option::is_none")]
client_id: Option<&'a str>,
#[serde(skip_serializing_if = "Option::is_none")]
client_secret: Option<&'a str>,
#[serde(skip_serializing_if = "Option::is_none")]
Expand Down
16 changes: 4 additions & 12 deletions crates/oidc-client/tests/it/types/client_credentials.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,12 +188,8 @@ async fn pass_client_secret_jwt() {
.and(move |req: &Request| {
let query_pairs = form_urlencoded::parse(&req.body).collect::<HashMap<_, _>>();

if query_pairs
.get("client_id")
.filter(|s| *s == CLIENT_ID)
.is_none()
{
println!("Wrong or missing client ID");
if query_pairs.contains_key("client_id") {
println!("`client_secret_jwt` client authentication should not use `client_id`");
return false;
}
if query_pairs
Expand Down Expand Up @@ -271,12 +267,8 @@ async fn pass_private_key_jwt() {
.and(move |req: &Request| {
let query_pairs = form_urlencoded::parse(&req.body).collect::<HashMap<_, _>>();

if query_pairs
.get("client_id")
.filter(|s| *s == CLIENT_ID)
.is_none()
{
println!("Wrong or missing client ID");
if query_pairs.contains_key("client_id") {
println!("`private_key_jwt` client authentication should not use `client_id`");
return false;
}
if query_pairs
Expand Down
Loading