aiolabs/lightning-pub
2
0
Fork 0
Code Issues 9 Pull requests 4 Projects Releases Packages Wiki Activity Actions

Simplify existing-lnd new alias flow

Browse source
This commit is contained in:
Daniel Lugo 2021-12-27 15:20:41 -04:00
parent b5b6a1350a
commit 2a72f2df9d
1 changed files with 11 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/routes.js
View file

@ -890,15 +890,15 @@ module.exports = async (
app.post('/api/lnd/wallet/existing', async (req, res) => {
try {
const trustedKeys = await Storage.get('trustedPKs')
const { password, alias } = req.body
const healthResponse = await checkHealth()
const exists = await walletExists()
const allowUnlockedLND = process.env.ALLOW_UNLOCKED_LND === 'true'
const isLocked = healthResponse.LNDStatus.service === 'walletUnlocker'
if (!exists) {
return res.status(500).json({
field: 'wallet',
errorMessage: 'LND wallet does not exist, please create a new one'
})
throw new Error('LND wallet does not exist, please create a new one')
}
if (!alias) {
@ -923,32 +923,23 @@ module.exports = async (
})
}
if (
healthResponse.LNDStatus.service !== 'walletUnlocker' &&
!allowUnlockedLND
) {
return res.status(400).json({
field: 'wallet',
errorMessage:
'Wallet is already unlocked. Please restart your LND instance and try again.'
})
if (!isLocked && !allowUnlockedLND) {
throw new Error(
'Wallet is already unlocked. Please restart your LND instance and try again.'
)
}
try {
if (healthResponse.LNDStatus.service === 'walletUnlocker') {
if (isLocked) {
await unlockWallet(password)
}
} catch (err) {
return res.status(401).json({
field: 'wallet',
errorMessage: 'Invalid LND wallet password'
})
} catch (_) {
throw new Error('Invalid LND wallet password')
}
// Register user after verifying wallet password
const publicKey = await GunDB.register(alias, password)
const trustedKeys = await Storage.get('trustedPKs')
await Storage.setItem('trustedPKs', [...(trustedKeys || []), publicKey])
// Generate Access Token