Fix logging out not logging out properly

Author: shana

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

@@ -551,18 +551,6 @@ private void DoToolbarGUI()
                 }
 
                 GUILayout.FlexibleSpace();
-
-                if (connection == null)
-                {
-                    if (GUILayout.Button("Sign in", Styles.HistoryToolbarButtonStyle))
-                        SignIn(null);
-                }
-                else
-                {
-                    if (GUILayout.Button(connection.Username, EditorStyles.toolbarDropDown))
-                    {
-                        DoAccountDropdown();
-                    }
             }
             EditorGUILayout.EndHorizontal();
         }
@@ -632,8 +620,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();
         }
@@ -823,15 +821,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)