Adding SetConfigUserAndEmail to GitClient and using it in UserSettingsView

Author: StanleyGoldman

src/GitHub.Api/Git/GitClient.cs

@@ -83,6 +83,8 @@ ITask<string> Unlock(string file, bool force,
         ITask<Version> Version(IOutputProcessor<Version> processor = null);
 
         ITask<Version> LfsVersion(IOutputProcessor<Version> processor = null);
+
+        ITask<User> SetConfigUserAndEmail(string username, string email);
     }
 
     class GitClient : IGitClient
@@ -270,17 +272,24 @@ public ITask<User> GetConfigUserAndEmail()
                     }
                 })
                 .Then(GetConfig(UserEmailConfigKey, GitConfigSource.User)
-                .Then((success, value) => {
-                    if (success)
-                    {
-                        email = value;
-                    }
-                })).Then(success => {
+                    .Then((success, value) => {
+                        if (success)
+                        {
+                            email = value;
+                        }
+                    })).Then(success => {
                     Logger.Trace("{0}:{1} {2}:{3}", UserNameConfigKey, username, UserEmailConfigKey, email);
-                    return new User { Name= username, Email = email };
+                    return new User { Name = username, Email = email };
                 });
         }
 
+        public ITask<User> SetConfigUserAndEmail(string username, string email)
+        {
+            return SetConfig(UserNameConfigKey, username, GitConfigSource.User)
+                .Then(SetConfig(UserEmailConfigKey, email, GitConfigSource.User))
+                .Then(b => new User { Name = username, Email = email });
+        }
+
         public ITask<List<GitLock>> ListLocks(bool local, BaseOutputListProcessor<GitLock> processor = null)
         {
             Logger.Trace("ListLocks");

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

@@ -56,14 +56,15 @@ public override void OnGUI()
                         GUI.FocusControl(null);
                         isBusy = true;
 
-                        GitClient.SetConfig("user.name", newGitName, GitConfigSource.User)
-                                 .Then((success, value) =>
-                                 {
+                        GitClient.SetConfigUserAndEmail(newGitName, newGitEmail)
+                                 .FinallyInUI((success, exception, user) => {
+                                     isBusy = false;
                                      if (success)
                                      {
                                          if (Repository != null)
                                          {
                                              Repository.User.Name = newGitName;
+                                             Repository.User.Email = newGitEmail;
                                          }
                                          else
                                          {
@@ -72,33 +73,13 @@ public override void OnGUI()
                                                  cachedUser = new User();
                                              }
                                              cachedUser.Name = newGitName;
+                                             cachedUser.Email = newGitEmail;
                                          }
+
+                                         Redraw();
+                                         Finish(true);
                                      }
                                  })
-                                 .Then(
-                                     GitClient.SetConfig("user.email", newGitEmail, GitConfigSource.User)
-                                              .Then((success, value) =>
-                                              {
-                                                  if (success)
-                                                  {
-                                                      if (Repository != null)
-                                                      {
-                                                          Repository.User.Email = newGitEmail;
-                                                      }
-                                                      else
-                                                      {
-                                                          cachedUser.Email = newGitEmail;
-                                                      }
-
-                                                      userDataHasChanged = true;
-                                                  }
-                                              }))
-                                 .FinallyInUI((_, __) =>
-                                 {
-                                     isBusy = false;
-                                     Redraw();
-                                     Finish(true);
-                                 })
                                  .Start();
                     }
                 }