grassrootseconomics/openethereum
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Passwords are valid by default (#4075)

Browse Source 
* Passwords are valid by default #4059

* Actually fixing the issue
This commit is contained in:
Nicolas Gotchac 2017-01-06 17:56:57 +01:00 committed by Jaco Greeff
parent a7f23cbaed
commit 761ed913a8
5 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/src/modals/CreateAccount/NewAccount/newAccount.js
View File

@ -40,7 +40,7 @@ export default class CreateAccount extends Component {
accountNameError: ERRORS.noName, accountNameError: ERRORS.noName,
accounts: null, accounts: null,
isValidName: false, isValidName: false,
isValidPass: false, isValidPass: true,
passwordHint: '', passwordHint: '',
password1: '', password1: '',
password1Error: null, password1Error: null,

2
js/src/modals/CreateAccount/NewImport/newImport.js
View File

@ -37,7 +37,7 @@ export default class NewImport extends Component {
accountName: '', accountName: '',
accountNameError: ERRORS.noName, accountNameError: ERRORS.noName,
isValidFile: false, isValidFile: false,
isValidPass: false, isValidPass: true,
isValidName: false, isValidName: false,
password: '', password: '',
passwordError: null, passwordError: null,

4
js/src/modals/CreateAccount/RawKey/rawKey.js
View File

@ -36,7 +36,7 @@ export default class RawKey extends Component {
accountNameError: ERRORS.noName, accountNameError: ERRORS.noName,
isValidKey: false, isValidKey: false,
isValidName: false, isValidName: false,
isValidPass: false, isValidPass: true,
passwordHint: '', passwordHint: '',
password1: '', password1: '',
password1Error: null, password1Error: null,
@ -119,8 +119,6 @@ export default class RawKey extends Component {
const rawKey = event.target.value; const rawKey = event.target.value;
let rawKeyError = null; let rawKeyError = null;
console.log(rawKey.length, rawKey);
if (!rawKey || !rawKey.trim().length) { if (!rawKey || !rawKey.trim().length) {
rawKeyError = ERRORS.noKey; rawKeyError = ERRORS.noKey;
} else if (rawKey.substr(0, 2) !== '0x' || rawKey.substr(2).length !== 64 || !api.util.isHex(rawKey)) { } else if (rawKey.substr(0, 2) !== '0x' || rawKey.substr(2).length !== 64 || !api.util.isHex(rawKey)) {

4
js/src/modals/CreateAccount/RecoveryPhrase/recoveryPhrase.js
View File

@ -31,9 +31,9 @@ export default class RecoveryPhrase extends Component {
state = { state = {
accountName: '', accountName: '',
accountNameError: ERRORS.noName, accountNameError: ERRORS.noName,
isValidPass: false, isValidPass: true,
isValidName: false, isValidName: false,
isValidPhrase: false, isValidPhrase: true,
passwordHint: '', passwordHint: '',
password1: '', password1: '',
password1Error: null, password1Error: null,

9
js/src/modals/CreateAccount/createAccount.js
View File

@ -240,6 +240,7 @@ export default class CreateAccount extends Component {
if (createType === 'fromNew' || createType === 'fromPhrase') { if (createType === 'fromNew' || createType === 'fromPhrase') {
let phrase = this.state.phrase; let phrase = this.state.phrase;
if (createType === 'fromPhrase' && windowsPhrase) { if (createType === 'fromPhrase' && windowsPhrase) {
phrase = phrase phrase = phrase
.split(' ') // get the words .split(' ') // get the words
@ -271,7 +272,9 @@ export default class CreateAccount extends Component {
this.newError(error); this.newError(error);
}); });
} else if (createType === 'fromRaw') { }
if (createType === 'fromRaw') {
return api.parity return api.parity
.newAccountFromSecret(this.state.rawKey, this.state.password) .newAccountFromSecret(this.state.rawKey, this.state.password)
.then((address) => { .then((address) => {
@ -296,7 +299,9 @@ export default class CreateAccount extends Component {
this.newError(error); this.newError(error);
}); });
} else if (createType === 'fromGeth') { }
if (createType === 'fromGeth') {
return api.parity return api.parity
.importGethAccounts(this.state.gethAddresses) .importGethAccounts(this.state.gethAddresses)
.then((result) => { .then((result) => {