Adding an OctorunTask

Author: StanleyGoldman

script

@@ -30,6 +30,8 @@ public static IApiClient Create(UriString repositoryUrl, IKeychain keychain, IPr
         private readonly IGitHubClient githubClient;
         private readonly IProcessManager processManager;
         private readonly ITaskManager taskManager;
+        private readonly NPath nodeJsExecutablePath;
+        private readonly NPath octorunScriptPath;
         private readonly ILoginManager loginManager;
 
         public ApiClient(UriString hostUrl, IKeychain keychain, IGitHubClient githubClient, IProcessManager processManager, ITaskManager taskManager, NPath nodeJsExecutablePath, NPath octorunScriptPath)
@@ -44,6 +46,8 @@ public ApiClient(UriString hostUrl, IKeychain keychain, IGitHubClient githubClie
             this.githubClient = githubClient;
             this.processManager = processManager;
             this.taskManager = taskManager;
+            this.nodeJsExecutablePath = nodeJsExecutablePath;
+            this.octorunScriptPath = octorunScriptPath;
             loginManager = new LoginManager(keychain, ApplicationInfo.ClientId, ApplicationInfo.ClientSecret,
                 processManager: processManager,
                 taskManager: taskManager,

src/GitHub.Api/Application/ApiClient.cs

@@ -261,8 +261,9 @@ string password
         {
             logger.Info("Login Username:{0} Script:{1}", username, octorunScript);
 
-            ApplicationAuthorization auth = null;
-            var loginTask = new SimpleListProcessTask(taskManager.Token, nodeJsExecutablePath, $"{octorunScript} login");
+            ApplicationAuthorization auth;
+            var loginTask = new OctorunTask(taskManager.Token, nodeJsExecutablePath, octorunScript,
+                "login", ApplicationInfo.ClientId, ApplicationInfo.ClientSecret);
             loginTask.Configure(processManager, workingDirectory: octorunScript.Parent.Parent, withInput: true);
             loginTask.OnStartProcess += proc =>
             {
@@ -280,7 +281,7 @@ string password
 
             if (ret.Count == 1)
             {
-                if (ret[0] == ("Must specify two-factor authentication OTP code."))
+                if (ret[0] == "Must specify two-factor authentication OTP code.")
                 {
                     keychain.SetToken(host, ret[0]);
                     await keychain.Save(host);
@@ -312,8 +313,9 @@ string code
         {
             logger.Info("Continue Username:{0}", username);
 
-            ApplicationAuthorization auth = null;
-            var loginTask = new SimpleListProcessTask(taskManager.Token, nodeJsExecutablePath, $"{octorunScript} login --twoFactor");
+            ApplicationAuthorization auth;
+            var loginTask = new OctorunTask(taskManager.Token, nodeJsExecutablePath, octorunScript,
+                "login --twoFactor", ApplicationInfo.ClientId, ApplicationInfo.ClientSecret);
             loginTask.Configure(processManager, workingDirectory: octorunScript.Parent.Parent, withInput: true);
             loginTask.OnStartProcess += proc =>
             {

src/GitHub.Api/Authentication/LoginManager.cs

@@ -140,6 +140,7 @@
     <Compile Include="Tasks\ConfigOutputProcessor.cs" />
     <Compile Include="Tasks\DownloadTask.cs" />
     <Compile Include="Tasks\ITaskManager.cs" />
+    <Compile Include="Tasks\OctorunTask.cs" />
     <Compile Include="Tasks\ProcessTask.cs" />
     <Compile Include="Tasks\TaskBase.cs" />
     <Compile Include="Tasks\TaskCanceledExceptions.cs" />

src/GitHub.Api/GitHub.Api.csproj

@@ -0,0 +1,53 @@
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Threading;
+
+namespace GitHub.Unity
+{
+    class OctorunTask : SimpleListProcessTask
+    {
+        private readonly string clientId;
+        private readonly string clientSecret;
+        private readonly string user;
+        private readonly string userToken;
+
+        public OctorunTask(CancellationToken token, NPath pathToNodeJs, NPath pathToOctorunJs, string arguments,
+            string clientId = null,
+            string clientSecret = null,
+            string user = null,
+            string userToken = null,
+            IOutputProcessor<string, List<string>> processor = null) 
+            : base(token, pathToNodeJs, $"{pathToOctorunJs} {arguments}", processor)
+        {
+            this.clientId = clientId;
+            this.clientSecret = clientSecret;
+            this.user = user;
+            this.userToken = userToken;
+        }
+
+        public override void Configure(ProcessStartInfo psi)
+        {
+            base.Configure(psi);
+
+            if (clientId != null)
+            {
+                psi.EnvironmentVariables.Add("OCTOKIT_CLIENT_ID", clientId);
+            }
+
+            if (clientSecret != null)
+            {
+                psi.EnvironmentVariables.Add("OCTOKIT_CLIENT_SECRET", clientSecret);
+            }
+
+            if (user != null)
+            {
+                psi.EnvironmentVariables.Add("OCTORUN_USER", user);
+            }
+
+            if (userToken != null)
+            {
+                psi.EnvironmentVariables.Add("OCTORUN_TOKEN", userToken);
+            }
+        }
+    }
+}