Skip to content

[PM-31771]Default payment method not updated within subscription #7253

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cyprain-okeke wants to merge 2 commits into
base: main
Choose a base branch
from
+69 −0
Open

[PM-31771]Default payment method not updated within subscription #7253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7c66c0a
Fix the root cause of the bug
cyprain-okeke Mar 19, 2026
8ee23fc
Merge branch 'main' into billing/pm-31771/default-payment-method-not-…
cyprain-okeke Mar 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/Core/Billing/Subscriptions/Commands/RestartSubscriptionCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,11 +162,14 @@ private async Task RestartOrganizationSubscriptionAsync(
}
}

var customer = await subscriberService.GetCustomer(organization);

var options = new SubscriptionCreateOptions
{
AutomaticTax = new SubscriptionAutomaticTaxOptions { Enabled = true },
CollectionMethod = CollectionMethod.ChargeAutomatically,
Customer = canceledSubscription.CustomerId,
DefaultPaymentMethod = customer.InvoiceSettings?.DefaultPaymentMethodId,
Items = items,
Metadata = canceledSubscription.Metadata,
OffSession = true,
Expand Down
66 changes: 66 additions & 0 deletions test/Core.Test/Billing/Subscriptions/RestartSubscriptionCommandTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,15 @@ public async Task Run_Organization_WithNonDisabledPlan_PasswordManagerOnly_Succe
Metadata = new Dictionary<string, string> { ["organizationId"] = organizationId.ToString() }
};

var customer = new Customer
{
Id = "cus_123",
InvoiceSettings = new CustomerInvoiceSettings
{
DefaultPaymentMethodId = "pm_test123"
}
};

var newSubscription = new Subscription
{
Id = "sub_new",
Expand All @@ -252,6 +261,7 @@ public async Task Run_Organization_WithNonDisabledPlan_PasswordManagerOnly_Succe
};

_subscriberService.GetSubscription(organization).Returns(existingSubscription);
_subscriberService.GetCustomer(organization).Returns(customer);
_pricingClient.ListPlans().Returns([plan]);
_stripeAdapter.CreateSubscriptionAsync(Arg.Any<SubscriptionCreateOptions>()).Returns(newSubscription);

Expand All @@ -263,6 +273,7 @@ await _stripeAdapter.Received(1).CreateSubscriptionAsync(Arg.Is<SubscriptionCrea
options.AutomaticTax.Enabled == true &&
options.CollectionMethod == CollectionMethod.ChargeAutomatically &&
options.Customer == "cus_123" &&
options.DefaultPaymentMethod == "pm_test123" &&
options.Items.Count == 1 &&
options.Items[0].Price == plan.PasswordManager.StripeSeatPlanId &&
options.Items[0].Quantity == 10 &&
Expand Down Expand Up @@ -306,6 +317,15 @@ public async Task Run_Organization_WithNonDisabledPlan_WithStorage_Success()
Metadata = new Dictionary<string, string> { ["organizationId"] = organizationId.ToString() }
};

var customer = new Customer
{
Id = "cus_456",
InvoiceSettings = new CustomerInvoiceSettings
{
DefaultPaymentMethodId = "pm_456"
}
};

var newSubscription = new Subscription
{
Id = "sub_new_2",
Expand All @@ -316,6 +336,7 @@ public async Task Run_Organization_WithNonDisabledPlan_WithStorage_Success()
};

_subscriberService.GetSubscription(organization).Returns(existingSubscription);
_subscriberService.GetCustomer(organization).Returns(customer);
_pricingClient.ListPlans().Returns([plan]);
_stripeAdapter.CreateSubscriptionAsync(Arg.Any<SubscriptionCreateOptions>()).Returns(newSubscription);

Expand All @@ -324,6 +345,7 @@ public async Task Run_Organization_WithNonDisabledPlan_WithStorage_Success()
Assert.True(result.IsT0);

await _stripeAdapter.Received(1).CreateSubscriptionAsync(Arg.Is<SubscriptionCreateOptions>(options =>
options.DefaultPaymentMethod == "pm_456" &&
options.Items.Count == 2 &&
options.Items[0].Price == plan.PasswordManager.StripeSeatPlanId &&
options.Items[0].Quantity == 5 &&
Expand Down Expand Up @@ -375,7 +397,17 @@ public async Task Run_Organization_WithSecretsManager_Success()
}
};

var customer = new Customer
{
Id = "cus_789",
InvoiceSettings = new CustomerInvoiceSettings
{
DefaultPaymentMethodId = "pm_789"
}
};

