Merge branch 'master' into fixes/1176-duplicate-login-classes

Conflicts: src/GitHub.App/Models/RepositoryHost.cs src/UnitTests/GitHub.App/Models/RepositoryHostTests.cs
github · shana · Nov 9, 2017 · Aug 25, 2017 · Aug 25, 2017 · Aug 25, 2017
commit 7b4080ffa79889b7c8810ce5673bf71c04206b1f
diff --git a/src/GitHub.App/Models/RepositoryHost.cs b/src/GitHub.App/Models/RepositoryHost.cs
@@ -142,53 +142,6 @@ public IObservable<Unit> LogOut()
                 });
         }
 
-        static IObservable<AuthenticationResult> GetAuthenticationResultForUser(UserAndScopes account)
-        {
-            return Observable.Return(account == null ? AuthenticationResult.CredentialFailure
-                : account == unverifiedUser
-                    ? AuthenticationResult.VerificationFailure
-                    : AuthenticationResult.Success);
-        }
-
-        IObservable<AuthenticationResult> LoginWithApiUser(UserAndScopes userAndScopes)
-        {
-            return GetAuthenticationResultForUser(userAndScopes)
-                .SelectMany(result =>
-                {
-                    if (result.IsSuccess())
-                    {
-                        var accountCacheItem = new AccountCacheItem(userAndScopes.User);
-                        usage.IncrementLoginCount().Forget();
-                        return ModelService.InsertUser(accountCacheItem).Select(_ => result);
-                    }
-
-                    if (result == AuthenticationResult.VerificationFailure)
-                    {
-                        return keychain.Delete(Address).ToObservable().Select(_ => result);
-                    }
-                    return Observable.Return(result);
-                })
-                .ObserveOn(RxApp.MainThreadScheduler)
-                .Do(result =>
-                {
-                    if (result.IsSuccess())
-                    {
-                        SupportsGist = userAndScopes.Scopes?.Contains("gist") ?? true;
-                        IsLoggedIn = true;
-                    }
-
-                    log.Info("Log in from cache for login '{0}' to host '{1}' {2}",
-                        userAndScopes?.User?.Login ?? "(null)",
-                        hostAddress.ApiUri,
-                        result.IsSuccess() ? "SUCCEEDED" : "FAILED");
-                });
-        }
-
-        IObservable<UserAndScopes> GetUserFromApi()
-        {
-            return Observable.Defer(() => ApiClient.GetUser());
-        }
-
         protected virtual void Dispose(bool disposing)
         {}
 

diff --git a/src/UnitTests/GitHub.App/Models/RepositoryHostTests.cs b/src/UnitTests/GitHub.App/Models/RepositoryHostTests.cs
@@ -26,7 +26,7 @@ public async Task LogsTheUserInSuccessfullyAndCachesRelevantInfo()
             apiClient.GetOrCreateApplicationAuthenticationCode(
                 Args.TwoFactorChallengCallback, Args.String, Args.Boolean)
                 .Returns(Observable.Return(new ApplicationAuthorization("S3CR3TS")));
-            apiClient.GetUser().Returns(Observable.Return(CreateOctokitUser("baymax")));
+            apiClient.GetUser().Returns(Observable.Return(CreateUserAndScopes("baymax")));
             var hostCache = new InMemoryBlobCache();
             var modelService = new ModelService(apiClient, hostCache, Substitute.For<IAvatarProvider>());
             var loginManager = Substitute.For<ILoginManager>();
@@ -51,7 +51,7 @@ public async Task IncrementsLoginCount()
             apiClient.GetOrCreateApplicationAuthenticationCode(
                 Args.TwoFactorChallengCallback, Args.String, Args.Boolean)
                 .Returns(Observable.Return(new ApplicationAuthorization("S3CR3TS")));
-            apiClient.GetUser().Returns(Observable.Return(CreateOctokitUser("baymax")));
+            apiClient.GetUser().Returns(Observable.Return(CreateUserAndScopes("baymax")));
             var hostCache = new InMemoryBlobCache();
             var modelService = Substitute.For<IModelService>();
             var loginManager = Substitute.For<ILoginManager>();