Adding an extension method to easily parse error api output

Author: StanleyGoldman

src/GitHub.Api/Application/ApiClient.cs

@@ -247,12 +247,7 @@ private async Task<GitHubRepository> CreateRepositoryInternal(string repositoryN
                     };
                 }
 
-                if (ret.Output.Any())
-                {
-                    throw new ApiClientException(string.Join(Environment.NewLine, ret.Output));
-                }
-
-                throw new ApiClientException("Publish failed");
+                throw new ApiClientException(ret.GetApiErrorMessage() ?? "Publish failed");
             }
             catch (Exception ex)
             {
@@ -294,12 +289,7 @@ private async Task GetOrganizationInternal(Action<Organization[]> onSuccess, Act
                     return;
                 }
 
-                if (ret.Output.Any())
-                {
-                    throw new ApiClientException(string.Join(Environment.NewLine, ret.Output));
-                }
-
-                throw new ApiClientException("Error getting organizations");
+                throw new ApiClientException(ret.GetApiErrorMessage() ?? "Error getting organizations");
             }
             catch (Exception ex)
             {
@@ -332,12 +322,7 @@ private async Task<GitHubUser> GetCurrentUserInternal()
                     };
                 }
 
-                if (ret.Output.Any())
-                {
-                    throw new ApiClientException(string.Join(Environment.NewLine, ret.Output));
-                }
-
-                throw new ApiClientException("Error validating current user");
+                throw new ApiClientException(ret.GetApiErrorMessage() ?? "Error validating current user");
             }
             catch (KeychainEmptyException)
             {

src/GitHub.Api/Authentication/LoginManager.cs

@@ -193,12 +193,7 @@ private async Task<LoginResultData> TryLogin(
                 return new LoginResultData(resultCodes, message, host, ret.Output[0]);
             }
 
-            if (ret.Output.Any())
-            {
-                return new LoginResultData(LoginResultCodes.Failed, ret.Output[0], host);
-            }
-
-            return new LoginResultData(LoginResultCodes.Failed, "Failed.", host);
+            return new LoginResultData(LoginResultCodes.Failed, ret.GetApiErrorMessage() ?? "Failed.", host);
         }
     }
 

src/GitHub.Api/Tasks/OctorunTask.cs

@@ -3,6 +3,7 @@
 using System.Diagnostics;
 using System.Linq;
 using System.Reflection;
+using System.Text.RegularExpressions;
 using System.Threading;
 using GitHub.Logging;
 
@@ -133,4 +134,19 @@ public OctorunResult(string status, string[] output)
         public bool IsError => Status.Equals("error", StringComparison.InvariantCultureIgnoreCase);
         public bool IsTwoFactorRequired => Status.Equals("2fa", StringComparison.InvariantCultureIgnoreCase);
     }
+
+    static class OctorunResultExtensions {
+        private static Regex ApiErrorMessageRegex = new Regex(@"\""message\"":\""(.*?)\""", RegexOptions.Compiled);
+
+        internal static string GetApiErrorMessage(this OctorunResult octorunResult)
+        {
+            if (!octorunResult.IsError || !octorunResult.Output.Any())
+            {
+                return null;
+            }
+
+            var match = ApiErrorMessageRegex.Match(octorunResult.Output[0]);
+            return match.Success ? match.Groups[1].Value : octorunResult.Output[0];
+        }
+    }
 }