-Fix JTokenReader.ReadAsBytes to read strings as base64 data

Author: JamesNK

Src/Newtonsoft.Json.Tests/Linq/JTokenReaderTest.cs

@@ -247,5 +247,31 @@ public void ReadBytesFailure()
         jsonReader.ReadAsBytes();
       }
     }
+
+    public class HasBytes
+    {
+      public byte[] Bytes { get; set; }
+    }
+
+    [Test]
+    public void ReadBytesFromString()
+    {
+      var bytes = new HasBytes { Bytes = new byte[] { 1, 2, 3, 4 } };
+      var json = JsonConvert.SerializeObject(bytes);
+
+      TextReader textReader = new StringReader(json);
+      JsonReader jsonReader = new JsonTextReader(textReader);
+      //var result = (HasBytes)JsonSerializer.Create(null)
+      //                 .Deserialize(jsonReader, typeof(HasBytes));
+
+      var jToken = JToken.ReadFrom(jsonReader);
+
+      jsonReader = new JTokenReader(jToken);
+
+      var result2 = (HasBytes)JsonSerializer.Create(null)
+                 .Deserialize(jsonReader, typeof(HasBytes));
+
+      Assert.AreEqual(new byte[] { 1, 2, 3, 4 }, result2.Bytes);
+    }
   }
 }

Src/Newtonsoft.Json/Converters/KeyValuePairConverter.cs

@@ -7,8 +7,17 @@
 
 namespace Newtonsoft.Json.Converters
 {
+  /// <summary>
+  /// Converts a <see cref="KeyValuePair{TKey,TValue}"/> to and from JSON.
+  /// </summary>
   public class KeyValuePairConverter : JsonConverter
   {
+    /// <summary>
+    /// Writes the JSON representation of the object.
+    /// </summary>
+    /// <param name="writer">The <see cref="JsonWriter"/> to write to.</param>
+    /// <param name="value">The value.</param>
+    /// <param name="serializer">The calling serializer.</param>
     public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
     {
       Type t = value.GetType();
@@ -23,6 +32,14 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
       writer.WriteEndObject();
     }
 
+    /// <summary>
+    /// Reads the JSON representation of the object.
+    /// </summary>
+    /// <param name="reader">The <see cref="JsonReader"/> to read from.</param>
+    /// <param name="objectType">Type of the object.</param>
+    /// <param name="existingValue">The existing value of object being read.</param>
+    /// <param name="serializer">The calling serializer.</param>
+    /// <returns>The object value.</returns>
     public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
     {
       IList<Type> genericArguments = objectType.GetGenericArguments();
@@ -40,6 +57,13 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
       return ReflectionUtils.CreateInstance(objectType, key, value);
     }
 
+    /// <summary>
+    /// Determines whether this instance can convert the specified object type.
+    /// </summary>
+    /// <param name="objectType">Type of the object.</param>
+    /// <returns>
+    /// 	<c>true</c> if this instance can convert the specified object type; otherwise, <c>false</c>.
+    /// </returns>
     public override bool CanConvert(Type objectType)
     {
       if (objectType.IsValueType && objectType.IsGenericType)

Src/Newtonsoft.Json/Linq/JTokenReader.cs

@@ -37,6 +37,14 @@ public JTokenReader(JToken token)
     public override byte[] ReadAsBytes()
     {
       Read();
+
+      // attempt to convert possible base 64 string to bytes
+      if (TokenType == JsonToken.String)
+      {
+        byte[] data = Convert.FromBase64String((string)Value);
+        SetToken(JsonToken.Bytes, data);
+      }
+
       if (TokenType != JsonToken.Bytes)
         throw new JsonReaderException("Error reading bytes. Expected bytes but got {0}.".FormatWith(CultureInfo.InvariantCulture, TokenType));