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

fix: delete account endpoint updated 

Local keystore file deletion is done only if an account being deleted is migrated to a keycard.
This commit is contained in:
Sale Djenic 2023-04-10 16:36:01 +02:00 committed by saledjenic
parent ba1ba1ac02
commit a37b586915
1 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
services/accounts/accounts.go
View File

@ -69,18 +69,28 @@ func (api *API) GetAccounts(ctx context.Context) ([]*accounts.Account, error) {
}
func (api *API) DeleteAccount(ctx context.Context, address types.Address, password string) error {
if len(password) > 0 {
acc, err := api.db.GetAccountByAddress(address)
if err != nil {
acc, err := api.db.GetAccountByAddress(address)
if err != nil {
return err
}
migratedKeyPairs, err := api.db.GetMigratedKeyPairByKeyUID(acc.KeyUID)
if err != nil {
return err
}
if acc.Type != accounts.AccountTypeWatch && len(migratedKeyPairs) == 0 {
if len(password) == 0 {
return errors.New("`password` must be provided for non keycard accounts")
}
err = api.manager.DeleteAccount(address, password)
var e *account.ErrCannotLocateKeyFile
if err != nil && !errors.As(err, &e) {
return err
}
if acc.Type != accounts.AccountTypeWatch {
err = api.manager.DeleteAccount(address, password)
var e *account.ErrCannotLocateKeyFile
if err != nil && !errors.As(err, &e) {
return err
}
if acc.Type != accounts.AccountTypeKey {
allAccountsOfKeypairWithKeyUID, err := api.db.GetAccountsByKeyUID(acc.KeyUID)
if err != nil {
return err