Avoid obfuscated aggregated exceptions by returning the innerexception message

Author: Bram Verswalm

OrbitOne.BuildScreen/OrbitOne.BuildScreen.Configuration/OrbitOne.BuildScreen.Configuration.csproj

@@ -32,6 +32,8 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.TeamFoundation.Client, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
+    <Reference Include="Microsoft.TeamFoundation.Common, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
+    <Reference Include="Microsoft.VisualStudio.Services.Common, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
     <Reference Include="Newtonsoft.Json">
       <HintPath>..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>

OrbitOne.BuildScreen/OrbitOne.BuildScreen.Configuration/ServiceConfiguration.cs

@@ -11,6 +11,7 @@
 using System.Text;
 using System.Threading.Tasks;
 using System.Web;
+using Microsoft.TeamFoundation;
 using Microsoft.TeamFoundation.Client;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
@@ -57,7 +58,7 @@ public static void CreateNewConfiguration()
                 LogService.WriteError(e);
                 throw;
             }
-            
+
         }
         public static void UpdateConfiguration(int id, ServiceConfig ic)
         {
@@ -67,7 +68,7 @@ public static void UpdateConfiguration(int id, ServiceConfig ic)
             if (configuration == null)
                 throw new ArgumentException("Configuration with Id \"" + ic.Id + "\" can't be found.");
             if (string.IsNullOrEmpty(ic.Password) || ic.Password.Equals(ReturnPassword))
-            { 
+            {
                 var password = configuration.Password;
                 ic.Password = password;
             }
@@ -94,7 +95,7 @@ public static ServiceConfig GetConfiguration(int id)
             {
                 LogService.WriteError(e);
                 throw;
-            } 
+            }
             return configs;
         }
 
@@ -179,7 +180,7 @@ public static List<ServiceConfig> GetListOfConfigurationsNoPassword()
             List<ServiceConfig> configs = null;
             try
             {
-                configs = GetListOfConfigurationsInternal().Select(c =>{c.Password = ReturnPassword; return c;}).ToList();
+                configs = GetListOfConfigurationsInternal().Select(c => { c.Password = ReturnPassword; return c; }).ToList();
             }
             catch (Exception e)
             {
@@ -242,6 +243,10 @@ private static string CheckValidityOfConfig(IServiceConfig config)
             }
             catch (AggregateException e)
             {
+                if (e.InnerException is Exception)
+                {
+                    return e.InnerException.Message;
+                }
                 return "DNS could not find server adress";
             }
             catch (Exception e)
@@ -254,35 +259,34 @@ private static string CheckValidityOfConfig(IServiceConfig config)
         private static async Task<bool> CanLogIn(string username, string password, string uri, string configType)
         {
             bool response = false;
-            try
+            // VSO check
+            if (configType == "VSO")
             {
-                // VSO check
-                if (configType == "VSO")
+                using (var client = new HttpClient())
                 {
-                    using (var client = new HttpClient())
-                    {
-                        client.BaseAddress = new Uri(uri);
-                        client.DefaultRequestHeaders.Accept.Clear();
-                        client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Basic",
-                            Convert.ToBase64String(
-                                Encoding.ASCII.GetBytes(string.Format("{0}:{1}", username, password))));
-                        Debug.WriteLine("Code: " + client.GetAsync("").Result.StatusCode);
-                        response = client.GetAsync("").Result.StatusCode == HttpStatusCode.OK;
-                    }
+                    client.BaseAddress = new Uri(uri);
+                    client.DefaultRequestHeaders.Accept.Clear();
+                    client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Basic",
+                        Convert.ToBase64String(
+                            Encoding.ASCII.GetBytes(string.Format("{0}:{1}", username, password))));
+                    Debug.WriteLine("Code: " + client.GetAsync("").Result.StatusCode);
+                    response = client.GetAsync("").Result.StatusCode == HttpStatusCode.OK;
                 }
-                // TFS check
-                else if (configType == "TFS")
+            }
+            // TFS check
+            else if (configType == "TFS")
+            {
+                var credentials = new TfsClientCredentials(new WindowsCredential(new NetworkCredential(username, password)));
+                var server = new TfsConfigurationServer(new Uri(uri), credentials);
+                try
                 {
-                    var credentials = new TfsClientCredentials(new WindowsCredential(new NetworkCredential(username, password)));
-                    var server = new TfsConfigurationServer(new Uri(uri), credentials);
                     server.EnsureAuthenticated();
-                    response = server.HasAuthenticated;
                 }
-            }
-            catch (Exception e)
-            { 
-                LogService.WriteError(e);
-                throw;
+                catch (TeamFoundationServerUnauthorizedException e)
+                {
+                    return false;
+                }
+                response = server.HasAuthenticated;
             }
             return response;
         }