Message: fixed serialization

ONLYOFFICE · Dec 13, 2023 · aba68fd · aba68fd
1 parent fbf12d5
commit aba68fd
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/common/ASC.MessagingSystem/Core/MessageService.cs b/common/ASC.MessagingSystem/Core/MessageService.cs
@@ -24,6 +24,8 @@
 // content are licensed under the terms of the Creative Commons Attribution-ShareAlike 4.0
 // International. See the License terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
 
+using System.Text.Json.Serialization;
+
 namespace ASC.MessagingSystem.Core;
 
 [Scope]
@@ -278,13 +280,19 @@ private bool TryAddNotificationParam(MessageAction action, List<Guid> userIds, o
             {
                 UserIds = userIds,
                 UserRole = (int)userType
+            }, new JsonSerializerOptions
+            {
+                 DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull
             });
         }
         else if (action is MessageAction.UserCreated or MessageAction.UserUpdated)
         {
             parametr = JsonSerializer.Serialize(new AdditionalNotificationInfo
             {
                 UserIds = userIds
+            }, new JsonSerializerOptions
+            {
+                DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull
             });
         }
         else

diff --git a/products/ASC.Files/Core/Helpers/FilesMessageService.cs b/products/ASC.Files/Core/Helpers/FilesMessageService.cs
@@ -250,7 +250,7 @@ public async Task SendAsync<T>(MessageAction action, FileEntry<T> entry, Message
             _ => string.Empty
         };
 
-        var serializedParam = JsonSerializer.Serialize(info);
+        var serializedParam = JsonSerializer.Serialize(info, new JsonSerializerOptions{ DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull });
 
         return serializedParam;
     }