Foundry376/Mailspring
1
1
Fork 0
mirror of https://github.com/Foundry376/Mailspring.git synced 2025-01-15 20:48:01 +08:00
Code Issues Projects Releases Packages Wiki Activity

fix(tokens): Don't assume that keytar is sync, don't wipe until next save

Browse source
This commit is contained in:
Ben Gotow 2016-03-23 15:56:31 -07:00
parent 0056773769
commit 0a8e578e9f
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/flux/stores/account-store.coffee
View file

@ -45,19 +45,19 @@ class AccountStore extends NylasStore
for json in NylasEnv.config.get(configAccountsKey) || []
@_accounts.push((new Account).fromJSON(json))
# Load tokens using the old config method and save them into the keychain
oldTokens = NylasEnv.config.get(configTokensKey)
if oldTokens
# Load tokens using the old config method and save them into the keychain
@_tokens = oldTokens
for key, val of oldTokens
account = @accountForId(key)
continue unless account
keytar.replacePassword(keytarServiceName, account.emailAddress, val)
NylasEnv.config.set(configTokensKey, null)
# Load tokens using the new keytar method
@_tokens = {}
for account in @_accounts
@_tokens[account.id] = keytar.getPassword(keytarServiceName, account.emailAddress)
else
# Load tokens using the new keytar method
@_tokens = {}
for account in @_accounts
@_tokens[account.id] = keytar.getPassword(keytarServiceName, account.emailAddress)
@_trigger()
@ -73,6 +73,7 @@ class AccountStore extends NylasStore
@_version += 1
NylasEnv.config.set(configVersionKey, @_version)
NylasEnv.config.set(configAccountsKey, @_accounts)
NylasEnv.config.set(configTokensKey, null)
NylasEnv.config.save()
@_trigger()