Display more user-friendly errors.

Author: grokys

src/GitHub.App/Services/StandardUserErrors.cs

@@ -138,8 +138,8 @@ public static class StandardUserErrors
             { ErrorType.EnterpriseConnectFailed, Map(Defaults("Connecting to GitHub Enterprise instance failed", "Could not find a GitHub Enterprise instance at '{0}'. Double check the URL and your internet/intranet connection.")) },
             { ErrorType.LaunchEnterpriseConnectionFailed, Map(Defaults("Failed to launch the enterprise connection.")) },
             { ErrorType.LogFileError, Map(Defaults("Could not open the log file", "Could not find or open the log file.")) },
-            { ErrorType.LoginFailed, Map(Defaults("login failed", "Unable to retrieve your user info from the server. A proxy server might be interfering with the request.")) },
-            { ErrorType.LogoutFailed, Map(Defaults("logout failed", "Logout failed. A proxy server might be interfering with the request.")) },
+            { ErrorType.LoginFailed, Map(Defaults("Login failed", "Unable to retrieve your user info from the server. A proxy server might be interfering with the request.")) },
+            { ErrorType.LogoutFailed, Map(Defaults("Logout failed", "Logout failed. A proxy server might be interfering with the request.")) },
             { ErrorType.RepoCreationAsPrivateNotAvailableForFreePlan, Map(Defaults("Failed to create private repository", "You are currently on a free plan and unable to create private repositories. Either make the repository public or upgrade your account on the website to a plan that allows for private repositories.")) },
             { ErrorType.RepoCreationFailed, Map(Defaults("Failed to create repository", "An error occurred while creating the repository. You might need to open a shell and debug the state of this repo.")) },
             { ErrorType.RepoExistsOnDisk, Map(Defaults("Failed to create repository", "A repository named '{0}' exists in the directory\n'{1}'.")) },

src/GitHub.TeamFoundation.14/Connect/GitHubConnectSection.cs

@@ -186,7 +186,7 @@ protected void Refresh(IConnection connection)
         {
             InitializeInvitationSection();
 
-            ErrorMessage = connection?.ConnectionError?.Message?.Trim();
+            ErrorMessage = connection?.ConnectionError?.GetUserFriendlyErrorMessage(ErrorType.LoginFailed);
             IsLoggingIn = connection?.IsLoggingIn ?? false;
             IsVisible = connection != null || (invitationSection?.IsVisible == false);
 

src/GitHub.VisualStudio.UI/UI/Views/GitHubConnectContent.xaml

@@ -6,7 +6,7 @@
              xmlns:ghfvs="https://github.com/github/VisualStudio"
              xmlns:local="clr-namespace:GitHub.VisualStudio.UI.Views"
              xmlns:prop="clr-namespace:GitHub.VisualStudio.UI"
-             mc:Ignorable="d" 
+             mc:Ignorable="d"
              KeyboardNavigation.TabNavigation="Local"
              DataContext="{Binding ViewModel}"
              Background="{DynamicResource GitHubVsToolWindowBackground}" >
@@ -236,15 +236,32 @@
                Visibility="{Binding IsLoggingIn, Converter={ghfvs:BooleanToVisibilityConverter}}">
       Logging in...
     </TextBlock>
-    
-    <DockPanel Grid.Row="1"
-               Visibility="{Binding ErrorMessage, Converter={ghfvs:NotEqualsToVisibilityConverter {x:Null}}}">
-      <ghfvs:OcticonImage DockPanel.Dock="Left"
+
+    <Grid Grid.Row="1"
+          Visibility="{Binding ErrorMessage, Converter={ghfvs:NotEqualsToVisibilityConverter {x:Null}}}">
+      <Grid.ColumnDefinitions>
+        <ColumnDefinition Width="Auto"/>
+        <ColumnDefinition Width="*"/>
+      </Grid.ColumnDefinitions>
+      <Grid.RowDefinitions>
+        <RowDefinition Height="*"/>
+        <RowDefinition Height="Auto"/>
+      </Grid.RowDefinitions>
+
+      <ghfvs:OcticonImage Grid.Column="0"
+                          Grid.RowSpan="3"
                           Icon="alert"
-                          Margin="8"
-                          VerticalAlignment="Top"/>
+                          Margin="8"/>
 
-      <StackPanel DockPanel.Dock="Bottom" Orientation="Horizontal">
+      <TextBlock Grid.Column="1"
+                 Grid.Row="0"
+                 Text="{Binding ErrorMessage}"
+                 TextWrapping="Wrap"/>
+
+      <StackPanel Grid.Column="1"
+                  Grid.Row="1"
+                  Margin="0,8,0,0"
+                  Orientation="Horizontal">
         <Button Style="{StaticResource ActionLinkButton}"
                 Content="{x:Static prop:Resources.Retry}"
                 Click="retry_Click"
@@ -255,12 +272,7 @@
                 Content="{x:Static prop:Resources.SignOutLink}"
                 Visibility="{Binding ShowLogout, Converter={StaticResource BooleanToVisibilityConverter}}"/>
       </StackPanel>
-      
-      <TextBlock DockPanel.Dock="Top"
-                 Margin="0,0,0,8"
-                 Text="{x:Static prop:Resources.LoginFailedText}"/>
-      <TextBlock Margin="0,0,0,8"
-                 Text="{Binding ErrorMessage}"/>
-    </DockPanel>
+    </Grid>
+    
   </Grid>
 </UserControl>