fix: only fetch keys for activated users
This commit is contained in:
@@ -230,7 +230,10 @@ async def get_wallet_for_key(
|
|||||||
SELECT balance FROM balances WHERE wallet_id = wallets.id
|
SELECT balance FROM balances WHERE wallet_id = wallets.id
|
||||||
), 0)
|
), 0)
|
||||||
AS balance_msat FROM wallets
|
AS balance_msat FROM wallets
|
||||||
WHERE (adminkey = :key OR inkey = :key) AND deleted = false
|
INNER JOIN accounts ON wallets.user = accounts.id
|
||||||
|
WHERE (adminkey = :key OR inkey = :key)
|
||||||
|
AND deleted = false
|
||||||
|
AND accounts.activated = true
|
||||||
""",
|
""",
|
||||||
{"key": key},
|
{"key": key},
|
||||||
Wallet,
|
Wallet,
|
||||||
@@ -250,8 +253,11 @@ async def get_base_wallet_for_key(
|
|||||||
) -> BaseWallet | None:
|
) -> BaseWallet | None:
|
||||||
wallet = await (conn or db).fetchone(
|
wallet = await (conn or db).fetchone(
|
||||||
"""
|
"""
|
||||||
SELECT id, "user", wallet_type, adminkey, inkey FROM wallets
|
SELECT wallets.id, "user", wallet_type, adminkey, inkey FROM wallets
|
||||||
WHERE (adminkey = :key OR inkey = :key) AND deleted = false
|
INNER JOIN accounts ON wallets.user = accounts.id
|
||||||
|
WHERE (adminkey = :key OR inkey = :key)
|
||||||
|
AND deleted = false
|
||||||
|
AND accounts.activated = true
|
||||||
""",
|
""",
|
||||||
{"key": key},
|
{"key": key},
|
||||||
BaseWallet,
|
BaseWallet,
|
||||||
|
|||||||
@@ -147,7 +147,7 @@ window._lnbitsApi = {
|
|||||||
name: name,
|
name: name,
|
||||||
wallet_type: walletType,
|
wallet_type: walletType,
|
||||||
...opts
|
...opts
|
||||||
}).catch(LNbits.utils.notifyApiError)
|
})
|
||||||
},
|
},
|
||||||
updateWallet(name, wallet) {
|
updateWallet(name, wallet) {
|
||||||
return this.request('patch', '/api/v1/wallet', wallet.adminkey, {
|
return this.request('patch', '/api/v1/wallet', wallet.adminkey, {
|
||||||
|
|||||||
@@ -97,6 +97,7 @@ window.app.component('lnbits-wallet-new', {
|
|||||||
this.g.lastWalletId = res.data.id
|
this.g.lastWalletId = res.data.id
|
||||||
this.$router.push(`/wallet/${res.data.id}`)
|
this.$router.push(`/wallet/${res.data.id}`)
|
||||||
})
|
})
|
||||||
|
.catch(LNbits.utils.notifyApiError)
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
created() {
|
created() {
|
||||||
|
|||||||
Reference in New Issue
Block a user