Extract token reading code into a separate ReadPropertyValue.

AzureAD · May 4, 2024 · 6100ea7 · 6100ea7
1 parent 28e8784
commit 6100ea7
Showing 1 changed file with 71 additions and 66 deletions.
diff --git a/src/Microsoft.IdentityModel.JsonWebTokens/Json/JsonWebToken.PayloadClaimSet.cs b/src/Microsoft.IdentityModel.JsonWebTokens/Json/JsonWebToken.PayloadClaimSet.cs
@@ -18,7 +18,7 @@ internal JsonClaimSet CreatePayloadClaimSet(byte[] bytes, int length)
         }
 
         internal JsonClaimSet CreatePayloadClaimSet(ReadOnlySpan<byte> byteSpan)
-        { 
+        {
             Utf8JsonReader reader = new(byteSpan);
             if (!JsonSerializerPrimitives.IsReaderAtTokenType(ref reader, JsonTokenType.StartObject, true))
                 throw LogHelper.LogExceptionMessage(
@@ -37,71 +37,7 @@ internal JsonClaimSet CreatePayloadClaimSet(ReadOnlySpan<byte> byteSpan)
             {
                 if (reader.TokenType == JsonTokenType.PropertyName)
                 {
-                    if (reader.ValueTextEquals(JwtPayloadUtf8Bytes.Aud))
-                    {
-                        _audiences = [];
-                        reader.Read();
-                        if (reader.TokenType == JsonTokenType.StartArray)
-                        {
-                            JsonSerializerPrimitives.ReadStringsSkipNulls(ref reader, _audiences, JwtRegisteredClaimNames.Aud, ClassName);
-                            claims[JwtRegisteredClaimNames.Aud] = _audiences;
-                        }
-                        else
-                        {
-                            if (reader.TokenType != JsonTokenType.Null)
-                            {
-                                _audiences.Add(JsonSerializerPrimitives.ReadString(ref reader, JwtRegisteredClaimNames.Aud, ClassName));
-                                claims[JwtRegisteredClaimNames.Aud] = _audiences[0];
-                            }
-                            else
-                            {
-                                claims[JwtRegisteredClaimNames.Aud] = _audiences;
-                            }
-                        }
-                    }
-                    else if (reader.ValueTextEquals(JwtPayloadUtf8Bytes.Azp))
-                    {
-                        _azp = JsonSerializerPrimitives.ReadString(ref reader, JwtRegisteredClaimNames.Azp, ClassName, true);
-                        claims[JwtRegisteredClaimNames.Azp] = _azp;
-                    }
-                    else if (reader.ValueTextEquals(JwtPayloadUtf8Bytes.Exp))
-                    {
-                        _exp = JsonSerializerPrimitives.ReadLong(ref reader, JwtRegisteredClaimNames.Exp, ClassName, true);
-                        _expDateTime = EpochTime.DateTime(_exp.Value);
-                        claims[JwtRegisteredClaimNames.Exp] = _exp;
-                    }
-                    else if (reader.ValueTextEquals(JwtPayloadUtf8Bytes.Iat))
-                    {
-                        _iat = JsonSerializerPrimitives.ReadLong(ref reader, JwtRegisteredClaimNames.Iat, ClassName, true);
-                        _iatDateTime = EpochTime.DateTime(_iat.Value);
-                        claims[JwtRegisteredClaimNames.Iat] = _iat;
-                    }
-                    else if (reader.ValueTextEquals(JwtPayloadUtf8Bytes.Iss))
-                    {
-                        _iss = JsonSerializerPrimitives.ReadString(ref reader, JwtRegisteredClaimNames.Iss, ClassName, true);
-                        claims[JwtRegisteredClaimNames.Iss] = _iss;
-                    }
-                    else if (reader.ValueTextEquals(JwtPayloadUtf8Bytes.Jti))
-                    {
-                        _jti = JsonSerializerPrimitives.ReadString(ref reader, JwtRegisteredClaimNames.Jti, ClassName, true);
-                        claims[JwtRegisteredClaimNames.Jti] = _jti;
-                    }
-                    else if (reader.ValueTextEquals(JwtPayloadUtf8Bytes.Nbf))
-                    {
-                        _nbf = JsonSerializerPrimitives.ReadLong(ref reader, JwtRegisteredClaimNames.Nbf, ClassName, true);
-                        _nbfDateTime = EpochTime.DateTime(_nbf.Value);
-                        claims[JwtRegisteredClaimNames.Nbf] = _nbf;
-                    }
-                    else if (reader.ValueTextEquals(JwtPayloadUtf8Bytes.Sub))
-                    {
-                        _sub = JsonSerializerPrimitives.ReadStringOrNumberAsString(ref reader, JwtRegisteredClaimNames.Sub, ClassName, true);
-                        claims[JwtRegisteredClaimNames.Sub] = _sub;
-                    }
-                    else
-                    {
-                        string propertyName = reader.GetString();
-                        claims[propertyName] = JsonSerializerPrimitives.ReadPropertyValueAsObject(ref reader, propertyName, JsonClaimSet.ClassName, true);
-                    }
+                    ReadPropertyValue(ref reader, claims);
                 }
                 // We read a JsonTokenType.StartObject above, exiting and positioning reader at next token.
                 else if (JsonSerializerPrimitives.IsReaderAtTokenType(ref reader, JsonTokenType.EndObject, false))
@@ -112,5 +48,74 @@ internal JsonClaimSet CreatePayloadClaimSet(ReadOnlySpan<byte> byteSpan)
 
             return new JsonClaimSet(claims);
         }
+
+        private protected virtual void ReadPropertyValue(ref Utf8JsonReader reader, Dictionary<string, object> claims)
+        {
+            if (reader.ValueTextEquals(JwtPayloadUtf8Bytes.Aud))
+            {
+                _audiences = [];
+                reader.Read();
+                if (reader.TokenType == JsonTokenType.StartArray)
+                {
+                    JsonSerializerPrimitives.ReadStringsSkipNulls(ref reader, _audiences, JwtRegisteredClaimNames.Aud, ClassName);
+                    claims[JwtRegisteredClaimNames.Aud] = _audiences;
+                }
+                else
+                {
+                    if (reader.TokenType != JsonTokenType.Null)
+                    {
+                        _audiences.Add(JsonSerializerPrimitives.ReadString(ref reader, JwtRegisteredClaimNames.Aud, ClassName));
+                        claims[JwtRegisteredClaimNames.Aud] = _audiences[0];
+                    }
+                    else
+                    {
+                        claims[JwtRegisteredClaimNames.Aud] = _audiences;
+                    }
+                }
+            }
+            else if (reader.ValueTextEquals(JwtPayloadUtf8Bytes.Azp))
+            {
+                _azp = JsonSerializerPrimitives.ReadString(ref reader, JwtRegisteredClaimNames.Azp, ClassName, true);
+                claims[JwtRegisteredClaimNames.Azp] = _azp;
+            }
+            else if (reader.ValueTextEquals(JwtPayloadUtf8Bytes.Exp))
+            {
+                _exp = JsonSerializerPrimitives.ReadLong(ref reader, JwtRegisteredClaimNames.Exp, ClassName, true);
+                _expDateTime = EpochTime.DateTime(_exp.Value);
+                claims[JwtRegisteredClaimNames.Exp] = _exp;
+            }
+            else if (reader.ValueTextEquals(JwtPayloadUtf8Bytes.Iat))
+            {
+                _iat = JsonSerializerPrimitives.ReadLong(ref reader, JwtRegisteredClaimNames.Iat, ClassName, true);
+                _iatDateTime = EpochTime.DateTime(_iat.Value);
+                claims[JwtRegisteredClaimNames.Iat] = _iat;
+            }
+            else if (reader.ValueTextEquals(JwtPayloadUtf8Bytes.Iss))
+            {
+                _iss = JsonSerializerPrimitives.ReadString(ref reader, JwtRegisteredClaimNames.Iss, ClassName, true);
+                claims[JwtRegisteredClaimNames.Iss] = _iss;
+            }
+            else if (reader.ValueTextEquals(JwtPayloadUtf8Bytes.Jti))
+            {
+                _jti = JsonSerializerPrimitives.ReadString(ref reader, JwtRegisteredClaimNames.Jti, ClassName, true);
+                claims[JwtRegisteredClaimNames.Jti] = _jti;
+            }
+            else if (reader.ValueTextEquals(JwtPayloadUtf8Bytes.Nbf))
+            {
+                _nbf = JsonSerializerPrimitives.ReadLong(ref reader, JwtRegisteredClaimNames.Nbf, ClassName, true);
+                _nbfDateTime = EpochTime.DateTime(_nbf.Value);
+                claims[JwtRegisteredClaimNames.Nbf] = _nbf;
+            }
+            else if (reader.ValueTextEquals(JwtPayloadUtf8Bytes.Sub))
+            {
+                _sub = JsonSerializerPrimitives.ReadStringOrNumberAsString(ref reader, JwtRegisteredClaimNames.Sub, ClassName, true);
+                claims[JwtRegisteredClaimNames.Sub] = _sub;
+            }
+            else
+            {
+                string propertyName = reader.GetString();
+                claims[propertyName] = JsonSerializerPrimitives.ReadPropertyValueAsObject(ref reader, propertyName, JsonClaimSet.ClassName, true);
+            }
+        }
     }
 }