From a587de4226a761283de9db117b64c23045101bff Mon Sep 17 00:00:00 2001
From: Thomas Rittson <31796059+eliykat@users.noreply.github.com>
Date: Thu, 17 Oct 2024 02:49:17 +1000
Subject: [PATCH] [PM-13646] Revert disabling policies when org plan is changed

This reverts commit fd8c1aae02e90924c4bbff63430c7269e4068847.
---
 .../Controllers/OrganizationsController.cs    | 27 +------------------
 1 file changed, 1 insertion(+), 26 deletions(-)

diff --git a/src/Admin/AdminConsole/Controllers/OrganizationsController.cs b/src/Admin/AdminConsole/Controllers/OrganizationsController.cs
index 78c8785c7..70c09a539 100644
--- a/src/Admin/AdminConsole/Controllers/OrganizationsController.cs
+++ b/src/Admin/AdminConsole/Controllers/OrganizationsController.cs
@@ -7,7 +7,6 @@ using Bit.Core;
 using Bit.Core.AdminConsole.Entities;
 using Bit.Core.AdminConsole.Providers.Interfaces;
 using Bit.Core.AdminConsole.Repositories;
-using Bit.Core.AdminConsole.Services;
 using Bit.Core.Billing.Extensions;
 using Bit.Core.Billing.Services;
 using Bit.Core.Context;
@@ -57,7 +56,6 @@ public class OrganizationsController : Controller
     private readonly IRemoveOrganizationFromProviderCommand _removeOrganizationFromProviderCommand;
     private readonly IFeatureService _featureService;
     private readonly IProviderBillingService _providerBillingService;
-    private readonly IPolicyService _policyService;
 
     public OrganizationsController(
         IOrganizationService organizationService,
@@ -84,8 +82,7 @@ public class OrganizationsController : Controller
         IProviderOrganizationRepository providerOrganizationRepository,
         IRemoveOrganizationFromProviderCommand removeOrganizationFromProviderCommand,
         IFeatureService featureService,
-        IProviderBillingService providerBillingService,
-        IPolicyService policyService)
+        IProviderBillingService providerBillingService)
     {
         _organizationService = organizationService;
         _organizationRepository = organizationRepository;
@@ -112,7 +109,6 @@ public class OrganizationsController : Controller
         _removeOrganizationFromProviderCommand = removeOrganizationFromProviderCommand;
         _featureService = featureService;
         _providerBillingService = providerBillingService;
-        _policyService = policyService;
     }
 
     [RequirePermission(Permission.Org_List_View)]
@@ -440,13 +436,6 @@ public class OrganizationsController : Controller
             organization.MaxAutoscaleSmServiceAccounts = model.MaxAutoscaleSmServiceAccounts;
         }
 
-        var plan = StaticStore.GetPlan(organization.PlanType);
-
-        if (!organization.UsePolicies || !plan.HasPolicies)
-        {
-            await DisableOrganizationPoliciesAsync(organization.Id);
-        }
-
         if (_accessControlService.UserHasPermission(Permission.Org_Licensing_Edit))
         {
             organization.LicenseKey = model.LicenseKey;
@@ -463,18 +452,4 @@ public class OrganizationsController : Controller
 
         return organization;
     }
-
-    private async Task DisableOrganizationPoliciesAsync(Guid organizationId)
-    {
-        var policies = await _policyRepository.GetManyByOrganizationIdAsync(organizationId);
-
-        if (policies.Count != 0)
-        {
-            await Task.WhenAll(policies.Select(async policy =>
-            {
-                policy.Enabled = false;
-                await _policyService.SaveAsync(policy, _organizationService, null);
-            }));
-        }
-    }
 }