From 43dbfdc4d6b982725bfe3937aebaf5af3238ca2c Mon Sep 17 00:00:00 2001
From: Jamie Cansdale <jcansdale@gmail.com>
Date: Sat, 7 Mar 2020 22:51:00 +0000
Subject: [PATCH] Only show sign in with browser for github.com

---
 .../Views/Dialog/LoginCredentialsView.xaml    | 59 +++++++++++--------
 1 file changed, 33 insertions(+), 26 deletions(-)

diff --git a/src/GitHub.VisualStudio.UI/Views/Dialog/LoginCredentialsView.xaml b/src/GitHub.VisualStudio.UI/Views/Dialog/LoginCredentialsView.xaml
index dfdbdaef4f..9cb0268001 100644
--- a/src/GitHub.VisualStudio.UI/Views/Dialog/LoginCredentialsView.xaml
+++ b/src/GitHub.VisualStudio.UI/Views/Dialog/LoginCredentialsView.xaml
@@ -85,32 +85,39 @@
                     <StackPanel x:Name="dotComloginControlsPanel">
                         
                         <StackPanel Style="{StaticResource FormFieldStackPanel}">
-                            <ghfvs:PromptTextBox
-                                x:Name="dotComUserNameOrEmail"
-                                PromptText="{x:Static ghfvs:Resources.UserNameOrEmailPromptText}"
-                                Margin="0,0,0,10" AutomationProperties.AutomationId="{x:Static ghfvs:AutomationIDs.DotcomUsernameEmailTextBox}" />
-
-                            <ghfvs:SecurePasswordBox x:Name="dotComPassword" PromptText="{x:Static ghfvs:Resources.PasswordPrompt}" AutomationProperties.AutomationId="{x:Static ghfvs:AutomationIDs.DotcomPasswordTextBox}"/>
-
-                            <Border Style="{StaticResource LoginButtonBorder}" Margin="0 16 0 0">
-                                <Button
-                                    x:Name="dotComLogInButton"
-                                    Content="{x:Static ghfvs:Resources.LoginLink}"
-                                    IsDefault="True"
-                                    Command=""
-                                    AutomationProperties.AutomationId="{x:Static ghfvs:AutomationIDs.DotcomSignInButton}" />
-                            </Border>
-
-                            <Grid Margin="0 8">
-                              <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="*"/>
-                                <ColumnDefinition Width="Auto"/>
-                                <ColumnDefinition Width="*"/>
-                              </Grid.ColumnDefinitions>
-                              <Rectangle Grid.Column="0" Fill="#FFDDDDDD" Height="1"/>
-                              <TextBlock Grid.Column="1" Margin="8,0,8,4">or</TextBlock>
-                              <Rectangle Grid.Column="2" Fill="#FFDDDDDD" Height="1"/>
-                            </Grid>
+                            <!--
+                                Signing with with username/password is going away, see:
+                                https://developer.github.com/changes/2020-02-14-deprecating-oauth-auth-endpoint/
+                                Setting Visibility="Collapsed"
+                            -->
+                            <StackPanel Name="dotComUsernamePasswordPanel" Visibility="Collapsed">
+                                <ghfvs:PromptTextBox
+                                    x:Name="dotComUserNameOrEmail"
+                                    PromptText="{x:Static ghfvs:Resources.UserNameOrEmailPromptText}"
+                                    Margin="0,0,0,10" AutomationProperties.AutomationId="{x:Static ghfvs:AutomationIDs.DotcomUsernameEmailTextBox}" />
+
+                                <ghfvs:SecurePasswordBox x:Name="dotComPassword" PromptText="{x:Static ghfvs:Resources.PasswordPrompt}" AutomationProperties.AutomationId="{x:Static ghfvs:AutomationIDs.DotcomPasswordTextBox}"/>
+
+                                <Border Style="{StaticResource LoginButtonBorder}" Margin="0 16 0 0">
+                                    <Button
+                                        x:Name="dotComLogInButton"
+                                        Content="{x:Static ghfvs:Resources.LoginLink}"
+                                        IsDefault="True"
+                                        Command=""
+                                        AutomationProperties.AutomationId="{x:Static ghfvs:AutomationIDs.DotcomSignInButton}" />
+                                </Border>
+
+                                <Grid Margin="0 8">
+                                  <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="*"/>
+                                    <ColumnDefinition Width="Auto"/>
+                                    <ColumnDefinition Width="*"/>
+                                  </Grid.ColumnDefinitions>
+                                  <Rectangle Grid.Column="0" Fill="#FFDDDDDD" Height="1"/>
+                                  <TextBlock Grid.Column="1" Margin="8,0,8,4">or</TextBlock>
+                                  <Rectangle Grid.Column="2" Fill="#FFDDDDDD" Height="1"/>
+                                </Grid>
+                            </StackPanel>
 
                             <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
                               <ghfvs:GitHubActionLink x:Name="dotComSsaLogInButton" Content="{x:Static ghfvs:Resources.SignInWithYourBrowser}"/>