"user key" schema and api changes

src/Core/Models/Api/Request/Accounts/EmailRequestModel.cs

@@ -18,6 +18,6 @@ namespace Bit.Core.Models.Api
         [Required]
         public string Token { get; set; }
         [Required]
-        public DataReloadRequestModel Data { get; set; }
+        public string Key { get; set; }
     }
 }

src/Core/Models/Api/Request/Accounts/PasswordRequestModel.cs

@@ -12,6 +12,6 @@ namespace Bit.Core.Models.Api
         [StringLength(300)]
         public string NewMasterPasswordHash { get; set; }
         [Required]
-        public DataReloadRequestModel Data { get; set; }
+        public string Key { get; set; }
     }
 }

src/Core/Models/Api/Request/Accounts/RegisterRequestModel.cs

@@ -16,6 +16,7 @@ namespace Bit.Core.Models.Api
         public string MasterPasswordHash { get; set; }
         [StringLength(50)]
         public string MasterPasswordHint { get; set; }
+        public string Key { get; set; }
         public KeysRequestModel Keys { get; set; }
 
         public User ToUser()
@@ -27,6 +28,11 @@ namespace Bit.Core.Models.Api
                 MasterPasswordHint = MasterPasswordHint
             };
 
+            if(Key != null)
+            {
+                user.Key = Key;
+            }
+
             if(Keys != null)
             {
                 Keys.ToUser(user);

src/Core/Models/Api/Request/Accounts/UpdateKeyRequestModel.cs

@@ -3,13 +3,18 @@ using System.ComponentModel.DataAnnotations;
 
 namespace Bit.Core.Models.Api
 {
-    public class DataReloadRequestModel
+    public class UpdateKeyRequestModel
     {
+        [Required]
+        [StringLength(300)]
+        public string MasterPasswordHash { get; set; }
         [Required]
         public IEnumerable<LoginWithIdRequestModel> Ciphers { get; set; }
         [Required]
         public IEnumerable<FolderWithIdRequestModel> Folders { get; set; }
         [Required]
         public string PrivateKey { get; set; }
+        [Required]
+        public string Key { get; set; }
     }
 }

src/Core/Models/Api/Response/KeysResponseModel.cs

@@ -13,10 +13,12 @@ namespace Bit.Core.Models.Api
                 throw new ArgumentNullException(nameof(user));
             }
 
+            Key = user.Key;
             PublicKey = user.PublicKey;
             PrivateKey = user.PrivateKey;
         }
 
+        public string Key { get; set; }
         public string PublicKey { get; set; }
         public string PrivateKey { get; set; }
     }

src/Core/Models/Table/User.cs

@@ -21,6 +21,7 @@ namespace Bit.Core.Models.Table
         public string EquivalentDomains { get; set; }
         public string ExcludedGlobalEquivalentDomains { get; set; }
         public DateTime AccountRevisionDate { get; internal set; } = DateTime.UtcNow;
+        public string Key { get; set; }
         public string PublicKey { get; set; }
         public string PrivateKey { get; set; }
         public DateTime CreationDate { get; internal set; } = DateTime.UtcNow;