mirror of
https://github.com/bitwarden/server
synced 2025-12-06 00:03:34 +00:00
[PM-26099] Update public list members endpoint to include collections (#6503)
* Add CreateCollectionAsync method to OrganizationTestHelpers for collection creation with user and group associations * Update public MembersController List endpoint to include associated collections in member response model * Update MembersControllerTests to validate collection associations in List endpoint. Add JsonConstructor to AssociationWithPermissionsResponseModel * Refactor MembersController by removing unused IUserService and IApplicationCacheService dependencies. * Remove nullable disable directive from Public MembersController
This commit is contained in:
@@ -64,6 +64,17 @@ public class MembersControllerTests : IClassFixture<ApiApplicationFactory>, IAsy
|
||||
var (userEmail4, orgUser4) = await OrganizationTestHelpers.CreateNewUserWithAccountAsync(_factory, _organization.Id,
|
||||
OrganizationUserType.Admin);
|
||||
|
||||
var collection1 = await OrganizationTestHelpers.CreateCollectionAsync(_factory, _organization.Id, "Test Collection 1", users:
|
||||
[
|
||||
new CollectionAccessSelection { Id = orgUser1.Id, ReadOnly = false, HidePasswords = false, Manage = true },
|
||||
new CollectionAccessSelection { Id = orgUser3.Id, ReadOnly = true, HidePasswords = false, Manage = false }
|
||||
]);
|
||||
|
||||
var collection2 = await OrganizationTestHelpers.CreateCollectionAsync(_factory, _organization.Id, "Test Collection 2", users:
|
||||
[
|
||||
new CollectionAccessSelection { Id = orgUser1.Id, ReadOnly = false, HidePasswords = true, Manage = false }
|
||||
]);
|
||||
|
||||
var response = await _client.GetAsync($"/public/members");
|
||||
Assert.Equal(HttpStatusCode.OK, response.StatusCode);
|
||||
var result = await response.Content.ReadFromJsonAsync<ListResponseModel<MemberResponseModel>>();
|
||||
@@ -71,23 +82,47 @@ public class MembersControllerTests : IClassFixture<ApiApplicationFactory>, IAsy
|
||||
Assert.Equal(5, result.Data.Count());
|
||||
|
||||
// The owner
|
||||
Assert.NotNull(result.Data.SingleOrDefault(m =>
|
||||
m.Email == _ownerEmail && m.Type == OrganizationUserType.Owner));
|
||||
var ownerResult = result.Data.SingleOrDefault(m => m.Email == _ownerEmail && m.Type == OrganizationUserType.Owner);
|
||||
Assert.NotNull(ownerResult);
|
||||
Assert.Empty(ownerResult.Collections);
|
||||
|
||||
// The custom user
|
||||
// The custom user with collections
|
||||
var user1Result = result.Data.Single(m => m.Email == userEmail1);
|
||||
Assert.Equal(OrganizationUserType.Custom, user1Result.Type);
|
||||
AssertHelper.AssertPropertyEqual(
|
||||
new PermissionsModel { AccessImportExport = true, ManagePolicies = true, AccessReports = true },
|
||||
user1Result.Permissions);
|
||||
// Verify collections
|
||||
Assert.NotNull(user1Result.Collections);
|
||||
Assert.Equal(2, user1Result.Collections.Count());
|
||||
var user1Collection1 = user1Result.Collections.Single(c => c.Id == collection1.Id);
|
||||
Assert.False(user1Collection1.ReadOnly);
|
||||
Assert.False(user1Collection1.HidePasswords);
|
||||
Assert.True(user1Collection1.Manage);
|
||||
var user1Collection2 = user1Result.Collections.Single(c => c.Id == collection2.Id);
|
||||
Assert.False(user1Collection2.ReadOnly);
|
||||
Assert.True(user1Collection2.HidePasswords);
|
||||
Assert.False(user1Collection2.Manage);
|
||||
|
||||
// Everyone else
|
||||
Assert.NotNull(result.Data.SingleOrDefault(m =>
|
||||
m.Email == userEmail2 && m.Type == OrganizationUserType.Owner));
|
||||
Assert.NotNull(result.Data.SingleOrDefault(m =>
|
||||
m.Email == userEmail3 && m.Type == OrganizationUserType.User));
|
||||
Assert.NotNull(result.Data.SingleOrDefault(m =>
|
||||
m.Email == userEmail4 && m.Type == OrganizationUserType.Admin));
|
||||
// The other owner
|
||||
var user2Result = result.Data.SingleOrDefault(m => m.Email == userEmail2 && m.Type == OrganizationUserType.Owner);
|
||||
Assert.NotNull(user2Result);
|
||||
Assert.Empty(user2Result.Collections);
|
||||
|
||||
// The user with one collection
|
||||
var user3Result = result.Data.SingleOrDefault(m => m.Email == userEmail3 && m.Type == OrganizationUserType.User);
|
||||
Assert.NotNull(user3Result);
|
||||
Assert.NotNull(user3Result.Collections);
|
||||
Assert.Single(user3Result.Collections);
|
||||
var user3Collection1 = user3Result.Collections.Single(c => c.Id == collection1.Id);
|
||||
Assert.True(user3Collection1.ReadOnly);
|
||||
Assert.False(user3Collection1.HidePasswords);
|
||||
Assert.False(user3Collection1.Manage);
|
||||
|
||||
// The admin with no collections
|
||||
var user4Result = result.Data.SingleOrDefault(m => m.Email == userEmail4 && m.Type == OrganizationUserType.Admin);
|
||||
Assert.NotNull(user4Result);
|
||||
Assert.Empty(user4Result.Collections);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
|
||||
@@ -151,6 +151,28 @@ public static class OrganizationTestHelpers
|
||||
return group;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Creates a collection with optional user and group associations.
|
||||
/// </summary>
|
||||
public static async Task<Collection> CreateCollectionAsync(
|
||||
ApiApplicationFactory factory,
|
||||
Guid organizationId,
|
||||
string name,
|
||||
IEnumerable<CollectionAccessSelection>? users = null,
|
||||
IEnumerable<CollectionAccessSelection>? groups = null)
|
||||
{
|
||||
var collectionRepository = factory.GetService<ICollectionRepository>();
|
||||
var collection = new Collection
|
||||
{
|
||||
OrganizationId = organizationId,
|
||||
Name = name,
|
||||
Type = CollectionType.SharedCollection
|
||||
};
|
||||
|
||||
await collectionRepository.CreateAsync(collection, groups, users);
|
||||
return collection;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Enables the Organization Data Ownership policy for the specified organization.
|
||||
/// </summary>
|
||||
|
||||
Reference in New Issue
Block a user