Revert ByteArrayJsonConverter Impl

Author: TanayParikh

src/JSInterop/Microsoft.JSInterop/src/Infrastructure/ByteArrayJsonConverter.cs

@@ -29,19 +29,39 @@ public ByteArrayJsonConverter(JSRuntime jSRuntime)
                 throw new JsonException("ByteArraysToBeRevived is empty.");
             }
 
-            var byteArrayRef = JsonSerializer.Deserialize<ByteArrayRef>(ref reader, options);
+            int? byteArrayRef = null;
 
-            if (byteArrayRef.Id is null)
+            while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+            {
+                if (reader.TokenType == JsonTokenType.PropertyName)
+                {
+                    if (byteArrayRef is null && reader.ValueTextEquals(ByteArrayRefKey.EncodedUtf8Bytes))
+                    {
+                        reader.Read();
+                        byteArrayRef = reader.GetInt32();
+                    }
+                    else
+                    {
+                        throw new JsonException($"Unexpected JSON property {reader.GetString()}.");
+                    }
+                }
+                else
+                {
+                    throw new JsonException($"Unexpected JSON Token {reader.TokenType}.");
+                }
+            }
+
+            if (byteArrayRef is null)
             {
                 throw new JsonException($"Required property {ByteArrayRefKey} not found.");
             }
 
-            if (byteArrayRef.Id >= JSRuntime.ByteArraysToBeRevived.Count || byteArrayRef.Id < 0)
+            if (byteArrayRef >= JSRuntime.ByteArraysToBeRevived.Count || byteArrayRef < 0)
             {
-                throw new JsonException($"Byte array {byteArrayRef.Id} not found.");
+                throw new JsonException($"Byte array {byteArrayRef} not found.");
             }
 
-            var byteArray = JSRuntime.ByteArraysToBeRevived.Buffer[byteArrayRef.Id.Value];
+            var byteArray = JSRuntime.ByteArraysToBeRevived.Buffer[byteArrayRef.Value];
             return byteArray;
         }
 

src/JSInterop/Microsoft.JSInterop/test/Infrastructure/ByteArrayJsonConverterTest.cs

@@ -51,7 +51,7 @@ public void Read_Throws_IfJsonContainsUnknownContent()
 
             // Act & Assert
             var ex = Assert.Throws<JsonException>(() => JsonSerializer.Deserialize<byte[]>(json, JsonSerializerOptions));
-            Assert.Equal("Required property __byte[] not found.", ex.Message);
+            Assert.Equal("Unexpected JSON property foo.", ex.Message);
         }
 
         [Fact]
@@ -84,18 +84,19 @@ public void Read_ReadsJson()
         }
 
         [Fact]
-        public void Read_IfByteArraysIdAppearsMultipleTimesUseLastProperty()
+        public void Read_ByteArraysIdAppearsMultipleTimesThrows()
         {
             // Arrange
             var byteArray = new byte[] { 1, 5, 7 };
             JSRuntime.ByteArraysToBeRevived.Append(byteArray);
 
             var json = $"{{\"__byte[]\":9120,\"__byte[]\":0}}";
 
-            var deserialized = JsonSerializer.Deserialize<byte[]>(json, JsonSerializerOptions)!;
+            // Act
+            var ex = Assert.Throws<JsonException>(() => JsonSerializer.Deserialize<byte[]>(json, JsonSerializerOptions));
 
-            // Act & Assert
-            Assert.Equal(byteArray, deserialized);
+            // Assert
+            Assert.Equal("Unexpected JSON property __byte[].", ex.Message);
         }
 
         [Fact]