Merge pull request #820 from github-for-unity/fixes/login-logout

Fix sign in and out

Author: StanleyGoldman

src/GitHub.Api/Primitives/UriString.cs

@@ -267,7 +267,7 @@ static string GetSerializedValue(SerializationInfo info)
 
         static string NormalizePath(string path)
         {
-            return path?.Replace('\\', '/');
+            return path?.Replace('\\', '/').TrimEnd('/');
         }
 
         static string GetRepositoryName(string repositoryNameSegment)

src/UnityExtension/Assets/Editor/GitHub.Unity/UI/Window.cs

@@ -54,6 +54,7 @@ class Window : BaseWindow
         [SerializeField] private string repositoryProgressMessage;
         [SerializeField] private float appManagerProgressValue;
         [SerializeField] private string appManagerProgressMessage;
+        [SerializeField] private Connection connection;
 
         [MenuItem(Menu_Window_GitHub)]
         public static void Window_GitHub()
@@ -210,6 +211,8 @@ private void ValidateCachedData(IRepository repository)
 
         private void MaybeUpdateData()
         {
+            connection = Platform.Keychain.Connections.FirstOrDefault();
+
             if (repositoryProgressHasUpdate)
             {
                 if (repositoryProgress != null)
@@ -351,6 +354,7 @@ private void AttachHandlers(IRepository repository)
             repository.TrackingStatusChanged += RepositoryOnTrackingStatusChanged;
             repository.StatusEntriesChanged += RepositoryOnStatusEntriesChanged;
             repository.OnProgress += UpdateProgress;
+            Platform.Keychain.ConnectionsChanged += ConnectionsChanged;
         }
 
         private void DetachHandlers(IRepository repository)
@@ -362,6 +366,7 @@ private void DetachHandlers(IRepository repository)
             repository.StatusEntriesChanged -= RepositoryOnStatusEntriesChanged;
             repository.OnProgress -= UpdateProgress;
             Manager.OnProgress -= ApplicationManagerOnProgress;
+            Platform.Keychain.ConnectionsChanged -= ConnectionsChanged;
         }
 
         private void RepositoryOnCurrentBranchAndRemoteChanged(CacheUpdateEvent cacheUpdateEvent)
@@ -419,6 +424,14 @@ private void ApplicationManagerOnProgress(IProgress progress)
             appManagerProgressHasUpdate = true;
         }
 
+        private void ConnectionsChanged()
+        {
+            if (!ThreadingHelper.InUIThread)
+                TaskManager.RunInUI(Redraw);
+            else
+                Redraw();
+        }
+
         public override void OnUI()
         {
             base.OnUI();
@@ -610,8 +623,18 @@ private void DoActionbarGUI()
 
                 GUILayout.FlexibleSpace();
 
-                if (GUILayout.Button(Localization.AccountButton, EditorStyles.toolbarDropDown))
-                    DoAccountDropdown();
+                if (connection == null)
+                {
+                    if (GUILayout.Button("Sign in", EditorStyles.toolbarButton))
+                        SignIn(null);
+                }
+                else
+                {
+                    if (GUILayout.Button(connection.Username, EditorStyles.toolbarDropDown))
+                    {
+                        DoAccountDropdown();
+                    }
+                }
             }
             EditorGUILayout.EndHorizontal();
         }
@@ -770,23 +793,15 @@ private void SwitchView(Subview fromView, Subview toView)
             toView.OnDataUpdate();
 
             // this triggers a repaint
-            Repaint();
+            Redraw();
         }
 
         private void DoAccountDropdown()
         {
             GenericMenu accountMenu = new GenericMenu();
-
-            if (!Platform.Keychain.HasKeys)
-            {
-                accountMenu.AddItem(new GUIContent("Sign in"), false, SignIn, "sign in");
-            }
-            else
-            {
-                accountMenu.AddItem(new GUIContent("Go to Profile"), false, GoToProfile, "profile");
-                accountMenu.AddSeparator("");
-                accountMenu.AddItem(new GUIContent("Sign out"), false, SignOut, "sign out");
-            }
+            accountMenu.AddItem(new GUIContent("Go to Profile"), false, GoToProfile, "profile");
+            accountMenu.AddSeparator("");
+            accountMenu.AddItem(new GUIContent("Sign out"), false, SignOut, "sign out");
             accountMenu.ShowAsContext();
         }
 
@@ -809,15 +824,15 @@ private void SignOut(object obj)
             if (Repository != null && Repository.CloneUrl != null && Repository.CloneUrl.IsValidUri)
             {
                 host = new UriString(Repository.CloneUrl.ToRepositoryUri()
-                                               .GetComponents(UriComponents.SchemeAndServer, UriFormat.SafeUnescaped));
+                    .GetComponents(UriComponents.SchemeAndServer, UriFormat.SafeUnescaped));
             }
             else
             {
                 host = UriString.ToUriString(HostAddress.GitHubDotComHostAddress.WebUri);
             }
 
             var apiClient = new ApiClient(host, Platform.Keychain, null, null, NPath.Default, NPath.Default);
-            apiClient.Logout(host);
+            apiClient.Logout(host).FinallyInUI((s, e) => Redraw());
         }
 
         public new void ShowNotification(GUIContent content)

src/tests/UnitTests/Authentication/KeychainTests.cs

@@ -305,7 +305,7 @@ public void ShouldConnectSetCredentialsTokenAndSave()
             fileSystem.DidNotReceive().FileDelete(Args.String);
             fileSystem.DidNotReceive().ReadAllText(Args.String);
             fileSystem.DidNotReceive().ReadAllLines(Args.String);
-            fileSystem.Received(1).WriteAllText(connectionsCacheFile, @"[{""Host"":""https://github.com/"",""Username"":""SomeUser""}]");
+            fileSystem.Received(1).WriteAllText(connectionsCacheFile, @"[{""Host"":""https://github.com"",""Username"":""SomeUser""}]");
 
             credentialManager.DidNotReceive().Load(Args.UriString);
             credentialManager.DidNotReceive().HasCredentials();