Getting rid of CipherDataModel in favor of more specific models. Optimizations to model transformations.

src/Api/Models/CipherDataModel.cs

@@ -1,36 +0,0 @@
-namespace Bit.Api.Models
-{
-    public class CipherDataModel
-    {
-        public CipherDataModel() { }
-
-        public CipherDataModel(CipherRequestModel cipher)
-        {
-            Name = cipher.Name;
-            Uri = cipher.Uri;
-            Username = cipher.Username;
-            Password = cipher.Password;
-            Notes = cipher.Notes;
-        }
-
-        public CipherDataModel(SiteRequestModel site)
-        {
-            Name = site.Name;
-            Uri = site.Uri;
-            Username = site.Username;
-            Password = site.Password;
-            Notes = site.Notes;
-        }
-
-        public CipherDataModel(FolderRequestModel folder)
-        {
-            Name = folder.Name;
-        }
-
-        public string Name { get; set; }
-        public string Uri { get; set; }
-        public string Username { get; set; }
-        public string Password { get; set; }
-        public string Notes { get; set; }
-    }
-}

src/Api/Models/FolderDataModel.cs

@@ -0,0 +1,35 @@
+using System;
+using Bit.Core.Domains;
+using Newtonsoft.Json;
+
+namespace Bit.Api.Models
+{
+    public class FolderDataModel
+    {
+        public FolderDataModel() { }
+
+        public FolderDataModel(FolderRequestModel folder)
+        {
+            Name = folder.Name;
+        }
+
+        public FolderDataModel(CipherRequestModel cipher)
+        {
+            Name = cipher.Name;
+        }
+
+        public FolderDataModel(Cipher cipher)
+        {
+            if(cipher.Type != Core.Enums.CipherType.Folder)
+            {
+                throw new ArgumentException("Cipher is not correct type.");
+            }
+
+            var data = JsonConvert.DeserializeObject<FolderDataModel>(cipher.Data);
+
+            Name = data.Name;
+        }
+
+        public string Name { get; set; }
+    }
+}

src/Api/Models/Request/CipherRequestModel.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using Bit.Api.Utilities;
 using Bit.Core.Domains;
@@ -8,7 +7,7 @@ using Newtonsoft.Json;
 
 namespace Bit.Api.Models
 {
-    public class CipherRequestModel : IValidatableObject
+    public class CipherRequestModel
     {
         public CipherType Type { get; set; }
 
@@ -36,29 +35,27 @@ namespace Bit.Api.Models
 
         public virtual Cipher ToCipher(string userId = null)
         {
-            return new Cipher
+            var cipher = new Cipher
             {
                 Id = new Guid(Id),
                 UserId = new Guid(userId),
                 FolderId = string.IsNullOrWhiteSpace(FolderId) ? null : (Guid?)new Guid(FolderId),
-                Type = Type,
+                Type = Type
-                Data = JsonConvert.SerializeObject(new CipherDataModel(this), new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore })
             };
-        }
 
-        public IEnumerable<ValidationResult> Validate(ValidationContext validationContext)
+            switch(Type)
-        {
-            if(Type == CipherType.Site)
             {
-                if(string.IsNullOrWhiteSpace(Uri))
+                case CipherType.Folder:
-                {
+                    cipher.Data = JsonConvert.SerializeObject(new FolderDataModel(this), new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore });
-                    yield return new ValidationResult("Uri is required for a site cypher.", new[] { "Uri" });
+                    break;
-                }
+                case CipherType.Site:
-                if(string.IsNullOrWhiteSpace(Password))
+                    cipher.Data = JsonConvert.SerializeObject(new SiteDataModel(this), new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore });
-                {
+                    break;
-                    yield return new ValidationResult("Password is required for a site cypher.", new[] { "Password" });
+                default:
-                }
+                    throw new ArgumentException("Unsupported " + nameof(Type) + ".");
             }
+
+            return cipher;
         }
     }
 }

src/Api/Models/Request/FolderRequestModel.cs

@@ -15,17 +15,15 @@ namespace Bit.Api.Models
 
         public Cipher ToCipher(string userId = null)
         {
-            return new Cipher
+            return ToCipher(new Cipher
             {
-                UserId = new Guid(userId),
+                UserId = new Guid(userId)
-                Data = JsonConvert.SerializeObject(new CipherDataModel(this), new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore }),
+            });
-                Type = Core.Enums.CipherType.Folder
-            };
         }
 
         public Cipher ToCipher(Cipher existingFolder)
         {
-            existingFolder.Data = JsonConvert.SerializeObject(new CipherDataModel(this), new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore });
+            existingFolder.Data = JsonConvert.SerializeObject(new FolderDataModel(this), new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore });
             existingFolder.Type = Core.Enums.CipherType.Folder;
 
             return existingFolder;

