yesBad/proton-bridge
1
0
Fork 0
forked from Silverfish/proton-bridge
Code Actions Activity

test: add test using fake helper

Browse Source
This commit is contained in:
James Houlahan
2021-01-06 13:28:39 +01:00
parent 5ad338e835
commit 67a7d556ec
2 changed files with 156 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/keychain/keychain.go
View File

@ -51,9 +51,6 @@ func NewKeychain(s *settings.Settings, keychainName string) (*Keychain, error) {
return nil, ErrNoKeychain
}
// hostURL uniquely identifies the app's keychain items within the system keychain.
hostURL := fmt.Sprintf("protonmail/%v/users", keychainName)
// If the preferred keychain is unsupported, fallback to the default one.
// NOTE: Maybe we want to error out here and show something in the GUI instead?
if _, ok := Helpers[s.Get(settings.PreferredKeychainKey)]; !ok {
@ -67,12 +64,17 @@ func NewKeychain(s *settings.Settings, keychainName string) (*Keychain, error) {
}
// Construct the keychain helper.
helper, err := helperConstructor(hostURL)
helper, err := helperConstructor(hostURL(keychainName))
if err != nil {
return nil, err
}
return newKeychain(helper, hostURL), nil
return newKeychain(helper, hostURL(keychainName)), nil
}
// hostURL uniquely identifies the app's keychain items within the system keychain.
func hostURL(keychainName string) string {
return fmt.Sprintf("protonmail/%v/users", keychainName)
}
func newKeychain(helper credentials.Helper, url string) *Keychain {