Merge pull request #46 from vgromfeld/disableLoginButtonOnClick

Disable login button while login or logout

Author: vgromfeld

Microsoft.Toolkit.Graph.Controls/Controls/LoginButton/LoginButton.Properties.cs

@@ -46,6 +46,6 @@ public bool IsLoading
         /// The identifier for the <see cref="IsLoading"/> dependency property.
         /// </returns>
         public static readonly DependencyProperty IsLoadingProperty =
-            DependencyProperty.Register("IsLoading", typeof(bool), typeof(LoginButton), new PropertyMetadata(true));
+            DependencyProperty.Register(nameof(IsLoading), typeof(bool), typeof(LoginButton), new PropertyMetadata(true));
     }
 }

Microsoft.Toolkit.Graph.Controls/Controls/LoginButton/LoginButton.cs

@@ -4,8 +4,8 @@
 
 using System;
 using System.ComponentModel;
+using System.Diagnostics;
 using System.Threading.Tasks;
-using Microsoft.Graph.Auth;
 using Microsoft.Toolkit.Graph.Providers;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
@@ -33,22 +33,15 @@ public LoginButton()
         {
             this.DefaultStyleKey = typeof(LoginButton);
 
-            ProviderManager.Instance.ProviderUpdated += (sender, args) =>
-            {
-                if (!IsLoading && ProviderManager.Instance?.GlobalProvider?.State == ProviderState.Loading)
-                {
-                    IsLoading = true;
-                }
-
-                LoadData();
-            };
+            ProviderManager.Instance.ProviderUpdated += (sender, args) => LoadData();
         }
 
         /// <inheritdoc/>
         protected override void OnApplyTemplate()
         {
             base.OnApplyTemplate();
 
+            IsLoading = true;
             LoadData();
 
             if (_loginButton != null)
@@ -111,7 +104,11 @@ private async void LoadData()
                 return;
             }
 
-            if (provider.State == ProviderState.SignedIn)
+            if (provider.State == ProviderState.Loading)
+            {
+                IsLoading = true;
+            }
+            else if (provider.State == ProviderState.SignedIn)
             {
                 try
                 {
@@ -123,18 +120,20 @@ private async void LoadData()
                 {
                     LoginFailed?.Invoke(this, new LoginFailedEventArgs(e));
                 }
+
+                IsLoading = false;
             }
             else if (provider.State == ProviderState.SignedOut)
             {
                 UserDetails = null; // What if this was user provided? Should we not hook into these events then?
+
+                IsLoading = false;
             }
             else
             {
                 // Provider in Loading state
-                return;
+                Debug.Fail("unsupported state");
             }
-
-            IsLoading = false;
         }
 
         /// <summary>
@@ -143,7 +142,7 @@ private async void LoadData()
         /// <returns>A <see cref="Task"/> representing the asynchronous operation.</returns>
         public async Task LoginAsync()
         {
-            if (UserDetails != null)
+            if (UserDetails != null || IsLoading)
             {
                 return;
             }
@@ -154,6 +153,7 @@ public async Task LoginAsync()
             {
                 try
                 {
+                    IsLoading = true;
                     await provider.LoginAsync();
 
                     if (provider.State == ProviderState.SignedIn)
@@ -172,6 +172,10 @@ public async Task LoginAsync()
                 {
                     LoginFailed?.Invoke(this, new LoginFailedEventArgs(e));
                 }
+                finally
+                {
+                    IsLoading = false;
+                }
             }
         }
 
@@ -181,6 +185,11 @@ public async Task LoginAsync()
         /// <returns>A <see cref="Task"/> representing the asynchronous operation.</returns>
         public async Task LogoutAsync()
         {
+            if (IsLoading)
+            {
+                return;
+            }
+
             var cargs = new CancelEventArgs();
             LogoutInitiated?.Invoke(this, cargs);
 
@@ -202,7 +211,9 @@ public async Task LogoutAsync()
 
             if (provider != null)
             {
+                IsLoading = true;
                 await provider.LogoutAsync();
+                IsLoading = false;
 
                 LogoutCompleted?.Invoke(this, new EventArgs());
             }