Merge pull request #1203 from github/fixes/1201-gists-logout

Removed LogoutRequired flow for Gists

Author: shana

src/GitHub.App/Api/ApiClient.cs

@@ -26,7 +26,6 @@ public partial class ApiClient : IApiClient
         const string ScopesHeader = "X-OAuth-Scopes";
         const string ProductName = Info.ApplicationInfo.ApplicationDescription;
         static readonly Logger log = LogManager.GetCurrentClassLogger();
-        static readonly Uri userEndpoint = new Uri("user", UriKind.Relative);
 
         readonly IObservableGitHubClient gitHubClient;
         // There are two sets of authorization scopes, old and new:
@@ -96,30 +95,9 @@ public IObservable<Gist> CreateGist(NewGist newGist)
             return gitHubClient.Gist.Create(newGist);
         }
 
-        public IObservable<UserAndScopes> GetUser()
+        public IObservable<User> GetUser()
         {
-            return GetUserInternal().ToObservable();
-        }
-
-        async Task<UserAndScopes> GetUserInternal()
-        {
-            var response = await gitHubClient.Connection.Get<User>(
-                userEndpoint, null, null).ConfigureAwait(false);
-            var scopes = default(string[]);
-
-            if (response.HttpResponse.Headers.ContainsKey(ScopesHeader))
-            {
-                scopes = response.HttpResponse.Headers[ScopesHeader]
-                    .Split(',')
-                    .Select(x => x.Trim())
-                    .ToArray();
-            }
-            else
-            {
-                log.Error($"Error reading scopes: /user succeeded but {ScopesHeader} was not present.");
-            }
-
-            return new UserAndScopes(response.Body, scopes);
+            return gitHubClient.User.Current();
         }
 
         public IObservable<ApplicationAuthorization> GetOrCreateApplicationAuthenticationCode(

src/GitHub.App/Controllers/UIController.cs

@@ -319,7 +319,6 @@ void ConfigureUIHandlingStates()
             ConfigureEntriesExitsForView(UIViewType.Login);
             ConfigureEntriesExitsForView(UIViewType.TwoFactor);
             ConfigureEntriesExitsForView(UIViewType.Gist);
-            ConfigureEntriesExitsForView(UIViewType.LogoutRequired);
             ConfigureEntriesExitsForView(UIViewType.StartPageClone);
 
             uiStateMachine.Configure(UIViewType.End)
@@ -421,7 +420,6 @@ void ConfigureLogicStates()
             ConfigureSingleViewLogic(UIControllerFlow.Create, UIViewType.Create);
             ConfigureSingleViewLogic(UIControllerFlow.Gist, UIViewType.Gist);
             ConfigureSingleViewLogic(UIControllerFlow.Home, UIViewType.PRList);
-            ConfigureSingleViewLogic(UIControllerFlow.LogoutRequired, UIViewType.LogoutRequired);
             ConfigureSingleViewLogic(UIControllerFlow.Publish, UIViewType.Publish);
             ConfigureSingleViewLogic(UIControllerFlow.PullRequestList, UIViewType.PRList);
             ConfigureSingleViewLogic(UIControllerFlow.PullRequestDetail, UIViewType.PRDetail);
@@ -448,11 +446,7 @@ UIControllerFlow SelectActiveFlow()
         {
             var host = connection != null ? hosts.LookupHost(connection.HostAddress) : null;
             var loggedIn = host?.IsLoggedIn ?? false;
-            if (!loggedIn || selectedFlow != UIControllerFlow.Gist)
-                return loggedIn ? selectedFlow : UIControllerFlow.Authentication;
-
-            var supportsGist = host?.SupportsGist ?? false;
-            return supportsGist ? selectedFlow : UIControllerFlow.LogoutRequired;
+            return loggedIn ? selectedFlow : UIControllerFlow.Authentication;
         }
 
         /// <summary>

src/GitHub.App/GitHub.App.csproj

@@ -216,7 +216,6 @@
     <Compile Include="ViewModels\NotAGitRepositoryViewModel.cs" />
     <Compile Include="ViewModels\NotAGitHubRepositoryViewModel.cs" />
     <Compile Include="ViewModels\LoggedOutViewModel.cs" />
-    <Compile Include="ViewModels\LogoutRequiredViewModel.cs" />
     <Compile Include="ViewModels\PullRequestCreationViewModel.cs" />
     <Compile Include="ViewModels\PullRequestDetailViewModel.cs" />
     <Compile Include="ViewModels\PullRequestDirectoryNode.cs" />

src/GitHub.App/Models/DisconnectedRepositoryHosts.cs

@@ -25,7 +25,6 @@ public DisconnectedRepositoryHost()
 
         public bool IsLoggedIn { get; private set; }
         public bool IsLoggingIn { get; private set; }
-        public bool SupportsGist { get; private set; }
         public ReactiveList<IAccount> Organizations { get; private set; }
         public ReactiveList<IAccount> Accounts { get; private set; }
         public string Title { get; private set; }

src/GitHub.App/Models/RepositoryHost.cs

@@ -27,7 +27,6 @@ namespace GitHub.Models
     public class RepositoryHost : ReactiveObject, IRepositoryHost
     {
         static readonly Logger log = LogManager.GetCurrentClassLogger();
-        static readonly UserAndScopes unverifiedUser = new UserAndScopes(null, null);
 
         readonly ILoginManager loginManager;
         readonly HostAddress hostAddress;
@@ -65,8 +64,6 @@ public bool IsLoggedIn
             private set { this.RaiseAndSetIfChanged(ref isLoggedIn, value); }
         }
 
-        public bool SupportsGist { get; private set; }
-
         public string Title { get; private set; }
 
         [SuppressMessage("Microsoft.Reliability", "CA2000:Dispose objects before losing scope")]
@@ -81,7 +78,7 @@ public IObservable<AuthenticationResult> LogInFromCache()
                     usage.IncrementLoginCount().Forget();
                     await ModelService.InsertUser(accountCacheItem);
 
-                    if (user != unverifiedUser.User)
+                    if (user != null)
                     {
                         IsLoggedIn = true;
                         return AuthenticationResult.Success;
@@ -112,7 +109,7 @@ public IObservable<AuthenticationResult> LogIn(string usernameOrEmail, string pa
                 usage.IncrementLoginCount().Forget();
                 await ModelService.InsertUser(accountCacheItem);
 
-                if (user != unverifiedUser.User)
+                if (user != null)
                 {
                     IsLoggedIn = true;
                     return Observable.Return(AuthenticationResult.Success);
@@ -149,53 +146,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 loginCache.EraseLogin(Address).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)
         {}
 

src/GitHub.App/Resources.Designer.cs

@@ -159,15 +159,6 @@
   <data name="LoginTitle" xml:space="preserve">
     <value>Connect To GitHub</value>
   </data>
-  <data name="LogoutRequiredFeatureGist" xml:space="preserve">
-    <value>create a Gist</value>
-  </data>
-  <data name="LogoutRequiredMessage" xml:space="preserve">
-    <value>To {0} you need to sign out and back in.</value>
-  </data>
-  <data name="LogoutRequiredTitle" xml:space="preserve">
-    <value>Sign Out Required</value>
-  </data>
   <data name="PasswordValidatorEmpty" xml:space="preserve">
     <value>Please enter your password</value>
   </data>

src/GitHub.App/Resources.resx

@@ -276,12 +276,6 @@ public bool IsLoggedIn
             private set;
         }
 
-        public bool SupportsGist
-        {
-            get;
-            private set;
-        }
-
         public IModelService ModelService
         {
             get;

src/GitHub.App/SampleData/SampleViewModels.cs

@@ -15,7 +15,7 @@ public interface IApiClient
 
         IObservable<Repository> CreateRepository(NewRepository repository, string login, bool isUser);
         IObservable<Gist> CreateGist(NewGist newGist);
-        IObservable<UserAndScopes> GetUser();
+        IObservable<User> GetUser();
         IObservable<Organization> GetOrganizations();
         /// <summary>
         /// Retrieves all repositories that belong to this user.