status-im/status-keycard-go
2
0
Fork 0
mirror of https://github.com/status-im/status-keycard-go.git synced 2025-01-18 18:31:56 +00:00
Code Issues Projects Releases Wiki Activity

add key uid to all flows

Browse Source
This commit is contained in:
Michele Balistreri 2022-12-29 14:49:26 +01:00
parent 01c3a00862
commit 73e8c3e830
No known key found for this signature in database
GPG Key ID: E9567DA33A4F791A
1 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
flow.go
View File

@ -434,7 +434,7 @@ func (f *KeycardFlow) changePINFlow(kc *keycardContext) (FlowStatus, error) {
return nil, err
}
return FlowStatus{InstanceUID: f.cardInfo.instanceUID}, nil
return FlowStatus{InstanceUID: f.cardInfo.instanceUID, KeyUID: f.cardInfo.keyUID}, nil
}
func (f *KeycardFlow) changePUKFlow(kc *keycardContext) (FlowStatus, error) {
@ -450,7 +450,7 @@ func (f *KeycardFlow) changePUKFlow(kc *keycardContext) (FlowStatus, error) {
return nil, err
}
return FlowStatus{InstanceUID: f.cardInfo.instanceUID}, nil
return FlowStatus{InstanceUID: f.cardInfo.instanceUID, KeyUID: f.cardInfo.keyUID}, nil
}
func (f *KeycardFlow) changePairingFlow(kc *keycardContext) (FlowStatus, error) {
@ -466,7 +466,7 @@ func (f *KeycardFlow) changePairingFlow(kc *keycardContext) (FlowStatus, error)
return nil, err
}
return FlowStatus{InstanceUID: f.cardInfo.instanceUID}, nil
return FlowStatus{InstanceUID: f.cardInfo.instanceUID, KeyUID: f.cardInfo.keyUID}, nil
}
func (f *KeycardFlow) unpairThisFlow(kc *keycardContext) (FlowStatus, error) {
@ -483,7 +483,7 @@ func (f *KeycardFlow) unpairThisFlow(kc *keycardContext) (FlowStatus, error) {
}
f.cardInfo.freeSlots++
return FlowStatus{InstanceUID: f.cardInfo.instanceUID, FreeSlots: f.cardInfo.freeSlots}, nil
return FlowStatus{InstanceUID: f.cardInfo.instanceUID, KeyUID: f.cardInfo.keyUID, FreeSlots: f.cardInfo.freeSlots}, nil
}
func (f *KeycardFlow) unpairOthersFlow(kc *keycardContext) (FlowStatus, error) {
@ -506,7 +506,7 @@ func (f *KeycardFlow) unpairOthersFlow(kc *keycardContext) (FlowStatus, error) {
}
return FlowStatus{InstanceUID: f.cardInfo.instanceUID, FreeSlots: f.cardInfo.freeSlots}, nil
return FlowStatus{InstanceUID: f.cardInfo.instanceUID, KeyUID: f.cardInfo.keyUID, FreeSlots: f.cardInfo.freeSlots}, nil
}
func (f *KeycardFlow) deleteUnpairFlow(kc *keycardContext) (FlowStatus, error) {
@ -548,7 +548,7 @@ func (f *KeycardFlow) storeMetadataFlow(kc *keycardContext) (FlowStatus, error)
return nil, err
}
return FlowStatus{InstanceUID: f.cardInfo.instanceUID}, nil
return FlowStatus{InstanceUID: f.cardInfo.instanceUID, KeyUID: f.cardInfo.keyUID}, nil
}
func (f *KeycardFlow) getMetadataFlow(kc *keycardContext) (FlowStatus, error) {
@ -558,6 +558,8 @@ func (f *KeycardFlow) getMetadataFlow(kc *keycardContext) (FlowStatus, error) {
return nil, err
}
result := FlowStatus{InstanceUID: f.cardInfo.instanceUID, KeyUID: f.cardInfo.keyUID}
if resolveAddr, ok := f.params[ResolveAddr]; ok && resolveAddr.(bool) {
if f.cardInfo.keyUID == "" {
return FlowStatus{ErrorKey: ErrorNoKeys, InstanceUID: f.cardInfo.instanceUID, CardMeta: m}, nil
@ -569,6 +571,15 @@ func (f *KeycardFlow) getMetadataFlow(kc *keycardContext) (FlowStatus, error) {
return nil, err
}
if exportMaster, ok := f.params[ExportMaster]; ok && exportMaster.(bool) {
masterKey, err := f.exportKey(kc, masterPath, true)
result[MasterAddr] = masterKey.Address
if err != nil {
return nil, err
}
}
for i := range m.Wallets {
k, err := f.exportKey(kc, m.Wallets[i].Path, true)
@ -580,5 +591,7 @@ func (f *KeycardFlow) getMetadataFlow(kc *keycardContext) (FlowStatus, error) {
}
}
return FlowStatus{InstanceUID: f.cardInfo.instanceUID, CardMeta: m}, nil
result[CardMeta] = m
return result, nil
}