nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-04-06 05:28:15 -05:00
Code

[PM 237] Test Clock Error in Production when attempting to view Stripe Subscription page (#2745)

Browse Source 
* Check for environment before hitting TestClock

* Getting the environment from WebHotsEnvironment

* Dotnet format changes
This commit is contained in:
cyprain-okeke 2023-03-12 17:10:07 +01:00 committed by GitHub
parent dafcdde715
commit 24d227d075
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Admin/Controllers/ToolsController.cs
View File

@ -27,6 +27,7 @@ public class ToolsController : Controller
private readonly IPaymentService _paymentService; private readonly IPaymentService _paymentService;
private readonly ITaxRateRepository _taxRateRepository; private readonly ITaxRateRepository _taxRateRepository;
private readonly IStripeAdapter _stripeAdapter; private readonly IStripeAdapter _stripeAdapter;
private readonly IWebHostEnvironment _environment;
public ToolsController( public ToolsController(
GlobalSettings globalSettings, GlobalSettings globalSettings,
@ -38,7 +39,8 @@ public class ToolsController : Controller
IOrganizationUserRepository organizationUserRepository, IOrganizationUserRepository organizationUserRepository,
ITaxRateRepository taxRateRepository, ITaxRateRepository taxRateRepository,
IPaymentService paymentService, IPaymentService paymentService,
IStripeAdapter stripeAdapter) IStripeAdapter stripeAdapter,
IWebHostEnvironment environment)
{ {
_globalSettings = globalSettings; _globalSettings = globalSettings;
_organizationRepository = organizationRepository; _organizationRepository = organizationRepository;
@ -50,6 +52,7 @@ public class ToolsController : Controller
_taxRateRepository = taxRateRepository; _taxRateRepository = taxRateRepository;
_paymentService = paymentService; _paymentService = paymentService;
_stripeAdapter = stripeAdapter; _stripeAdapter = stripeAdapter;
_environment = environment;
} }
public IActionResult ChargeBraintree() public IActionResult ChargeBraintree()
@ -450,11 +453,12 @@ public class ToolsController : Controller
subscriptions.FirstOrDefault()?.Id : subscriptions.FirstOrDefault()?.Id :
null; null;
var isProduction = _environment.IsProduction();
var model = new StripeSubscriptionsModel() var model = new StripeSubscriptionsModel()
{ {
Items = subscriptions.Select(s => new StripeSubscriptionRowModel(s)).ToList(), Items = subscriptions.Select(s => new StripeSubscriptionRowModel(s)).ToList(),
Prices = (await _stripeAdapter.PriceListAsync(new Stripe.PriceListOptions() { Limit = 100 })).Data, Prices = (await _stripeAdapter.PriceListAsync(new Stripe.PriceListOptions() { Limit = 100 })).Data,
TestClocks = await _stripeAdapter.TestClockListAsync(), TestClocks = isProduction ? new List<Stripe.TestHelpers.TestClock>() : await _stripeAdapter.TestClockListAsync(),
Filter = options Filter = options
}; };
return View(model); return View(model);
@ -465,8 +469,9 @@ public class ToolsController : Controller
{ {
if (!ModelState.IsValid) if (!ModelState.IsValid)
{ {
var isProduction = _environment.IsProduction();
model.Prices = (await _stripeAdapter.PriceListAsync(new Stripe.PriceListOptions() { Limit = 100 })).Data; model.Prices = (await _stripeAdapter.PriceListAsync(new Stripe.PriceListOptions() { Limit = 100 })).Data;
model.TestClocks = await _stripeAdapter.TestClockListAsync(); model.TestClocks = isProduction ? new List<Stripe.TestHelpers.TestClock>() : await _stripeAdapter.TestClockListAsync();
return View(model); return View(model);
} }