nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-04-17 19:18:16 -05:00
Code

Moved FromOrganization mapper method to a constructor

Browse Source
This commit is contained in:
jrmccannon 2025-03-05 15:04:50 -06:00
parent 611ad8c343
commit c7cc9527f4
No known key found for this signature in database
GPG Key ID: CF03F3DB01CE96A6
7 changed files with 37 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bitwarden_license/src/Scim/Users/PostUserCommand.cs
View File

@ -62,7 +62,7 @@ public class PostUserCommand(
return await InviteScimOrganizationUserAsync(model.ToRequest( return await InviteScimOrganizationUserAsync(model.ToRequest(
scimProvider: scimProvider, scimProvider: scimProvider,
hasSecretsManager: hasStandaloneSecretsManager, hasSecretsManager: hasStandaloneSecretsManager,
organization: OrganizationDto.FromOrganization(organization), organization: new OrganizationDto(organization),
performedAt: timeProvider.GetUtcNow())); performedAt: timeProvider.GetUtcNow()));
} }

30
src/Core/AdminConsole/Models/Business/OrganizationDto.cs
View File

@ -16,17 +16,21 @@ public record OrganizationDto
public string GatewaySubscriptionId { get; init; } public string GatewaySubscriptionId { get; init; }
public bool UseSecretsManager { get; init; } public bool UseSecretsManager { get; init; }
public static OrganizationDto FromOrganization(Organization organization) => public OrganizationDto()
new() {
{
OrganizationId = organization.Id, }
Seats = organization.Seats,
MaxAutoScaleSeats = organization.MaxAutoscaleSeats, public OrganizationDto(Organization organization)
SmSeats = organization.SmSeats, {
SmMaxAutoScaleSeats = organization.MaxAutoscaleSmSeats, OrganizationId = organization.Id;
Plan = StaticStore.GetPlan(organization.PlanType), Seats = organization.Seats;
GatewayCustomerId = organization.GatewayCustomerId, MaxAutoScaleSeats = organization.MaxAutoscaleSeats;
GatewaySubscriptionId = organization.GatewaySubscriptionId, SmSeats = organization.SmSeats;
UseSecretsManager = organization.UseSecretsManager SmMaxAutoScaleSeats = organization.MaxAutoscaleSmSeats;
}; Plan = StaticStore.GetPlan(organization.PlanType);
GatewayCustomerId = organization.GatewayCustomerId;
GatewaySubscriptionId = organization.GatewaySubscriptionId;
UseSecretsManager = organization.UseSecretsManager;
}
} }

12
test/Core.Test/AdminConsole/OrganizationFeatures/OrganizationUsers/InviteUsers/InviteOrganizationUserCommandTests.cs
View File

