From a3338c59d3b1355903e7944b1427599ddbc41168 Mon Sep 17 00:00:00 2001
From: Bernd Schoolmann <mail@quexten.com>
Date: Tue, 2 Dec 2025 15:44:13 +0100
Subject: [PATCH] Move request models to core

---
 .../Auth/Models/Api/Request/Accounts/KeysRequestModel.cs     | 2 ++
 .../Models/Api/Request}/AccountKeysRequestModel.cs           | 5 ++---
 .../Api/Request}/PublicKeyEncryptionKeyPairRequestModel.cs   | 2 +-
 .../Models/Api/Request}/SignatureKeyPairRequestModel.cs      | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)
 rename src/{Api/KeyManagement/Models/Requests => Core/KeyManagement/Models/Api/Request}/AccountKeysRequestModel.cs (92%)
 rename src/{Api/KeyManagement/Models/Requests => Core/KeyManagement/Models/Api/Request}/PublicKeyEncryptionKeyPairRequestModel.cs (91%)
 rename src/{Api/KeyManagement/Models/Requests => Core/KeyManagement/Models/Api/Request}/SignatureKeyPairRequestModel.cs (93%)

diff --git a/src/Core/Auth/Models/Api/Request/Accounts/KeysRequestModel.cs b/src/Core/Auth/Models/Api/Request/Accounts/KeysRequestModel.cs
index f89b67f3c5..9769bbe0ea 100644
--- a/src/Core/Auth/Models/Api/Request/Accounts/KeysRequestModel.cs
+++ b/src/Core/Auth/Models/Api/Request/Accounts/KeysRequestModel.cs
@@ -3,6 +3,7 @@
 
 using System.ComponentModel.DataAnnotations;
 using Bit.Core.Entities;
+using Bit.Core.KeyManagement.Models.Api.Request;
 using Bit.Core.Utilities;
 
 namespace Bit.Core.Auth.Models.Api.Request.Accounts;
@@ -13,6 +14,7 @@ public class KeysRequestModel
     public string PublicKey { get; set; }
     [Required]
     public string EncryptedPrivateKey { get; set; }
+    public AccountKeysRequestModel accountKeys { get; set; }
 
     public User ToUser(User existingUser)
     {
diff --git a/src/Api/KeyManagement/Models/Requests/AccountKeysRequestModel.cs b/src/Core/KeyManagement/Models/Api/Request/AccountKeysRequestModel.cs
similarity index 92%
rename from src/Api/KeyManagement/Models/Requests/AccountKeysRequestModel.cs
rename to src/Core/KeyManagement/Models/Api/Request/AccountKeysRequestModel.cs
index b64e826911..bdf538e6d8 100644
--- a/src/Api/KeyManagement/Models/Requests/AccountKeysRequestModel.cs
+++ b/src/Core/KeyManagement/Models/Api/Request/AccountKeysRequestModel.cs
@@ -1,8 +1,7 @@
-using Bit.Core.KeyManagement.Models.Api.Request;
-using Bit.Core.KeyManagement.Models.Data;
+using Bit.Core.KeyManagement.Models.Data;
 using Bit.Core.Utilities;
 
-namespace Bit.Api.KeyManagement.Models.Requests;
+namespace Bit.Core.KeyManagement.Models.Api.Request;
 
 public class AccountKeysRequestModel
 {
diff --git a/src/Api/KeyManagement/Models/Requests/PublicKeyEncryptionKeyPairRequestModel.cs b/src/Core/KeyManagement/Models/Api/Request/PublicKeyEncryptionKeyPairRequestModel.cs
similarity index 91%
rename from src/Api/KeyManagement/Models/Requests/PublicKeyEncryptionKeyPairRequestModel.cs
rename to src/Core/KeyManagement/Models/Api/Request/PublicKeyEncryptionKeyPairRequestModel.cs
index 24c1e6a946..f9b009f7e2 100644
--- a/src/Api/KeyManagement/Models/Requests/PublicKeyEncryptionKeyPairRequestModel.cs
+++ b/src/Core/KeyManagement/Models/Api/Request/PublicKeyEncryptionKeyPairRequestModel.cs
@@ -1,7 +1,7 @@
 using Bit.Core.KeyManagement.Models.Data;
 using Bit.Core.Utilities;
 
-namespace Bit.Api.KeyManagement.Models.Requests;
+namespace Bit.Core.KeyManagement.Models.Api.Request;
 
 public class PublicKeyEncryptionKeyPairRequestModel
 {
diff --git a/src/Api/KeyManagement/Models/Requests/SignatureKeyPairRequestModel.cs b/src/Core/KeyManagement/Models/Api/Request/SignatureKeyPairRequestModel.cs
similarity index 93%
rename from src/Api/KeyManagement/Models/Requests/SignatureKeyPairRequestModel.cs
rename to src/Core/KeyManagement/Models/Api/Request/SignatureKeyPairRequestModel.cs
index 3cdb4f53f1..a569bc70ab 100644
--- a/src/Api/KeyManagement/Models/Requests/SignatureKeyPairRequestModel.cs
+++ b/src/Core/KeyManagement/Models/Api/Request/SignatureKeyPairRequestModel.cs
@@ -1,7 +1,7 @@
 using Bit.Core.KeyManagement.Models.Data;
 using Bit.Core.Utilities;
 
-namespace Bit.Api.KeyManagement.Models.Requests;
+namespace Bit.Core.KeyManagement.Models.Api.Request;
 
 public class SignatureKeyPairRequestModel
 {