Merge pull request #110 from github-for-unity/features/keychain

Exposing a list of Hosts keys through IKeychain

Author: shana

src/GitHub.Api/Application/ApplicationManagerBase.cs

@@ -142,7 +142,7 @@ private async Task LoadKeychain()
         {
             Logger.Trace("Loading Keychain");
 
-            var firstConnection = Platform.Keychain.Connections.FirstOrDefault();
+            var firstConnection = Platform.Keychain.Hosts.FirstOrDefault();
             if (firstConnection == null)
             {
                 Logger.Trace("No Host Found");

src/GitHub.Api/Authentication/IKeychain.cs

@@ -12,7 +12,8 @@ interface IKeychain
         void UpdateToken(UriString host, string token);
         void SetCredentials(ICredential credential);
         void Initialize();
-        IList<UriString> Connections { get; }
+        Connection[] Connections { get; }
+        IList<UriString> Hosts { get; }
         bool HasKeys { get; }
         void SetToken(UriString host, string token);
     }

src/GitHub.Api/Authentication/Keychain.cs

@@ -225,7 +225,9 @@ public void UpdateToken(UriString host, string token)
             keychainItem.UpdateToken(token);
         }
 
-        public IList<UriString> Connections => connectionCache.Keys.ToArray();
+        public Connection[] Connections => connectionCache.Values.ToArray();
+
+        public IList<UriString> Hosts => connectionCache.Keys.ToArray();
 
         public bool HasKeys => connectionCache.Any();
     }

src/tests/UnitTests/Authentication/KeychainTests.cs

@@ -48,7 +48,7 @@ public void ShouldInitializeWhenCacheDoesNotExist()
             credentialManager.DidNotReceive().Save(Arg.Any<ICredential>());
 
             keychain.HasKeys.Should().BeFalse();
-            keychain.Connections.Should().BeEmpty();
+            keychain.Hosts.Should().BeEmpty();
         }
 
         [Test]
@@ -88,7 +88,7 @@ public void ShouldInitializeWhenCacheInvalid()
             credentialManager.DidNotReceive().Save(Arg.Any<ICredential>());
 
             keychain.HasKeys.Should().BeFalse();
-            keychain.Connections.Should().BeEmpty();
+            keychain.Hosts.Should().BeEmpty();
         }
 
         [Test]
@@ -130,7 +130,7 @@ public void ShouldInitializeWhenCacheExists()
             credentialManager.DidNotReceive().Save(Arg.Any<ICredential>());
 
             keychain.HasKeys.Should().BeTrue();
-            keychain.Connections.Should().BeEquivalentTo(hostUri);
+            keychain.Hosts.Should().BeEquivalentTo(hostUri);
         }
 
         [Test]
@@ -177,7 +177,7 @@ public void ShouldLoadFromConnectionManager()
             fileSystem.DidNotReceive().WriteAllText(Args.String, Args.String);
             fileSystem.DidNotReceive().WriteAllLines(Args.String, Arg.Any<string[]>());
 
-            var uriString = keychain.Connections.FirstOrDefault();
+            var uriString = keychain.Hosts.FirstOrDefault();
             var keychainAdapter = keychain.Load(uriString).Result;
             keychainAdapter.Credential.Username.Should().Be(username);
             keychainAdapter.Credential.Token.Should().Be(token);
@@ -227,7 +227,7 @@ public void ShouldDeleteFromCacheWhenLoadReturnsNullFromConnectionManager()
             fileSystem.DidNotReceive().WriteAllText(Args.String, Args.String);
             fileSystem.ClearReceivedCalls();
 
-            var uriString = keychain.Connections.FirstOrDefault();
+            var uriString = keychain.Hosts.FirstOrDefault();
             var keychainAdapter = keychain.Load(uriString).Result;
             keychainAdapter.Credential.Should().BeNull();
 
@@ -302,7 +302,7 @@ public void ShouldDeleteFromCacheWhenLoadReturnsNullFromConnectionManagerDueToUs
 
             fileSystem.ClearReceivedCalls();
 
-            var uriString = keychain.Connections.FirstOrDefault();
+            var uriString = keychain.Hosts.FirstOrDefault();
             var keychainAdapter = keychain.Load(uriString).Result;
             keychainAdapter.Credential.Should().BeNull();
 
@@ -364,7 +364,7 @@ public void ShouldConnectSetCredentialsTokenAndSave()
             credentialManager.DidNotReceive().Save(Arg.Any<ICredential>());
 
             keychain.HasKeys.Should().BeFalse();
-            keychain.Connections.Should().BeEmpty();
+            keychain.Hosts.Should().BeEmpty();
 
             var keychainAdapter = keychain.Connect(hostUri);
 
@@ -450,7 +450,7 @@ public void ShouldConnectSetCredentialsAndClear()
             credentialManager.DidNotReceive().Save(Arg.Any<ICredential>());
 
             keychain.HasKeys.Should().BeFalse();
-            keychain.Connections.Should().BeEmpty();
+            keychain.Hosts.Should().BeEmpty();
 
             var keychainAdapter = keychain.Connect(hostUri);