Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use verifyPassword instead of submitPassword when exporting priv key #9288

Merged
merged 5 commits into from
Aug 26, 2020
Merged

Use verifyPassword instead of submitPassword when exporting priv key #9288

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ee8302b
Use verifyPassword instead of submitPassword when exporting priv key
tmashuang Aug 21, 2020
9bce868
Hide Warning on componentWillUnmount
tmashuang Aug 21, 2020
5a0a9c3
Update exportAccount tests to verifyPassword
tmashuang Aug 21, 2020
dd6b916
Update ui/app/store/actions.js
tmashuang Aug 26, 2020
d622acd
Update ui/app/store/actions.js
tmashuang Aug 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions test/unit/ui/app/actions.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1144,10 +1144,10 @@ describe('Actions', function () {
})

describe('#exportAccount', function () {
let submitPasswordSpy, exportAccountSpy
let verifyPasswordSpy, exportAccountSpy

afterEach(function () {
submitPasswordSpy.restore()
verifyPasswordSpy.restore()
exportAccountSpy.restore()
})

Expand All @@ -1159,11 +1159,11 @@ describe('Actions', function () {
{ type: 'SHOW_PRIVATE_KEY', value: '7ec73b91bb20f209a7ff2d32f542c3420b4fccf14abcc7840d2eff0ebcb18505' },
]

submitPasswordSpy = sinon.spy(background, 'submitPassword')
verifyPasswordSpy = sinon.spy(background, 'verifyPassword')
exportAccountSpy = sinon.spy(background, 'exportAccount')

await store.dispatch(actions.exportAccount(password, '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc'))
assert(submitPasswordSpy.calledOnce)
assert(verifyPasswordSpy.calledOnce)
assert(exportAccountSpy.calledOnce)
assert.deepEqual(store.getActions(), expectedActions)
})
Expand All @@ -1176,8 +1176,8 @@ describe('Actions', function () {
{ type: 'DISPLAY_WARNING', value: 'Incorrect Password.' },
]

submitPasswordSpy = sinon.stub(background, 'submitPassword')
submitPasswordSpy.callsFake((_, callback) => {
verifyPasswordSpy = sinon.stub(background, 'verifyPassword')
verifyPasswordSpy.callsFake((_, callback) => {
callback(new Error('error'))
})

Expand Down
2 changes: 2 additions & 0 deletions ui/app/components/app/modals/export-private-key-modal/export-private-key-modal.component.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ export default class ExportPrivateKeyModal extends Component {
warning: PropTypes.node,
showAccountDetailModal: PropTypes.func.isRequired,
hideModal: PropTypes.func.isRequired,
hideWarning: PropTypes.func.isRequired,
clearAccountDetails: PropTypes.func.isRequired,
previousModalState: PropTypes.string,
}
Expand All @@ -37,6 +38,7 @@ export default class ExportPrivateKeyModal extends Component {

componentWillUnmount () {
this.props.clearAccountDetails()
this.props.hideWarning()
}

exportAccountAndGetPrivateKey = (password, address) => {
Expand Down
1 change: 1 addition & 0 deletions ui/app/components/app/modals/export-private-key-modal/export-private-key-modal.container.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ function mapDispatchToProps (dispatch) {
},
showAccountDetailModal: () => dispatch(showModal({ name: 'ACCOUNT_DETAILS' })),
hideModal: () => dispatch(hideModal()),
hideWarning: () => dispatch(hideWarning()),
clearAccountDetails: () => dispatch(clearAccountDetails()),
}
}
Expand Down
6 changes: 3 additions & 3 deletions ui/app/store/actions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1707,11 +1707,11 @@ export function exportAccount (password, address) {
return function (dispatch) {
dispatch(showLoadingIndication())

log.debug(`background.submitPassword`)
log.debug(`background.verifyPassword`)
return new Promise((resolve, reject) => {
background.submitPassword(password, function (err) {
background.verifyPassword(password, function (err) {
if (err) {
log.error('Error in submitting password.')
log.error('Error in verifying password.')
dispatch(hideLoadingIndication())
dispatch(displayWarning('Incorrect Password.'))
reject(err)
Expand Down