[AC-2648] Remove Organization.FlexibleCollections from Models (#4529)

* chore: remove FlexibleCollections refs from OrganizationAbility, AC-2648

* chore: remove FlexibleCollections property from OrganizationResponseModel, refs AC-2648

* chore: remove FlexibleCollections from ProfileOrganizationResponseModel and ProfileProviderOrganizationResponseModel, refs AC-2648

* chore: remove FlexibleCollections from SelfHostedOrganizationDetails, refs AC-2648

src/Api/AdminConsole/Models/Response/Organizations/OrganizationResponseModel.cs

@@ -57,7 +57,6 @@ public class OrganizationResponseModel : ResponseModel
         MaxAutoscaleSmServiceAccounts = organization.MaxAutoscaleSmServiceAccounts;
         LimitCollectionCreationDeletion = organization.LimitCollectionCreationDeletion;
         AllowAdminAccessToAllCollectionItems = organization.AllowAdminAccessToAllCollectionItems;
-        FlexibleCollections = organization.FlexibleCollections;
     }
 
     public Guid Id { get; set; }
@@ -101,7 +100,6 @@ public class OrganizationResponseModel : ResponseModel
     public int? MaxAutoscaleSmServiceAccounts { get; set; }
     public bool LimitCollectionCreationDeletion { get; set; }
     public bool AllowAdminAccessToAllCollectionItems { get; set; }
-    public bool FlexibleCollections { get; set; }
 }
 
 public class OrganizationSubscriptionResponseModel : OrganizationResponseModel

src/Api/AdminConsole/Models/Response/ProfileOrganizationResponseModel.cs

@@ -64,7 +64,6 @@ public class ProfileOrganizationResponseModel : ResponseModel
         AccessSecretsManager = organization.AccessSecretsManager;
         LimitCollectionCreationDeletion = organization.LimitCollectionCreationDeletion;
         AllowAdminAccessToAllCollectionItems = organization.AllowAdminAccessToAllCollectionItems;
-        FlexibleCollections = organization.FlexibleCollections;
 
         if (organization.SsoConfig != null)
         {
@@ -73,39 +72,36 @@ public class ProfileOrganizationResponseModel : ResponseModel
             KeyConnectorUrl = ssoConfigData.KeyConnectorUrl;
         }
 
-        if (FlexibleCollections)
+        // Downgrade Custom users with no other permissions than 'Edit/Delete Assigned Collections' to User
+        if (Type == OrganizationUserType.Custom && Permissions is not null)
         {
-            // Downgrade Custom users with no other permissions than 'Edit/Delete Assigned Collections' to User
+            if ((Permissions.EditAssignedCollections || Permissions.DeleteAssignedCollections) &&
-            if (Type == OrganizationUserType.Custom && Permissions is not null)
+                Permissions is
-            {
-                if ((Permissions.EditAssignedCollections || Permissions.DeleteAssignedCollections) &&
-                    Permissions is
-                    {
-                        AccessEventLogs: false,
-                        AccessImportExport: false,
-                        AccessReports: false,
-                        CreateNewCollections: false,
-                        EditAnyCollection: false,
-                        DeleteAnyCollection: false,
-                        ManageGroups: false,
-                        ManagePolicies: false,
-                        ManageSso: false,
-                        ManageUsers: false,
-                        ManageResetPassword: false,
-                        ManageScim: false
-                    })
                 {
-                    organization.Type = OrganizationUserType.User;
+                    AccessEventLogs: false,
-                }
+                    AccessImportExport: false,
-            }
+                    AccessReports: false,
-
+                    CreateNewCollections: false,
-            // Set 'Edit/Delete Assigned Collections' custom permissions to false
+                    EditAnyCollection: false,
-            if (Permissions is not null)
+                    DeleteAnyCollection: false,
+                    ManageGroups: false,
+                    ManagePolicies: false,
+                    ManageSso: false,
+                    ManageUsers: false,
+                    ManageResetPassword: false,
+                    ManageScim: false
+                })
             {
-                Permissions.EditAssignedCollections = false;
+                organization.Type = OrganizationUserType.User;
-                Permissions.DeleteAssignedCollections = false;
             }
         }
