remove feature flagged logic (#6901)

src/Api/AdminConsole/Controllers/OrganizationUsersController.cs

@@ -287,14 +287,7 @@ public class OrganizationUsersController : BaseAdminConsoleController
         var userId = _userService.GetProperUserId(User);
 
         IEnumerable<Tuple<Core.Entities.OrganizationUser, string>> result;
-        if (_featureService.IsEnabled(FeatureFlagKeys.IncreaseBulkReinviteLimitForCloud))
+        result = await _bulkResendOrganizationInvitesCommand.BulkResendInvitesAsync(orgId, userId.Value, model.Ids);
-        {
-            result = await _bulkResendOrganizationInvitesCommand.BulkResendInvitesAsync(orgId, userId.Value, model.Ids);
-        }
-        else
-        {
-            result = await _organizationService.ResendInvitesAsync(orgId, userId.Value, model.Ids);
-        }
 
         return new ListResponseModel<OrganizationUserBulkResponseModel>(
             result.Select(t => new OrganizationUserBulkResponseModel(t.Item1.Id, t.Item2)));

src/Core/AdminConsole/Services/IOrganizationService.cs

@@ -27,7 +27,6 @@ public interface IOrganizationService
         OrganizationUserInvite invite, string externalId);
     Task<List<OrganizationUser>> InviteUsersAsync(Guid organizationId, Guid? invitingUserId, EventSystemUser? systemUser,
         IEnumerable<(OrganizationUserInvite invite, string externalId)> invites);
-    Task<IEnumerable<Tuple<OrganizationUser, string>>> ResendInvitesAsync(Guid organizationId, Guid? invitingUserId, IEnumerable<Guid> organizationUsersId);
     Task UpdateUserResetPasswordEnrollmentAsync(Guid organizationId, Guid userId, string resetPasswordKey, Guid? callingUserId);
     Task DeleteSsoUserAsync(Guid userId, Guid? organizationId);
     Task ReplaceAndUpdateCacheAsync(Organization org, EventType? orgEvent = null);

src/Core/AdminConsole/Services/Implementations/OrganizationService.cs

@@ -14,7 +14,6 @@ using Bit.Core.AdminConsole.OrganizationFeatures.Policies;
 using Bit.Core.AdminConsole.OrganizationFeatures.Policies.PolicyRequirements;
 using Bit.Core.AdminConsole.Repositories;
 using Bit.Core.AdminConsole.Services;
-using Bit.Core.AdminConsole.Utilities.DebuggingInstruments;
 using Bit.Core.Auth.Enums;
 using Bit.Core.Auth.Repositories;
 using Bit.Core.Billing.Constants;
@@ -718,32 +717,6 @@ public class OrganizationService : IOrganizationService
         return (allOrgUsers, events);
     }
 
-    public async Task<IEnumerable<Tuple<OrganizationUser, string>>> ResendInvitesAsync(Guid organizationId,
-        Guid? invitingUserId,
-        IEnumerable<Guid> organizationUsersId)
-    {
-        var orgUsers = await _organizationUserRepository.GetManyAsync(organizationUsersId);
-        _logger.LogUserInviteStateDiagnostics(orgUsers);
-
-        var org = await GetOrgById(organizationId);
-
-        var result = new List<Tuple<OrganizationUser, string>>();
-        foreach (var orgUser in orgUsers)
-        {
-            if (orgUser.Status != OrganizationUserStatusType.Invited || orgUser.OrganizationId != organizationId)
-            {
-                result.Add(Tuple.Create(orgUser, "User invalid."));
-                continue;
-            }
-
-            await SendInviteAsync(orgUser, org, false);
-            result.Add(Tuple.Create(orgUser, ""));
-        }
-
-        return result;
-    }
-
-
     private async Task SendInvitesAsync(IEnumerable<OrganizationUser> orgUsers, Organization organization) =>
         await _sendOrganizationInvitesCommand.SendInvitesAsync(new SendInvitesRequest(orgUsers, organization));
 

test/Api.Test/AdminConsole/Controllers/OrganizationUsersControllerTests.cs

@@ -734,7 +734,7 @@ public class OrganizationUsersControllerTests
 
     [Theory]
     [BitAutoData]
-    public async Task BulkReinvite_WhenFeatureFlagEnabled_UsesBulkResendOrganizationInvitesCommand(
+    public async Task BulkReinvite_UsesBulkResendOrganizationInvitesCommand(
         Guid organizationId,
         OrganizationUserBulkRequestModel bulkRequestModel,
         List<OrganizationUser> organizationUsers,
@@ -744,9 +744,6 @@ public class OrganizationUsersControllerTests
         // Arrange
         sutProvider.GetDependency<ICurrentContext>().ManageUsers(organizationId).Returns(true);
         sutProvider.GetDependency<IUserService>().GetProperUserId(Arg.Any<ClaimsPrincipal>()).Returns(userId);
-        sutProvider.GetDependency<IFeatureService>()
-            .IsEnabled(FeatureFlagKeys.IncreaseBulkReinviteLimitForCloud)
-            .Returns(true);
 
         var expectedResults = organizationUsers.Select(u => Tuple.Create(u, "")).ToList();
         sutProvider.GetDependency<IBulkResendOrganizationInvitesCommand>()
@@ -763,36 +760,4 @@ public class OrganizationUsersControllerTests
             .Received(1)
             .BulkResendInvitesAsync(organizationId, userId, bulkRequestModel.Ids);
     }
-
-    [Theory]
-    [BitAutoData]
-    public async Task BulkReinvite_WhenFeatureFlagDisabled_UsesLegacyOrganizationService(
-        Guid organizationId,
-        OrganizationUserBulkRequestModel bulkRequestModel,
-        List<OrganizationUser> organizationUsers,
-        Guid userId,
-        SutProvider<OrganizationUsersController> sutProvider)
-    {
-        // Arrange
-        sutProvider.GetDependency<ICurrentContext>().ManageUsers(organizationId).Returns(true);
-        sutProvider.GetDependency<IUserService>().GetProperUserId(Arg.Any<ClaimsPrincipal>()).Returns(userId);
-        sutProvider.GetDependency<IFeatureService>()
-            .IsEnabled(FeatureFlagKeys.IncreaseBulkReinviteLimitForCloud)
-            .Returns(false);
-
-        var expectedResults = organizationUsers.Select(u => Tuple.Create(u, "")).ToList();
-        sutProvider.GetDependency<IOrganizationService>()
-            .ResendInvitesAsync(organizationId, userId, bulkRequestModel.Ids)
-            .Returns(expectedResults);
-
-        // Act
-        var response = await sutProvider.Sut.BulkReinvite(organizationId, bulkRequestModel);
-
-        // Assert
-        Assert.Equal(organizationUsers.Count, response.Data.Count());
-
-        await sutProvider.GetDependency<IOrganizationService>()
-            .Received(1)
-            .ResendInvitesAsync(organizationId, userId, bulkRequestModel.Ids);
-    }
 }