From 21e15c79d786ac5d3c26143d541f5d07e12770c6 Mon Sep 17 00:00:00 2001 From: Thomas Rittson Date: Fri, 1 Sep 2023 11:30:56 +1000 Subject: [PATCH] Revert "Prevent manually adding SM to an MSP-managed org" This change is no longer required This reverts commit 51b086243bf7ab63897a904b6b14fa1077a2bc6e. --- src/Admin/Controllers/OrganizationsController.cs | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/Admin/Controllers/OrganizationsController.cs b/src/Admin/Controllers/OrganizationsController.cs index c2498f8fe0..44b83c2f34 100644 --- a/src/Admin/Controllers/OrganizationsController.cs +++ b/src/Admin/Controllers/OrganizationsController.cs @@ -5,7 +5,6 @@ using Bit.Admin.Utilities; using Bit.Core.Context; using Bit.Core.Entities; using Bit.Core.Enums; -using Bit.Core.Enums.Provider; using Bit.Core.Exceptions; using Bit.Core.Models.OrganizationConnectionConfigs; using Bit.Core.OrganizationFeatures.OrganizationSponsorships.FamiliesForEnterprise.Interfaces; @@ -209,12 +208,6 @@ public class OrganizationsController : Controller throw new BadRequestException("Plan does not support Secrets Manager"); } - if (organization.UseSecretsManager && model.Provider is { Type: ProviderType.Msp }) - { - throw new BadRequestException( - "Organizations with a Managed Service Provider do not support Secrets Manager."); - } - await _organizationRepository.ReplaceAsync(organization); await _applicationCacheService.UpsertOrganizationAbilityAsync(organization); await _referenceEventService.RaiseEventAsync(new ReferenceEvent(ReferenceEventType.OrganizationEditedByAdmin, organization, _currentContext)