bitwarden/server
1
0
Fork 0
mirror of https://github.com/bitwarden/server synced 2025-12-26 05:03:18 +00:00
Code Issues Releases Wiki Activity

[PM-23687] Support free organizations on Payment Details page (#6084)

Browse Source 
* Resolve JSON serialization bug in OneOf converters and organize pricing models

* Support free organizations for payment method and billing address flows

* Run dotnet format
This commit is contained in:
Alex Morask
2025-07-14 12:39:49 -05:00
committed by GitHub
parent 0e4e060f22
commit d914ab8a98
30 changed files with 575 additions and 316 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
test/Core.Test/Billing/Payment/Commands/UpdatePaymentMethodCommandTests.cs
View File

@@ -45,7 +45,8 @@ public class UpdatePaymentMethodCommandTests
{
var organization = new Organization
{
Id = Guid.NewGuid()
Id = Guid.NewGuid(),
GatewayCustomerId = "cus_123"
};
var customer = new Customer
@@ -100,13 +101,75 @@ public class UpdatePaymentMethodCommandTests
}
[Fact]
public async Task Run_BankAccount_StripeToPayPal_MakesCorrectInvocations_ReturnsMaskedBankAccount()
public async Task Run_BankAccount_NoCurrentCustomer_MakesCorrectInvocations_ReturnsMaskedBankAccount()
{
var organization = new Organization
{
Id = Guid.NewGuid()
};
var customer = new Customer
{
Address = new Address
{
Country = "US",
PostalCode = "12345"
},
Metadata = new Dictionary<string, string>()
};
_subscriberService.GetCustomer(organization).Returns(customer);
const string token = "TOKEN";
var setupIntent = new SetupIntent
{
Id = "seti_123",
PaymentMethod =
new PaymentMethod
{
Type = "us_bank_account",
UsBankAccount = new PaymentMethodUsBankAccount { BankName = "Chase", Last4 = "9999" }
},
NextAction = new SetupIntentNextAction
{
VerifyWithMicrodeposits = new SetupIntentNextActionVerifyWithMicrodeposits()
},
Status = "requires_action"
};
_stripeAdapter.SetupIntentList(Arg.Is<SetupIntentListOptions>(options =>
options.PaymentMethod == token && options.HasExpansions("data.payment_method"))).Returns([setupIntent]);
var result = await _command.Run(organization,
new TokenizedPaymentMethod { Type = TokenizablePaymentMethodType.BankAccount, Token = token }, new BillingAddress
{
Country = "US",
PostalCode = "12345"
});
Assert.True(result.IsT0);
var maskedPaymentMethod = result.AsT0;
Assert.True(maskedPaymentMethod.IsT0);
var maskedBankAccount = maskedPaymentMethod.AsT0;
Assert.Equal("Chase", maskedBankAccount.BankName);
Assert.Equal("9999", maskedBankAccount.Last4);
Assert.False(maskedBankAccount.Verified);
await _subscriberService.Received(1).CreateStripeCustomer(organization);
await _setupIntentCache.Received(1).Set(organization.Id, setupIntent.Id);
}
[Fact]
public async Task Run_BankAccount_StripeToPayPal_MakesCorrectInvocations_ReturnsMaskedBankAccount()
{
var organization = new Organization
{
Id = Guid.NewGuid(),
GatewayCustomerId = "cus_123"
};
var customer = new Customer
{
Address = new Address
@@ -170,7 +233,8 @@ public class UpdatePaymentMethodCommandTests
{
var organization = new Organization
{
Id = Guid.NewGuid()
Id = Guid.NewGuid(),
GatewayCustomerId = "cus_123"
};
var customer = new Customer
@@ -227,7 +291,8 @@ public class UpdatePaymentMethodCommandTests
{
var organization = new Organization
{
Id = Guid.NewGuid()
Id = Guid.NewGuid(),
GatewayCustomerId = "cus_123"
};
var customer = new Customer
@@ -282,7 +347,8 @@ public class UpdatePaymentMethodCommandTests
{
var organization = new Organization
{
Id = Guid.NewGuid()
Id = Guid.NewGuid(),
GatewayCustomerId = "cus_123"
};
var customer = new Customer
@@ -343,7 +409,8 @@ public class UpdatePaymentMethodCommandTests
{
var organization = new Organization
{
Id = Guid.NewGuid()
Id = Guid.NewGuid(),
GatewayCustomerId = "cus_123"
};
var customer = new Customer