From 378b54524fff3137edba579f49a788d86e8dfa73 Mon Sep 17 00:00:00 2001 From: Robyn MacCallum Date: Thu, 21 Jul 2022 12:55:57 -0400 Subject: [PATCH] [SG 475] Fix error thrown when changing payment method (#2137) * Add null check for sources * Add expand to get customer sources --- .../Implementations/StripePaymentService.cs | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/src/Core/Services/Implementations/StripePaymentService.cs b/src/Core/Services/Implementations/StripePaymentService.cs index ba0fb60d90..812f5cdaf9 100644 --- a/src/Core/Services/Implementations/StripePaymentService.cs +++ b/src/Core/Services/Implementations/StripePaymentService.cs @@ -1187,7 +1187,9 @@ namespace Bit.Core.Services if (!string.IsNullOrWhiteSpace(subscriber.GatewayCustomerId)) { - customer = await _stripeAdapter.CustomerGetAsync(subscriber.GatewayCustomerId); + var options = new Stripe.CustomerGetOptions(); + options.AddExpand("sources"); + customer = await _stripeAdapter.CustomerGetAsync(subscriber.GatewayCustomerId, options); if (customer.Metadata?.Any() ?? false) { stripeCustomerMetadata = customer.Metadata; @@ -1372,15 +1374,18 @@ namespace Bit.Core.Services } } - foreach (var source in customer.Sources.Where(s => s.Id != defaultSourceId)) + if (customer.Sources != null) { - if (source is Stripe.BankAccount) + foreach (var source in customer.Sources.Where(s => s.Id != defaultSourceId)) { - await _stripeAdapter.BankAccountDeleteAsync(customer.Id, source.Id); - } - else if (source is Stripe.Card) - { - await _stripeAdapter.CardDeleteAsync(customer.Id, source.Id); + if (source is Stripe.BankAccount) + { + await _stripeAdapter.BankAccountDeleteAsync(customer.Id, source.Id); + } + else if (source is Stripe.Card) + { + await _stripeAdapter.CardDeleteAsync(customer.Id, source.Id); + } } }