bitwarden/server
1
0
Fork 0
mirror of https://github.com/bitwarden/server synced 2025-12-20 02:03:46 +00:00
Code Issues Releases Wiki Activity

stub out fields and secure note models

Browse Source
This commit is contained in:
Kyle Spearrin
2017-09-13 16:54:23 -04:00
parent d2405bc1cc
commit 27216efd1f
9 changed files with 102 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/Core/Models/Api/Request/CipherRequestModel.cs
View File

@@ -37,16 +37,8 @@ namespace Bit.Core.Models.Api
[EncryptedString]
[StringLength(1000)]
public string Totp { get; set; }
public virtual Cipher ToCipher(Guid userId)
{
return ToCipher(new Cipher
{
Id = new Guid(Id),
UserId = string.IsNullOrWhiteSpace(OrganizationId) ? (Guid?)userId : null,
Type = Type
});
}
public IEnumerable<FieldDataModel> Fields { get; set; }
public Dictionary<string, string> Attachments { get; set; }
public virtual Cipher ToCipher(Cipher existingCipher)
{
@@ -60,29 +52,23 @@ namespace Bit.Core.Models.Api
throw new ArgumentException("Unsupported " + nameof(Type) + ".");
}
return existingCipher;
}
}
public class CipherAttachmentRequestModel : CipherRequestModel
{
public Dictionary<string, string> Attachments { get; set; }
public override Cipher ToCipher(Cipher existingCipher)
{
base.ToCipher(existingCipher);
var attachments = existingCipher.GetAttachments();
if((Attachments?.Count ?? 0) > 0 && (attachments?.Count ?? 0) > 0)
if((Attachments?.Count ?? 0) == 0)
{
foreach(var attachment in existingCipher.GetAttachments().Where(a => Attachments.ContainsKey(a.Key)))
{
attachment.Value.FileName = Attachments[attachment.Key];
}
existingCipher.SetAttachments(attachments);
return existingCipher;
}
var attachments = existingCipher.GetAttachments();
if((attachments?.Count ?? 0) == 0)
{
return existingCipher;
}
foreach(var attachment in attachments.Where(a => Attachments.ContainsKey(a.Key)))
{
attachment.Value.FileName = Attachments[attachment.Key];
}
existingCipher.SetAttachments(attachments);
return existingCipher;
}
}
@@ -92,7 +78,7 @@ namespace Bit.Core.Models.Api
[Required]
public IEnumerable<string> CollectionIds { get; set; }
[Required]
public CipherAttachmentRequestModel Cipher { get; set; }
public CipherRequestModel Cipher { get; set; }
public IEnumerable<ValidationResult> Validate(ValidationContext validationContext)
{

2
src/Core/Models/Api/Request/LoginRequestModel.cs
View File

@@ -4,6 +4,7 @@ using Bit.Core.Utilities;
using Newtonsoft.Json;
using Core.Models.Data;
using Bit.Core.Models.Table;
using System.Collections.Generic;
namespace Bit.Core.Models.Api
{
@@ -33,6 +34,7 @@ namespace Bit.Core.Models.Api
[EncryptedString]
[StringLength(1000)]
public string Totp { get; set; }
public IEnumerable<FieldDataModel> Fields { get; set; }
public CipherDetails ToCipherDetails(Guid userId)
{