Merge branch 'features/octorun-js' into fixes/remove-octokit-and-octorun

# Conflicts:
#	src/GitHub.Api/Authentication/LoginManager.cs
#	src/UnityExtension/Assets/Editor/GitHub.Unity/GitHub.Unity.csproj

Author: StanleyGoldman

src/GitHub.Api/Application/ApplicationManagerBase.cs

@@ -50,10 +50,10 @@ public void Run(bool firstRun)
             Logger.Trace("Using octorunScriptPath: {0}", octorunScriptPath);
 
             var gitExecutablePath = SystemSettings.Get(Constants.GitInstallPathKey)?.ToNPath();            
-            if (gitExecutablePath != null && gitExecutablePath.Value.FileExists()) // we have a git path
+            if (gitExecutablePath.HasValue && gitExecutablePath.Value.FileExists()) // we have a git path
             {
                 Logger.Trace("Using git install path from settings: {0}", gitExecutablePath);
-                InitializeEnvironment(gitExecutablePath, octorunScriptPath);
+                InitializeEnvironment(gitExecutablePath.Value, octorunScriptPath);
             }
             else // we need to go find git
             {
@@ -62,7 +62,7 @@ public void Run(bool firstRun)
                 var initEnvironmentTask = new ActionTask<NPath>(CancellationToken, (_, path) => InitializeEnvironment(path, octorunScriptPath)) { Affinity = TaskAffinity.UI };
                 var findExecTask = new FindExecTask("git", CancellationToken)
                     .FinallyInUI((b, ex, path) => {
-                        if (b && path != null)
+                        if (b && path.IsInitialized)
                         {
                             Logger.Trace("FindExecTask Success: {0}", path);
                             InitializeEnvironment(path, octorunScriptPath);

src/GitHub.Api/Authentication/LoginManager.cs

@@ -26,8 +26,8 @@ class LoginManager : ILoginManager
         private readonly string clientSecret;
         private readonly IProcessManager processManager;
         private readonly ITaskManager taskManager;
-        private readonly NPath nodeJsExecutablePath;
-        private readonly NPath octorunScript;
+        private readonly NPath? nodeJsExecutablePath;
+        private readonly NPath? octorunScript;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="LoginManager"/> class.
@@ -43,7 +43,7 @@ public LoginManager(
             IKeychain keychain,
             string clientId,
             string clientSecret,
-            IProcessManager processManager = null, ITaskManager taskManager = null, NPath nodeJsExecutablePath = null, NPath octorunScript = null)
+            IProcessManager processManager = null, ITaskManager taskManager = null, NPath? nodeJsExecutablePath = null, NPath? octorunScript = null)
         {
             Guard.ArgumentNotNull(keychain, nameof(keychain));
             Guard.ArgumentNotNullOrWhiteSpace(clientId, nameof(clientId));
@@ -149,9 +149,19 @@ private async Task<string> TryLogin(
             string password
         )
         {
-            var loginTask = new OctorunTask(taskManager.Token, nodeJsExecutablePath, octorunScript,
+            if (!nodeJsExecutablePath.HasValue)
+            {
+                throw new InvalidOperationException("nodeJsExecutablePath must be set");
+            }
+
+            if (!octorunScript.HasValue)
+            {
+                throw new InvalidOperationException("octorunScript must be set");
+            }
+
+            var loginTask = new OctorunTask(taskManager.Token, nodeJsExecutablePath.Value, octorunScript.Value,
                 "login", ApplicationInfo.ClientId, ApplicationInfo.ClientSecret);
-            loginTask.Configure(processManager, workingDirectory: octorunScript.Parent.Parent, withInput: true);
+            loginTask.Configure(processManager, workingDirectory: octorunScript.Value.Parent.Parent, withInput: true);
             loginTask.OnStartProcess += proc =>
             {
                 proc.StandardInput.WriteLine(username);
@@ -193,11 +203,19 @@ private async Task<string> TryContinueLogin(
             string code
         )
         {
-            logger.Info("Continue Username:{0} {1} {2}", username, password, code);
+            if (!nodeJsExecutablePath.HasValue)
+            {
+                throw new InvalidOperationException("nodeJsExecutablePath must be set");
+            }
+
+            if (!octorunScript.HasValue)
+            {
+                throw new InvalidOperationException("octorunScript must be set");
+            }
 
-            var loginTask = new OctorunTask(taskManager.Token, nodeJsExecutablePath, octorunScript,
+            var loginTask = new OctorunTask(taskManager.Token, nodeJsExecutablePath.Value, octorunScript.Value,
                 "login --twoFactor", ApplicationInfo.ClientId, ApplicationInfo.ClientSecret);
-            loginTask.Configure(processManager, workingDirectory: octorunScript.Parent.Parent, withInput: true);
+            loginTask.Configure(processManager, workingDirectory: octorunScript.Value.Parent.Parent, withInput: true);
             loginTask.OnStartProcess += proc =>
             {
                 proc.StandardInput.WriteLine(username);
@@ -208,8 +226,6 @@ string code
 
             var ret = (await loginTask.StartAwait());
 
-            logger.Trace("Return: {0}", string.Join(";", ret.ToArray()));
-
             if (ret.Count == 0)
             {
                 throw new Exception("Authentication failed");

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

@@ -451,7 +451,7 @@ private void SignOut(object obj)
                 host = UriString.ToUriString(HostAddress.GitHubDotComHostAddress.WebUri);
             }
 
-            var apiClient = ApiClient.Create(host, Platform.Keychain, null, null, null, null);
+            var apiClient = ApiClient.Create(host, Platform.Keychain, null, null, NPath.Default, NPath.Default);
             apiClient.Logout(host);
         }