Refactor: Add Serialization for JsonWebToken in OpenIdConnectConfiguration #2627
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@nguyencuong2596 can you please add a description for what you are trying to do? |
brentschmaltz
requested changes
Jun 13, 2024
nguyencuong2596
force-pushed
the
cuong/idenitity-model-serializer
branch
from
8f42e4a
to
cc1bc52
Compare
nguyencuong2596
force-pushed
the
cuong/idenitity-model-serializer
branch
from
cc1bc52
to
6aacac0
Compare
| @@ -156,6 +158,14 @@ public static OpenIdConnectConfiguration Read(ref Utf8JsonReader reader, OpenIdC | |||
| else if (reader.ValueTextEquals(Utf8Bytes.EndSessionEndpoint)) | |||
| config.EndSessionEndpoint = JsonPrimitives.ReadString(ref reader, MetadataName.EndSessionEndpoint, ClassName, true); | |||
|
|
|||
| else if (reader.ValueTextEquals(Encoding.UTF8.GetBytes(JsonWebKeySetParameterNames.Keys))) | |||
There was a problem hiding this comment.
OpenIdConnectRetriever will reset the JsonWebKeySet here:
Is that accounted for?
There was a problem hiding this comment.
Good point. However, this shouldn't disrupt the flow that retrieves the configuration from an L2 cache. It might be best to fetch keys only if they are not already set.
brentschmaltz
requested changes
Jun 17, 2024
# Conflicts: # src/Microsoft.IdentityModel.Protocols.OpenIdConnect/Configuration/OpenIdConnectConfiguration.cs # src/Microsoft.IdentityModel.Protocols.OpenIdConnect/Json/OpenIdConnectConfigurationSerializer.cs
nguyencuong2596
commented
Jun 18, 2024
test/Microsoft.IdentityModel.Protocols.OpenIdConnect.Tests/OpenIdConnectSerializationTests.cs
Outdated
Show resolved
Hide resolved
# Conflicts: # test/Microsoft.IdentityModel.Protocols.OpenIdConnect.Tests/OpenIdConnectConfigurationTests.cs
nguyencuong2596
force-pushed
the
cuong/idenitity-model-serializer
branch
from
50ee6d6
to
39c3ac2
Compare
src/Microsoft.IdentityModel.Tokens/Json/JsonWebKeySetSerializer.cs
Outdated
Show resolved
Hide resolved
brentschmaltz
requested changes
Jun 20, 2024
| @@ -220,6 +223,16 @@ public static OpenIdConnectConfiguration Read(ref Utf8JsonReader reader, OpenIdC | |||
| else if (reader.ValueTextEquals(Utf8Bytes.EndSessionEndpoint)) | |||
| config.EndSessionEndpoint = JsonPrimitives.ReadString(ref reader, MetadataName.EndSessionEndpoint, ClassName, true); | |||
|
|
|||
| else if (reader.ValueTextEquals(Encoding.UTF8.GetBytes(JsonWebKeySetParameterNames.Keys))) | |||
| { | |||
| config.ShouldSerializeJsonWebKeys = true; | |||
| @@ -575,6 +587,14 @@ public static OpenIdConnectConfiguration Read(ref Utf8JsonReader reader, OpenIdC | |||
|
|
|||
| else if (propertyName.Equals(MetadataName.UserInfoSigningAlgValuesSupported, StringComparison.OrdinalIgnoreCase)) | |||
| JsonPrimitives.ReadStrings(ref reader, config.UserInfoEndpointSigningAlgValuesSupported, propertyName, ClassName); | |||
|
|
|||
| else if (propertyName.Equals(JsonWebKeySetParameterNames.Keys, StringComparison.OrdinalIgnoreCase)) | |||
There was a problem hiding this comment.
This is a breaking behavior for users.
Previously, users would have found an object in AdditionalData.
| if (config.JsonWebKeySet == null) | ||
| config.JsonWebKeySet = new JsonWebKeySet(); | ||
| // Skip key "Keys" | ||
| reader.Read(); |
There was a problem hiding this comment.
this is different than the case-insensitive below, reader.Read() is not called.
|
|
||
| internal static void Append(ref Utf8JsonWriter writer, JsonWebKeySet jsonWebKeySet) |
There was a problem hiding this comment.
WriteKeys would be a better name than Append.
| @@ -634,7 +634,7 @@ public static TheoryData<ConfigurationManagerTheoryData<OpenIdConnectConfigurati | |||
| ConfigurationValidator = openIdConnectConfigurationValidator2, | |||
| DocumentRetriever = new FileDocumentRetriever(), | |||
| ExpectedException = new ExpectedException(typeof(InvalidOperationException), "IDX21817:", typeof(InvalidConfigurationException)), | |||
| MetadataAddress = "JsonWebKeySetUnrecognizedKty.json", | |||
| MetadataAddress = "EmptyJsonWebKeySet.json", | |||
There was a problem hiding this comment.
Why were these tests removed?
JsonWebKeySetUnrecognizedKty
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Refactor: Add Serialization for JsonWebToken in OpenIdConnectConfiguration
Summary of the changes (Less than 80 chars)
Description