bitbucket: show on-prem URL in UI and use better help links

Update the Bitbucket credential UI to show the URL of the Bitbucket
Server or Data Center instance, if we're talking to them.

Also fix up the help links to point to a host-relative location; not
always to Bitbucket Cloud pages. Note that the OAuth prompt will never
been shown for Server/DC since 2FA is not supported there.

Author: mjcheetham

src/shared/Atlassian.Bitbucket.UI.Avalonia/Views/CredentialsView.axaml

@@ -23,6 +23,9 @@
         <StackPanel DockPanel.Dock="Top" Margin="0,0,0,30">
             <Image HorizontalAlignment="Center" Source="/Assets/atlassian-logo.png" />
             <TextBlock HorizontalAlignment="Center" Text="Log in to your account"/>
+            <TextBlock HorizontalAlignment="Center" Text="{Binding Url}"
+                       IsVisible="{Binding Url, Converter={x:Static StringConverters.IsNotNullOrEmpty}}"
+                       Margin="0,10,0,0"/>
         </StackPanel>
 
         <StackPanel Width="288">

src/shared/Atlassian.Bitbucket.UI/Commands/CredentialsCommand.cs

@@ -15,6 +15,10 @@ public abstract class CredentialsCommand : HelperCommand
         protected CredentialsCommand(ICommandContext context)
             : base(context, "userpass", "Show authentication prompt.")
         {
+            AddOption(
+                new Option<string>("--url", "Bitbucket Server or Data Center URL")
+            );
+
             AddOption(
                 new Option<string>("--username", "Username or email.")
             );
@@ -23,13 +27,14 @@ protected CredentialsCommand(ICommandContext context)
                 new Option("--show-oauth", "Show OAuth option.")
             );
 
-            Handler = CommandHandler.Create<string, bool>(ExecuteAsync);
+            Handler = CommandHandler.Create<Uri, string, bool>(ExecuteAsync);
         }
 
-        private async Task<int> ExecuteAsync(string userName, bool showOAuth)
+        private async Task<int> ExecuteAsync(Uri url, string userName, bool showOAuth)
         {
             var viewModel = new CredentialsViewModel(Context.Environment)
             {
+                Url = url,
                 UserName = userName,
                 ShowOAuth = showOAuth
             };

src/shared/Atlassian.Bitbucket.UI/Commands/OAuthCommand.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.CommandLine;
 using System.CommandLine.Invocation;
 using System.Threading;
 using System.Threading.Tasks;
@@ -14,6 +15,10 @@ public abstract class OAuthCommand : HelperCommand
         protected OAuthCommand(ICommandContext context)
             : base(context, "oauth", "Show OAuth required prompt.")
         {
+            AddOption(
+                new Option<string>("--url", "Bitbucket Server or Data Center URL")
+            );
+
             Handler = CommandHandler.Create(ExecuteAsync);
         }
 

src/shared/Atlassian.Bitbucket.UI/ViewModels/CredentialsViewModel.cs

@@ -1,3 +1,4 @@
+using System;
 using System.ComponentModel;
 using System.Windows.Input;
 using GitCredentialManager;
@@ -10,6 +11,7 @@ public class CredentialsViewModel : WindowViewModel
     {
         private readonly IEnvironment _environment;
 
+        private Uri _url;
         private string _userName;
         private string _password;
         private bool _showOAuth;
@@ -64,12 +66,26 @@ private bool CanAcceptOAuth()
 
         private void ForgotPassword()
         {
-            BrowserUtils.OpenDefaultBrowser(_environment, "https://bitbucket.org/account/password/reset/");
+            Uri passwordResetUri = _url is null
+                ? new Uri(BitbucketConstants.HelpUrls.PasswordReset)
+                : new Uri(_url, BitbucketConstants.HelpUrls.DataCenterPasswordReset);
+
+            BrowserUtils.OpenDefaultBrowser(_environment, passwordResetUri);
         }
 
         private void SignUp()
         {
-            BrowserUtils.OpenDefaultBrowser(_environment, "https://bitbucket.org/account/signup/");
+            Uri signUpUri = _url is null
+                ? new Uri(BitbucketConstants.HelpUrls.SignUp)
+                : new Uri(_url, BitbucketConstants.HelpUrls.DataCenterLogin);
+
+            BrowserUtils.OpenDefaultBrowser(_environment, signUpUri);
+        }
+
+        public Uri Url
+        {
+            get => _url;
+            set => SetAndRaisePropertyChanged(ref _url, value);
         }
 
         public string UserName

src/shared/Atlassian.Bitbucket.UI/ViewModels/OAuthViewModel.cs

@@ -30,17 +30,18 @@ public OAuthViewModel(IEnvironment environment)
 
         private void LearnMore()
         {
-            BrowserUtils.OpenDefaultBrowser(_environment, "https://confluence.atlassian.com/bitbucket/two-step-verification-777023203.html");
+            // 2FA is not supported on Server/DC so this prompt will never be seen outside of Bitbucket Cloud
+            BrowserUtils.OpenDefaultBrowser(_environment, BitbucketConstants.HelpUrls.TwoFactor);
         }
 
         private void ForgotPassword()
         {
-            BrowserUtils.OpenDefaultBrowser(_environment, "https://bitbucket.org/account/password/reset/");
+            BrowserUtils.OpenDefaultBrowser(_environment, BitbucketConstants.HelpUrls.PasswordReset);
         }
 
         private void SignUp()
         {
-            BrowserUtils.OpenDefaultBrowser(_environment, "https://bitbucket.org/account/signup/");
+            BrowserUtils.OpenDefaultBrowser(_environment, BitbucketConstants.HelpUrls.SignUp);
         }
 
         /// <summary>

src/shared/Atlassian.Bitbucket/BitbucketAuthentication.cs

@@ -94,6 +94,11 @@ public async Task<CredentialsPromptResult> GetCredentialsAsync(Uri targetUri, st
                 TryFindHelperExecutablePath(out string helperPath))
             {
                 var cmdArgs = new StringBuilder("userpass");
+                if (!BitbucketHostProvider.IsBitbucketOrg(targetUri))
+                {
+                    cmdArgs.AppendFormat(" --url {0}", QuoteCmdArg(targetUri.ToString()));
+                }
+
                 if (!string.IsNullOrWhiteSpace(userName))
                 {
                     cmdArgs.AppendFormat(" --username {0}", QuoteCmdArg(userName));

src/shared/Atlassian.Bitbucket/BitbucketConstants.cs

@@ -49,6 +49,15 @@ public static class Credential
             }
         }
 
+        public static class HelpUrls
+        {
+            public const string DataCenterPasswordReset = "/passwordreset";
+            public const string DataCenterLogin = "/login";
+            public const string PasswordReset = "https://bitbucket.org/account/password/reset/";
+            public const string SignUp = "https://bitbucket.org/account/signup/";
+            public const string TwoFactor = "https://support.atlassian.com/bitbucket-cloud/docs/enable-two-step-verification/";
+        }
+
         /// <summary>
         /// Supported authentication modes for Bitbucket.org
         /// </summary>