mirror of
https://github.com/bitwarden/server
synced 2025-12-21 10:43:44 +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>
116 lines
4.2 KiB
C#
116 lines
4.2 KiB
C#
using Bit.Api.Billing.Controllers;
|
|
using Bit.Core.AdminConsole.Entities;
|
|
using Bit.Core.Billing.Models;
|
|
using Bit.Core.Billing.Organizations.Models;
|
|
using Bit.Core.Billing.Organizations.Services;
|
|
using Bit.Core.Billing.Services;
|
|
using Bit.Core.Context;
|
|
using Bit.Core.Repositories;
|
|
using Bit.Test.Common.AutoFixture;
|
|
using Bit.Test.Common.AutoFixture.Attributes;
|
|
using Microsoft.AspNetCore.Http.HttpResults;
|
|
using NSubstitute;
|
|
using Xunit;
|
|
|
|
using static Bit.Api.Test.Billing.Utilities;
|
|
|
|
namespace Bit.Api.Test.Billing.Controllers;
|
|
|
|
[ControllerCustomize(typeof(OrganizationBillingController))]
|
|
[SutProviderCustomize]
|
|
public class OrganizationBillingControllerTests
|
|
{
|
|
[Theory, BitAutoData]
|
|
public async Task GetMetadataAsync_Unauthorized_ReturnsUnauthorized(
|
|
Guid organizationId,
|
|
SutProvider<OrganizationBillingController> sutProvider)
|
|
{
|
|
sutProvider.GetDependency<ICurrentContext>().AccessMembersTab(organizationId).Returns(false);
|
|
|
|
var result = await sutProvider.Sut.GetMetadataAsync(organizationId);
|
|
|
|
AssertUnauthorized(result);
|
|
}
|
|
|
|
[Theory, BitAutoData]
|
|
public async Task GetMetadataAsync_MetadataNull_NotFound(
|
|
Guid organizationId,
|
|
SutProvider<OrganizationBillingController> sutProvider)
|
|
{
|
|
sutProvider.GetDependency<ICurrentContext>().OrganizationUser(organizationId).Returns(true);
|
|
sutProvider.GetDependency<IOrganizationBillingService>().GetMetadata(organizationId).Returns((OrganizationMetadata)null);
|
|
|
|
var result = await sutProvider.Sut.GetMetadataAsync(organizationId);
|
|
|
|
AssertNotFound(result);
|
|
}
|
|
|
|
[Theory, BitAutoData]
|
|
public async Task GetMetadataAsync_OK(
|
|
Guid organizationId,
|
|
SutProvider<OrganizationBillingController> sutProvider)
|
|
{
|
|
sutProvider.GetDependency<ICurrentContext>().OrganizationUser(organizationId).Returns(true);
|
|
sutProvider.GetDependency<IOrganizationBillingService>().GetMetadata(organizationId)
|
|
.Returns(new OrganizationMetadata(true, 10));
|
|
|
|
var result = await sutProvider.Sut.GetMetadataAsync(organizationId);
|
|
|
|
Assert.IsType<Ok<OrganizationMetadata>>(result);
|
|
|
|
var response = ((Ok<OrganizationMetadata>)result).Value;
|
|
|
|
Assert.True(response.IsOnSecretsManagerStandalone);
|
|
Assert.Equal(10, response.OrganizationOccupiedSeats);
|
|
}
|
|
|
|
[Theory, BitAutoData]
|
|
public async Task GetHistoryAsync_Unauthorized_ReturnsUnauthorized(
|
|
Guid organizationId,
|
|
SutProvider<OrganizationBillingController> sutProvider)
|
|
{
|
|
sutProvider.GetDependency<ICurrentContext>().ViewBillingHistory(organizationId).Returns(false);
|
|
|
|
var result = await sutProvider.Sut.GetHistoryAsync(organizationId);
|
|
|
|
AssertUnauthorized(result);
|
|
}
|
|
|
|
[Theory, BitAutoData]
|
|
public async Task GetHistoryAsync_OrganizationNotFound_ReturnsNotFound(
|
|
Guid organizationId,
|
|
SutProvider<OrganizationBillingController> sutProvider)
|
|
{
|
|
sutProvider.GetDependency<ICurrentContext>().ViewBillingHistory(organizationId).Returns(true);
|
|
sutProvider.GetDependency<IOrganizationRepository>().GetByIdAsync(organizationId).Returns((Organization)null);
|
|
|
|
var result = await sutProvider.Sut.GetHistoryAsync(organizationId);
|
|
|
|
AssertNotFound(result);
|
|
}
|
|
|
|
[Theory]
|
|
[BitAutoData]
|
|
public async Task GetHistoryAsync_OK(
|
|
Guid organizationId,
|
|
Organization organization,
|
|
SutProvider<OrganizationBillingController> sutProvider)
|
|
{
|
|
// Arrange
|
|
sutProvider.GetDependency<ICurrentContext>().ViewBillingHistory(organizationId).Returns(true);
|
|
sutProvider.GetDependency<IOrganizationRepository>().GetByIdAsync(organizationId).Returns(organization);
|
|
|
|
// Manually create a BillingHistoryInfo object to avoid requiring AutoFixture to create HttpResponseHeaders
|
|
var billingInfo = new BillingHistoryInfo();
|
|
|
|
sutProvider.GetDependency<IStripePaymentService>().GetBillingHistoryAsync(organization).Returns(billingInfo);
|
|
|
|
// Act
|
|
var result = await sutProvider.Sut.GetHistoryAsync(organizationId);
|
|
|
|
// Assert
|
|
var okResult = Assert.IsType<Ok<BillingHistoryInfo>>(result);
|
|
Assert.Equal(billingInfo, okResult.Value);
|
|
}
|
|
}
|