nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-05-20 19:14:32 -05:00
Code

[PM-4252] Change attachment Size to be represented as a string (#3335)

Browse Source
This commit is contained in:
Oscar Hinton 2023-10-23 16:56:04 +02:00 committed by GitHub
parent 19e2215376
commit 18b43130e8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Api/Vault/Models/Response/AttachmentResponseModel.cs
View File

@ -1,5 +1,4 @@
using System.Text.Json.Serialization; using Bit.Core.Models.Api;
using Bit.Core.Models.Api;
using Bit.Core.Settings; using Bit.Core.Settings;
using Bit.Core.Utilities; using Bit.Core.Utilities;
using Bit.Core.Vault.Entities; using Bit.Core.Vault.Entities;
@ -15,7 +14,7 @@ public class AttachmentResponseModel : ResponseModel
Url = data.Url; Url = data.Url;
FileName = data.Data.FileName; FileName = data.Data.FileName;
Key = data.Data.Key; Key = data.Data.Key;
Size = data.Data.Size; Size = data.Data.Size.ToString();
SizeName = CoreHelpers.ReadableBytesSize(data.Data.Size); SizeName = CoreHelpers.ReadableBytesSize(data.Data.Size);
} }
@ -27,7 +26,7 @@ public class AttachmentResponseModel : ResponseModel
Url = $"{globalSettings.Attachment.BaseUrl}/{cipher.Id}/{id}"; Url = $"{globalSettings.Attachment.BaseUrl}/{cipher.Id}/{id}";
FileName = data.FileName; FileName = data.FileName;
Key = data.Key; Key = data.Key;
Size = data.Size; Size = data.Size.ToString();
SizeName = CoreHelpers.ReadableBytesSize(data.Size); SizeName = CoreHelpers.ReadableBytesSize(data.Size);
} }
@ -35,8 +34,7 @@ public class AttachmentResponseModel : ResponseModel
public string Url { get; set; } public string Url { get; set; }
public string FileName { get; set; } public string FileName { get; set; }
public string Key { get; set; } public string Key { get; set; }
[JsonNumberHandling(JsonNumberHandling.AllowReadingFromString | JsonNumberHandling.WriteAsString)] public string Size { get; set; }
public long Size { get; set; }
public string SizeName { get; set; } public string SizeName { get; set; }
public static IEnumerable<AttachmentResponseModel> FromCipher(Cipher cipher, IGlobalSettings globalSettings) public static IEnumerable<AttachmentResponseModel> FromCipher(Cipher cipher, IGlobalSettings globalSettings)