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

feat: handling migrating non profile keycard keypair to app on paired device

This commit is contained in:
Sale Djenic 2023-08-29 17:09:15 +02:00 committed by saledjenic
parent 3ab312f6d1
commit fbcda780ec
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
protocol/messenger_handler.go
View File

@ -3101,7 +3101,8 @@ func mapSyncAccountToAccount(message *protobuf.SyncAccount, accountOperability a
}
}
func (m *Messenger) resolveAccountOperability(syncAcc *protobuf.SyncAccount, syncKpMigratedToKeycard bool, accountReceivedFromLocalPairing bool) (accounts.AccountOperable, error) {
func (m *Messenger) resolveAccountOperability(syncAcc *protobuf.SyncAccount, syncKpMigratedToKeycard bool,
dbKpMigratedToKeycard bool, accountReceivedFromLocalPairing bool) (accounts.AccountOperable, error) {
if accountReceivedFromLocalPairing {
return accounts.AccountOperable(syncAcc.Operable), nil
}
@ -3116,6 +3117,10 @@ func (m *Messenger) resolveAccountOperability(syncAcc *protobuf.SyncAccount, syn
return accountsOperability, err
}
if dbAccount != nil {
// We're here when we receive a keypair from the paired device which has just migrated from keycard to app.
if !syncKpMigratedToKeycard && dbKpMigratedToKeycard {
return accounts.AccountNonOperable, nil
}
return dbAccount.Operable, nil
}
@ -3275,7 +3280,8 @@ func (m *Messenger) handleSyncKeypair(message *protobuf.SyncKeypair, fromLocalPa
}
syncKpMigratedToKeycard = multiAcc != nil && multiAcc.KeycardPairing != ""
}
accountOperability, err := m.resolveAccountOperability(sAcc, syncKpMigratedToKeycard, fromLocalPairing)
accountOperability, err := m.resolveAccountOperability(sAcc, syncKpMigratedToKeycard,
dbKeypair != nil && dbKeypair.MigratedToKeycard(), fromLocalPairing)
if err != nil {
return nil, err
}