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

fix bitpay initalization

Browse Source
This commit is contained in:
Kyle Spearrin 2019-03-19 23:32:54 -04:00
parent e2be61da0a
commit 685928a4c7
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Api/Controllers/MiscController.cs
View File

@ -13,7 +13,8 @@ namespace Bit.Api.Controllers
private readonly BitPayClient _bitPayClient;
private readonly GlobalSettings _globalSettings;
public MiscController(BitPayClient bitPayClient,
public MiscController(
BitPayClient bitPayClient,
GlobalSettings globalSettings)
{
_bitPayClient = bitPayClient;

5
src/Api/Startup.cs
View File

@ -58,13 +58,14 @@ namespace Bit.Api
// Caching
services.AddMemoryCache();
// BitPay
services.AddSingleton<BitPayClient>();
if(!globalSettings.SelfHosted)
{
// Rate limiting
services.AddSingleton<IIpPolicyStore, MemoryCacheIpPolicyStore>();
services.AddSingleton<IRateLimitCounterStore, MemoryCacheRateLimitCounterStore>();
// BitPay
services.AddSingleton<BitPayClient>();
}
// Identity

11
src/Core/Utilities/BitPayClient.cs
View File

@ -9,10 +9,13 @@ namespace Bit.Core.Utilities
public BitPayClient(GlobalSettings globalSettings)
{
var btcSecret = new NBitcoin.BitcoinSecret(globalSettings.BitPay.Base58Secret,
globalSettings.BitPay.Production ? null : NBitcoin.Network.TestNet);
_bpClient = new NBitpayClient.Bitpay(btcSecret.PrivateKey,
new Uri(globalSettings.BitPay.Production ? "https://bitpay.com/" : "https://test.bitpay.com/"));
if(CoreHelpers.SettingHasValue(globalSettings.BitPay.Base58Secret))
{
var btcSecret = new NBitcoin.BitcoinSecret(globalSettings.BitPay.Base58Secret,
globalSettings.BitPay.Production ? null : NBitcoin.Network.TestNet);
_bpClient = new NBitpayClient.Bitpay(btcSecret.PrivateKey,
new Uri(globalSettings.BitPay.Production ? "https://bitpay.com/" : "https://test.bitpay.com/"));
}
}
public Task<bool> TestAccessAsync()