@ -38,7 +38,7 @@ public class InviteOrganizationUserCommandTests
// Arrange // Arrange
user.Email = address.Address; user.Email = address.Address;
var organizationDto = OrganizationDto.FromOrganization(organization); var organizationDto = new OrganizationDto(organization);
var request = new InviteScimOrganizationUserRequest(user.Email, var request = new InviteScimOrganizationUserRequest(user.Email,
true, true,
@ -86,7 +86,7 @@ public class InviteOrganizationUserCommandTests
// Arrange // Arrange
user.Email = address.Address; user.Email = address.Address;
var organizationDto = OrganizationDto.FromOrganization(organization); var organizationDto = new OrganizationDto(organization);
var request = new InviteScimOrganizationUserRequest(user.Email, var request = new InviteScimOrganizationUserRequest(user.Email,
true, true,
@ -139,7 +139,7 @@ public class InviteOrganizationUserCommandTests
user.Email = address.Address; user.Email = address.Address;
var organizationDto = OrganizationDto.FromOrganization(organization); var organizationDto = new OrganizationDto(organization);
var request = new InviteScimOrganizationUserRequest(user.Email, var request = new InviteScimOrganizationUserRequest(user.Email,
true, true,
@ -194,7 +194,7 @@ public class InviteOrganizationUserCommandTests
organization.MaxAutoscaleSeats = 2; organization.MaxAutoscaleSeats = 2;
ownerDetails.Type = OrganizationUserType.Owner; ownerDetails.Type = OrganizationUserType.Owner;
var organizationDto = OrganizationDto.FromOrganization(organization); var organizationDto = new OrganizationDto(organization);
var request = new InviteScimOrganizationUserRequest(user.Email, var request = new InviteScimOrganizationUserRequest(user.Email,
true, true,
@ -250,7 +250,7 @@ public class InviteOrganizationUserCommandTests
organization.MaxAutoscaleSeats = 2; organization.MaxAutoscaleSeats = 2;
ownerDetails.Type = OrganizationUserType.Owner; ownerDetails.Type = OrganizationUserType.Owner;
var organizationDto = OrganizationDto.FromOrganization(organization); var organizationDto = new OrganizationDto(organization);
var request = new InviteScimOrganizationUserRequest(user.Email, var request = new InviteScimOrganizationUserRequest(user.Email,
true, true,
@ -313,7 +313,7 @@ public class InviteOrganizationUserCommandTests
organization.MaxAutoscaleSeats = 2; organization.MaxAutoscaleSeats = 2;
ownerDetails.Type = OrganizationUserType.Owner; ownerDetails.Type = OrganizationUserType.Owner;
var organizationDto = OrganizationDto.FromOrganization(organization); var organizationDto = new OrganizationDto(organization);
var request = new InviteScimOrganizationUserRequest(user.Email, var request = new InviteScimOrganizationUserRequest(user.Email,
true, true,

6
test/Core.Test/AdminConsole/OrganizationFeatures/OrganizationUsers/InviteUsers/Validation/InviteUserOrganizationValidationTests.cs
View File

@ -12,7 +12,7 @@ public class InviteUserOrganizationValidationTests
[BitAutoData] [BitAutoData]
public void Validate_WhenOrganizationIsFreeTier_ShouldReturnValidResponse(Organization organization) public void Validate_WhenOrganizationIsFreeTier_ShouldReturnValidResponse(Organization organization)
{ {
var result = InvitingUserOrganizationValidation.Validate(OrganizationDto.FromOrganization(organization)); var result = InvitingUserOrganizationValidation.Validate(new OrganizationDto(organization));
Assert.IsType<Valid<OrganizationDto>>(result); Assert.IsType<Valid<OrganizationDto>>(result);
} }
@ -24,7 +24,7 @@ public class InviteUserOrganizationValidationTests
{ {
organization.GatewayCustomerId = string.Empty; organization.GatewayCustomerId = string.Empty;
var result = InvitingUserOrganizationValidation.Validate(OrganizationDto.FromOrganization(organization)); var result = InvitingUserOrganizationValidation.Validate(new OrganizationDto(organization));
Assert.IsType<Invalid<OrganizationDto>>(result); Assert.IsType<Invalid<OrganizationDto>>(result);
Assert.Equal(InviteUserValidationErrorMessages.NoPaymentMethodFoundError, result.ErrorMessageString); Assert.Equal(InviteUserValidationErrorMessages.NoPaymentMethodFoundError, result.ErrorMessageString);
@ -37,7 +37,7 @@ public class InviteUserOrganizationValidationTests
{ {
organization.GatewaySubscriptionId = string.Empty; organization.GatewaySubscriptionId = string.Empty;
var result = InvitingUserOrganizationValidation.Validate(OrganizationDto.FromOrganization(organization)); var result = InvitingUserOrganizationValidation.Validate(new OrganizationDto(organization));
Assert.IsType<Invalid<OrganizationDto>>(result); Assert.IsType<Invalid<OrganizationDto>>(result);
Assert.Equal(InviteUserValidationErrorMessages.NoSubscriptionFoundError, result.ErrorMessageString); Assert.Equal(InviteUserValidationErrorMessages.NoSubscriptionFoundError, result.ErrorMessageString);

2
test/Core.Test/AdminConsole/OrganizationFeatures/OrganizationUsers/InviteUsers/Validation/InviteUserPaymentValidationTests.cs
View File

@ -20,7 +20,7 @@ public class InviteUserPaymentValidationTests
var result = InviteUserPaymentValidation.Validate(new PaymentSubscriptionDto var result = InviteUserPaymentValidation.Validate(new PaymentSubscriptionDto
{ {
SubscriptionStatus = StripeConstants.SubscriptionStatus.Active, SubscriptionStatus = StripeConstants.SubscriptionStatus.Active,
ProductTierType = OrganizationDto.FromOrganization(organization).Plan.ProductTier ProductTierType = new OrganizationDto(organization).Plan.ProductTier
}); });
Assert.IsType<Valid<PaymentSubscriptionDto>>(result); Assert.IsType<Valid<PaymentSubscriptionDto>>(result);

8
test/Core.Test/AdminConsole/OrganizationFeatures/OrganizationUsers/InviteUsers/Validation/PasswordManagerInviteUserValidationTests.cs
View File

@ -17,7 +17,7 @@ public class PasswordManagerInviteUserValidationTests
{ {
organization.Seats = null; organization.Seats = null;
var organizationDto = OrganizationDto.FromOrganization(organization); var organizationDto = new OrganizationDto(organization);
var subscriptionUpdate = PasswordManagerSubscriptionUpdate.Create(organizationDto, 0, 0); var subscriptionUpdate = PasswordManagerSubscriptionUpdate.Create(organizationDto, 0, 0);
@ -35,7 +35,7 @@ public class PasswordManagerInviteUserValidationTests
var seatsOccupiedByUsers = 4; var seatsOccupiedByUsers = 4;
var additionalSeats = 4; var additionalSeats = 4;
var organizationDto = OrganizationDto.FromOrganization(organization); var organizationDto = new OrganizationDto(organization);
var subscriptionUpdate = PasswordManagerSubscriptionUpdate.Create(organizationDto, seatsOccupiedByUsers, additionalSeats); var subscriptionUpdate = PasswordManagerSubscriptionUpdate.Create(organizationDto, seatsOccupiedByUsers, additionalSeats);
@ -54,7 +54,7 @@ public class PasswordManagerInviteUserValidationTests
var seatsOccupiedByUsers = 4; var seatsOccupiedByUsers = 4;
var additionalSeats = 1; var additionalSeats = 1;
var organizationDto = OrganizationDto.FromOrganization(organization); var organizationDto = new OrganizationDto(organization);
var subscriptionUpdate = PasswordManagerSubscriptionUpdate.Create(organizationDto, seatsOccupiedByUsers, additionalSeats); var subscriptionUpdate = PasswordManagerSubscriptionUpdate.Create(organizationDto, seatsOccupiedByUsers, additionalSeats);
@ -73,7 +73,7 @@ public class PasswordManagerInviteUserValidationTests
var additionalSeats = 4; var additionalSeats = 4;
organization.PlanType = PlanType.Free; organization.PlanType = PlanType.Free;
var organizationDto = OrganizationDto.FromOrganization(organization); var organizationDto = new OrganizationDto(organization);
var subscriptionUpdate = PasswordManagerSubscriptionUpdate.Create(organizationDto, seatsOccupiedByUsers, additionalSeats); var subscriptionUpdate = PasswordManagerSubscriptionUpdate.Create(organizationDto, seatsOccupiedByUsers, additionalSeats);

10
test/Core.Test/AdminConsole/OrganizationFeatures/OrganizationUsers/InviteUsers/Validation/SecretsManagerInviteUserValidationTests.cs
View File

@ -21,7 +21,7 @@ public class SecretsManagerInviteUserValidationTests
{ {
organization.UseSecretsManager = false; organization.UseSecretsManager = false;
var organizationDto = OrganizationDto.FromOrganization(organization); var organizationDto = new OrganizationDto(organization);
var subscriptionUpdate = PasswordManagerSubscriptionUpdate.Create(organizationDto, 0, 0); var subscriptionUpdate = PasswordManagerSubscriptionUpdate.Create(organizationDto, 0, 0);
var request = new InviteUserOrganizationValidationRequest var request = new InviteUserOrganizationValidationRequest
@ -48,7 +48,7 @@ public class SecretsManagerInviteUserValidationTests
{ {
organization.UseSecretsManager = false; organization.UseSecretsManager = false;
var organizationDto = OrganizationDto.FromOrganization(organization); var organizationDto = new OrganizationDto(organization);
var subscriptionUpdate = PasswordManagerSubscriptionUpdate.Create(organizationDto, 0, 0); var subscriptionUpdate = PasswordManagerSubscriptionUpdate.Create(organizationDto, 0, 0);
var invite = OrganizationUserInvite.Create(["email@test.com"], [], OrganizationUserType.User, new Permissions(), string.Empty, true); var invite = OrganizationUserInvite.Create(["email@test.com"], [], OrganizationUserType.User, new Permissions(), string.Empty, true);
@ -79,7 +79,7 @@ public class SecretsManagerInviteUserValidationTests
organization.SmSeats = null; organization.SmSeats = null;
organization.UseSecretsManager = true; organization.UseSecretsManager = true;
var organizationDto = OrganizationDto.FromOrganization(organization); var organizationDto = new OrganizationDto(organization);
var subscriptionUpdate = PasswordManagerSubscriptionUpdate.Create(organizationDto, 0, 0); var subscriptionUpdate = PasswordManagerSubscriptionUpdate.Create(organizationDto, 0, 0);
var request = new InviteUserOrganizationValidationRequest var request = new InviteUserOrganizationValidationRequest
@ -109,7 +109,7 @@ public class SecretsManagerInviteUserValidationTests
organization.UseSecretsManager = true; organization.UseSecretsManager = true;
organization.PlanType = PlanType.EnterpriseAnnually; organization.PlanType = PlanType.EnterpriseAnnually;
var organizationDto = OrganizationDto.FromOrganization(organization); var organizationDto = new OrganizationDto(organization);
var subscriptionUpdate = PasswordManagerSubscriptionUpdate.Create(organizationDto, 0, 0); var subscriptionUpdate = PasswordManagerSubscriptionUpdate.Create(organizationDto, 0, 0);
var request = new InviteUserOrganizationValidationRequest var request = new InviteUserOrganizationValidationRequest
@ -140,7 +140,7 @@ public class SecretsManagerInviteUserValidationTests
organization.UseSecretsManager = true; organization.UseSecretsManager = true;
organization.PlanType = PlanType.EnterpriseAnnually; organization.PlanType = PlanType.EnterpriseAnnually;
var organizationDto = OrganizationDto.FromOrganization(organization); var organizationDto = new OrganizationDto(organization);
var subscriptionUpdate = PasswordManagerSubscriptionUpdate.Create(organizationDto, 0, 0); var subscriptionUpdate = PasswordManagerSubscriptionUpdate.Create(organizationDto, 0, 0);
var request = new InviteUserOrganizationValidationRequest var request = new InviteUserOrganizationValidationRequest