From 6262686c0ca1cbd8462d88a9d0ffdc31e0c4fd08 Mon Sep 17 00:00:00 2001 From: Thomas Rittson <31796059+eliykat@users.noreply.github.com> Date: Fri, 21 Jun 2024 09:00:01 +1000 Subject: [PATCH] [AC-2699] Remove AccessAll from api request/response models (#4203) --- .../Models/Request/GroupRequestModel.cs | 2 -- .../OrganizationUserRequestModels.cs | 4 ---- .../Models/Response/GroupResponseModel.cs | 2 -- .../OrganizationUserResponseModel.cs | 3 --- .../Controllers/GroupsControllerTests.cs | 24 +++++-------------- 5 files changed, 6 insertions(+), 29 deletions(-) diff --git a/src/Api/AdminConsole/Models/Request/GroupRequestModel.cs b/src/Api/AdminConsole/Models/Request/GroupRequestModel.cs index d4043d7ead..a6cfb6733b 100644 --- a/src/Api/AdminConsole/Models/Request/GroupRequestModel.cs +++ b/src/Api/AdminConsole/Models/Request/GroupRequestModel.cs @@ -9,7 +9,6 @@ public class GroupRequestModel [Required] [StringLength(100)] public string Name { get; set; } - public bool? AccessAll { get; set; } public IEnumerable Collections { get; set; } public IEnumerable Users { get; set; } @@ -24,7 +23,6 @@ public class GroupRequestModel public Group ToGroup(Group existingGroup) { existingGroup.Name = Name; - existingGroup.AccessAll = AccessAll ?? false; return existingGroup; } } diff --git a/src/Api/AdminConsole/Models/Request/Organizations/OrganizationUserRequestModels.cs b/src/Api/AdminConsole/Models/Request/Organizations/OrganizationUserRequestModels.cs index eacb3f9c03..0313d85798 100644 --- a/src/Api/AdminConsole/Models/Request/Organizations/OrganizationUserRequestModels.cs +++ b/src/Api/AdminConsole/Models/Request/Organizations/OrganizationUserRequestModels.cs @@ -15,7 +15,6 @@ public class OrganizationUserInviteRequestModel public IEnumerable Emails { get; set; } [Required] public OrganizationUserType? Type { get; set; } - public bool AccessAll { get; set; } public bool AccessSecretsManager { get; set; } public Permissions Permissions { get; set; } public IEnumerable Collections { get; set; } @@ -27,7 +26,6 @@ public class OrganizationUserInviteRequestModel { Emails = Emails, Type = Type, - AccessAll = AccessAll, AccessSecretsManager = AccessSecretsManager, Collections = Collections?.Select(c => c.ToSelectionReadOnly()), Groups = Groups, @@ -86,7 +84,6 @@ public class OrganizationUserUpdateRequestModel { [Required] public OrganizationUserType? Type { get; set; } - public bool AccessAll { get; set; } public bool AccessSecretsManager { get; set; } public Permissions Permissions { get; set; } public IEnumerable Collections { get; set; } @@ -96,7 +93,6 @@ public class OrganizationUserUpdateRequestModel { existingUser.Type = Type.Value; existingUser.Permissions = CoreHelpers.ClassToJsonData(Permissions); - existingUser.AccessAll = AccessAll; existingUser.AccessSecretsManager = AccessSecretsManager; return existingUser; } diff --git a/src/Api/AdminConsole/Models/Response/GroupResponseModel.cs b/src/Api/AdminConsole/Models/Response/GroupResponseModel.cs index b5d00fca98..f956f27ebc 100644 --- a/src/Api/AdminConsole/Models/Response/GroupResponseModel.cs +++ b/src/Api/AdminConsole/Models/Response/GroupResponseModel.cs @@ -18,14 +18,12 @@ public class GroupResponseModel : ResponseModel Id = group.Id; OrganizationId = group.OrganizationId; Name = group.Name; - AccessAll = group.AccessAll; ExternalId = group.ExternalId; } public Guid Id { get; set; } public Guid OrganizationId { get; set; } public string Name { get; set; } - public bool AccessAll { get; set; } public string ExternalId { get; set; } } diff --git a/src/Api/AdminConsole/Models/Response/Organizations/OrganizationUserResponseModel.cs b/src/Api/AdminConsole/Models/Response/Organizations/OrganizationUserResponseModel.cs index 278e55c4ca..bf095c1f4a 100644 --- a/src/Api/AdminConsole/Models/Response/Organizations/OrganizationUserResponseModel.cs +++ b/src/Api/AdminConsole/Models/Response/Organizations/OrganizationUserResponseModel.cs @@ -23,7 +23,6 @@ public class OrganizationUserResponseModel : ResponseModel UserId = organizationUser.UserId; Type = organizationUser.Type; Status = organizationUser.Status; - AccessAll = organizationUser.AccessAll; ExternalId = organizationUser.ExternalId; AccessSecretsManager = organizationUser.AccessSecretsManager; Permissions = CoreHelpers.LoadClassFromJsonData(organizationUser.Permissions); @@ -42,7 +41,6 @@ public class OrganizationUserResponseModel : ResponseModel UserId = organizationUser.UserId; Type = organizationUser.Type; Status = organizationUser.Status; - AccessAll = organizationUser.AccessAll; ExternalId = organizationUser.ExternalId; AccessSecretsManager = organizationUser.AccessSecretsManager; Permissions = CoreHelpers.LoadClassFromJsonData(organizationUser.Permissions); @@ -55,7 +53,6 @@ public class OrganizationUserResponseModel : ResponseModel public Guid? UserId { get; set; } public OrganizationUserType Type { get; set; } public OrganizationUserStatusType Status { get; set; } - public bool AccessAll { get; set; } public string ExternalId { get; set; } public bool AccessSecretsManager { get; set; } public Permissions Permissions { get; set; } diff --git a/test/Api.Test/AdminConsole/Controllers/GroupsControllerTests.cs b/test/Api.Test/AdminConsole/Controllers/GroupsControllerTests.cs index 99406c7f98..6f077fbd3e 100644 --- a/test/Api.Test/AdminConsole/Controllers/GroupsControllerTests.cs +++ b/test/Api.Test/AdminConsole/Controllers/GroupsControllerTests.cs @@ -39,14 +39,12 @@ public class GroupsControllerTests await sutProvider.GetDependency().Received(1).ManageGroups(organization.Id); await sutProvider.GetDependency().Received(1).CreateGroupAsync( Arg.Is(g => - g.OrganizationId == organization.Id && g.Name == groupRequestModel.Name && - g.AccessAll == groupRequestModel.AccessAll), + g.OrganizationId == organization.Id && g.Name == groupRequestModel.Name), organization, Arg.Any>(), Arg.Any>()); Assert.Equal(groupRequestModel.Name, response.Name); Assert.Equal(organization.Id, response.OrganizationId); - Assert.Equal(groupRequestModel.AccessAll, response.AccessAll); } [Theory] @@ -85,15 +83,13 @@ public class GroupsControllerTests // Assert that it saved the data await sutProvider.GetDependency().Received(1).CreateGroupAsync( Arg.Is(g => - g.OrganizationId == organization.Id && g.Name == groupRequestModel.Name && - g.AccessAll == groupRequestModel.AccessAll), + g.OrganizationId == organization.Id && g.Name == groupRequestModel.Name), organization, Arg.Is>(access => access.All(c => requestModelCollectionIds.Contains(c.Id))), Arg.Any>()); Assert.Equal(groupRequestModel.Name, response.Name); Assert.Equal(organization.Id, response.OrganizationId); - Assert.Equal(groupRequestModel.AccessAll, response.AccessAll); } [Theory] @@ -151,8 +147,7 @@ public class GroupsControllerTests await sutProvider.GetDependency().Received(1).ManageGroups(organization.Id); await sutProvider.GetDependency().Received(1).UpdateGroupAsync( Arg.Is(g => - g.OrganizationId == organization.Id && g.Name == groupRequestModel.Name && - g.AccessAll == groupRequestModel.AccessAll), + g.OrganizationId == organization.Id && g.Name == groupRequestModel.Name), Arg.Is(o => o.Id == organization.Id), // Should overwrite any existing collections Arg.Is>(access => @@ -160,7 +155,6 @@ public class GroupsControllerTests Arg.Any>()); Assert.Equal(groupRequestModel.Name, response.Name); Assert.Equal(organization.Id, response.OrganizationId); - Assert.Equal(groupRequestModel.AccessAll, response.AccessAll); } [Theory] @@ -248,14 +242,12 @@ public class GroupsControllerTests await sutProvider.GetDependency().Received(1).ManageGroups(organization.Id); await sutProvider.GetDependency().Received(1).UpdateGroupAsync( Arg.Is(g => - g.OrganizationId == organization.Id && g.Name == groupRequestModel.Name && - g.AccessAll == groupRequestModel.AccessAll), + g.OrganizationId == organization.Id && g.Name == groupRequestModel.Name), Arg.Is(o => o.Id == organization.Id), Arg.Any>(), Arg.Any>()); Assert.Equal(groupRequestModel.Name, response.Name); Assert.Equal(organization.Id, response.OrganizationId); - Assert.Equal(groupRequestModel.AccessAll, response.AccessAll); } [Theory] @@ -295,14 +287,12 @@ public class GroupsControllerTests await sutProvider.GetDependency().Received(1).ManageGroups(organization.Id); await sutProvider.GetDependency().Received(1).UpdateGroupAsync( Arg.Is(g => - g.OrganizationId == organization.Id && g.Name == groupRequestModel.Name && - g.AccessAll == groupRequestModel.AccessAll), + g.OrganizationId == organization.Id && g.Name == groupRequestModel.Name), Arg.Is(o => o.Id == organization.Id), Arg.Any>(), Arg.Any>()); Assert.Equal(groupRequestModel.Name, response.Name); Assert.Equal(organization.Id, response.OrganizationId); - Assert.Equal(groupRequestModel.AccessAll, response.AccessAll); } [Theory] @@ -378,8 +368,7 @@ public class GroupsControllerTests await sutProvider.GetDependency().Received(1).ManageGroups(organization.Id); await sutProvider.GetDependency().Received(1).UpdateGroupAsync( Arg.Is(g => - g.OrganizationId == organization.Id && g.Name == groupRequestModel.Name && - g.AccessAll == groupRequestModel.AccessAll), + g.OrganizationId == organization.Id && g.Name == groupRequestModel.Name), Arg.Is(o => o.Id == organization.Id), Arg.Is>(cas => cas.Select(c => c.Id).SequenceEqual(currentCollectionAccess.Select(c => c.Id)) && @@ -389,7 +378,6 @@ public class GroupsControllerTests Arg.Any>()); Assert.Equal(groupRequestModel.Name, response.Name); Assert.Equal(organization.Id, response.OrganizationId); - Assert.Equal(groupRequestModel.AccessAll, response.AccessAll); } [Theory]