Merge branch 'master' into dev
This commit is contained in:
commit
5da6089aab
1 changed files with 8 additions and 2 deletions
|
|
@ -571,6 +571,10 @@ module.exports = async (
|
||||||
const walletUnlocked = health.LNDStatus.walletStatus === 'unlocked'
|
const walletUnlocked = health.LNDStatus.walletStatus === 'unlocked'
|
||||||
const { authorization = '' } = req.headers
|
const { authorization = '' } = req.headers
|
||||||
|
|
||||||
|
if (!isKeyTrusted) {
|
||||||
|
logger.warn('Untrusted public key!')
|
||||||
|
}
|
||||||
|
|
||||||
if (!walletUnlocked) {
|
if (!walletUnlocked) {
|
||||||
await unlockWallet(password)
|
await unlockWallet(password)
|
||||||
}
|
}
|
||||||
|
|
@ -578,7 +582,8 @@ module.exports = async (
|
||||||
if (walletUnlocked && !authorization && !isKeyTrusted) {
|
if (walletUnlocked && !authorization && !isKeyTrusted) {
|
||||||
res.status(401).json({
|
res.status(401).json({
|
||||||
field: 'alias',
|
field: 'alias',
|
||||||
errorMessage: 'Invalid alias/password combination',
|
errorMessage:
|
||||||
|
'Invalid alias/password combination (Untrusted Device)',
|
||||||
success: false
|
success: false
|
||||||
})
|
})
|
||||||
return
|
return
|
||||||
|
|
@ -592,7 +597,8 @@ module.exports = async (
|
||||||
if (!validatedToken) {
|
if (!validatedToken) {
|
||||||
res.status(401).json({
|
res.status(401).json({
|
||||||
field: 'alias',
|
field: 'alias',
|
||||||
errorMessage: 'Invalid alias/password combination',
|
errorMessage:
|
||||||
|
'Invalid alias/password combination (Untrusted Auth Token)',
|
||||||
success: false
|
success: false
|
||||||
})
|
})
|
||||||
return
|
return
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue