Skip to content
This repository was archived by the owner on Jun 21, 2023. It is now read-only.

Only show sign in with browser for github.com #2469

Merged
jcansdale merged 2 commits into from
Mar 11, 2020
Merged

Only show sign in with browser for github.com #2469

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
43dbfdc
Only show sign in with browser for github.com
jcansdale Mar 7, 2020
c488a10
Merge branch 'master' into fixes/2468-dotcom-web-flow-only
jcansdale Mar 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 33 additions & 26 deletions src/GitHub.VisualStudio.UI/Views/Dialog/LoginCredentialsView.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"/>
Expand Down