+
+        // Set 'Edit/Delete Assigned Collections' custom permissions to false
+        if (Permissions is not null)
+        {
+            Permissions.EditAssignedCollections = false;
+            Permissions.DeleteAssignedCollections = false;
+        }
     }
 
     public Guid Id { get; set; }
@@ -157,5 +153,4 @@ public class ProfileOrganizationResponseModel : ResponseModel
     public bool AccessSecretsManager { get; set; }
     public bool LimitCollectionCreationDeletion { get; set; }
     public bool AllowAdminAccessToAllCollectionItems { get; set; }
-    public bool FlexibleCollections { get; set; }
 }

src/Api/AdminConsole/Models/Response/ProfileProviderOrganizationResponseModel.cs

@@ -46,6 +46,5 @@ public class ProfileProviderOrganizationResponseModel : ProfileOrganizationRespo
         ProductTierType = StaticStore.GetPlan(organization.PlanType).ProductTier;
         LimitCollectionCreationDeletion = organization.LimitCollectionCreationDeletion;
         AllowAdminAccessToAllCollectionItems = organization.AllowAdminAccessToAllCollectionItems;
-        FlexibleCollections = organization.FlexibleCollections;
     }
 }

src/Core/AdminConsole/Models/Data/Organizations/OrganizationAbility.cs

@@ -23,7 +23,6 @@ public class OrganizationAbility
         UsePolicies = organization.UsePolicies;
         LimitCollectionCreationDeletion = organization.LimitCollectionCreationDeletion;
         AllowAdminAccessToAllCollectionItems = organization.AllowAdminAccessToAllCollectionItems;
-        FlexibleCollections = organization.FlexibleCollections;
     }
 
     public Guid Id { get; set; }
@@ -40,5 +39,4 @@ public class OrganizationAbility
     public bool UsePolicies { get; set; }
     public bool LimitCollectionCreationDeletion { get; set; }
     public bool AllowAdminAccessToAllCollectionItems { get; set; }
-    public bool FlexibleCollections { get; set; }
 }

src/Core/AdminConsole/Models/Data/Organizations/SelfHostedOrganizationDetails.cs

@@ -146,7 +146,6 @@ public class SelfHostedOrganizationDetails : Organization
             OwnersNotifiedOfAutoscaling = OwnersNotifiedOfAutoscaling,
             LimitCollectionCreationDeletion = LimitCollectionCreationDeletion,
             AllowAdminAccessToAllCollectionItems = AllowAdminAccessToAllCollectionItems,
-            FlexibleCollections = FlexibleCollections,
             Status = Status
         };
     }

src/Infrastructure.EntityFramework/AdminConsole/Repositories/OrganizationRepository.cs

@@ -100,8 +100,7 @@ public class OrganizationRepository : Repository<Core.AdminConsole.Entities.Orga
                 UseCustomPermissions = e.UseCustomPermissions,
                 UsePolicies = e.UsePolicies,
                 LimitCollectionCreationDeletion = e.LimitCollectionCreationDeletion,
-                AllowAdminAccessToAllCollectionItems = e.AllowAdminAccessToAllCollectionItems,
+                AllowAdminAccessToAllCollectionItems = e.AllowAdminAccessToAllCollectionItems
-                FlexibleCollections = e.FlexibleCollections
             }).ToListAsync();
         }
     }

test/Api.Test/Vault/AuthorizationHandlers/BulkCollectionAuthorizationHandlerTests.cs

@@ -1477,7 +1477,6 @@ public class BulkCollectionAuthorizationHandlerTests
     {
         var organizationAbility = new OrganizationAbility();
         organizationAbility.Id = organization.Id;
-        organizationAbility.FlexibleCollections = true;
         organizationAbility.LimitCollectionCreationDeletion = limitCollectionCreationDeletion;
         organizationAbility.AllowAdminAccessToAllCollectionItems = allowAdminAccessToAllCollectionItems;