bitbucket: update shared UI helper code for new UI model

Update shared UI helper code for Bitbucket to remove the separate OAuth
prompt/command, and allow basic authentication (username/password)
options to be hidden based on a command-line option.

Author: mjcheetham

src/shared/Atlassian.Bitbucket.Tests/BitbucketAuthenticationTest.cs

@@ -122,7 +122,7 @@ public async Task BitbucketAuthentication_GetCredentialsAsync_AllModes_NoUser_BB
                 ["password"] = expectedPassword
             };
 
-            string expectedArgs = $"userpass --show-oauth";
+            string expectedArgs = $"prompt --show-basic --show-oauth";
 
             var context = new TestCommandContext();
             context.SessionManager.IsDesktopSession = true; // Enable OAuth and UI helper selection
@@ -158,7 +158,7 @@ public async Task BitbucketAuthentication_GetCredentialsAsync_BasicOnly_User_BBC
                 ["password"] = expectedPassword
             };
 
-            string expectedArgs = $"userpass --username {expectedUserName}";
+            string expectedArgs = $"prompt --username {expectedUserName} --show-basic";
 
             var context = new TestCommandContext();
             context.SessionManager.IsDesktopSession = true; // Enable UI helper selection
@@ -194,7 +194,7 @@ public async Task BitbucketAuthentication_GetCredentialsAsync_AllModes_NoUser_BB
                 ["password"] = expectedPassword
             };
 
-            string expectedArgs = $"userpass --url {targetUri} --show-oauth";
+            string expectedArgs = $"prompt --url {targetUri} --show-basic --show-oauth";
 
             var context = new TestCommandContext();
             context.SessionManager.IsDesktopSession = true; // Enable OAuth and UI helper selection

src/shared/Atlassian.Bitbucket.Tests/BitbucketHostProviderTest.cs

@@ -475,7 +475,7 @@ private void VerifyOAuthFlowRan(InputArguments input, string token)
         {
             var remoteUri = input.GetRemoteUri();
 
-            // use refresh token to get new access token and refresh token
+            // Get new access token and refresh token
             bitbucketAuthentication.Verify(m => m.CreateOAuthCredentialsAsync(remoteUri), Times.Once);
 
             // Check access token works/resolve username

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

@@ -13,7 +13,7 @@ namespace Atlassian.Bitbucket.UI.Commands
     public abstract class CredentialsCommand : HelperCommand
     {
         protected CredentialsCommand(ICommandContext context)
-            : base(context, "userpass", "Show authentication prompt.")
+            : base(context, "prompt", "Show authentication prompt.")
         {
             AddOption(
                 new Option<string>("--url", "Bitbucket Server or Data Center URL")
@@ -27,40 +27,51 @@ protected CredentialsCommand(ICommandContext context)
                 new Option("--show-oauth", "Show OAuth option.")
             );
 
-            Handler = CommandHandler.Create<Uri, string, bool>(ExecuteAsync);
+            AddOption(
+                new Option("--show-basic", "Show username/password option.")
+            );
+
+            Handler = CommandHandler.Create<Uri, string, bool, bool>(ExecuteAsync);
         }
 
-        private async Task<int> ExecuteAsync(Uri url, string userName, bool showOAuth)
+        private async Task<int> ExecuteAsync(Uri url, string userName, bool showOAuth, bool showBasic)
         {
             var viewModel = new CredentialsViewModel(Context.Environment)
             {
                 Url = url,
                 UserName = userName,
-                ShowOAuth = showOAuth
+                ShowOAuth = showOAuth,
+                ShowBasic = showBasic
             };
 
             await ShowAsync(viewModel, CancellationToken.None);
 
-            if (!viewModel.WindowResult)
+            if (!viewModel.WindowResult || viewModel.SelectedMode == AuthenticationModes.None)
             {
                 throw new Exception("User cancelled dialog.");
             }
 
-            if (viewModel.UseOAuth)
+            switch (viewModel.SelectedMode)
             {
-                WriteResult(new Dictionary<string, string>
-                {
-                    ["mode"] = "oauth"
-                });
-            }
-            else
-            {
-                WriteResult(new Dictionary<string, string>
-                {
-                    ["mode"] = "basic",
-                    ["username"] = viewModel.UserName,
-                    ["password"] = viewModel.Password,
-                });
+                case AuthenticationModes.OAuth:
+                    WriteResult(new Dictionary<string, string>
+                    {
+                        ["mode"] = "oauth"
+                    });
+                    break;
+
+                case AuthenticationModes.Basic:
+                    WriteResult(new Dictionary<string, string>
+                    {
+                        ["mode"] = "basic",
+                        ["username"] = viewModel.UserName,
+                        ["password"] = viewModel.Password,
+                    });
+                    break;
+
+                default:
+                    throw new ArgumentOutOfRangeException(nameof(AuthenticationModes),
+                        "Unknown authentication mode", viewModel.SelectedMode.ToString());
             }
 
             return 0;

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

@@ -15,6 +15,7 @@ public class CredentialsViewModel : WindowViewModel
         private string _userName;
         private string _password;
         private bool _showOAuth;
+        private bool _showBasic;
 
         public CredentialsViewModel()
         {
@@ -28,7 +29,7 @@ public CredentialsViewModel(IEnvironment environment)
             _environment = environment;
 
             Title = "Connect to Bitbucket";
-            LoginCommand = new RelayCommand(Accept, CanLogin);
+            LoginCommand = new RelayCommand(AcceptBasic, CanLogin);
             CancelCommand = new RelayCommand(Cancel);
             OAuthCommand = new RelayCommand(AcceptOAuth, CanAcceptOAuth);
             ForgotPasswordCommand = new RelayCommand(ForgotPassword);
@@ -53,9 +54,15 @@ private bool CanLogin()
             return !string.IsNullOrWhiteSpace(UserName) && !string.IsNullOrWhiteSpace(Password);
         }
 
+        private void AcceptBasic()
+        {
+            SelectedMode = AuthenticationModes.Basic;
+            Accept();
+        }
+
         private void AcceptOAuth()
         {
-            UseOAuth = true;
+            SelectedMode = AuthenticationModes.OAuth;
             Accept();
         }
 
@@ -101,7 +108,7 @@ public string Password
         }
 
         /// <summary>
-        /// Show the direct-to-OAuth button.
+        /// Show the OAuth option.
         /// </summary>
         public bool ShowOAuth
         {
@@ -110,14 +117,16 @@ public bool ShowOAuth
         }
 
         /// <summary>
-        /// User indicated a preference to use OAuth authentication over username/password.
+        /// Show the basic authentication options.
         /// </summary>
-        public bool UseOAuth
+        public bool ShowBasic
         {
-            get;
-            private set;
+            get => _showBasic;
+            set => SetAndRaisePropertyChanged(ref _showBasic, value);
         }
 
+        public AuthenticationModes SelectedMode { get; private set; }
+
         /// <summary>
         /// Start the process to validate the username/password
         /// </summary>

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

@@ -90,7 +90,7 @@ public async Task<CredentialsPromptResult> GetCredentialsAsync(Uri targetUri, st
             if (Context.Settings.IsGuiPromptsEnabled && Context.SessionManager.IsDesktopSession &&
                 TryFindHelperExecutablePath(out string helperPath))
             {
-                var cmdArgs = new StringBuilder("userpass");
+                var cmdArgs = new StringBuilder("prompt");
                 if (!BitbucketHostProvider.IsBitbucketOrg(targetUri))
                 {
                     cmdArgs.AppendFormat(" --url {0}", QuoteCmdArg(targetUri.ToString()));