AaronFiore/electrum
1
0
Fork 0
Code Activity

implement auth by PIN and allow auth override to wallet password

Browse Source 
by passing method='wallet' to auth_protect
This commit is contained in:
Sander van Grieken
2022-07-06 16:23:29 +02:00
parent cc778356eb
commit 2a13212ded
5 changed files with 218 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
electrum/gui/qml/components/main.qml
View File

@@ -179,6 +179,14 @@ ApplicationWindow
}
}
property alias pinDialog: _pinDialog
Component {
id: _pinDialog
Pin {
onClosed: destroy()
}
}
NotificationPopup {
id: notificationPopup
}
@@ -221,7 +229,7 @@ ApplicationWindow
interval: 5000
repeat: false
}
Connections {
target: Daemon
function onWalletRequiresPassword() {
@@ -233,6 +241,9 @@ ApplicationWindow
var dialog = app.messageDialog.createObject(app, {'text': error})
dialog.open()
}
function onAuthRequired(method) {
handleAuthRequired(Daemon, method)
}
}
Connections {
@@ -244,24 +255,8 @@ ApplicationWindow
Connections {
target: Daemon.currentWallet
function onAuthRequired() {
if (Daemon.currentWallet.verify_password('')) {
// wallet has no password
Daemon.currentWallet.authProceed()
} else {
var dialog = app.passwordDialog.createObject(app, {'title': qsTr('Enter current password')})
dialog.accepted.connect(function() {
if (Daemon.currentWallet.verify_password(dialog.password)) {
Daemon.currentWallet.authProceed()
} else {
Daemon.currentWallet.authCancel()
}
})
dialog.rejected.connect(function() {
Daemon.currentWallet.authCancel()
})
dialog.open()
}
function onAuthRequired(method) {
handleAuthRequired(Daemon.currentWallet, method)
}
// TODO: add to notification queue instead of barging through
function onPaymentSucceeded(key) {
@@ -273,16 +268,48 @@ ApplicationWindow
}
Connections {
target: Daemon
function onAuthRequired() {
var dialog = app.messageDialog.createObject(app, {'text': 'Auth placeholder', 'yesno': true})
dialog.yesClicked.connect(function() {
Daemon.authProceed()
})
dialog.noClicked.connect(function() {
Daemon.authCancel()
})
dialog.open()
target: Config
function onAuthRequired(method) {
handleAuthRequired(Config, method)
}
}
function handleAuthRequired(qtobject, method) {
console.log('AUTHENTICATING USING METHOD ' + method)
if (method == 'wallet') {
if (Daemon.currentWallet.verify_password('')) {
// wallet has no password
qtobject.authProceed()
} else {
var dialog = app.passwordDialog.createObject(app, {'title': qsTr('Enter current password')})
dialog.accepted.connect(function() {
if (Daemon.currentWallet.verify_password(dialog.password)) {
qtobject.authProceed()
} else {
qtobject.authCancel()
}
})
dialog.rejected.connect(function() {
qtobject.authCancel()
})
dialog.open()
}
} else if (method == 'pin') {
if (Config.pinCode == '') {
// no PIN configured
qtobject.authProceed()
} else {
var dialog = app.pinDialog.createObject(app, {mode: 'check', pincode: Config.pinCode})
dialog.accepted.connect(function() {
qtobject.authProceed()
dialog.close()
})
dialog.rejected.connect(function() {
qtobject.authCancel()
})
dialog.open()
}
}
}
}