Update the MongoDB stores to use BsonDocument.Parse() to ensure prope…

…rties are correctly serialized
openiddict · Oct 5, 2019 · 2175c96 · 2175c96
1 parent 53086ac
commit 2175c96
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/src/OpenIddict.MongoDb/Stores/OpenIddictApplicationStore.cs b/src/OpenIddict.MongoDb/Stores/OpenIddictApplicationStore.cs
@@ -16,6 +16,7 @@
 using MongoDB.Bson;
 using MongoDB.Driver;
 using MongoDB.Driver.Linq;
+using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using OpenIddict.Abstractions;
 using OpenIddict.MongoDb.Models;
@@ -757,7 +758,7 @@ public virtual Task SetPropertiesAsync([NotNull] TApplication application, [CanB
                 return Task.CompletedTask;
             }
 
-            application.Properties = new BsonDocument(properties.ToObject<IDictionary<string, object>>());
+            application.Properties = BsonDocument.Parse(properties.ToString(Formatting.None));
 
             return Task.CompletedTask;
         }

diff --git a/src/OpenIddict.MongoDb/Stores/OpenIddictAuthorizationStore.cs b/src/OpenIddict.MongoDb/Stores/OpenIddictAuthorizationStore.cs
@@ -16,6 +16,7 @@
 using MongoDB.Bson;
 using MongoDB.Driver;
 using MongoDB.Driver.Linq;
+using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using OpenIddict.Abstractions;
 using OpenIddict.MongoDb.Models;
@@ -754,7 +755,7 @@ public virtual Task SetPropertiesAsync([NotNull] TAuthorization authorization, [
                 return Task.CompletedTask;
             }
 
-            authorization.Properties = new BsonDocument(properties.ToObject<IDictionary<string, object>>());
+            authorization.Properties = BsonDocument.Parse(properties.ToString(Formatting.None));
 
             return Task.CompletedTask;
         }

diff --git a/src/OpenIddict.MongoDb/Stores/OpenIddictScopeStore.cs b/src/OpenIddict.MongoDb/Stores/OpenIddictScopeStore.cs
@@ -16,6 +16,7 @@
 using MongoDB.Bson;
 using MongoDB.Driver;
 using MongoDB.Driver.Linq;
+using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using OpenIddict.Abstractions;
 using OpenIddict.MongoDb.Models;
@@ -550,7 +551,7 @@ public virtual Task SetPropertiesAsync([NotNull] TScope scope, [CanBeNull] JObje
                 return Task.CompletedTask;
             }
 
-            scope.Properties = new BsonDocument(properties.ToObject<IDictionary<string, object>>());
+            scope.Properties = BsonDocument.Parse(properties.ToString(Formatting.None));
 
             return Task.CompletedTask;
         }

diff --git a/src/OpenIddict.MongoDb/Stores/OpenIddictTokenStore.cs b/src/OpenIddict.MongoDb/Stores/OpenIddictTokenStore.cs
@@ -16,6 +16,7 @@
 using MongoDB.Bson;
 using MongoDB.Driver;
 using MongoDB.Driver.Linq;
+using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using OpenIddict.Abstractions;
 using OpenIddict.MongoDb.Models;
@@ -860,7 +861,7 @@ public virtual Task SetPropertiesAsync([NotNull] TToken token, [CanBeNull] JObje
                 return Task.CompletedTask;
             }
 
-            token.Properties = new BsonDocument(properties.ToObject<IDictionary<string, object>>());
+            token.Properties = BsonDocument.Parse(properties.ToString(Formatting.None));
 
             return Task.CompletedTask;
         }