_subscriberService.GetSubscription(organization).Returns(existingSubscription);
_subscriberService.GetCustomer(organization).Returns(customer);
_pricingClient.ListPlans().Returns([plan]);
_stripeAdapter.CreateSubscriptionAsync(Arg.Any<SubscriptionCreateOptions>()).Returns(newSubscription);

Expand All @@ -384,6 +416,7 @@ public async Task Run_Organization_WithSecretsManager_Success()
Assert.True(result.IsT0);

await _stripeAdapter.Received(1).CreateSubscriptionAsync(Arg.Is<SubscriptionCreateOptions>(options =>
options.DefaultPaymentMethod == "pm_789" &&
options.Items.Count == 4 &&
options.Items[0].Price == plan.PasswordManager.StripeSeatPlanId &&
options.Items[0].Quantity == 15 &&
Expand Down Expand Up @@ -438,7 +471,17 @@ public async Task Run_Organization_WithDisabledPlan_UpgradesToNewPlan_Success()
}
};

var customer = new Customer
{
Id = "cus_old",
InvoiceSettings = new CustomerInvoiceSettings
{
DefaultPaymentMethodId = "pm_old"
}
};

_subscriberService.GetSubscription(organization).Returns(existingSubscription);
_subscriberService.GetCustomer(organization).Returns(customer);
_pricingClient.ListPlans().Returns([oldPlan, newPlan]);
_stripeAdapter.CreateSubscriptionAsync(Arg.Any<SubscriptionCreateOptions>()).Returns(newSubscription);

Expand All @@ -447,6 +490,7 @@ public async Task Run_Organization_WithDisabledPlan_UpgradesToNewPlan_Success()
Assert.True(result.IsT0);

await _stripeAdapter.Received(1).CreateSubscriptionAsync(Arg.Is<SubscriptionCreateOptions>(options =>
options.DefaultPaymentMethod == "pm_old" &&
options.Items.Count == 2 &&
options.Items[0].Price == newPlan.PasswordManager.StripeSeatPlanId &&
options.Items[0].Quantity == 20 &&
Expand Down Expand Up @@ -514,7 +558,17 @@ public async Task Run_Organization_WithStorageAndSecretManagerButNoServiceAccoun
}
};

var customer = new Customer
{
Id = "cus_complex",
InvoiceSettings = new CustomerInvoiceSettings
{
DefaultPaymentMethodId = "pm_complex"
}
};

_subscriberService.GetSubscription(organization).Returns(existingSubscription);
_subscriberService.GetCustomer(organization).Returns(customer);
_pricingClient.ListPlans().Returns([plan]);
_stripeAdapter.CreateSubscriptionAsync(Arg.Any<SubscriptionCreateOptions>()).Returns(newSubscription);

Expand All @@ -523,6 +577,7 @@ public async Task Run_Organization_WithStorageAndSecretManagerButNoServiceAccoun
Assert.True(result.IsT0);

await _stripeAdapter.Received(1).CreateSubscriptionAsync(Arg.Is<SubscriptionCreateOptions>(options =>
options.DefaultPaymentMethod == "pm_complex" &&
options.Items.Count == 3 &&
options.Items[0].Price == plan.PasswordManager.StripeSeatPlanId &&
options.Items[0].Quantity == 12 &&
Expand Down Expand Up @@ -574,7 +629,17 @@ public async Task Run_Organization_WithSecretsManagerOnly_NoServiceAccounts_Succ
}
};

var customer = new Customer
{
Id = "cus_sm",
InvoiceSettings = new CustomerInvoiceSettings
{
DefaultPaymentMethodId = "pm_sm"
}
};

_subscriberService.GetSubscription(organization).Returns(existingSubscription);
_subscriberService.GetCustomer(organization).Returns(customer);
_pricingClient.ListPlans().Returns([plan]);
_stripeAdapter.CreateSubscriptionAsync(Arg.Any<SubscriptionCreateOptions>()).Returns(newSubscription);

Expand All @@ -583,6 +648,7 @@ public async Task Run_Organization_WithSecretsManagerOnly_NoServiceAccounts_Succ
Assert.True(result.IsT0);

await _stripeAdapter.Received(1).CreateSubscriptionAsync(Arg.Is<SubscriptionCreateOptions>(options =>
options.DefaultPaymentMethod == "pm_sm" &&
options.Items.Count == 2 &&
options.Items[0].Price == plan.PasswordManager.StripeSeatPlanId &&
options.Items[0].Quantity == 8 &&
Expand Down
Loading