Merge pull request #691 from github-for-unity/fixes/save-keychain-on-2fa-success

Don't save the keychain before completing 2FA

Author: shana

src/GitHub.Api/Application/ApiClient.cs

@@ -131,55 +131,6 @@ public async Task ContinueLogin(LoginResult loginResult, string code)
             loginResult.Callback(result.Code == LoginResultCodes.Success, result.Message);
         }
 
-        public async Task<bool> LoginAsync(string username, string password, Func<LoginResult, string> need2faCode)
-        {
-            Guard.ArgumentNotNull(need2faCode, "need2faCode");
-
-            LoginResultData res = null;
-            try
-            {
-                res = await loginManager.Login(OriginalUrl, username, password);
-            }
-            catch (Exception)
-            {
-                return false;
-            }
-
-            if (res.Code == LoginResultCodes.CodeRequired)
-            {
-                var resultCache = new LoginResult(res, null, null);
-                var code = need2faCode(resultCache);
-                return await ContinueLoginAsync(resultCache, need2faCode, code);
-            }
-            else
-            {
-                return res.Code == LoginResultCodes.Success;
-            }
-        }
-
-        public async Task<bool> ContinueLoginAsync(LoginResult loginResult, Func<LoginResult, string> need2faCode, string code)
-        {
-            LoginResultData result = null;
-            try
-            {
-                result = await loginManager.ContinueLogin(loginResult.Data, code);
-            }
-            catch (Exception)
-            {
-                return false;
-            }
-
-            if (result.Code == LoginResultCodes.CodeFailed)
-            {
-                var resultCache = new LoginResult(result, null, null);
-                code = need2faCode(resultCache);
-                if (String.IsNullOrEmpty(code))
-                    return false;
-                return await ContinueLoginAsync(resultCache, need2faCode, code);
-            }
-            return result.Code == LoginResultCodes.Success;
-        }
-
         private async Task<GitHubUser> GetCurrentUser()
         {
             //TODO: ONE_USER_LOGIN This assumes we only support one login

src/GitHub.Api/Application/IApiClient.cs

@@ -12,7 +12,6 @@ Task CreateRepository(string name, string description, bool isPrivate,
         Task GetOrganizations(Action<Organization[]> onSuccess, Action<Exception> onError = null);
         Task Login(string username, string password, Action<LoginResult> need2faCode, Action<bool, string> result);
         Task ContinueLogin(LoginResult loginResult, string code);
-        Task<bool> LoginAsync(string username, string password, Func<LoginResult, string> need2faCode);
         Task Logout(UriString host);
         Task GetCurrentUser(Action<GitHubUser> onSuccess, Action<Exception> onError = null);
     }

src/GitHub.Api/Authentication/LoginManager.cs

@@ -85,7 +85,11 @@ public async Task<LoginResultData> Login(
                     }
 
                     keychain.SetToken(host, loginResultData.Token);
-                    await keychain.Save(host);
+
+                    if (loginResultData.Code == LoginResultCodes.Success)
+                    {
+                        await keychain.Save(host);
+                    }
 
                     return loginResultData;
                 }