Browse Source

Rename OpenIddictConfiguration.JwksUri to JsonWebKeySetUri for consistency with the recent changes

pull/2195/head
Kévin Chalet 1 year ago
parent
commit
cccfeadda5
  1. 4
      src/OpenIddict.Abstractions/Primitives/OpenIddictConfiguration.cs
  2. 2
      src/OpenIddict.Client.WebIntegration/OpenIddictClientWebIntegrationHandlers.Discovery.cs
  3. 2
      src/OpenIddict.Client/OpenIddictClientHandlers.Discovery.cs
  4. 4
      src/OpenIddict.Client/OpenIddictClientRetriever.cs
  5. 2
      src/OpenIddict.Validation/OpenIddictValidationHandlers.Discovery.cs
  6. 4
      src/OpenIddict.Validation/OpenIddictValidationRetriever.cs

4
src/OpenIddict.Abstractions/Primitives/OpenIddictConfiguration.cs

@ -72,9 +72,9 @@ public sealed class OpenIddictConfiguration
public JsonWebKeySet? JsonWebKeySet { get; set; }
/// <summary>
/// Gets or sets the URI of the JSON Web Key Set endpoint.
/// Gets or sets the URI of the JSON Web Key Set.
/// </summary>
public Uri? JwksUri { get; set; }
public Uri? JsonWebKeySetUri { get; set; }
/// <summary>
/// Gets or sets the URI of the mTLS-enabled device authorization endpoint.

2
src/OpenIddict.Client.WebIntegration/OpenIddictClientWebIntegrationHandlers.Discovery.cs

@ -426,7 +426,7 @@ public static partial class OpenIddictClientWebIntegrationHandlers
{
context.Configuration.AuthorizationEndpoint =
new Uri("https://www.sandbox.paypal.com/signin/authorize", UriKind.Absolute);
context.Configuration.JwksUri =
context.Configuration.JsonWebKeySetUri =
new Uri("https://api-m.sandbox.paypal.com/v1/oauth2/certs", UriKind.Absolute);
context.Configuration.RevocationEndpoint =
new Uri("https://api-m.sandbox.paypal.com/v1/oauth2/revoke", UriKind.Absolute);

2
src/OpenIddict.Client/OpenIddictClientHandlers.Discovery.cs

@ -345,7 +345,7 @@ public static partial class OpenIddictClientHandlers
return default;
}
context.Configuration.JwksUri = uri;
context.Configuration.JsonWebKeySetUri = uri;
return default;
}

4
src/OpenIddict.Client/OpenIddictClientRetriever.cs

@ -54,12 +54,12 @@ public sealed class OpenIddictClientRetriever : IConfigurationRetriever<OpenIddi
var configuration = await _service.GetConfigurationAsync(_registration, uri, cancel) ??
throw new InvalidOperationException(SR.GetResourceString(SR.ID0145));
if (configuration.JwksUri is null)
if (configuration.JsonWebKeySetUri is null)
{
throw new InvalidOperationException(SR.GetResourceString(SR.ID0146));
}
configuration.JsonWebKeySet = await _service.GetSecurityKeysAsync(_registration, configuration.JwksUri, cancel) ??
configuration.JsonWebKeySet = await _service.GetSecurityKeysAsync(_registration, configuration.JsonWebKeySetUri, cancel) ??
throw new InvalidOperationException(SR.GetResourceString(SR.ID0147));
// Copy the signing keys found in the JSON Web Key Set to the SigningKeys collection.

2
src/OpenIddict.Validation/OpenIddictValidationHandlers.Discovery.cs

@ -257,7 +257,7 @@ public static partial class OpenIddictValidationHandlers
return default;
}
context.Configuration.JwksUri = uri;
context.Configuration.JsonWebKeySetUri = uri;
return default;
}

4
src/OpenIddict.Validation/OpenIddictValidationRetriever.cs

@ -48,12 +48,12 @@ public sealed class OpenIddictValidationRetriever : IConfigurationRetriever<Open
var configuration = await _service.GetConfigurationAsync(uri, cancel) ??
throw new InvalidOperationException(SR.GetResourceString(SR.ID0145));
if (configuration.JwksUri is null)
if (configuration.JsonWebKeySetUri is null)
{
throw new InvalidOperationException(SR.GetResourceString(SR.ID0146));
}
configuration.JsonWebKeySet = await _service.GetSecurityKeysAsync(configuration.JwksUri, cancel) ??
configuration.JsonWebKeySet = await _service.GetSecurityKeysAsync(configuration.JsonWebKeySetUri, cancel) ??
throw new InvalidOperationException(SR.GetResourceString(SR.ID0147));
// Copy the signing keys found in the JSON Web Key Set to the SigningKeys collection.

Loading…
Cancel
Save