Hotfix release GCM 2.1.1 (#1244)

**Changes since 2.1.0:**

- Fix several UI bugs (#1238, #1241)
- Lazily initialise Bitbucket host provider dependencies (#1239)

Author: mjcheetham

VERSION

@@ -1 +1 @@
-2.1.0.0
+2.1.1.0

src/shared/Atlassian.Bitbucket/Atlassian.Bitbucket.csproj

@@ -17,4 +17,8 @@
     <Reference Include="System.Net.Http" />
   </ItemGroup>
 
+  <ItemGroup>
+    <AvaloniaResource Include="UI\Assets\atlassian-logo.png" />
+  </ItemGroup>
+
 </Project>

src/shared/Atlassian.Bitbucket/BitbucketAuthentication.cs

@@ -110,12 +110,20 @@ private async Task<CredentialsPromptResult> GetCredentialsViaUiAsync(
         {
             var viewModel = new CredentialsViewModel(Context.Environment)
             {
-                Url = targetUri,
-                UserName = userName,
                 ShowOAuth = (modes & AuthenticationModes.OAuth) != 0,
                 ShowBasic = (modes & AuthenticationModes.Basic) != 0
             };
 
+            if (!BitbucketHelper.IsBitbucketOrg(targetUri))
+            {
+                viewModel.Url = targetUri;
+            }
+
+            if (!string.IsNullOrWhiteSpace(userName))
+            {
+                viewModel.UserName = userName;
+            }
+
             await AvaloniaUi.ShowViewAsync<CredentialsView>(viewModel, GetParentWindowHandle(), CancellationToken.None);
 
             ThrowIfWindowCancelled(viewModel);

src/shared/Atlassian.Bitbucket/OAuth2ClientRegistry.cs

@@ -3,21 +3,18 @@
 
 namespace Atlassian.Bitbucket
 {
-    public class OAuth2ClientRegistry : IRegistry<BitbucketOAuth2Client>
+    public class OAuth2ClientRegistry : DisposableObject, IRegistry<BitbucketOAuth2Client>
     {
-        private readonly HttpClient http;
-        private ISettings settings;
-        private readonly ITrace trace;
-        private readonly ITrace2 trace2;
-        private Cloud.BitbucketOAuth2Client cloudClient;
-        private DataCenter.BitbucketOAuth2Client dataCenterClient;
+        private readonly ICommandContext _context;
+
+        private HttpClient _httpClient;
+        private Cloud.BitbucketOAuth2Client _cloudClient;
+        private DataCenter.BitbucketOAuth2Client _dataCenterClient;
 
         public OAuth2ClientRegistry(ICommandContext context)
         {
-            this.http = context.HttpClientFactory.CreateClient();
-            this.settings = context.Settings;
-            this.trace = context.Trace;
-            this.trace2 = context.Trace2;
+            EnsureArgument.NotNull(context, nameof(context));
+            _context = context;
         }
 
         public BitbucketOAuth2Client Get(InputArguments input)
@@ -30,15 +27,20 @@ public BitbucketOAuth2Client Get(InputArguments input)
             return CloudClient;
         }
 
-        public void Dispose()
+        protected override void ReleaseManagedResources()
         {
-            http.Dispose();
-            settings.Dispose();
-            cloudClient = null;
-            dataCenterClient = null;
+            _httpClient?.Dispose();
+            _cloudClient = null;
+            _dataCenterClient = null;
+            base.ReleaseManagedResources();
         }
 
-        private Cloud.BitbucketOAuth2Client CloudClient => cloudClient ??= new Cloud.BitbucketOAuth2Client(http, settings, trace2);
-        private DataCenter.BitbucketOAuth2Client DataCenterClient => dataCenterClient ??= new DataCenter.BitbucketOAuth2Client(http, settings, trace2);
+        private HttpClient HttpClient => _httpClient ??= _context.HttpClientFactory.CreateClient();
+
+        private Cloud.BitbucketOAuth2Client CloudClient =>
+            _cloudClient ??= new Cloud.BitbucketOAuth2Client(HttpClient, _context.Settings, _context.Trace2);
+
+        private DataCenter.BitbucketOAuth2Client DataCenterClient =>
+            _dataCenterClient ??= new DataCenter.BitbucketOAuth2Client(HttpClient, _context.Settings, _context.Trace2);
     }
 }

src/shared/Core/Authentication/BasicAuthentication.cs

@@ -60,7 +60,7 @@ private async Task<ICredential> GetCredentialsViaUiAsync(string resource, string
                 Description = !string.IsNullOrWhiteSpace(resource)
                     ? $"Enter your credentials for '{resource}'"
                     : "Enter your credentials",
-                UserName = userName,
+                UserName = string.IsNullOrWhiteSpace(userName) ? null : userName,
             };
 
             await AvaloniaUi.ShowViewAsync<CredentialsView>(viewModel, GetParentWindowHandle(), CancellationToken.None);

src/shared/GitHub/GitHubAuthentication.cs

@@ -144,7 +144,7 @@ private async Task<AuthenticationPromptResult> GetAuthenticationViaUiAsync(
                 case AuthenticationModes.Pat:
                     return new AuthenticationPromptResult(
                         AuthenticationModes.Pat,
-                        new GitCredential(userName, viewModel.Password)
+                        new GitCredential(userName, viewModel.Token)
                     );
 
                 default: