Add EncObject

Author: Hinton

src/Api/Models/Request/CipherRequestModel.cs

@@ -86,7 +86,7 @@ public Cipher ToCipher(Cipher existingCipher)
                     existingCipher.Data = JsonSerializer.Serialize(ToCipherSecureNoteData(), JsonHelpers.IgnoreWritingNull);
                     break;
                 default:
-                    existingCipher.Data = JsonSerializer.Serialize(ToCipherCustomData(), JsonHelpers.IgnoreWritingNull);
+                    //existingCipher.Data = JsonSerializer.Serialize(ToCipherCustomData(), JsonHelpers.IgnoreWritingNull);
                     break;
             }
 
@@ -231,17 +231,6 @@ private CipherSecureNoteData ToCipherSecureNoteData()
                 Type = SecureNote.Type,
             };
         }
-
-        private CipherCustomData ToCipherCustomData()
-        {
-            return new CipherCustomData
-            {
-                Name = Name,
-                Notes = Notes,
-                Fields = Fields?.Select(f => f.ToCipherFieldData()),
-                PasswordHistory = PasswordHistory?.Select(ph => ph.ToCipherPasswordHistoryData()),
-            };
-        }
     }
 
     public class CipherWithIdRequestModel : CipherRequestModel

src/Api/Models/Response/CipherResponseModel.cs

@@ -52,16 +52,19 @@ public CipherMiniResponseModel(Cipher cipher, IGlobalSettings globalSettings, bo
                     Identity = new CipherIdentityModel(identityData);
                     break;
                 default:
-                    var customData = JsonSerializer.Deserialize<CipherCustomData>(cipher.Data);
+                    var customData = JsonSerializer.Deserialize<EncObject>(cipher.Data);
                     Data = customData;
-                    cipherData = customData;
+                    cipherData = null;
                     break;
             }
 
-            Name = cipherData.Name;
-            Notes = cipherData.Notes;
-            Fields = cipherData.Fields?.Select(f => new CipherFieldModel(f));
-            PasswordHistory = cipherData.PasswordHistory?.Select(ph => new CipherPasswordHistoryModel(ph));
+            if (cipherData != null)
+            {
+                Name = cipherData.Name;
+                Notes = cipherData.Notes;
+                Fields = cipherData.Fields?.Select(f => new CipherFieldModel(f));
+                PasswordHistory = cipherData.PasswordHistory?.Select(ph => new CipherPasswordHistoryModel(ph));
+            }
             RevisionDate = cipher.RevisionDate;
             OrganizationId = cipher.OrganizationId?.ToString();
             Attachments = AttachmentResponseModel.FromCipher(cipher, globalSettings);

src/Core/Enums/CipherType.cs

@@ -7,6 +7,6 @@ public enum CipherType : byte
         Login = 1,
         SecureNote = 2,
         Card = 3,
-        Identity = 4
+        Identity = 4,
     }
 }

src/Core/Models/Data/Cipher/CipherCustomData.cs

@@ -0,0 +1,12 @@
+using Bit.Core.Enums;
+
+namespace Bit.Core.Models.Data
+{
+    public class EncObject
+    {
+        public EncryptionType Type { get; set; }
+        public string Data { get; set; }
+        public string Iv { get; set; }
+        public string Mac { get; set; }
+    }
+}