Merge branch 'master' into fixes/user-cache-update

Author: shana

src/GitHub.Api/Authentication/Keychain.cs

@@ -152,9 +152,10 @@ public async Task Clear(UriString host, bool deleteFromCredentialManager)
 
             Guard.ArgumentNotNull(host, nameof(host));
 
+            RemoveConnection(host);
+
             //clear octokit credentials
             await RemoveCredential(host, deleteFromCredentialManager);
-            RemoveConnection(host);
         }
 
         public async Task Save(UriString host)

src/GitHub.Api/Authentication/LoginManager.cs

@@ -72,7 +72,11 @@ public async Task<LoginResultData> Login(
                         throw new InvalidOperationException("Returned token is null or empty");
                     }
 
-                    username = await RetrieveUsername(loginResultData, username);
+                    if (loginResultData.Code == LoginResultCodes.Success)
+                    {
+                        username = await RetrieveUsername(loginResultData, username);
+                    }
+
                     keychain.SetToken(host, loginResultData.Token, username);
 
                     if (loginResultData.Code == LoginResultCodes.Success)