mirror of
https://github.com/bitwarden/server.git
synced 2025-12-10 00:42:07 -06:00
* Add GroupsRecipe to manage group creation and user relationships in organizations
* Add CollectionsRecipe to manage collection creation and user relationships in organizations
* Refactor OrganizationUsersControllerPerformanceTests to enhance performance testing and add new test cases
* Add OrganizationDomainRecipe to add verified domains for organizations
* Add more tests to OrganizationUsersControllerPerformanceTests and enhance seeding logic for organizations
- Updated performance tests to use dynamic domain generation for organization users.
- Refactored seeding methods in OrganizationWithUsersRecipe to accept user status and type.
- Modified AddToOrganization methods in CollectionsRecipe and GroupsRecipe to return created IDs.
- Adjusted DbSeederUtility to align with new seeding method signatures.
* Enhance OrganizationSeeder with additional configuration options and update seat calculation in OrganizationWithUsersRecipe to ensure a minimum of 1000 seats.
* Add performance tests for Groups, Organizations, Organization Users, and Provider Organizations controllers
- Introduced `GroupsControllerPerformanceTests` to validate the performance of the PutGroupAsync method.
- Added `OrganizationsControllerPerformanceTests` with multiple tests including DeleteOrganizationAsync, DeleteOrganizationWithTokenAsync, PostStorageAsync, and CreateWithoutPaymentAsync.
- Enhanced `OrganizationUsersControllerPerformanceTests` with DeleteSingleUserAccountAsync and InviteUsersAsync methods to test user account deletion and bulk invitations.
- Created `ProviderOrganizationsControllerPerformanceTests` to assess the performance of deleting provider organizations.
These tests ensure the reliability and efficiency of the respective controller actions under various scenarios.
* Refactor GroupsControllerPerformanceTests to use parameterized tests
- Renamed `GroupsControllerPerformanceTest` to `GroupsControllerPerformanceTests` for consistency.
- Updated `PutGroupAsync` method to use `[Theory]` with `InlineData` for dynamic user and collection counts.
- Adjusted organization user and collection seeding logic to utilize the new parameters.
- Enhanced logging to provide clearer performance metrics during tests.
* Update domain generation in GroupsControllerPerformanceTests for improved test consistency
* Remove ProviderOrganizationsControllerPerformanceTests
* Refactor performance tests for Groups, Organizations, and Organization Users controllers
- Updated method names for clarity and consistency, e.g., `PutGroupAsync` to `UpdateGroup_WithUsersAndCollections`.
- Enhanced test documentation with XML comments to describe the purpose of each test.
- Improved domain generation logic for consistency across tests.
- Adjusted logging to provide detailed performance metrics during test execution.
- Renamed several test methods to better reflect their functionality.
* Refactor performance tests in Organizations and Organization Users controllers
- Updated tests to use parameterized `[Theory]` attributes with `InlineData` for dynamic user, collection, and group counts.
- Enhanced logging to include detailed metrics such as user and collection counts during test execution.
- Marked several tests as skipped for performance considerations.
- Removed unused code and improved organization of test methods for clarity.
* Add bulk reinvite users performance test to OrganizationUsersControllerPerformanceTests
- Implemented a new performance test for the POST /organizations/{orgId}/users/reinvite endpoint.
- Utilized parameterized testing with `[Theory]` and `InlineData` to evaluate performance with varying user counts.
- Enhanced logging to capture request duration and response status for better performance insights.
- Updated OrganizationSeeder to conditionally set email based on user status during seeding.
* Refactor domain generation in performance tests to use OrganizationTestHelpers
- Updated domain generation logic in GroupsControllerPerformanceTests, OrganizationsControllerPerformanceTests, and OrganizationUsersControllerPerformanceTests to utilize the new GenerateRandomDomain method from OrganizationTestHelpers.
- This change enhances consistency and readability across the tests by centralizing domain generation logic.
* Update CollectionsRecipe to have better readability
* Update GroupsRecipe to have better readability
* Refactor authentication in performance tests to use centralized helper method. This change reduces code duplication across Groups, Organizations, and OrganizationUsers controller tests by implementing the `AuthenticateClientAsync` method in a new `PerformanceTestHelpers` class.
* Refactor OrganizationUsersControllerPerformanceTests to filter organization users by OrganizationId.
* Refactor CreateOrganizationUser method to improve handling of user status and key assignment based on invitation and confirmation states.
* Add XML documentation for CreateOrganizationUser method to clarify user status handling
123 lines
4.6 KiB
C#
123 lines
4.6 KiB
C#
using Bit.Core.Enums;
|
|
using Bit.Core.Utilities;
|
|
using Bit.Infrastructure.EntityFramework.Repositories;
|
|
using LinqToDB.EntityFrameworkCore;
|
|
|
|
namespace Bit.Seeder.Recipes;
|
|
|
|
public class CollectionsRecipe(DatabaseContext db)
|
|
{
|
|
/// <summary>
|
|
/// Adds collections to an organization and creates relationships between users and collections.
|
|
/// </summary>
|
|
/// <param name="organizationId">The ID of the organization to add collections to.</param>
|
|
/// <param name="collections">The number of collections to add.</param>
|
|
/// <param name="organizationUserIds">The IDs of the users to create relationships with.</param>
|
|
/// <param name="maxUsersWithRelationships">The maximum number of users to create relationships with.</param>
|
|
public List<Guid> AddToOrganization(Guid organizationId, int collections, List<Guid> organizationUserIds, int maxUsersWithRelationships = 1000)
|
|
{
|
|
var collectionList = CreateAndSaveCollections(organizationId, collections);
|
|
|
|
if (collectionList.Any())
|
|
{
|
|
CreateAndSaveCollectionUserRelationships(collectionList, organizationUserIds, maxUsersWithRelationships);
|
|
}
|
|
|
|
return collectionList.Select(c => c.Id).ToList();
|
|
}
|
|
|
|
private List<Core.Entities.Collection> CreateAndSaveCollections(Guid organizationId, int count)
|
|
{
|
|
var collectionList = new List<Core.Entities.Collection>();
|
|
|
|
for (var i = 0; i < count; i++)
|
|
{
|
|
collectionList.Add(new Core.Entities.Collection
|
|
{
|
|
Id = CoreHelpers.GenerateComb(),
|
|
OrganizationId = organizationId,
|
|
Name = $"Collection {i + 1}",
|
|
Type = CollectionType.SharedCollection,
|
|
CreationDate = DateTime.UtcNow,
|
|
RevisionDate = DateTime.UtcNow
|
|
});
|
|
}
|
|
|
|
if (collectionList.Any())
|
|
{
|
|
db.BulkCopy(collectionList);
|
|
}
|
|
|
|
return collectionList;
|
|
}
|
|
|
|
private void CreateAndSaveCollectionUserRelationships(
|
|
List<Core.Entities.Collection> collections,
|
|
List<Guid> organizationUserIds,
|
|
int maxUsersWithRelationships)
|
|
{
|
|
if (!organizationUserIds.Any() || maxUsersWithRelationships <= 0)
|
|
{
|
|
return;
|
|
}
|
|
|
|
var collectionUsers = BuildCollectionUserRelationships(collections, organizationUserIds, maxUsersWithRelationships);
|
|
|
|
if (collectionUsers.Any())
|
|
{
|
|
db.BulkCopy(collectionUsers);
|
|
}
|
|
}
|
|
|
|
/// <summary>
|
|
/// Creates user-to-collection relationships with varied assignment patterns for realistic test data.
|
|
/// Each user gets 1-3 collections based on a rotating pattern.
|
|
/// </summary>
|
|
private List<Core.Entities.CollectionUser> BuildCollectionUserRelationships(
|
|
List<Core.Entities.Collection> collections,
|
|
List<Guid> organizationUserIds,
|
|
int maxUsersWithRelationships)
|
|
{
|
|
var maxRelationships = Math.Min(organizationUserIds.Count, maxUsersWithRelationships);
|
|
var collectionUsers = new List<Core.Entities.CollectionUser>();
|
|
|
|
for (var i = 0; i < maxRelationships; i++)
|
|
{
|
|
var orgUserId = organizationUserIds[i];
|
|
var userCollectionAssignments = CreateCollectionAssignmentsForUser(collections, orgUserId, i);
|
|
collectionUsers.AddRange(userCollectionAssignments);
|
|
}
|
|
|
|
return collectionUsers;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Assigns collections to a user with varying permissions.
|
|
/// Pattern: 1-3 collections per user (cycles: 1, 2, 3, 1, 2, 3...).
|
|
/// First collection has Manage rights, subsequent ones are ReadOnly.
|
|
/// </summary>
|
|
private List<Core.Entities.CollectionUser> CreateCollectionAssignmentsForUser(
|
|
List<Core.Entities.Collection> collections,
|
|
Guid organizationUserId,
|
|
int userIndex)
|
|
{
|
|
var assignments = new List<Core.Entities.CollectionUser>();
|
|
var userCollectionCount = (userIndex % 3) + 1; // Cycles through 1, 2, or 3 collections
|
|
|
|
for (var j = 0; j < userCollectionCount; j++)
|
|
{
|
|
var collectionIndex = (userIndex + j) % collections.Count; // Distribute across available collections
|
|
assignments.Add(new Core.Entities.CollectionUser
|
|
{
|
|
CollectionId = collections[collectionIndex].Id,
|
|
OrganizationUserId = organizationUserId,
|
|
ReadOnly = j > 0, // First assignment gets write access
|
|
HidePasswords = false,
|
|
Manage = j == 0 // First assignment gets manage permissions
|
|
});
|
|
}
|
|
|
|
return assignments;
|
|
}
|
|
}
|