msauth: replace WinForms dummy window with Avn window

Author: mjcheetham

src/shared/Core/Authentication/MicrosoftAuthentication.cs

@@ -7,11 +7,11 @@
 using Microsoft.Identity.Client;
 using Microsoft.Identity.Client.Extensions.Msal;
 using System.Threading;
-using System.Runtime.InteropServices;
+using Avalonia.Controls;
+using GitCredentialManager.UI;
+using GitCredentialManager.UI.Views;
 
 #if NETFRAMEWORK
-using System.Drawing;
-using System.Windows.Forms;
 using Microsoft.Identity.Client.Broker;
 #endif
 
@@ -46,9 +46,7 @@ public class MicrosoftAuthentication : AuthenticationBase, IMicrosoftAuthenticat
             "live", "liveconnect", "liveid",
         };
 
-#if NETFRAMEWORK
-        private DummyWindow _dummyWindow;
-#endif
+        private readonly CancellationTokenSource _progressWindowCts = new();
 
         public MicrosoftAuthentication(ICommandContext context)
             : base(context) { }
@@ -166,10 +164,8 @@ public async Task<IMicrosoftAuthenticationResult> GetTokenAsync(
             }
             finally
             {
-#if NETFRAMEWORK
-                // If we created a dummy window during authentication we should dispose of it now that we're done
-                _dummyWindow?.Dispose();
-#endif
+                // If we created a progress window during authentication we should close it now that we're done
+                _progressWindowCts.Cancel();
             }
         }
 
@@ -266,11 +262,27 @@ private async Task<IPublicClientApplication> CreatePublicClientApplicationAsync(
                     }
                     else if (enableBroker) // Only actually need to set a parent window when using the Windows broker
                     {
-#if NETFRAMEWORK
-                        Context.Trace.WriteLine($"Using dummy parent window for MSAL authentication dialogs.");
-                        _dummyWindow = new DummyWindow();
-                        appBuilder.WithParentActivityOrWindow(_dummyWindow.ShowAndGetHandle);
-#endif
+                        IntPtr ShowAndGetProgressWindowHandle()
+                        {
+                            var windowShown = new TaskCompletionSource<IntPtr>();
+
+                            Window CreateWindow()
+                            {
+                                var window = new ProgressWindow();
+                                window.Loaded += (s, e) =>
+                                    windowShown.SetResult(window.PlatformImpl?.Handle.Handle ?? IntPtr.Zero);
+                                return window;
+                            }
+
+                            // Do not wait for the window to be closed, but instead wait for the window to be shown
+                            // and return the window handle immediately.
+                            Task _ = AvaloniaUi.ShowWindowAsync(CreateWindow, IntPtr.Zero, _progressWindowCts.Token);
+
+                            return windowShown.Task.GetAwaiter().GetResult();
+                        }
+
+                        Context.Trace.WriteLine("Using progress window for MSAL authentication dialogs.");
+                        appBuilder.WithParentActivityOrWindow(ShowAndGetProgressWindowHandle);
                     }
                 }
             }
@@ -545,73 +557,5 @@ public MsalResult(AuthenticationResult msalResult)
             public string AccessToken => _msalResult.AccessToken;
             public string AccountUpn => _msalResult.Account.Username;
         }
-
-#if NETFRAMEWORK
-        private class DummyWindow : IDisposable
-        {
-            private readonly Thread _staThread;
-            private readonly ManualResetEventSlim _readyEvent;
-            private Form _window;
-            private IntPtr _handle;
-
-            public DummyWindow()
-            {
-                _staThread = new Thread(ThreadProc);
-                _staThread.SetApartmentState(ApartmentState.STA);
-                _readyEvent = new ManualResetEventSlim();
-            }
-
-            public IntPtr ShowAndGetHandle()
-            {
-                _staThread.Start();
-                _readyEvent.Wait();
-                return _handle;
-            }
-
-            public void Dispose()
-            {
-                _window?.Invoke(() => _window.Close());
-
-                if (_staThread.IsAlive)
-                {
-                    _staThread.Join();
-                }
-            }
-
-            private void ThreadProc()
-            {
-                System.Windows.Forms.Application.EnableVisualStyles();
-                _window = new Form
-                {
-                    TopMost = true,
-                    ControlBox = false,
-                    MaximizeBox = false,
-                    MinimizeBox = false,
-                    ClientSize = new Size(182, 46),
-                    FormBorderStyle = FormBorderStyle.None,
-                    StartPosition = FormStartPosition.CenterScreen,
-                };
-
-                var progress = new ProgressBar
-                {
-                    Style = ProgressBarStyle.Marquee,
-                    Location = new Point(12, 12),
-                    Size = new Size(158, 23),
-                    MarqueeAnimationSpeed = 30,
-                };
-
-                _window.Controls.Add(progress);
-                _window.Shown += (s, e) =>
-                {
-                    _handle = _window.Handle;
-                    _readyEvent.Set();
-                };
-
-                _window.ShowDialog();
-                _window.Dispose();
-                _window = null;
-            }
-        }
-#endif
     }
 }

src/shared/Core/Core.csproj

@@ -14,7 +14,7 @@
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Web" />
     <PackageReference Include="Microsoft.Identity.Client.Broker" Version="4.52.0" />
-    <PackageReference Include="Avalonia.Win32" Version="11.0.0-preview6"/>
+    <PackageReference Include="Avalonia.Win32" Version="11.0.0-preview6" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' != 'net472'">

src/shared/Core/UI/Views/ProgressWindow.axaml

@@ -0,0 +1,10 @@
+<Window xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        SizeToContent="WidthAndHeight"
+        x:Class="GitCredentialManager.UI.Views.ProgressWindow"
+        Title="ProgressWindow"
+        WindowStartupLocation="CenterScreen"
+        ShowInTaskbar="False"
+        SystemDecorations="BorderOnly">
+    <ProgressBar Margin="10" IsIndeterminate="True" Height="20" Width="80"/>
+</Window>

src/shared/Core/UI/Views/ProgressWindow.axaml.cs

@@ -0,0 +1,21 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+
+namespace GitCredentialManager.UI.Views;
+
+public partial class ProgressWindow : Window
+{
+    public ProgressWindow()
+    {
+        InitializeComponent();
+#if DEBUG
+        this.AttachDevTools();
+#endif
+    }
+
+    private void InitializeComponent()
+    {
+        AvaloniaXamlLoader.Load(this);
+    }
+}