aljaz/btcpayserver
1
0
Fork 0
mirror of https://github.com/aljazceru/btcpayserver.git synced 2025-12-19 15:04:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Trying to fix TrezorT

Browse Source
This commit is contained in:
nicolas.dorier
2019-12-04 22:12:38 +09:00
parent a1d82b0e8b
commit 84d943d6cc
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
BTCPayServer/Controllers/VaultController.cs
View File

@@ -82,16 +82,26 @@ namespace BTCPayServer.Controllers
if ((deviceEntry.Code is HwiErrorCode.DeviceNotReady || deviceEntry.NeedsPinSent is true) if ((deviceEntry.Code is HwiErrorCode.DeviceNotReady || deviceEntry.NeedsPinSent is true)
&& !pinProvided) && !pinProvided)
{ {
if (IsTrezorT(deviceEntry)) if (!IsTrezorT(deviceEntry))
{ {
await websocketHelper.Send("{ \"error\": \"need-pin-on-device\"}", cancellationToken); await websocketHelper.Send("{ \"error\": \"need-pin\"}", cancellationToken);
return true;
} }
else else
{ {
await websocketHelper.Send("{ \"error\": \"need-pin\"}", cancellationToken); try
{
// On trezor T this will prompt the password!
await device.PromptPinAsync(cancellationToken);
} }
catch (HwiException ex) when (ex.ErrorCode == HwiErrorCode.DeviceAlreadyUnlocked)
{
pinProvided = true;
}
await websocketHelper.Send("{ \"error\": \"need-passphrase-on-device\"}", cancellationToken);
return true; return true;
} }
}
if ((deviceEntry.Code is HwiErrorCode.DeviceNotReady || deviceEntry.NeedsPassphraseSent is true) && password == null) if ((deviceEntry.Code is HwiErrorCode.DeviceNotReady || deviceEntry.NeedsPassphraseSent is true) && password == null)
{ {
if (IsTrezorT(deviceEntry)) if (IsTrezorT(deviceEntry))