diff --git a/src/Api/AdminConsole/Public/Controllers/GroupsController.cs b/src/Api/AdminConsole/Public/Controllers/GroupsController.cs index 373cf78e36..9ce22536b1 100644 --- a/src/Api/AdminConsole/Public/Controllers/GroupsController.cs +++ b/src/Api/AdminConsole/Public/Controllers/GroupsController.cs @@ -111,7 +111,7 @@ public class GroupsController : Controller { var group = model.ToGroup(_currentContext.OrganizationId.Value); var organization = await _organizationRepository.GetByIdAsync(_currentContext.OrganizationId.Value); - var associations = model.Collections?.Select(c => c.ToCollectionAccessSelection(organization.FlexibleCollections)).ToList(); + var associations = model.Collections?.Select(c => c.ToCollectionAccessSelection()).ToList(); await _createGroupCommand.CreateGroupAsync(group, organization, associations); var response = new GroupResponseModel(group, associations); return new JsonResult(response); @@ -140,7 +140,7 @@ public class GroupsController : Controller var updatedGroup = model.ToGroup(existingGroup); var organization = await _organizationRepository.GetByIdAsync(_currentContext.OrganizationId.Value); - var associations = model.Collections?.Select(c => c.ToCollectionAccessSelection(organization.FlexibleCollections)).ToList(); + var associations = model.Collections?.Select(c => c.ToCollectionAccessSelection()).ToList(); await _updateGroupCommand.UpdateGroupAsync(updatedGroup, organization, associations); var response = new GroupResponseModel(updatedGroup, associations); return new JsonResult(response); diff --git a/src/Api/AdminConsole/Public/Controllers/MembersController.cs b/src/Api/AdminConsole/Public/Controllers/MembersController.cs index 3ec5b5ecd9..1ecec686a6 100644 --- a/src/Api/AdminConsole/Public/Controllers/MembersController.cs +++ b/src/Api/AdminConsole/Public/Controllers/MembersController.cs @@ -64,9 +64,8 @@ public class MembersController : Controller { return new NotFoundResult(); } - var flexibleCollectionsIsEnabled = await FlexibleCollectionsIsEnabledAsync(orgUser.OrganizationId); var response = new MemberResponseModel(orgUser, await _userService.TwoFactorIsEnabledAsync(orgUser), - userDetails.Item2, flexibleCollectionsIsEnabled); + userDetails.Item2); return new JsonResult(response); } @@ -105,10 +104,9 @@ public class MembersController : Controller { var users = await _organizationUserRepository.GetManyDetailsByOrganizationAsync( _currentContext.OrganizationId.Value); - var flexibleCollectionsIsEnabled = await FlexibleCollectionsIsEnabledAsync(_currentContext.OrganizationId.Value); // TODO: Get all CollectionUser associations for the organization and marry them up here for the response. var memberResponsesTasks = users.Select(async u => new MemberResponseModel(u, - await _userService.TwoFactorIsEnabledAsync(u), null, flexibleCollectionsIsEnabled)); + await _userService.TwoFactorIsEnabledAsync(u), null)); var memberResponses = await Task.WhenAll(memberResponsesTasks); var response = new ListResponseModel(memberResponses); return new JsonResult(response); @@ -126,12 +124,11 @@ public class MembersController : Controller [ProducesResponseType(typeof(ErrorResponseModel), (int)HttpStatusCode.BadRequest)] public async Task Post([FromBody] MemberCreateRequestModel model) { - var flexibleCollectionsIsEnabled = await FlexibleCollectionsIsEnabledAsync(_currentContext.OrganizationId.Value); - var invite = model.ToOrganizationUserInvite(flexibleCollectionsIsEnabled); + var invite = model.ToOrganizationUserInvite(); var user = await _organizationService.InviteUserAsync(_currentContext.OrganizationId.Value, null, systemUser: null, invite, model.ExternalId); - var response = new MemberResponseModel(user, invite.Collections, flexibleCollectionsIsEnabled); + var response = new MemberResponseModel(user, invite.Collections); return new JsonResult(response); } @@ -156,19 +153,18 @@ public class MembersController : Controller return new NotFoundResult(); } var updatedUser = model.ToOrganizationUser(existingUser); - var flexibleCollectionsIsEnabled = await FlexibleCollectionsIsEnabledAsync(_currentContext.OrganizationId.Value); - var associations = model.Collections?.Select(c => c.ToCollectionAccessSelection(flexibleCollectionsIsEnabled)).ToList(); + var associations = model.Collections?.Select(c => c.ToCollectionAccessSelection()).ToList(); await _updateOrganizationUserCommand.UpdateUserAsync(updatedUser, null, associations, model.Groups); MemberResponseModel response = null; if (existingUser.UserId.HasValue) { var existingUserDetails = await _organizationUserRepository.GetDetailsByIdAsync(id); response = new MemberResponseModel(existingUserDetails, - await _userService.TwoFactorIsEnabledAsync(existingUserDetails), associations, flexibleCollectionsIsEnabled); + await _userService.TwoFactorIsEnabledAsync(existingUserDetails), associations); } else { - response = new MemberResponseModel(updatedUser, associations, flexibleCollectionsIsEnabled); + response = new MemberResponseModel(updatedUser, associations); } return new JsonResult(response); } @@ -239,10 +235,4 @@ public class MembersController : Controller await _organizationService.ResendInviteAsync(_currentContext.OrganizationId.Value, null, id); return new OkResult(); } - - private async Task FlexibleCollectionsIsEnabledAsync(Guid organizationId) - { - var organizationAbility = await _applicationCacheService.GetOrganizationAbilityAsync(organizationId); - return organizationAbility?.FlexibleCollections ?? false; - } } diff --git a/src/Api/AdminConsole/Public/Models/GroupBaseModel.cs b/src/Api/AdminConsole/Public/Models/GroupBaseModel.cs index e5fa378f8c..fd42cccffd 100644 --- a/src/Api/AdminConsole/Public/Models/GroupBaseModel.cs +++ b/src/Api/AdminConsole/Public/Models/GroupBaseModel.cs @@ -12,12 +12,6 @@ public abstract class GroupBaseModel [StringLength(100)] public string Name { get; set; } /// - /// Determines if this group can access all collections within the organization, or only the associated - /// collections. If set to true, this option overrides any collection assignments. If your organization is using - /// the latest collection enhancements, you will not be allowed to set this property to true. - /// - public bool? AccessAll { get; set; } - /// /// External identifier for reference or linking this group to another system, such as a user directory. /// /// external_id_123456 diff --git a/src/Api/AdminConsole/Public/Models/MemberBaseModel.cs b/src/Api/AdminConsole/Public/Models/MemberBaseModel.cs index bed5d3de03..58f644409f 100644 --- a/src/Api/AdminConsole/Public/Models/MemberBaseModel.cs +++ b/src/Api/AdminConsole/Public/Models/MemberBaseModel.cs @@ -10,15 +10,14 @@ public abstract class MemberBaseModel { public MemberBaseModel() { } - public MemberBaseModel(OrganizationUser user, bool flexibleCollectionsEnabled) + public MemberBaseModel(OrganizationUser user) { if (user == null) { throw new ArgumentNullException(nameof(user)); } - Type = flexibleCollectionsEnabled ? GetFlexibleCollectionsUserType(user.Type, user.GetPermissions()) : user.Type; - AccessAll = user.AccessAll; + Type = GetFlexibleCollectionsUserType(user.Type, user.GetPermissions()); ExternalId = user.ExternalId; ResetPasswordEnrolled = user.ResetPasswordKey != null; @@ -28,15 +27,14 @@ public abstract class MemberBaseModel } } - public MemberBaseModel(OrganizationUserUserDetails user, bool flexibleCollectionsEnabled) + public MemberBaseModel(OrganizationUserUserDetails user) { if (user == null) { throw new ArgumentNullException(nameof(user)); } - Type = flexibleCollectionsEnabled ? GetFlexibleCollectionsUserType(user.Type, user.GetPermissions()) : user.Type; - AccessAll = user.AccessAll; + Type = GetFlexibleCollectionsUserType(user.Type, user.GetPermissions()); ExternalId = user.ExternalId; ResetPasswordEnrolled = user.ResetPasswordKey != null; @@ -53,12 +51,6 @@ public abstract class MemberBaseModel [Required] public OrganizationUserType? Type { get; set; } /// - /// Determines if this member can access all collections within the organization, or only the associated - /// collections. If set to true, this option overrides any collection assignments. If your organization is using - /// the latest collection enhancements, you will not be allowed to set this property to true. - /// - public bool? AccessAll { get; set; } - /// /// External identifier for reference or linking this member to another system, such as a user directory. /// /// external_id_123456 diff --git a/src/Api/AdminConsole/Public/Models/Request/AssociationWithPermissionsRequestModel.cs b/src/Api/AdminConsole/Public/Models/Request/AssociationWithPermissionsRequestModel.cs index acd6855842..202bd5f705 100644 --- a/src/Api/AdminConsole/Public/Models/Request/AssociationWithPermissionsRequestModel.cs +++ b/src/Api/AdminConsole/Public/Models/Request/AssociationWithPermissionsRequestModel.cs @@ -1,11 +1,10 @@ -using Bit.Core.Exceptions; -using Bit.Core.Models.Data; +using Bit.Core.Models.Data; namespace Bit.Api.AdminConsole.Public.Models.Request; public class AssociationWithPermissionsRequestModel : AssociationWithPermissionsBaseModel { - public CollectionAccessSelection ToCollectionAccessSelection(bool migratedToFlexibleCollections) + public CollectionAccessSelection ToCollectionAccessSelection() { var collectionAccessSelection = new CollectionAccessSelection { @@ -15,13 +14,6 @@ public class AssociationWithPermissionsRequestModel : AssociationWithPermissions Manage = Manage.GetValueOrDefault() }; - // Throws if the org has not migrated to use FC but has passed in a Manage value in the request - if (!migratedToFlexibleCollections && Manage.GetValueOrDefault()) - { - throw new BadRequestException( - "Your organization must be using the latest collection enhancements to use the Manage property."); - } - return collectionAccessSelection; } } diff --git a/src/Api/AdminConsole/Public/Models/Request/GroupCreateUpdateRequestModel.cs b/src/Api/AdminConsole/Public/Models/Request/GroupCreateUpdateRequestModel.cs index c1c7945d10..671503c649 100644 --- a/src/Api/AdminConsole/Public/Models/Request/GroupCreateUpdateRequestModel.cs +++ b/src/Api/AdminConsole/Public/Models/Request/GroupCreateUpdateRequestModel.cs @@ -20,7 +20,6 @@ public class GroupCreateUpdateRequestModel : GroupBaseModel public Group ToGroup(Group existingGroup) { existingGroup.Name = Name; - existingGroup.AccessAll = AccessAll.Value; existingGroup.ExternalId = ExternalId; return existingGroup; } diff --git a/src/Api/AdminConsole/Public/Models/Request/MemberCreateRequestModel.cs b/src/Api/AdminConsole/Public/Models/Request/MemberCreateRequestModel.cs index cc783a6e5b..f6b2c4d4af 100644 --- a/src/Api/AdminConsole/Public/Models/Request/MemberCreateRequestModel.cs +++ b/src/Api/AdminConsole/Public/Models/Request/MemberCreateRequestModel.cs @@ -22,14 +22,13 @@ public class MemberCreateRequestModel : MemberUpdateRequestModel throw new NotImplementedException(); } - public OrganizationUserInvite ToOrganizationUserInvite(bool flexibleCollectionsIsEnabled) + public OrganizationUserInvite ToOrganizationUserInvite() { var invite = new OrganizationUserInvite { Emails = new[] { Email }, Type = Type.Value, - AccessAll = AccessAll.Value, - Collections = Collections?.Select(c => c.ToCollectionAccessSelection(flexibleCollectionsIsEnabled)).ToList(), + Collections = Collections?.Select(c => c.ToCollectionAccessSelection()).ToList(), Groups = Groups }; diff --git a/src/Api/AdminConsole/Public/Models/Request/MemberUpdateRequestModel.cs b/src/Api/AdminConsole/Public/Models/Request/MemberUpdateRequestModel.cs index ba65d356c9..ac281e3c44 100644 --- a/src/Api/AdminConsole/Public/Models/Request/MemberUpdateRequestModel.cs +++ b/src/Api/AdminConsole/Public/Models/Request/MemberUpdateRequestModel.cs @@ -19,7 +19,6 @@ public class MemberUpdateRequestModel : MemberBaseModel, IValidatableObject public virtual OrganizationUser ToOrganizationUser(OrganizationUser existingUser) { existingUser.Type = Type.Value; - existingUser.AccessAll = AccessAll.Value; existingUser.ExternalId = ExternalId; // Permissions property is optional for backwards compatibility with existing usage diff --git a/src/Api/AdminConsole/Public/Models/Response/GroupResponseModel.cs b/src/Api/AdminConsole/Public/Models/Response/GroupResponseModel.cs index a2f6899e5e..c275d1658b 100644 --- a/src/Api/AdminConsole/Public/Models/Response/GroupResponseModel.cs +++ b/src/Api/AdminConsole/Public/Models/Response/GroupResponseModel.cs @@ -19,7 +19,6 @@ public class GroupResponseModel : GroupBaseModel, IResponseModel Id = group.Id; Name = group.Name; - AccessAll = group.AccessAll; ExternalId = group.ExternalId; Collections = collections?.Select(c => new AssociationWithPermissionsResponseModel(c)); } diff --git a/src/Api/AdminConsole/Public/Models/Response/MemberResponseModel.cs b/src/Api/AdminConsole/Public/Models/Response/MemberResponseModel.cs index 6b329be6af..6f73532ad4 100644 --- a/src/Api/AdminConsole/Public/Models/Response/MemberResponseModel.cs +++ b/src/Api/AdminConsole/Public/Models/Response/MemberResponseModel.cs @@ -16,9 +16,7 @@ public class MemberResponseModel : MemberBaseModel, IResponseModel [JsonConstructor] public MemberResponseModel() { } - public MemberResponseModel(OrganizationUser user, IEnumerable collections, - bool flexibleCollectionsEnabled) - : base(user, flexibleCollectionsEnabled) + public MemberResponseModel(OrganizationUser user, IEnumerable collections) : base(user) { if (user == null) { @@ -33,8 +31,7 @@ public class MemberResponseModel : MemberBaseModel, IResponseModel } public MemberResponseModel(OrganizationUserUserDetails user, bool twoFactorEnabled, - IEnumerable collections, bool flexibleCollectionsEnabled) - : base(user, flexibleCollectionsEnabled) + IEnumerable collections) : base(user) { if (user == null) { diff --git a/src/Api/Public/Controllers/CollectionsController.cs b/src/Api/Public/Controllers/CollectionsController.cs index 6ff9ada981..b16eb1a418 100644 --- a/src/Api/Public/Controllers/CollectionsController.cs +++ b/src/Api/Public/Controllers/CollectionsController.cs @@ -92,8 +92,7 @@ public class CollectionsController : Controller return new NotFoundResult(); } var updatedCollection = model.ToCollection(existingCollection); - var organizationAbility = await _applicationCacheService.GetOrganizationAbilityAsync(_currentContext.OrganizationId.Value); - var associations = model.Groups?.Select(c => c.ToCollectionAccessSelection(organizationAbility?.FlexibleCollections ?? false)).ToList(); + var associations = model.Groups?.Select(c => c.ToCollectionAccessSelection()).ToList(); await _collectionService.SaveAsync(updatedCollection, associations); var response = new CollectionResponseModel(updatedCollection, associations); return new JsonResult(response); diff --git a/test/Api.IntegrationTest/AdminConsole/Public/Controllers/MembersControllerTests.cs b/test/Api.IntegrationTest/AdminConsole/Public/Controllers/MembersControllerTests.cs index 2a63eee87b..cdb509984d 100644 --- a/test/Api.IntegrationTest/AdminConsole/Public/Controllers/MembersControllerTests.cs +++ b/test/Api.IntegrationTest/AdminConsole/Public/Controllers/MembersControllerTests.cs @@ -135,7 +135,6 @@ public class MembersControllerTests : IClassFixture, IAsy Email = email, Type = OrganizationUserType.Custom, ExternalId = "myCustomUser", - AccessAll = false, Collections = [], Groups = [] }; @@ -150,7 +149,6 @@ public class MembersControllerTests : IClassFixture, IAsy Assert.Equal(email, result.Email); Assert.Equal(OrganizationUserType.Custom, result.Type); Assert.Equal("myCustomUser", result.ExternalId); - Assert.False(result.AccessAll); Assert.Empty(result.Collections); // Assert against the database values @@ -160,7 +158,6 @@ public class MembersControllerTests : IClassFixture, IAsy Assert.Equal(email, orgUser.Email); Assert.Equal(OrganizationUserType.Custom, orgUser.Type); Assert.Equal("myCustomUser", orgUser.ExternalId); - Assert.False(orgUser.AccessAll); Assert.Equal(OrganizationUserStatusType.Invited, orgUser.Status); Assert.Equal(_organization.Id, orgUser.OrganizationId); } @@ -180,7 +177,6 @@ public class MembersControllerTests : IClassFixture, IAsy EditAnyCollection = true, AccessEventLogs = true }, - AccessAll = false, ExternalId = "example", Collections = [] }; @@ -198,7 +194,6 @@ public class MembersControllerTests : IClassFixture, IAsy AssertHelper.AssertPropertyEqual( new PermissionsModel { DeleteAnyCollection = true, EditAnyCollection = true, AccessEventLogs = true }, result.Permissions); - Assert.False(result.AccessAll); Assert.Empty(result.Collections); // Assert against the database values @@ -207,7 +202,6 @@ public class MembersControllerTests : IClassFixture, IAsy Assert.Equal(OrganizationUserType.Custom, updatedOrgUser.Type); Assert.Equal("example", updatedOrgUser.ExternalId); - Assert.False(updatedOrgUser.AccessAll); Assert.Equal(OrganizationUserStatusType.Confirmed, updatedOrgUser.Status); Assert.Equal(_organization.Id, updatedOrgUser.OrganizationId); } @@ -225,7 +219,6 @@ public class MembersControllerTests : IClassFixture, IAsy var request = new MemberUpdateRequestModel { Type = OrganizationUserType.Custom, - AccessAll = false, ExternalId = "example", Collections = [] }; diff --git a/test/Api.Test/AdminConsole/Public/Controllers/GroupsControllerTests.cs b/test/Api.Test/AdminConsole/Public/Controllers/GroupsControllerTests.cs index 6e24f44bd5..99964c2664 100644 --- a/test/Api.Test/AdminConsole/Public/Controllers/GroupsControllerTests.cs +++ b/test/Api.Test/AdminConsole/Public/Controllers/GroupsControllerTests.cs @@ -5,7 +5,6 @@ using Bit.Core.AdminConsole.Entities; using Bit.Core.AdminConsole.OrganizationFeatures.Groups.Interfaces; using Bit.Core.AdminConsole.Repositories; using Bit.Core.Context; -using Bit.Core.Exceptions; using Bit.Core.Models.Data; using Bit.Core.Repositories; using Bit.Test.Common.AutoFixture; @@ -22,105 +21,7 @@ public class GroupsControllerTests { [Theory] [BitAutoData] - public async Task Post_Success_BeforeFlexibleCollectionMigration(Organization organization, GroupCreateUpdateRequestModel groupRequestModel, SutProvider sutProvider) - { - // Organization has not migrated - organization.FlexibleCollections = false; - - // Permissions do not contain Manage property - var expectedPermissions = (groupRequestModel.Collections ?? []).Select(model => new AssociationWithPermissionsRequestModel { Id = model.Id, ReadOnly = model.ReadOnly, HidePasswords = model.HidePasswords.GetValueOrDefault() }); - groupRequestModel.Collections = expectedPermissions; - - sutProvider.GetDependency().OrganizationId.Returns(organization.Id); - sutProvider.GetDependency().GetByIdAsync(organization.Id).Returns(organization); - - var response = await sutProvider.Sut.Post(groupRequestModel) as JsonResult; - var responseValue = response.Value as GroupResponseModel; - - await sutProvider.GetDependency().Received(1).CreateGroupAsync( - Arg.Is(g => - g.OrganizationId == organization.Id && g.Name == groupRequestModel.Name && - g.AccessAll == groupRequestModel.AccessAll && g.ExternalId == groupRequestModel.ExternalId), - organization, - Arg.Any>()); - - Assert.Equal(groupRequestModel.Name, responseValue.Name); - Assert.Equal(groupRequestModel.AccessAll, responseValue.AccessAll); - Assert.Equal(groupRequestModel.ExternalId, responseValue.ExternalId); - } - - [Theory] - [BitAutoData] - public async Task Post_Throws_BadRequestException_BeforeFlexibleCollectionMigration_Manage(Organization organization, GroupCreateUpdateRequestModel groupRequestModel, SutProvider sutProvider) - { - // Organization has not migrated - organization.FlexibleCollections = false; - - // Contains at least one can manage - groupRequestModel.Collections.First().Manage = true; - - sutProvider.GetDependency().OrganizationId.Returns(organization.Id); - sutProvider.GetDependency().GetByIdAsync(organization.Id).Returns(organization); - - await sutProvider.GetDependency().DidNotReceiveWithAnyArgs().CreateGroupAsync(default, default, default, default); - await Assert.ThrowsAsync(() => sutProvider.Sut.Post(groupRequestModel)); - } - - [Theory] - [BitAutoData] - public async Task Put_Success_BeforeFlexibleCollectionMigration(Organization organization, Group group, GroupCreateUpdateRequestModel groupRequestModel, SutProvider sutProvider) - { - // Organization has not migrated - organization.FlexibleCollections = false; - - // Permissions do not contain Manage property - var expectedPermissions = (groupRequestModel.Collections ?? []).Select(model => new AssociationWithPermissionsRequestModel { Id = model.Id, ReadOnly = model.ReadOnly, HidePasswords = model.HidePasswords.GetValueOrDefault() }); - groupRequestModel.Collections = expectedPermissions; - - group.OrganizationId = organization.Id; - - sutProvider.GetDependency().GetByIdAsync(organization.Id).Returns(organization); - sutProvider.GetDependency().GetByIdAsync(group.Id).Returns(group); - sutProvider.GetDependency().OrganizationId.Returns(organization.Id); - - var response = await sutProvider.Sut.Put(group.Id, groupRequestModel) as JsonResult; - var responseValue = response.Value as GroupResponseModel; - - await sutProvider.GetDependency().Received(1).UpdateGroupAsync( - Arg.Is(g => - g.OrganizationId == organization.Id && g.Name == groupRequestModel.Name && - g.AccessAll == groupRequestModel.AccessAll && g.ExternalId == groupRequestModel.ExternalId), - Arg.Is(o => o.Id == organization.Id), - Arg.Any>()); - - Assert.Equal(groupRequestModel.Name, responseValue.Name); - Assert.Equal(groupRequestModel.AccessAll, responseValue.AccessAll); - Assert.Equal(groupRequestModel.ExternalId, responseValue.ExternalId); - } - - [Theory] - [BitAutoData] - public async Task Put_Throws_BadRequestException_BeforeFlexibleCollectionMigration_Manage(Organization organization, Group group, GroupCreateUpdateRequestModel groupRequestModel, SutProvider sutProvider) - { - // Organization has not migrated - organization.FlexibleCollections = false; - - // Contains at least one can manage - groupRequestModel.Collections.First().Manage = true; - - group.OrganizationId = organization.Id; - - sutProvider.GetDependency().GetByIdAsync(organization.Id).Returns(organization); - sutProvider.GetDependency().GetByIdAsync(group.Id).Returns(group); - sutProvider.GetDependency().OrganizationId.Returns(organization.Id); - - await sutProvider.GetDependency().DidNotReceiveWithAnyArgs().UpdateGroupAsync(default, default, default, default); - await Assert.ThrowsAsync(() => sutProvider.Sut.Put(group.Id, groupRequestModel)); - } - - [Theory] - [BitAutoData] - public async Task Post_Success_AfterFlexibleCollectionMigration(Organization organization, GroupCreateUpdateRequestModel groupRequestModel, SutProvider sutProvider) + public async Task Post_Success(Organization organization, GroupCreateUpdateRequestModel groupRequestModel, SutProvider sutProvider) { // Organization has migrated organization.FlexibleCollections = true; @@ -137,18 +38,17 @@ public class GroupsControllerTests await sutProvider.GetDependency().Received(1).CreateGroupAsync( Arg.Is(g => g.OrganizationId == organization.Id && g.Name == groupRequestModel.Name && - g.AccessAll == groupRequestModel.AccessAll && g.ExternalId == groupRequestModel.ExternalId), + g.ExternalId == groupRequestModel.ExternalId), organization, Arg.Any>()); Assert.Equal(groupRequestModel.Name, responseValue.Name); - Assert.Equal(groupRequestModel.AccessAll, responseValue.AccessAll); Assert.Equal(groupRequestModel.ExternalId, responseValue.ExternalId); } [Theory] [BitAutoData] - public async Task Put_Success_AfterFlexibleCollectionMigration(Organization organization, Group group, GroupCreateUpdateRequestModel groupRequestModel, SutProvider sutProvider) + public async Task Put_Success(Organization organization, Group group, GroupCreateUpdateRequestModel groupRequestModel, SutProvider sutProvider) { // Organization has migrated organization.FlexibleCollections = true; @@ -168,12 +68,11 @@ public class GroupsControllerTests await sutProvider.GetDependency().Received(1).UpdateGroupAsync( Arg.Is(g => g.OrganizationId == organization.Id && g.Name == groupRequestModel.Name && - g.AccessAll == groupRequestModel.AccessAll && g.ExternalId == groupRequestModel.ExternalId), + g.ExternalId == groupRequestModel.ExternalId), Arg.Is(o => o.Id == organization.Id), Arg.Any>()); Assert.Equal(groupRequestModel.Name, responseValue.Name); - Assert.Equal(groupRequestModel.AccessAll, responseValue.AccessAll); Assert.Equal(groupRequestModel.ExternalId, responseValue.ExternalId); } }