[AC-1122] Use V1 feature flag for new setting

src/Api/AdminConsole/Controllers/OrganizationsController.cs

@@ -29,6 +29,7 @@
 using Bit.Core.Utilities;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
+using Constants = Microsoft.VisualBasic.Constants;
 
 namespace Bit.Api.AdminConsole.Controllers;
 
@@ -794,6 +795,14 @@ public async Task<OrganizationResponseModel> PutCollectionManagement(Guid id, [F
             throw new NotFoundException();
         }
 
+        var v1Enabled = _featureService.IsEnabled(FeatureFlagKeys.FlexibleCollectionsV1, _currentContext);
+
+        if (!v1Enabled)
+        {
+            // V1 is disabled, ensure V1 setting doesn't change
+            model.AllowAdminAccessToAllCollectionItems = organization.AllowAdminAccessToAllCollectionItems;
+        }
+
         await _organizationService.UpdateAsync(model.ToOrganization(organization));
         return new OrganizationResponseModel(organization);
     }

src/Core/Constants.cs

@@ -60,6 +60,7 @@ public static class FeatureFlagKeys
     public const string AutofillV2 = "autofill-v2";
     public const string BrowserFilelessImport = "browser-fileless-import";
     public const string FlexibleCollections = "flexible-collections";
+    public const string FlexibleCollectionsV1 = "flexible-collections-v-1"; // v-1 is intentional
     public const string BulkCollectionAccess = "bulk-collection-access";
     public const string AutofillOverlay = "autofill-overlay";
     public const string ItemShare = "item-share";

src/Core/Services/Implementations/OrganizationService.cs

@@ -434,6 +434,8 @@ public async Task<Tuple<Organization, OrganizationUser>> SignUpAsync(Organizatio
 
         var flexibleCollectionsIsEnabled =
             _featureService.IsEnabled(FeatureFlagKeys.FlexibleCollections, _currentContext);
+        var flexibleCollectionsV1IsEnabled =
+            _featureService.IsEnabled(FeatureFlagKeys.FlexibleCollectionsV1, _currentContext);
 
         var organization = new Organization
         {
@@ -473,7 +475,7 @@ public async Task<Tuple<Organization, OrganizationUser>> SignUpAsync(Organizatio
             UsePasswordManager = true,
             UseSecretsManager = signup.UseSecretsManager,
             LimitCollectionCreationDeletion = !flexibleCollectionsIsEnabled,
-            AllowAdminAccessToAllCollectionItems = !flexibleCollectionsIsEnabled
+            AllowAdminAccessToAllCollectionItems = !flexibleCollectionsV1IsEnabled
         };
 
         if (signup.UseSecretsManager)