nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-04-05 13:08:17 -05:00
Code

fix cipher attachment saving on EF repos (#2365)

Browse Source
This commit is contained in:
Kyle Spearrin 2022-10-26 11:20:10 -04:00 committed by GitHub
parent 351f62866b
commit 20ddd9ae8c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Infrastructure.EntityFramework/Repositories/BaseEntityFrameworkRepository.cs
View File

@ -124,8 +124,8 @@ public abstract class BaseEntityFrameworkRepository
!string.IsNullOrWhiteSpace(e.Attachments)) !string.IsNullOrWhiteSpace(e.Attachments))
.Select(e => e.Attachments) .Select(e => e.Attachments)
.ToListAsync(); .ToListAsync();
var storage = attachments.Sum(e => JsonDocument.Parse(e)?.RootElement.EnumerateArray() var storage = attachments.Sum(e => JsonDocument.Parse(e)?.RootElement.EnumerateObject()
.Sum(p => p.GetProperty("Size").GetInt64()) ?? 0); .Sum(p => p.Value.GetProperty("Size").GetInt64()) ?? 0);
var organization = new Organization var organization = new Organization
{ {
Id = organizationId, Id = organizationId,
@ -152,8 +152,8 @@ public abstract class BaseEntityFrameworkRepository
!string.IsNullOrWhiteSpace(e.Attachments)) !string.IsNullOrWhiteSpace(e.Attachments))
.Select(e => e.Attachments) .Select(e => e.Attachments)
.ToListAsync(); .ToListAsync();
var storage = attachments.Sum(e => JsonDocument.Parse(e)?.RootElement.EnumerateArray() var storage = attachments.Sum(e => JsonDocument.Parse(e)?.RootElement.EnumerateObject()
.Sum(p => p.GetProperty("Size").GetInt64()) ?? 0); .Sum(p => p.Value.GetProperty("Size").GetInt64()) ?? 0);
var user = new Models.User var user = new Models.User
{ {
Id = userId, Id = userId,

8
src/Infrastructure.EntityFramework/Repositories/CipherRepository.cs
View File

@ -549,9 +549,11 @@ public class CipherRepository : Repository<Core.Entities.Cipher, Cipher, Guid>,
{ {
var dbContext = GetDatabaseContext(scope); var dbContext = GetDatabaseContext(scope);
var cipher = await dbContext.Ciphers.FindAsync(attachment.Id); var cipher = await dbContext.Ciphers.FindAsync(attachment.Id);
var attachmentsJson = string.IsNullOrWhiteSpace(cipher.Attachments) ? new JObject() : JObject.Parse(cipher.Attachments); var attachments = string.IsNullOrWhiteSpace(cipher.Attachments) ?
attachmentsJson.Add(attachment.AttachmentId, attachment.AttachmentData); new Dictionary<string, CipherAttachment.MetaData>() :
cipher.Attachments = JsonConvert.SerializeObject(attachmentsJson); JsonConvert.DeserializeObject<Dictionary<string, CipherAttachment.MetaData>>(cipher.Attachments);
attachments.Add(attachment.AttachmentId, JsonConvert.DeserializeObject<CipherAttachment.MetaData>(attachment.AttachmentData));
cipher.Attachments = JsonConvert.SerializeObject(attachments);
await dbContext.SaveChangesAsync(); await dbContext.SaveChangesAsync();
if (attachment.OrganizationId.HasValue) if (attachment.OrganizationId.HasValue)