Remove IObservableKeychainAdapter.

Just call `ToObservable` on the task returned by `IKeychain`.

Author: grokys

src/GitHub.App/Caches/ObservableKeychainAdapter.cs

@@ -17,7 +17,7 @@ public class RepositoryHostFactory : IRepositoryHostFactory
         readonly IApiClientFactory apiClientFactory;
         readonly IHostCacheFactory hostCacheFactory;
         readonly ILoginManager loginManager;
-        readonly IObservableKeychainAdapter keychain;
+        readonly IKeychain keychain;
         readonly IAvatarProvider avatarProvider;
         readonly CompositeDisposable hosts = new CompositeDisposable();
         readonly IUsageTracker usage;
@@ -27,7 +27,7 @@ public RepositoryHostFactory(
             IApiClientFactory apiClientFactory,
             IHostCacheFactory hostCacheFactory,
             ILoginManager loginManager,
-            IObservableKeychainAdapter keychain,
+            IKeychain keychain,
             IAvatarProvider avatarProvider,
             IUsageTracker usage)
         {

src/GitHub.App/Factories/RepositoryHostFactory.cs

@@ -177,7 +177,6 @@
     <Compile Include="Factories\HostCacheFactory.cs" />
     <Compile Include="Factories\IBlobCacheFactory.cs" />
     <Compile Include="Factories\IHostCacheFactory.cs" />
-    <Compile Include="Caches\ObservableKeychainAdapter.cs" />
     <Compile Include="Caches\SharedCache.cs" />
     <Compile Include="Factories\SqlitePersistentBlobCacheFactory.cs" />
     <Compile Include="Info\GitHubUrls.cs" />

src/GitHub.App/GitHub.App.csproj

@@ -27,7 +27,7 @@ public class RepositoryHost : ReactiveObject, IRepositoryHost
 
         readonly ILoginManager loginManager;
         readonly HostAddress hostAddress;
-        readonly IObservableKeychainAdapter keychain;
+        readonly IKeychain keychain;
         readonly IUsageTracker usage;
 
         bool isLoggedIn;
@@ -36,7 +36,7 @@ public RepositoryHost(
             IApiClient apiClient,
             IModelService modelService,
             ILoginManager loginManager,
-            IObservableKeychainAdapter keychain,
+            IKeychain keychain,
             IUsageTracker usage)
         {
             ApiClient = apiClient;
@@ -126,7 +126,7 @@ public IObservable<Unit> LogOut()
 
             log.Info(CultureInfo.InvariantCulture, "Logged off of host '{0}'", hostAddress.ApiUri);
 
-            return keychain.EraseLogin(Address)
+            return keychain.Delete(Address).ToObservable()
                 .Catch<Unit, Exception>(e =>
                 {
                     log.Warn("ASSERT! Failed to erase login. Going to invalidate cache anyways.", e);
@@ -167,7 +167,7 @@ IObservable<AuthenticationResult> LoginWithApiUser(UserAndScopes userAndScopes)
 
                     if (result == AuthenticationResult.VerificationFailure)
                     {
-                        return keychain.EraseLogin(Address).Select(_ => result);
+                        return keychain.Delete(Address).ToObservable().Select(_ => result);
                     }
                     return Observable.Return(result);
                 })

src/GitHub.App/Models/RepositoryHost.cs

@@ -120,7 +120,6 @@
     <Compile Include="ViewModels\ILoginToGitHubForEnterpriseViewModel.cs" />
     <Compile Include="ViewModels\ILoginToGitHubViewModel.cs" />
     <Compile Include="Caches\IImageCache.cs" />
-    <Compile Include="Caches\IObservableKeychainAdapter.cs" />
     <Compile Include="Caches\ISharedCache.cs" />
     <Compile Include="Services\IImageDownloader.cs" />
     <Compile Include="Services\IGitClient.cs" />

src/GitHub.Exports.Reactive/Caches/IObservableKeychainAdapter.cs

@@ -12,7 +12,6 @@
 using GitHub.Services;
 using NSubstitute;
 using Octokit;
-using UnitTests.Helpers;
 using Xunit;
 
 public class RepositoryHostTests
@@ -32,9 +31,9 @@ public async Task LogsTheUserInSuccessfullyAndCachesRelevantInfo()
             var modelService = new ModelService(apiClient, hostCache, Substitute.For<IAvatarProvider>());
             var loginManager = Substitute.For<ILoginManager>();
             loginManager.Login(HostAddress.GitHubDotComHostAddress, Arg.Any<IGitHubClient>(), "baymax", "aPassword").Returns(CreateUserAndScopes("baymax").User);
-            var loginCache = new TestLoginCache();
+            var keychain = Substitute.For<IKeychain>();
             var usage = Substitute.For<IUsageTracker>();
-            var host = new RepositoryHost(apiClient, modelService, loginManager, loginCache, usage);
+            var host = new RepositoryHost(apiClient, modelService, loginManager, keychain, usage);
 
             var result = await host.LogIn("baymax", "aPassword");
 
@@ -57,9 +56,9 @@ public async Task IncrementsLoginCount()
             var modelService = Substitute.For<IModelService>();
             var loginManager = Substitute.For<ILoginManager>();
             loginManager.Login(HostAddress.GitHubDotComHostAddress, Arg.Any<IGitHubClient>(), "baymax", "aPassword").Returns(CreateUserAndScopes("baymax").User);
-            var loginCache = new TestLoginCache();
+            var keychain = Substitute.For<IKeychain>();
             var usage = Substitute.For<IUsageTracker>();
-            var host = new RepositoryHost(apiClient, modelService, loginManager, loginCache, usage);
+            var host = new RepositoryHost(apiClient, modelService, loginManager, keychain, usage);
 
             var result = await host.LogIn("baymax", "aPassword");
 
@@ -76,9 +75,9 @@ public async Task DoesNotLogInWhenRetrievingOauthTokenFails()
             var loginManager = Substitute.For<ILoginManager>();
             loginManager.Login(HostAddress.GitHubDotComHostAddress, Arg.Any<IGitHubClient>(), "jiminy", "cricket")
                 .Returns<User>(_ => { throw new NotFoundException("", HttpStatusCode.BadGateway); });
-            var loginCache = new TestLoginCache();
+            var keychain = Substitute.For<IKeychain>();
             var usage = Substitute.For<IUsageTracker>();
-            var host = new RepositoryHost(apiClient, modelService, loginManager, loginCache, usage);
+            var host = new RepositoryHost(apiClient, modelService, loginManager, keychain, usage);
 
             await Assert.ThrowsAsync<NotFoundException>(async () => await host.LogIn("jiminy", "cricket"));
 
@@ -98,9 +97,9 @@ public async Task LogsTheUserInSuccessfullyAndCachesRelevantInfo()
             var modelService = new ModelService(apiClient, hostCache, Substitute.For<IAvatarProvider>());
             var loginManager = Substitute.For<ILoginManager>();
             loginManager.LoginFromCache(HostAddress.GitHubDotComHostAddress, Arg.Any<IGitHubClient>()).Returns(CreateUserAndScopes("baymax").User);
-            var loginCache = new TestLoginCache();
+            var keychain = Substitute.For<IKeychain>();
             var usage = Substitute.For<IUsageTracker>();
-            var host = new RepositoryHost(apiClient, modelService, loginManager, loginCache, usage);
+            var host = new RepositoryHost(apiClient, modelService, loginManager, keychain, usage);
 
             var result = await host.LogInFromCache();
 
@@ -119,9 +118,9 @@ public async Task IncrementsLoginCount()
             var modelService = Substitute.For<IModelService>();
             var loginManager = Substitute.For<ILoginManager>();
             loginManager.LoginFromCache(HostAddress.GitHubDotComHostAddress, Arg.Any<IGitHubClient>()).Returns(CreateUserAndScopes("baymax").User);
-            var loginCache = new TestLoginCache();
+            var keychain = Substitute.For<IKeychain>();
             var usage = Substitute.For<IUsageTracker>();
-            var host = new RepositoryHost(apiClient, modelService, loginManager, loginCache, usage);
+            var host = new RepositoryHost(apiClient, modelService, loginManager, keychain, usage);
 
             var result = await host.LogInFromCache();
 

src/GitHub.Exports.Reactive/GitHub.Exports.Reactive.csproj

@@ -264,7 +264,6 @@
     <Compile Include="Helpers\LazySubstitute.cs" />
     <Compile Include="Helpers\ReactiveTestHelper.cs" />
     <Compile Include="Helpers\TestBaseClass.cs" />
-    <Compile Include="Helpers\TestLoginCache.cs" />
     <Compile Include="Helpers\TestSharedCache.cs" />
     <Compile Include="Properties\Resources.Designer.cs">
       <AutoGen>True</AutoGen>