From 210d06acb427bd0247cf91879fe7e6420ec4954c Mon Sep 17 00:00:00 2001
From: Maciej Zieniuk <mzieniuk@bitwarden.com>
Date: Sat, 29 Mar 2025 16:12:32 +0000
Subject: [PATCH] revert new key management endpoints

---
 .../AccountsKeyManagementController.cs        |  7 ++--
 .../AccountsKeyManagementControllerTests.cs   | 34 ++++++++-----------
 2 files changed, 16 insertions(+), 25 deletions(-)

diff --git a/src/Api/KeyManagement/Controllers/AccountsKeyManagementController.cs b/src/Api/KeyManagement/Controllers/AccountsKeyManagementController.cs
index 6ac0bb6448..7b0c98243d 100644
--- a/src/Api/KeyManagement/Controllers/AccountsKeyManagementController.cs
+++ b/src/Api/KeyManagement/Controllers/AccountsKeyManagementController.cs
@@ -57,7 +57,8 @@ public class AccountsKeyManagementController : Controller
             emergencyAccessValidator,
         IRotationValidator<IEnumerable<ResetPasswordWithOrgIdRequestModel>, IReadOnlyList<OrganizationUser>>
             organizationUserValidator,
-        IRotationValidator<IEnumerable<WebAuthnLoginRotateKeyRequestModel>, IEnumerable<WebAuthnLoginRotateKeyData>> webAuthnKeyValidator)
+        IRotationValidator<IEnumerable<WebAuthnLoginRotateKeyRequestModel>, IEnumerable<WebAuthnLoginRotateKeyData>>
+            webAuthnKeyValidator)
     {
         _userService = userService;
         _featureService = featureService;
@@ -129,8 +130,6 @@ public class AccountsKeyManagementController : Controller
         throw new BadRequestException(ModelState);
     }
 
-    [HttpPost("key-management/set-key-connector-key")]
-    // Backwards compatibility, to be deleted in the future
     [HttpPost("set-key-connector-key")]
     public async Task PostSetKeyConnectorKeyAsync([FromBody] SetKeyConnectorKeyRequestModel model)
     {
@@ -154,8 +153,6 @@ public class AccountsKeyManagementController : Controller
         throw new BadRequestException(ModelState);
     }
 
-    [HttpPost("key-management/convert-to-key-connector")]
-    // Backwards compatibility, to be deleted in the future
     [HttpPost("convert-to-key-connector")]
     public async Task PostConvertToKeyConnectorAsync()
     {
diff --git a/test/Api.IntegrationTest/KeyManagement/Controllers/AccountsKeyManagementControllerTests.cs b/test/Api.IntegrationTest/KeyManagement/Controllers/AccountsKeyManagementControllerTests.cs
index 054507976d..7acf475dde 100644
--- a/test/Api.IntegrationTest/KeyManagement/Controllers/AccountsKeyManagementControllerTests.cs
+++ b/test/Api.IntegrationTest/KeyManagement/Controllers/AccountsKeyManagementControllerTests.cs
@@ -175,7 +175,8 @@ public class AccountsKeyManagementControllerTests : IClassFixture<ApiApplication
 
     [Theory]
     [BitAutoData]
-    public async Task RotateUserAccountKeysAsync_NotLoggedIn_Unauthorized(RotateUserAccountKeysAndDataRequestModel request)
+    public async Task RotateUserAccountKeysAsync_NotLoggedIn_Unauthorized(
+        RotateUserAccountKeysAndDataRequestModel request)
     {
         var response = await _client.PostAsJsonAsync("/accounts/key-management/rotate-user-account-keys", request);
 
@@ -257,20 +258,17 @@ public class AccountsKeyManagementControllerTests : IClassFixture<ApiApplication
     }
 
     [Theory]
-    [BitAutoData("/accounts/key-management/set-key-connector-key")]
-    [BitAutoData("/accounts/set-key-connector-key")]
-    public async Task PostSetKeyConnectorKeyAsync_NotLoggedIn_Unauthorized(string uri,
-        SetKeyConnectorKeyRequestModel request)
+    [BitAutoData]
+    public async Task PostSetKeyConnectorKeyAsync_NotLoggedIn_Unauthorized(SetKeyConnectorKeyRequestModel request)
     {
-        var response = await _client.PostAsJsonAsync(uri, request);
+        var response = await _client.PostAsJsonAsync("/accounts/set-key-connector-key", request);
 
         Assert.Equal(HttpStatusCode.Unauthorized, response.StatusCode);
     }
 
     [Theory]
-    [BitAutoData("/accounts/key-management/set-key-connector-key")]
-    [BitAutoData("/accounts/set-key-connector-key")]
-    public async Task PostSetKeyConnectorKeyAsync_Success(string uri, string organizationSsoIdentifier,
+    [BitAutoData]
+    public async Task PostSetKeyConnectorKeyAsync_Success(string organizationSsoIdentifier,
         SetKeyConnectorKeyRequestModel request)
     {
         var (organization, _) = await OrganizationTestHelpers.SignUpAsync(_factory,
@@ -291,7 +289,7 @@ public class AccountsKeyManagementControllerTests : IClassFixture<ApiApplication
         request.Key = _mockEncryptedString;
         request.OrgIdentifier = organizationSsoIdentifier;
 
-        var response = await _client.PostAsJsonAsync(uri, request);
+        var response = await _client.PostAsJsonAsync("/accounts/set-key-connector-key", request);
         response.EnsureSuccessStatusCode();
 
         var user = await _userRepository.GetByEmailAsync(ssoUserEmail);
@@ -308,20 +306,16 @@ public class AccountsKeyManagementControllerTests : IClassFixture<ApiApplication
         Assert.Null(ssoOrganizationUser.Email);
     }
 
-    [Theory]
-    [BitAutoData("/accounts/key-management/convert-to-key-connector")]
-    [BitAutoData("/accounts/convert-to-key-connector")]
-    public async Task PostConvertToKeyConnectorAsync_NotLoggedIn_Unauthorized(string uri)
+    [Fact]
+    public async Task PostConvertToKeyConnectorAsync_NotLoggedIn_Unauthorized()
     {
-        var response = await _client.PostAsJsonAsync(uri, new { });
+        var response = await _client.PostAsJsonAsync("/accounts/convert-to-key-connector", new { });
 
         Assert.Equal(HttpStatusCode.Unauthorized, response.StatusCode);
     }
 
-    [Theory]
-    [BitAutoData("/accounts/key-management/convert-to-key-connector")]
-    [BitAutoData("/accounts/convert-to-key-connector")]
-    public async Task PostConvertToKeyConnectorAsync_Success(string uri)
+    [Fact]
+    public async Task PostConvertToKeyConnectorAsync_Success()
     {
         var (organization, _) = await OrganizationTestHelpers.SignUpAsync(_factory,
             PlanType.EnterpriseAnnually, _ownerEmail, passwordManagerSeats: 10,
@@ -337,7 +331,7 @@ public class AccountsKeyManagementControllerTests : IClassFixture<ApiApplication
         await OrganizationTestHelpers.CreateUserAsync(_factory, organization.Id, ssoUserEmail,
             OrganizationUserType.User, userStatusType: OrganizationUserStatusType.Accepted);
 
-        var response = await _client.PostAsJsonAsync(uri, new { });
+        var response = await _client.PostAsJsonAsync("/accounts/convert-to-key-connector", new { });
         response.EnsureSuccessStatusCode();
 
         var user = await _userRepository.GetByEmailAsync(ssoUserEmail);