Skip to content

chore(import): fix legacy import issue with mixed up passwords #1202

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

Merged
DalderupMaurice merged 1 commit into from
Oct 20, 2019
Merged

chore(import): fix legacy import issue with mixed up passwords #1202

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 20 additions & 4 deletions src/renderer/shared/components/NewWallet/Import/ExistingImport/ExistingImport.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@ export default class ExistingImport extends React.PureComponent {
className: string,
account: accountShape.isRequired,
passphrase: string.isRequired,
legacyPassphrase: string.isRequired,
setPassphrase: func.isRequired,
setLegacyPassphrase: func.isRequired,
addAccount: func.isRequired,
accounts: arrayOf(legacyAccountShape).isRequired,
setCurrentAccount: func.isRequired,
Expand All @@ -31,7 +33,7 @@ export default class ExistingImport extends React.PureComponent {
};

render() {
const { className, accounts, passphrase, currentAccount } = this.props;
const { className, accounts, passphrase, legacyPassphrase, currentAccount } = this.props;

return (
<form className={className} onSubmit={this.submit} id="walletForm">
Expand All @@ -45,10 +47,19 @@ export default class ExistingImport extends React.PureComponent {
/>

<LabeledInput
id="passphrase"
id="legacyPassphrase"
type="password"
label="Legacy Passphrase"
placeholder="Enter your legacy passphrase"
value={legacyPassphrase}
onChange={this.handleChangeLegacyPassphrase}
/>

<LabeledInput
id="passphrase"
type="password"
label="Current Passphrase"
placeholder="Enter your current passphrase"
value={passphrase}
onChange={this.handleChangePassphrase}
/>
Expand All @@ -60,6 +71,10 @@ export default class ExistingImport extends React.PureComponent {
this.props.setPassphrase(event.target.value);
};

handleChangeLegacyPassphrase = (event) => {
this.props.setLegacyPassphrase(event.target.value);
};

handleChangeCurrentAccount = (value) => {
this.props.setCurrentAccount(value);
};
Expand All @@ -72,13 +87,14 @@ export default class ExistingImport extends React.PureComponent {
setPassphrase,
addAccount,
showErrorToast,
legacyPassphrase,
currentAccount
} = this.props;

const walletLabel = accounts.filter((acc) => acc.encryptedKey === currentAccount)[0].walletName;

try {
const wif = await wallet.decryptAsync(currentAccount, passphrase);
const wif = await wallet.decryptAsync(currentAccount, legacyPassphrase);
const { privateKey } = new wallet.Account(wif);

const options = {
Expand All @@ -92,7 +108,7 @@ export default class ExistingImport extends React.PureComponent {
addAccount({ account, passphrase, options });
setPassphrase('');
} catch (e) {
showErrorToast(`Wrong passphrase for account ${walletLabel}`);
showErrorToast(`Incorrect legacy passphrase for account ${walletLabel}`);
}
};

Expand Down
1 change: 1 addition & 0 deletions src/renderer/shared/components/NewWallet/Import/ExistingImport/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ export default compose(
withState('currentAccount', 'setCurrentAccount', ({ accounts }) => {
return accounts[0] && accounts[0].encryptedKey;
}),
withState('legacyPassphrase', 'setLegacyPassphrase', ''),
withState('passphrase', 'setPassphrase', ''),

withErrorToast(),
Expand Down