Spatial: Fixes deserialization when Json does not represent a Spatial…

… type (#2311) * when null * test Co-authored-by: j82w <j82w@users.noreply.github.com>
Azure · Mar 16, 2021 · 9f9b264 · 9f9b264
1 parent 1de5db6
commit 9f9b264
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/Microsoft.Azure.Cosmos/src/Spatial/Converters/GeometryJsonConverter.cs b/Microsoft.Azure.Cosmos/src/Spatial/Converters/GeometryJsonConverter.cs
@@ -61,7 +61,8 @@ public override object ReadJson(
             }
 
             JToken typeToken = token["type"];
-            if (typeToken.Type != JTokenType.String)
+            if (typeToken == null 
+                || typeToken.Type != JTokenType.String)
             {
                 throw new JsonSerializationException(RMResources.SpatialInvalidGeometryType);
             }

diff --git a/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.Tests/Spatial/CommonSerializationTest.cs b/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.Tests/Spatial/CommonSerializationTest.cs
@@ -29,6 +29,17 @@ public void TestInvalidJson()
             Point point = JsonConvert.DeserializeObject<Point>(json);
         }
 
+        /// <summary>
+        /// Tests that no type throws exception.
+        /// </summary>
+        [TestMethod]
+        [ExpectedException(typeof(JsonSerializationException))]
+        public void TestNoType()
+        {
+            string json = @"{""notatype"":""nothingrelevant""}";
+            Point point = JsonConvert.DeserializeObject<Point>(json);
+        }
+
         /// <summary>
         /// Tests that coordinates cannot be null.
         /// </summary>