From ca50eb8fe39d92a42afa1ed438401104755c3d09 Mon Sep 17 00:00:00 2001
From: Thomas Rittson <31796059+eliykat@users.noreply.github.com>
Date: Thu, 11 Jul 2024 08:38:06 +1000
Subject: [PATCH] [AC-2741] Turn on BulkDeviceApproval feature for self-host
 (#4453)

Also remove the feature flagging on server, but keep definition
for old clients
---
 .../Controllers/OrganizationAuthRequestsController.cs          | 3 ---
 .../AdminConsole/Controllers/OrganizationUsersController.cs    | 2 --
 src/Core/Constants.cs                                          | 3 ++-
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/Api/AdminConsole/Controllers/OrganizationAuthRequestsController.cs b/src/Api/AdminConsole/Controllers/OrganizationAuthRequestsController.cs
index dbb73f8706..ea3de5a38c 100644
--- a/src/Api/AdminConsole/Controllers/OrganizationAuthRequestsController.cs
+++ b/src/Api/AdminConsole/Controllers/OrganizationAuthRequestsController.cs
@@ -1,14 +1,12 @@
 using Bit.Api.AdminConsole.Models.Request;
 using Bit.Api.AdminConsole.Models.Response;
 using Bit.Api.Models.Response;
-using Bit.Core;
 using Bit.Core.AdminConsole.OrganizationAuth.Interfaces;
 using Bit.Core.Auth.Models.Api.Request.AuthRequest;
 using Bit.Core.Auth.Services;
 using Bit.Core.Context;
 using Bit.Core.Exceptions;
 using Bit.Core.Repositories;
-using Bit.Core.Utilities;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 
@@ -75,7 +73,6 @@ public class OrganizationAuthRequestsController : Controller
         }
     }
 
-    [RequireFeature(FeatureFlagKeys.BulkDeviceApproval)]
     [HttpPost("")]
     public async Task UpdateManyAuthRequests(Guid orgId, [FromBody] IEnumerable<OrganizationAuthRequestUpdateManyRequestModel> model)
     {
diff --git a/src/Api/AdminConsole/Controllers/OrganizationUsersController.cs b/src/Api/AdminConsole/Controllers/OrganizationUsersController.cs
index fd8149454b..0562b25631 100644
--- a/src/Api/AdminConsole/Controllers/OrganizationUsersController.cs
+++ b/src/Api/AdminConsole/Controllers/OrganizationUsersController.cs
@@ -22,7 +22,6 @@ using Bit.Core.OrganizationFeatures.OrganizationSubscriptions.Interface;
 using Bit.Core.OrganizationFeatures.OrganizationUsers.Interfaces;
 using Bit.Core.Repositories;
 using Bit.Core.Services;
-using Bit.Core.Utilities;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 
@@ -201,7 +200,6 @@ public class OrganizationUsersController : Controller
         return new OrganizationUserResetPasswordDetailsResponseModel(new OrganizationUserResetPasswordDetails(organizationUser, user, org));
     }
 
-    [RequireFeature(FeatureFlagKeys.BulkDeviceApproval)]
     [HttpPost("account-recovery-details")]
     public async Task<ListResponseModel<OrganizationUserResetPasswordDetailsResponseModel>> GetAccountRecoveryDetails(Guid orgId, [FromBody] OrganizationUserBulkRequestModel model)
     {
diff --git a/src/Core/Constants.cs b/src/Core/Constants.cs
index ac3adf2e06..743701c233 100644
--- a/src/Core/Constants.cs
+++ b/src/Core/Constants.cs
@@ -151,7 +151,8 @@ public static class FeatureFlagKeys
         return new Dictionary<string, string>()
         {
             { DuoRedirect, "true" },
-            { FlexibleCollectionsV1, "true" }
+            { FlexibleCollectionsV1, "true" },
+            { BulkDeviceApproval, "true" }
         };
     }
 }