status-im
/
status-desktop
mirror of https://github.com/status-im/status-desktop.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

refactor account setup

This commit is contained in:
Iuri Matias 2020-05-21 16:15:44 -04:00
parent de5428cc0a
commit bab04fac6f
2 changed files with 15 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/models/accounts.nim
View File

@ -62,18 +62,5 @@ proc generateRandomAccountAndLogin*(self: AccountModel) =
proc storeAccountAndLogin*(self: AccountModel, selectedAccountIndex: int, password: string): string = proc storeAccountAndLogin*(self: AccountModel, selectedAccountIndex: int, password: string): string =
let account: GeneratedAccount = self.generatedAddresses[selectedAccountIndex] let account: GeneratedAccount = self.generatedAddresses[selectedAccountIndex]
result = status_accounts.setupAccount(%account, password)
let multiAccounts = status_accounts.generateMultiAccounts(%account, password)
let whisperPubKey = account.derived[constants.PATH_WHISPER]["publicKey"].getStr
let alias = $libstatus.generateAlias(whisperPubKey.toGoString)
let identicon = $libstatus.identicon(whisperPubKey.toGoString)
let accountData = status_accounts.getAccountData(%account, alias, identicon)
var nodeConfig = constants.NODE_CONFIG
var settingsJSON = status_accounts.getAccountSettings(%account, alias, identicon, multiAccounts, constants.DEFAULT_NETWORKS)
discard saveAccountAndLogin(multiAccounts, alias, identicon, $accountData, password, $nodeConfig, $settingsJSON)
self.events.emit("accountsReady", Args()) self.events.emit("accountsReady", Args())
""

38
src/status/accounts.nim
View File

@ -31,15 +31,6 @@ proc generateAddresses*(): string =
proc generateAlias*(publicKey: string): string = proc generateAlias*(publicKey: string): string =
result = $libstatus.generateAlias(publicKey.toGoString) result = $libstatus.generateAlias(publicKey.toGoString)
# const datadir = "./data/"
# const keystoredir = "./data/keystore/"
# const nobackupdir = "./noBackup/"
proc recreateDir(dirname: string) =
if existsDir(dirname):
removeDir(dirname)
createDir(dirname)
proc ensureDir(dirname: string) = proc ensureDir(dirname: string) =
if not existsDir(dirname): if not existsDir(dirname):
# removeDir(dirname) # removeDir(dirname)
@ -130,22 +121,21 @@ proc getAccountSettings*(account: JsonNode, alias: string, identicon: string, mu
"installation-id": $genUUID() "installation-id": $genUUID()
} }
proc setupAccount*(account: JsonNode, password: string): string =
let multiAccounts = generateMultiAccounts(account, password)
let whisperPubKey = account["derived"][constants.PATH_WHISPER]["publicKey"].getStr
let alias = $libstatus.generateAlias(whisperPubKey.toGoString)
let identicon = $libstatus.identicon(whisperPubKey.toGoString)
let accountData = getAccountData(account, alias, identicon)
var settingsJSON = getAccountSettings(account, alias, identicon, multiAccounts, constants.DEFAULT_NETWORKS)
$saveAccountAndLogin(multiAccounts, alias, identicon, $accountData, password, $constants.NODE_CONFIG, $settingsJSON)
proc setupRandomTestAccount*(): string = proc setupRandomTestAccount*(): string =
let generatedAddresses = generateAddresses().parseJson let generatedAddresses = generateAddresses().parseJson
let account = generatedAddresses[0]
let account0 = generatedAddresses[0]
let password = "qwerty" let password = "qwerty"
let multiAccounts = generateMultiAccounts(account0, password)
# let alias = $libstatus.generateAlias(whisperPubKey.toGoString) setupAccount(account, password)
# let identicon = $libstatus.identicon(whisperPubKey.toGoString)
var alias = "Delectable Overjoyed Nauplius"
var identicon = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADIAAAAyCAYAAAAeP4ixAAAAmElEQVR4nOzX4QmAIBBA4Yp2aY52aox2ao6mqf+SoajwON73M0J4HBy6TEEYQmMIjSE0htCECVlbDziv+/n6fuzb3OP/UmEmYgiNITRNm+LPqO2UE2YihtAYQlN818ptoZzau1btOakwEzGExhCa5hdi7d2p1zZLhZmIITSG0PhCpDGExhANEmYihtAYQmMIjSE0bwAAAP//kHQdRIWYzToAAAAASUVORK5CYII="
let accountData = getAccountData(account0, alias, identicon)
var settingsJSON = getAccountSettings(account0, alias, identicon, multiAccounts, constants.DEFAULT_NETWORKS)
let configJSON = constants.NODE_CONFIG
var subaccountdata = saveAccountAndLogin(multiAccounts, alias, identicon, $accountData, password, $configJSON, $settingsJSON)
$subaccountData