src/Api/Models/Request/SiteRequestModel.cs

@@ -31,19 +31,16 @@ namespace Bit.Api.Models
 
         public Cipher ToCipher(string userId = null)
         {
-            return new Cipher
+            return ToCipher(new Cipher
             {
-                UserId = new Guid(userId),
+                UserId = new Guid(userId)
-                FolderId = string.IsNullOrWhiteSpace(FolderId) ? null : (Guid?)new Guid(FolderId),
+            });
-                Data = JsonConvert.SerializeObject(new CipherDataModel(this), new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore }),
-                Type = Core.Enums.CipherType.Site
-            };
         }
 
         public Cipher ToCipher(Cipher existingSite)
         {
             existingSite.FolderId = string.IsNullOrWhiteSpace(FolderId) ? null : (Guid?)new Guid(FolderId);
-            existingSite.Data = JsonConvert.SerializeObject(new CipherDataModel(this), new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore });
+            existingSite.Data = JsonConvert.SerializeObject(new SiteDataModel(this), new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore });
             existingSite.Type = Core.Enums.CipherType.Site;
 
             return existingSite;

src/Api/Models/Response/CipherResponseModel.cs

@@ -18,12 +18,24 @@ namespace Bit.Api.Models
             Type = cipher.Type;
             Data = cipher.Data;
             RevisionDate = cipher.RevisionDate;
+
+            switch(cipher.Type)
+            {
+                case Core.Enums.CipherType.Folder:
+                    Data = new FolderDataModel(cipher);
+                    break;
+                case Core.Enums.CipherType.Site:
+                    Data = new SiteDataModel(cipher);
+                    break;
+                default:
+                    throw new ArgumentException("Unsupported " + nameof(Type) + ".");
+            }
         }
 
         public string Id { get; set; }
         public string FolderId { get; set; }
         public Core.Enums.CipherType Type { get; set; }
-        public string Data { get; set; }
+        public dynamic Data { get; set; }
-        public DateTime RevisionDate { get; internal set; } = DateTime.UtcNow;
+        public DateTime RevisionDate { get; set; }
     }
 }

src/Api/Models/Response/FolderResponseModel.cs

@@ -1,6 +1,5 @@
 using System;
 using Bit.Core.Domains;
-using Newtonsoft.Json;
 
 namespace Bit.Api.Models
 {
@@ -19,7 +18,7 @@ namespace Bit.Api.Models
                 throw new ArgumentException(nameof(cipher.Type));
             }
 
-            var data = JsonConvert.DeserializeObject<CipherDataModel>(cipher.Data);
+            var data = new FolderDataModel(cipher);
 
             Id = cipher.Id.ToString();
             Name = data.Name;

src/Api/Models/Response/SiteResponseModel.cs

@@ -19,7 +19,7 @@ namespace Bit.Api.Models
                 throw new ArgumentException(nameof(cipher.Type));
             }
 
-            var data = JsonConvert.DeserializeObject<CipherDataModel>(cipher.Data);
+            var data = new SiteDataModel(cipher);
 
             Id = cipher.Id.ToString();
             FolderId = cipher.FolderId?.ToString();

src/Api/Models/SiteDataModel.cs

@@ -0,0 +1,51 @@
+using System;
+using Bit.Core.Domains;
+using Newtonsoft.Json;
+
+namespace Bit.Api.Models
+{
+    public class SiteDataModel
+    {
+        public SiteDataModel() { }
+
+        public SiteDataModel(SiteRequestModel site)
+        {
+            Name = site.Name;
+            Uri = site.Uri;
+            Username = site.Username;
+            Password = site.Password;
+            Notes = site.Notes;
+        }
+
+        public SiteDataModel(CipherRequestModel cipher)
+        {
+            Name = cipher.Name;
+            Uri = cipher.Uri;
+            Username = cipher.Username;
+            Password = cipher.Password;
+            Notes = cipher.Notes;
+        }
+
+        public SiteDataModel(Cipher cipher)
+        {
+            if(cipher.Type != Core.Enums.CipherType.Site)
+            {
+                throw new ArgumentException("Cipher is not correct type.");
+            }
+
+            var data = JsonConvert.DeserializeObject<SiteDataModel>(cipher.Data);
+
+            Name = data.Name;
+            Uri = data.Uri;
+            Username = data.Username;
+            Password = data.Password;
+            Notes = data.Notes;
+        }
+
+        public string Name { get; set; }
+        public string Uri { get; set; }
+        public string Username { get; set; }
+        public string Password { get; set; }
+        public string Notes { get; set; }
+    }
+}