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.

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

Use headers TryGetValues which is already case in-sensitive #122

Merged
merged 2 commits into from
Feb 23, 2025
Merged

Use headers TryGetValues which is already case in-sensitive #122

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
11bac4a
Use headers TryGetValues which is already case in-sensitive
damianh Feb 22, 2025
8d23759
Remove unused code.
damianh Feb 22, 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: 4 additions & 3 deletions access-token-management/src/AccessTokenManagement/DPoPExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// Copyright (c) Duende Software. All rights reserved.
// Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.

using System.ComponentModel.DataAnnotations;
using Duende.IdentityModel;

namespace Duende.AccessTokenManagement;
Expand Down Expand Up @@ -33,9 +34,9 @@ public static void SetDPoPProofToken(this HttpRequestMessage request, string? pr
/// </summary>
public static string? GetDPoPNonce(this HttpResponseMessage response)
{
return response.Headers
.FirstOrDefault(x => string.Equals(OidcConstants.HttpHeaders.DPoPNonce, x.Key, StringComparison.OrdinalIgnoreCase))
.Value?.FirstOrDefault();
return response.Headers.TryGetValues(OidcConstants.HttpHeaders.DPoPNonce, out var values)
? values.FirstOrDefault()
: null;
}

/// <summary>
Expand Down
37 changes: 3 additions & 34 deletions identity-model-oidc-client/src/IdentityModel.OidcClient.Extensions/DPoP/DPoPExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
// Copyright (c) Duende Software. All rights reserved.
// Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.

using Duende.IdentityModel;

namespace Duende.IdentityModel.OidcClient.DPoP;

/// <summary>
Expand All @@ -26,40 +24,11 @@ public static void SetDPoPProofToken(this HttpRequestMessage request, string? pr
/// </summary>
public static string? GetDPoPNonce(this HttpResponseMessage response)
{
return response.Headers
.FirstOrDefault(x => string.Equals(OidcConstants.HttpHeaders.DPoPNonce, x.Key, StringComparison.OrdinalIgnoreCase))
.Value?.FirstOrDefault();
return response.Headers.TryGetValues(OidcConstants.HttpHeaders.DPoPNonce, out var values)
? values.FirstOrDefault()
: null;
}

///// <summary>
///// Reads the WWW-Authenticate response header to determine if the respone is in error due to DPoP
///// </summary>
//public static bool IsDPoPError(this HttpResponseMessage response)
//{
// if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized)
// {
// var header = response.Headers.WwwAuthenticate.Where(x => x.Scheme == OidcConstants.AuthenticationSchemes.AuthorizationHeaderDPoP).FirstOrDefault();
// if (header != null && header.Parameter != null)
// {
// // WWW-Authenticate: DPoP error="use_dpop_nonce"
// var values = header.Parameter.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
// var error = values.Select(x =>
// {
// var parts = x.Split(new[] { '=' }, StringSplitOptions.RemoveEmptyEntries);
// if (parts.Length == 2 && parts[0] == OidcConstants.TokenResponse.Error)
// {
// return parts[1].Trim('"');
// }
// return null;
// }).Where(x => x != null).FirstOrDefault();

// return error == OidcConstants.TokenErrors.UseDPoPNonce || error == OidcConstants.TokenErrors.InvalidDPoPProof;
// }
// }

// return false;
//}

/// <summary>
/// Returns the URL without any query params
/// </summary>
Expand Down