From 974ca2724c33def000e12cf999fc276516beeb76 Mon Sep 17 00:00:00 2001 From: Rui Tome Date: Fri, 2 May 2025 11:49:16 +0100 Subject: [PATCH] Rename SignUpProviderClientOrganizationCommand --- ...IResellerClientOrganizationSignUpCommand.cs | 10 ---------- ...ISignUpProviderClientOrganizationCommand.cs | 15 +++++++++++++++ ...SignUpProviderClientOrganizationCommand.cs} | 6 +++--- ...pProviderClientOrganizationCommandTests.cs} | 18 +++++++++--------- 4 files changed, 27 insertions(+), 22 deletions(-) delete mode 100644 src/Core/AdminConsole/OrganizationFeatures/Organizations/Interfaces/IResellerClientOrganizationSignUpCommand.cs create mode 100644 src/Core/AdminConsole/OrganizationFeatures/Organizations/Interfaces/ISignUpProviderClientOrganizationCommand.cs rename src/Core/AdminConsole/OrganizationFeatures/Organizations/{ResellerClientOrganizationSignUpCommand.cs => SignUpProviderClientOrganizationCommand.cs} (96%) rename test/Core.Test/AdminConsole/OrganizationFeatures/Organizations/{ResellerClientOrganizationSignUpCommandTests.cs => SignUpProviderClientOrganizationCommandTests.cs} (90%) diff --git a/src/Core/AdminConsole/OrganizationFeatures/Organizations/Interfaces/IResellerClientOrganizationSignUpCommand.cs b/src/Core/AdminConsole/OrganizationFeatures/Organizations/Interfaces/IResellerClientOrganizationSignUpCommand.cs deleted file mode 100644 index 5eb0a13334..0000000000 --- a/src/Core/AdminConsole/OrganizationFeatures/Organizations/Interfaces/IResellerClientOrganizationSignUpCommand.cs +++ /dev/null @@ -1,10 +0,0 @@ -using Bit.Core.AdminConsole.Entities; -using Bit.Core.Entities; -using Bit.Core.Models.Business; - -namespace Bit.Core.AdminConsole.OrganizationFeatures.Organizations.Interfaces; - -public interface IResellerClientOrganizationSignUpCommand -{ - Task<(Organization organization, Collection defaultCollection)> SignupClientAsync(OrganizationSignup signup); -} diff --git a/src/Core/AdminConsole/OrganizationFeatures/Organizations/Interfaces/ISignUpProviderClientOrganizationCommand.cs b/src/Core/AdminConsole/OrganizationFeatures/Organizations/Interfaces/ISignUpProviderClientOrganizationCommand.cs new file mode 100644 index 0000000000..241698b41f --- /dev/null +++ b/src/Core/AdminConsole/OrganizationFeatures/Organizations/Interfaces/ISignUpProviderClientOrganizationCommand.cs @@ -0,0 +1,15 @@ +using Bit.Core.AdminConsole.Entities; +using Bit.Core.Entities; +using Bit.Core.Models.Business; + +namespace Bit.Core.AdminConsole.OrganizationFeatures.Organizations.Interfaces; + +public interface ISignUpProviderClientOrganizationCommand +{ + /// + /// Sign up a new client organization for a provider. + /// + /// The signup information. + /// A tuple containing the new organization and its default collection. + Task<(Organization organization, Collection defaultCollection)> SignUpClientOrganizationAsync(OrganizationSignup signup); +} diff --git a/src/Core/AdminConsole/OrganizationFeatures/Organizations/ResellerClientOrganizationSignUpCommand.cs b/src/Core/AdminConsole/OrganizationFeatures/Organizations/SignUpProviderClientOrganizationCommand.cs similarity index 96% rename from src/Core/AdminConsole/OrganizationFeatures/Organizations/ResellerClientOrganizationSignUpCommand.cs rename to src/Core/AdminConsole/OrganizationFeatures/Organizations/SignUpProviderClientOrganizationCommand.cs index f024a2c9f2..eb89214466 100644 --- a/src/Core/AdminConsole/OrganizationFeatures/Organizations/ResellerClientOrganizationSignUpCommand.cs +++ b/src/Core/AdminConsole/OrganizationFeatures/Organizations/SignUpProviderClientOrganizationCommand.cs @@ -16,7 +16,7 @@ using Bit.Core.Utilities; namespace Bit.Core.AdminConsole.OrganizationFeatures.Organizations; -public class ResellerClientOrganizationSignUpCommand : IResellerClientOrganizationSignUpCommand +public class SignUpProviderClientOrganizationCommand : ISignUpProviderClientOrganizationCommand { private readonly ICurrentContext _currentContext; private readonly IPricingClient _pricingClient; @@ -28,7 +28,7 @@ public class ResellerClientOrganizationSignUpCommand : IResellerClientOrganizati private readonly IDeviceRepository _deviceRepository; private readonly IPaymentService _paymentService; - public ResellerClientOrganizationSignUpCommand( + public SignUpProviderClientOrganizationCommand( ICurrentContext currentContext, IPricingClient pricingClient, IReferenceEventService referenceEventService, @@ -50,7 +50,7 @@ public class ResellerClientOrganizationSignUpCommand : IResellerClientOrganizati _paymentService = paymentService; } - public async Task<(Organization organization, Collection defaultCollection)> SignupClientAsync(OrganizationSignup signup) + public async Task<(Organization organization, Collection defaultCollection)> SignUpClientOrganizationAsync(OrganizationSignup signup) { var plan = await _pricingClient.GetPlanOrThrow(signup.Plan); diff --git a/test/Core.Test/AdminConsole/OrganizationFeatures/Organizations/ResellerClientOrganizationSignUpCommandTests.cs b/test/Core.Test/AdminConsole/OrganizationFeatures/Organizations/SignUpProviderClientOrganizationCommandTests.cs similarity index 90% rename from test/Core.Test/AdminConsole/OrganizationFeatures/Organizations/ResellerClientOrganizationSignUpCommandTests.cs rename to test/Core.Test/AdminConsole/OrganizationFeatures/Organizations/SignUpProviderClientOrganizationCommandTests.cs index 2df19ff8a8..2bc6703b7c 100644 --- a/test/Core.Test/AdminConsole/OrganizationFeatures/Organizations/ResellerClientOrganizationSignUpCommandTests.cs +++ b/test/Core.Test/AdminConsole/OrganizationFeatures/Organizations/SignUpProviderClientOrganizationCommandTests.cs @@ -22,7 +22,7 @@ using Xunit; namespace Bit.Core.Test.AdminConsole.OrganizationFeatures.Organizations; [SutProviderCustomize] -public class ResellerClientOrganizationSignUpCommandTests +public class SignUpProviderClientOrganizationCommandTests { [Theory] [BitAutoData(PlanType.TeamsAnnually)] @@ -33,7 +33,7 @@ public class ResellerClientOrganizationSignUpCommandTests PlanType planType, OrganizationSignup signup, string collectionName, - SutProvider sutProvider) + SutProvider sutProvider) { signup.Plan = planType; signup.AdditionalSeats = 15; @@ -44,7 +44,7 @@ public class ResellerClientOrganizationSignUpCommandTests .GetPlanOrThrow(signup.Plan) .Returns(plan); - var result = await sutProvider.Sut.SignupClientAsync(signup); + var result = await sutProvider.Sut.SignUpClientOrganizationAsync(signup); Assert.NotNull(result.organization); Assert.NotNull(result.defaultCollection); @@ -105,14 +105,14 @@ public class ResellerClientOrganizationSignUpCommandTests [BitAutoData] public async Task SignupClientAsync_NullPlan_ThrowsBadRequestException( OrganizationSignup signup, - SutProvider sutProvider) + SutProvider sutProvider) { sutProvider.GetDependency() .GetPlanOrThrow(signup.Plan) .Returns((Plan)null); var exception = await Assert.ThrowsAsync( - () => sutProvider.Sut.SignupClientAsync(signup)); + () => sutProvider.Sut.SignUpClientOrganizationAsync(signup)); Assert.Contains("Password Manager Plan was null", exception.Message); } @@ -121,7 +121,7 @@ public class ResellerClientOrganizationSignUpCommandTests [BitAutoData] public async Task SignupClientAsync_NegativeAdditionalSeats_ThrowsBadRequestException( OrganizationSignup signup, - SutProvider sutProvider) + SutProvider sutProvider) { signup.Plan = PlanType.TeamsMonthly; signup.AdditionalSeats = -5; @@ -132,7 +132,7 @@ public class ResellerClientOrganizationSignUpCommandTests .Returns(plan); var exception = await Assert.ThrowsAsync( - () => sutProvider.Sut.SignupClientAsync(signup)); + () => sutProvider.Sut.SignUpClientOrganizationAsync(signup)); Assert.Contains("You can't subtract Password Manager seats", exception.Message); } @@ -142,7 +142,7 @@ public class ResellerClientOrganizationSignUpCommandTests public async Task SignupClientAsync_WhenExceptionIsThrown_CleanupIsPerformed( PlanType planType, OrganizationSignup signup, - SutProvider sutProvider) + SutProvider sutProvider) { signup.Plan = planType; @@ -156,7 +156,7 @@ public class ResellerClientOrganizationSignUpCommandTests .Do(_ => throw new Exception()); var thrownException = await Assert.ThrowsAsync( - () => sutProvider.Sut.SignupClientAsync(signup)); + () => sutProvider.Sut.SignUpClientOrganizationAsync(signup)); await sutProvider.GetDependency() .Received(1)