mirror of
https://github.com/bitwarden/server
synced 2025-12-21 18:53:41 +00:00
* move billing services+tests to billing namespaces * reorganized methods in file and added comment headers * renamed StripeAdapter methods for better clarity * clean up redundant qualifiers * Upgrade Stripe.net to v48.4.0 * Update PreviewTaxAmountCommand * Remove unused UpcomingInvoiceOptionExtensions * Added SubscriptionExtensions with GetCurrentPeriodEnd * Update PremiumUserBillingService * Update OrganizationBillingService * Update GetOrganizationWarningsQuery * Update BillingHistoryInfo * Update SubscriptionInfo * Remove unused Sql Billing folder * Update StripeAdapter * Update StripePaymentService * Update InvoiceCreatedHandler * Update PaymentFailedHandler * Update PaymentSucceededHandler * Update ProviderEventService * Update StripeEventUtilityService * Update SubscriptionDeletedHandler * Update SubscriptionUpdatedHandler * Update UpcomingInvoiceHandler * Update ProviderSubscriptionResponse * Remove unused Stripe Subscriptions Admin Tool * Update RemoveOrganizationFromProviderCommand * Update ProviderBillingService * Update RemoveOrganizatinoFromProviderCommandTests * Update PreviewTaxAmountCommandTests * Update GetCloudOrganizationLicenseQueryTests * Update GetOrganizationWarningsQueryTests * Update StripePaymentServiceTests * Update ProviderBillingControllerTests * Update ProviderEventServiceTests * Update SubscriptionDeletedHandlerTests * Update SubscriptionUpdatedHandlerTests * Resolve Billing test failures I completely removed tests for the StripeEventService as they were using a system I setup a while back that read JSON files of the Stripe event structure. I did not anticipate how frequently these structures would change with each API version and the cost of trying to update these specific JSON files to test a very static data retrieval service far outweigh the benefit. * Resolve Core test failures * Run dotnet format * Remove unused provider migration * Fixed failing tests * Run dotnet format * Replace the old webhook secret key with new one (#6223) * Fix compilation failures in additions * Run dotnet format * Bump Stripe API version * Fix recent addition: CreatePremiumCloudHostedSubscriptionCommand * Fix new code in main according to Stripe update * Fix InvoiceExtensions * Bump SDK version to match API Version * cleanup * fixing items missed after the merge * use expression body for all simple returns * forgot fixes, format, and pr feedback * claude pr feedback * pr feedback and cleanup * more claude feedback --------- Co-authored-by: Alex Morask <amorask@bitwarden.com> Co-authored-by: cyprain-okeke <108260115+cyprain-okeke@users.noreply.github.com>
147 lines
5.9 KiB
C#
147 lines
5.9 KiB
C#
using Bit.Core.AdminConsole.Entities;
|
|
using Bit.Core.AdminConsole.Models.Data.Organizations;
|
|
using Bit.Core.AdminConsole.OrganizationFeatures.Organizations;
|
|
using Bit.Core.Billing.Enums;
|
|
using Bit.Core.Billing.Services;
|
|
using Bit.Core.Models.StaticStore;
|
|
using Bit.Core.Repositories;
|
|
using Bit.Core.Test.Billing.Mocks.Plans;
|
|
using Bit.Test.Common.AutoFixture;
|
|
using Bit.Test.Common.AutoFixture.Attributes;
|
|
using NSubstitute;
|
|
using NSubstitute.ExceptionExtensions;
|
|
using Xunit;
|
|
|
|
namespace Bit.Core.Test.AdminConsole.OrganizationFeatures.Organizations;
|
|
|
|
[SutProviderCustomize]
|
|
public class UpdateOrganizationSubscriptionCommandTests
|
|
{
|
|
[Theory]
|
|
[BitAutoData]
|
|
public async Task UpdateOrganizationSubscriptionAsync_WhenNoSubscriptionsNeedToBeUpdated_ThenNoSyncsOccur(
|
|
SutProvider<UpdateOrganizationSubscriptionCommand> sutProvider)
|
|
{
|
|
// Arrange
|
|
OrganizationSubscriptionUpdate[] subscriptionsToUpdate = [];
|
|
|
|
// Act
|
|
await sutProvider.Sut.UpdateOrganizationSubscriptionAsync(subscriptionsToUpdate);
|
|
|
|
await sutProvider.GetDependency<IStripePaymentService>()
|
|
.DidNotReceive()
|
|
.AdjustSeatsAsync(Arg.Any<Organization>(), Arg.Any<Plan>(), Arg.Any<int>());
|
|
|
|
await sutProvider.GetDependency<IOrganizationRepository>()
|
|
.DidNotReceive()
|
|
.UpdateSuccessfulOrganizationSyncStatusAsync(Arg.Any<IEnumerable<Guid>>(), Arg.Any<DateTime>());
|
|
}
|
|
|
|
[Theory]
|
|
[BitAutoData]
|
|
public async Task UpdateOrganizationSubscriptionAsync_WhenOrgUpdatePassedIn_ThenSyncedThroughPaymentService(
|
|
Organization organization,
|
|
SutProvider<UpdateOrganizationSubscriptionCommand> sutProvider)
|
|
{
|
|
// Arrange
|
|
organization.PlanType = PlanType.EnterpriseAnnually2023;
|
|
organization.Seats = 2;
|
|
|
|
OrganizationSubscriptionUpdate[] subscriptionsToUpdate =
|
|
[new() { Organization = organization, Plan = new Enterprise2023Plan(true) }];
|
|
|
|
// Act
|
|
await sutProvider.Sut.UpdateOrganizationSubscriptionAsync(subscriptionsToUpdate);
|
|
|
|
await sutProvider.GetDependency<IStripePaymentService>()
|
|
.Received(1)
|
|
.AdjustSeatsAsync(
|
|
Arg.Is<Organization>(x => x.Id == organization.Id),
|
|
Arg.Is<Plan>(x => x.Type == organization.PlanType),
|
|
organization.Seats!.Value);
|
|
|
|
await sutProvider.GetDependency<IOrganizationRepository>()
|
|
.Received(1)
|
|
.UpdateSuccessfulOrganizationSyncStatusAsync(
|
|
Arg.Is<IEnumerable<Guid>>(x => x.Contains(organization.Id)),
|
|
Arg.Any<DateTime>());
|
|
}
|
|
|
|
[Theory]
|
|
[BitAutoData]
|
|
public async Task UpdateOrganizationSubscriptionAsync_WhenOrgUpdateFails_ThenSyncDoesNotOccur(
|
|
Organization organization,
|
|
Exception exception,
|
|
SutProvider<UpdateOrganizationSubscriptionCommand> sutProvider)
|
|
{
|
|
// Arrange
|
|
organization.PlanType = PlanType.EnterpriseAnnually2023;
|
|
organization.Seats = 2;
|
|
|
|
OrganizationSubscriptionUpdate[] subscriptionsToUpdate =
|
|
[new() { Organization = organization, Plan = new Enterprise2023Plan(true) }];
|
|
|
|
sutProvider.GetDependency<IStripePaymentService>()
|
|
.AdjustSeatsAsync(
|
|
Arg.Is<Organization>(x => x.Id == organization.Id),
|
|
Arg.Is<Plan>(x => x.Type == organization.PlanType),
|
|
organization.Seats!.Value).ThrowsAsync(exception);
|
|
|
|
// Act
|
|
await sutProvider.Sut.UpdateOrganizationSubscriptionAsync(subscriptionsToUpdate);
|
|
|
|
await sutProvider.GetDependency<IOrganizationRepository>()
|
|
.DidNotReceive()
|
|
.UpdateSuccessfulOrganizationSyncStatusAsync(Arg.Any<IEnumerable<Guid>>(), Arg.Any<DateTime>());
|
|
}
|
|
|
|
[Theory]
|
|
[BitAutoData]
|
|
public async Task UpdateOrganizationSubscriptionAsync_WhenOneOrgUpdateFailsAndAnotherSucceeds_ThenSyncOccursForTheSuccessfulOrg(
|
|
Organization successfulOrganization,
|
|
Organization failedOrganization,
|
|
Exception exception,
|
|
SutProvider<UpdateOrganizationSubscriptionCommand> sutProvider)
|
|
{
|
|
// Arrange
|
|
successfulOrganization.PlanType = PlanType.EnterpriseAnnually2023;
|
|
successfulOrganization.Seats = 2;
|
|
failedOrganization.PlanType = PlanType.EnterpriseAnnually2023;
|
|
failedOrganization.Seats = 2;
|
|
|
|
OrganizationSubscriptionUpdate[] subscriptionsToUpdate =
|
|
[
|
|
new() { Organization = successfulOrganization, Plan = new Enterprise2023Plan(true) },
|
|
new() { Organization = failedOrganization, Plan = new Enterprise2023Plan(true) }
|
|
];
|
|
|
|
sutProvider.GetDependency<IStripePaymentService>()
|
|
.AdjustSeatsAsync(
|
|
Arg.Is<Organization>(x => x.Id == failedOrganization.Id),
|
|
Arg.Is<Plan>(x => x.Type == failedOrganization.PlanType),
|
|
failedOrganization.Seats!.Value).ThrowsAsync(exception);
|
|
|
|
// Act
|
|
await sutProvider.Sut.UpdateOrganizationSubscriptionAsync(subscriptionsToUpdate);
|
|
|
|
await sutProvider.GetDependency<IStripePaymentService>()
|
|
.Received(1)
|
|
.AdjustSeatsAsync(
|
|
Arg.Is<Organization>(x => x.Id == successfulOrganization.Id),
|
|
Arg.Is<Plan>(x => x.Type == successfulOrganization.PlanType),
|
|
successfulOrganization.Seats!.Value);
|
|
|
|
await sutProvider.GetDependency<IOrganizationRepository>()
|
|
.Received(1)
|
|
.UpdateSuccessfulOrganizationSyncStatusAsync(
|
|
Arg.Is<IEnumerable<Guid>>(x => x.Contains(successfulOrganization.Id)),
|
|
Arg.Any<DateTime>());
|
|
|
|
await sutProvider.GetDependency<IOrganizationRepository>()
|
|
.DidNotReceive()
|
|
.UpdateSuccessfulOrganizationSyncStatusAsync(
|
|
Arg.Is<IEnumerable<Guid>>(x => x.Contains(failedOrganization.Id)),
|
|
Arg.Any<DateTime>());
|
|
}
|
|
}
|