Fix several UI bugs in 2.1 pre-release (#1238)

Fix a few bugs that were spotted during testing of the 2.1 pre-release:

- Missing Atlassian logo resource from the compiled binaries
- Remote URL is shown even for Bitbucket cloud with in-proc GUI
- In-proc basic auth GUI user name field should only be set if non-null
or whitespace

Also bump the VERSION to 2.1.1 in the expectation for this to replace
2.1.0.

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/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);