diff --git a/src/Api/Models/Request/SendRequestModel.cs b/src/Api/Models/Request/SendRequestModel.cs index 19dbb45138..106f4b5c65 100644 --- a/src/Api/Models/Request/SendRequestModel.cs +++ b/src/Api/Models/Request/SendRequestModel.cs @@ -71,8 +71,7 @@ namespace Bit.Api.Models.Request existingSend.Data = JsonSerializer.Serialize(fileData, JsonHelpers.IgnoreWritingNull); break; case SendType.Text: - var sendData = ToSendData(); - existingSend.Data = JsonSerializer.Serialize(sendData, sendData.GetType(), JsonHelpers.IgnoreWritingNull); + existingSend.Data = JsonSerializer.Serialize(ToSendData(), JsonHelpers.IgnoreWritingNull); break; default: throw new ArgumentException("Unsupported type: " + nameof(Type) + "."); diff --git a/test/Api.Test/Models/Request/SendRequestModelTests.cs b/test/Api.Test/Models/Request/SendRequestModelTests.cs deleted file mode 100644 index 06959c014f..0000000000 --- a/test/Api.Test/Models/Request/SendRequestModelTests.cs +++ /dev/null @@ -1,61 +0,0 @@ -using System; -using System.Text.Json; -using Bit.Api.Models; -using Bit.Api.Models.Request; -using Bit.Core.Enums; -using Bit.Core.Services; -using Bit.Test.Common.Helpers; -using NSubstitute; -using Xunit; - -namespace Bit.Api.Test.Models.Request -{ - public class SendRequestModelTests - { - [Fact] - public void ToSend_Text_Success() - { - var deletionDate = DateTime.UtcNow.AddDays(5); - var sendRequest = new SendRequestModel - { - DeletionDate = deletionDate, - Disabled = false, - ExpirationDate = null, - HideEmail = false, - Key = "encrypted_key", - MaxAccessCount = null, - Name = "encrypted_name", - Notes = null, - Password = "Password", - Text = new SendTextModel() - { - Hidden = false, - Text = "encrypted_text" - }, - Type = SendType.Text, - }; - - var sendService = Substitute.For(); - sendService.HashPassword(Arg.Any()) - .Returns((info) => $"hashed_{(string)info[0]}"); - - var send = sendRequest.ToSend(Guid.NewGuid(), sendService); - - Assert.Equal(deletionDate, send.DeletionDate); - Assert.False(send.Disabled); - Assert.Null(send.ExpirationDate); - Assert.False(send.HideEmail); - Assert.Equal("encrypted_key", send.Key); - Assert.Equal("hashed_Password", send.Password); - - using var jsonDocument = JsonDocument.Parse(send.Data); - var root = jsonDocument.RootElement; - var text = AssertHelper.AssertJsonProperty(root, "Text", JsonValueKind.String).GetString(); - Assert.Equal("encrypted_text", text); - AssertHelper.AssertJsonProperty(root, "Hidden", JsonValueKind.False); - Assert.False(root.TryGetProperty("Notes", out var _)); - var name = AssertHelper.AssertJsonProperty(root, "Name", JsonValueKind.String).GetString(); - Assert.Equal("encrypted_name", name); - } - } -}