diff options
| -rw-r--r-- | app/scripts/keyring-controller.js | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/app/scripts/keyring-controller.js b/app/scripts/keyring-controller.js index 7020c188a..00c04ea9b 100644 --- a/app/scripts/keyring-controller.js +++ b/app/scripts/keyring-controller.js @@ -55,7 +55,7 @@ module.exports = class KeyringController extends EventEmitter { return { seedWords: this.configManager.getSeedWords(), isInitialized: (!!wallet || !!vault), - isUnlocked: !!this.key, + isUnlocked: this.keyrings.length > 0, isDisclaimerConfirmed: this.configManager.getConfirmedDisclaimer(), // AUDIT this.configManager.getConfirmedDisclaimer(), unconfTxs: this.configManager.unconfirmedTxs(), transactions: this.configManager.getTxList(), @@ -136,7 +136,7 @@ module.exports = class KeyringController extends EventEmitter { createNewVault (password, cb) { const configManager = this.configManager - const salt = this.encryptor.generateSalt() + const salt = this.getSalt() configManager.setSalt(salt) return this.migrateAndGetKey(password) @@ -186,7 +186,7 @@ module.exports = class KeyringController extends EventEmitter { submitPassword (password, cb) { this.migrateAndGetKey(password) .then((key) => { - return this.unlockKeyrings(key) + return this.unlockKeyrings(password) }) .then((keyrings) => { this.keyrings = keyrings @@ -201,7 +201,7 @@ module.exports = class KeyringController extends EventEmitter { } loadKey (password) { - const salt = this.configManager.getSalt() || this.encryptor.generateSalt() + const salt = this.getSalt() return this.encryptor.keyFromPassword(password + salt) .then((key) => { this.key = key @@ -210,6 +210,11 @@ module.exports = class KeyringController extends EventEmitter { }) } + getSalt () { + const vault = this.configManager.getVault() + const salt = vault.salt || this.encryptor.generateSalt() + } + addNewKeyring (type, opts, cb) { const Keyring = this.getKeyringClassForType(type) const keyring = new Keyring(opts) @@ -292,7 +297,7 @@ module.exports = class KeyringController extends EventEmitter { }) } - unlockKeyrings (key) { + unlockKeyrings (password) { const encryptedVault = this.configManager.getVault() return this.encryptor.decryptWithKey(key, encryptedVault) .then((vault) => { |