mirror of
https://github.com/bitwarden/server
synced 2025-12-11 13:53:40 +00:00
* Update ProviderUserOrganizationDetailsView to include SSO configuration data * Updated the ProviderUserOrganizationDetailsViewQuery to join with SsoConfigs and select SSO-related fields. * Modified the SQL view to reflect the inclusion of SSO configuration data. * Added a new migration script for the updated view structure. * Add SSO configuration properties to ProviderUserOrganizationDetails model * Add SSO configuration handling to ProfileProviderOrganizationResponseModel * Introduced properties for SSO configuration, including SSO enabled status and KeyConnector details. * Implemented deserialization of SSO configuration data to populate new fields in the response model. * Add integration tests for ProviderUserRepository.GetManyOrganizationDetailsByUserAsync * Add BaseUserOrganizationDetails model to encapsulate common properties * Introduced a new abstract class to define shared properties for organization users and provider organization users * Add BaseProfileOrganizationResponseModel to encapsulate organization response properties * Introduced a new abstract class that ensures all properties are fully populated for profile organization responses. * Update ProviderUserOrganizationDetailsViewQuery to include missing ProviderUserId * Refactor OrganizationUserOrganizationDetails and ProviderUserOrganizationDetails to inherit from BaseUserOrganizationDetails * Updated both models to extend BaseUserOrganizationDetails, promoting code reuse and ensure they have the same base properties * Refactor ProfileOrganizationResponseModel and ProfileProviderOrganizationResponseModel to inherit from BaseProfileOrganizationResponseModel * Refactor ProviderUserRepositoryTests to improve organization detail assertions * Consolidated assertions for organization details into a new method, AssertProviderOrganizationDetails, enhancing code readability and maintainability. * Updated test cases to verify all relevant properties for organizations with and without SSO configurations. * Add integration test for GetManyDetailsByUserAsync to verify SSO properties * Implemented a new test case to ensure that the SSO properties are correctly populated for organizations with and without SSO configurations. * The test verifies the expected behavior of the method when interacting with the user and organization repositories, including cleanup of created entities after the test execution. * Add unit tests for ProfileOrganizationResponseModel and ProfileProviderOrganizationResponseModel * Introduced tests to validate the constructors of ProfileOrganizationResponseModel and ProfileProviderOrganizationResponseModel, ensuring that all properties are populated correctly based on the provided organization details. * Verified expected behavior for both organization and provider models, including SSO configurations and relevant properties. * Update SyncControllerTests.Get_ProviderPlanTypeProperlyPopulated to nullify SSO configurations in provider user organization details * Refactor BaseProfileOrganizationResponseModel and ProfileOrganizationResponseModel for null safety Updated properties in BaseProfileOrganizationResponseModel and ProfileOrganizationResponseModel to support null safety by introducing nullable types where appropriate. * Enhance null safety in BaseUserOrganizationDetails and OrganizationUserOrganizationDetails Updated properties in BaseUserOrganizationDetails and OrganizationUserOrganizationDetails to support null safety by introducing nullable types where appropriate, ensuring better handling of potential null values. * Move common properties from ProfileOrganizationResponseModel to BaseProfileOrganizationResponseModel * Refactor organization details: Remove BaseUserOrganizationDetails and introduce IProfileMemberOrganizationDetails interface for improved structure and clarity in organization user data management. * Enhance OrganizationUserOrganizationDetails: Implement IProfileMemberOrganizationDetails interface * Refactor ProviderUserOrganizationDetails: Implement IProfileMemberOrganizationDetails interface * Refactor ProfileOrganizationResponseModelTests and ProfileProviderOrganizationResponseModelTests: Update constructors to utilize Organization and ProviderUserOrganizationDetails, enhancing property population and test coverage. * Enhance ProviderUserOrganizationDetails: Add UseResetPassword, UseSecretsManager, and UsePasswordManager properties to the query and SQL views * Update BaseProfileOrganizationResponseModel documentation: Clarify purpose and usage of organization properties for OrganizationUsers and ProviderUsers. * Rename ProfileOrganizationResponseModel to ProfileMemberOrganizationResponseModel, update references and update related test names * Add XML documentation for ProfileMemberOrganizationResponseModel and ProfileProviderOrganizationResponseModel to clarify their purpose and relationships * Remove unnecessary cleanup code from OrganizationUserRepositoryTests * Remove unnecessary cleanup code from ProviderUserRepositoryTests * Rename test method in ProviderUserRepositoryTests to improve clarity on property population * Add CreateFullOrganization method to ProviderUserRepositoryTests for improved organization setup in tests * Refactor organization creation in tests to use CreateTestOrganizationAsync for consistency and improved setup * Rename IProfileMemberOrganizationDetails to IProfileOrganizationDetails * Rename ProfileMemberOrganizationResponseModel back to ProfileOrganizationResponseModel * Refactor organization response models to remove Family Sponsorship properties from BaseProfileOrganizationResponseModel and reintroduce them in ProfileOrganizationResponseModel. Update related interfaces and tests accordingly. * Bump date on migration script * Update OrganizationUserOrganizationDetailsViewQuery to include UseAutomaticUserConfirmation property
181 lines
6.7 KiB
C#
181 lines
6.7 KiB
C#
using Bit.Core.AdminConsole.Entities;
|
|
using Bit.Core.AdminConsole.Repositories;
|
|
using Bit.Core.Billing.Enums;
|
|
using Bit.Core.Entities;
|
|
using Bit.Core.Enums;
|
|
using Bit.Core.Repositories;
|
|
|
|
namespace Bit.Infrastructure.IntegrationTest.AdminConsole;
|
|
|
|
/// <summary>
|
|
/// A set of extension methods used to arrange simple test data.
|
|
/// This should only be used for basic, repetitive data arrangement, not for anything complex or for
|
|
/// the repository method under test.
|
|
/// </summary>
|
|
public static class OrganizationTestHelpers
|
|
{
|
|
public static Task<User> CreateTestUserAsync(this IUserRepository userRepository, string identifier = "test")
|
|
{
|
|
var id = Guid.NewGuid();
|
|
return userRepository.CreateAsync(new User
|
|
{
|
|
Id = id,
|
|
Name = $"{identifier}-{id}",
|
|
Email = $"{id}@example.com",
|
|
ApiKey = "TEST",
|
|
SecurityStamp = "stamp",
|
|
});
|
|
}
|
|
|
|
/// <summary>
|
|
/// Creates an Enterprise organization.
|
|
/// </summary>
|
|
public static Task<Organization> CreateTestOrganizationAsync(this IOrganizationRepository organizationRepository,
|
|
int? seatCount = null,
|
|
string identifier = "test")
|
|
{
|
|
var id = Guid.NewGuid();
|
|
return organizationRepository.CreateAsync(new Organization
|
|
{
|
|
Name = $"{identifier}-{id}",
|
|
BillingEmail = $"billing-{id}@example.com",
|
|
Plan = "Enterprise (Annually)",
|
|
PlanType = PlanType.EnterpriseAnnually,
|
|
Identifier = $"{identifier}-{id}",
|
|
BusinessName = $"Test Business {id}",
|
|
BusinessAddress1 = "123 Test Street",
|
|
BusinessAddress2 = "Suite 100",
|
|
BusinessAddress3 = "Building A",
|
|
BusinessCountry = "US",
|
|
BusinessTaxNumber = "123456789",
|
|
Seats = seatCount,
|
|
MaxCollections = 50,
|
|
UsePolicies = true,
|
|
UseSso = true,
|
|
UseKeyConnector = true,
|
|
UseScim = true,
|
|
UseGroups = true,
|
|
UseDirectory = true,
|
|
UseEvents = true,
|
|
UseTotp = true,
|
|
Use2fa = true,
|
|
UseApi = true,
|
|
UseResetPassword = true,
|
|
UseSecretsManager = true,
|
|
UsePasswordManager = true,
|
|
SelfHost = false,
|
|
UsersGetPremium = true,
|
|
UseCustomPermissions = true,
|
|
Storage = 1073741824, // 1 GB in bytes
|
|
MaxStorageGb = 10,
|
|
Gateway = GatewayType.Stripe,
|
|
GatewayCustomerId = $"cus_{id}",
|
|
GatewaySubscriptionId = $"sub_{id}",
|
|
ReferenceData = "{\"test\":\"data\"}",
|
|
Enabled = true,
|
|
LicenseKey = $"license-{id}",
|
|
PublicKey = "test-public-key",
|
|
PrivateKey = "test-private-key",
|
|
TwoFactorProviders = null,
|
|
ExpirationDate = DateTime.UtcNow.AddYears(1),
|
|
MaxAutoscaleSeats = 200,
|
|
OwnersNotifiedOfAutoscaling = null,
|
|
Status = OrganizationStatusType.Managed,
|
|
SmSeats = 50,
|
|
SmServiceAccounts = 25,
|
|
MaxAutoscaleSmSeats = 100,
|
|
MaxAutoscaleSmServiceAccounts = 50,
|
|
LimitCollectionCreation = true,
|
|
LimitCollectionDeletion = true,
|
|
LimitItemDeletion = true,
|
|
AllowAdminAccessToAllCollectionItems = true,
|
|
UseRiskInsights = true,
|
|
UseOrganizationDomains = true,
|
|
UseAdminSponsoredFamilies = true,
|
|
SyncSeats = false,
|
|
UseAutomaticUserConfirmation = true
|
|
});
|
|
}
|
|
|
|
/// <summary>
|
|
/// Creates a confirmed Owner for the specified organization and user.
|
|
/// Does not include any cryptographic material.
|
|
/// </summary>
|
|
public static Task<OrganizationUser> CreateTestOrganizationUserAsync(
|
|
this IOrganizationUserRepository organizationUserRepository,
|
|
Organization organization,
|
|
User user)
|
|
=> organizationUserRepository.CreateAsync(new OrganizationUser
|
|
{
|
|
OrganizationId = organization.Id,
|
|
UserId = user.Id,
|
|
Status = OrganizationUserStatusType.Confirmed,
|
|
Type = OrganizationUserType.Owner
|
|
});
|
|
|
|
public static Task<OrganizationUser> CreateTestOrganizationUserInviteAsync(
|
|
this IOrganizationUserRepository organizationUserRepository,
|
|
Organization organization)
|
|
=> organizationUserRepository.CreateAsync(new OrganizationUser
|
|
{
|
|
OrganizationId = organization.Id,
|
|
UserId = null, // Invites are not linked to a UserId
|
|
Status = OrganizationUserStatusType.Invited,
|
|
Type = OrganizationUserType.Owner
|
|
});
|
|
|
|
public static Task<OrganizationUser> CreateAcceptedTestOrganizationUserAsync(
|
|
this IOrganizationUserRepository organizationUserRepository,
|
|
Organization organization,
|
|
User user)
|
|
=> organizationUserRepository.CreateAsync(new OrganizationUser
|
|
{
|
|
OrganizationId = organization.Id,
|
|
UserId = user.Id,
|
|
Status = OrganizationUserStatusType.Accepted,
|
|
Type = OrganizationUserType.Owner
|
|
});
|
|
|
|
public static Task<OrganizationUser> CreateRevokedTestOrganizationUserAsync(
|
|
this IOrganizationUserRepository organizationUserRepository,
|
|
Organization organization,
|
|
User user)
|
|
=> organizationUserRepository.CreateAsync(new OrganizationUser
|
|
{
|
|
OrganizationId = organization.Id,
|
|
UserId = user.Id,
|
|
Status = OrganizationUserStatusType.Revoked,
|
|
Type = OrganizationUserType.Owner
|
|
});
|
|
|
|
public static Task<OrganizationUser> CreateConfirmedTestOrganizationUserAsync(
|
|
this IOrganizationUserRepository organizationUserRepository,
|
|
Organization organization,
|
|
User user)
|
|
=> organizationUserRepository.CreateAsync(new OrganizationUser
|
|
{
|
|
OrganizationId = organization.Id,
|
|
UserId = user.Id,
|
|
Status = OrganizationUserStatusType.Confirmed,
|
|
Type = OrganizationUserType.Owner
|
|
});
|
|
|
|
public static Task<Group> CreateTestGroupAsync(
|
|
this IGroupRepository groupRepository,
|
|
Organization organization,
|
|
string identifier = "test")
|
|
=> groupRepository.CreateAsync(
|
|
new Group { OrganizationId = organization.Id, Name = $"{identifier} {Guid.NewGuid()}" }
|
|
);
|
|
|
|
public static Task<Collection> CreateTestCollectionAsync(
|
|
this ICollectionRepository collectionRepository,
|
|
Organization organization,
|
|
string identifier = "test")
|
|
=> collectionRepository.CreateAsync(new Collection
|
|
{
|
|
OrganizationId = organization.Id,
|
|
Name = $"{identifier} {Guid.NewGuid()}"
|
|
});
|
|
}
|