Add MFA to Dashboard

Author: ClaudioESSilva

Dashboard/AddServerDialog.xaml

@@ -51,29 +51,40 @@
                 <!-- Authentication Type -->
                 <TextBlock Text="Authentication:" FontWeight="Bold" Margin="0,0,0,5"
                            Foreground="{DynamicResource ForegroundBrush}"/>
-                <StackPanel Orientation="Horizontal" Margin="0,0,0,15">
+                <StackPanel Margin="0,0,0,15">
                     <RadioButton x:Name="WindowsAuthRadio" Content="Windows Authentication"
                                  GroupName="Auth" IsChecked="True"
                                  Foreground="{DynamicResource ForegroundBrush}"
-                                 Checked="AuthType_Changed" Margin="0,0,20,0"/>
+                                 Checked="AuthType_Changed" Margin="0,0,0,4"/>
                     <RadioButton x:Name="SqlAuthRadio" Content="SQL Server Authentication"
                                  GroupName="Auth"
                                  Foreground="{DynamicResource ForegroundBrush}"
-                                 Checked="AuthType_Changed"/>
+                                 Checked="AuthType_Changed" Margin="0,0,0,4"/>
+                    <RadioButton x:Name="EntraMfaAuthRadio" Content="Microsoft Entra MFA"
+                                 GroupName="Auth"
+                                 Foreground="{DynamicResource ForegroundBrush}"
+                                 Checked="AuthType_Changed"
+                                 ToolTip="Interactive authentication with MFA for Azure SQL Database."/>
                 </StackPanel>
 
-                <!-- SQL Authentication Fields (initially disabled) -->
-                <Border x:Name="SqlAuthPanel" IsEnabled="False">
-                    <StackPanel>
-                        <TextBlock Text="Username:" FontWeight="Bold" Margin="0,0,0,5"
-                                   Foreground="{DynamicResource ForegroundBrush}"/>
-                        <TextBox x:Name="UsernameTextBox" Height="25" Margin="0,0,0,15"/>
+                <!-- SQL Authentication Fields -->
+                <StackPanel x:Name="SqlAuthPanel" Visibility="Collapsed" Margin="0,0,0,15">
+                    <TextBlock Text="Username:" FontWeight="Bold" Margin="0,0,0,5"
+                               Foreground="{DynamicResource ForegroundBrush}"/>
+                    <TextBox x:Name="UsernameTextBox" Height="25" Margin="0,0,0,15"/>
 
-                        <TextBlock Text="Password:" FontWeight="Bold" Margin="0,0,0,5"
-                                   Foreground="{DynamicResource ForegroundBrush}"/>
-                        <PasswordBox x:Name="PasswordBox" Height="25" Margin="0,0,0,15"/>
-                    </StackPanel>
-                </Border>
+                    <TextBlock Text="Password:" FontWeight="Bold" Margin="0,0,0,5"
+                               Foreground="{DynamicResource ForegroundBrush}"/>
+                    <PasswordBox x:Name="PasswordBox" Height="25" Margin="0,0,0,0"/>
+                </StackPanel>
+
+                <!-- Microsoft Entra MFA Fields -->
+                <StackPanel x:Name="EntraMfaPanel" Visibility="Collapsed" Margin="0,0,0,15">
+                    <TextBlock Text="Username (optional):" FontWeight="Bold" Margin="0,0,0,5"
+                               Foreground="{DynamicResource ForegroundBrush}"/>
+                    <TextBox x:Name="EntraMfaUsernameBox" Height="25" Margin="0,0,0,0"
+                             ToolTip="Optional: Pre-populate the authentication dialog with this email address"/>
+                </StackPanel>
 
                 <!-- Description -->
                 <TextBlock Text="Description (optional):" FontWeight="Bold" Margin="0,0,0,5"

Dashboard/AddServerDialog.xaml.cs

@@ -10,6 +10,7 @@
 using System.Windows;
 using System.Windows.Controls;
 using Microsoft.Data.SqlClient;
+using PerformanceMonitorDashboard.Helpers;
 using PerformanceMonitorDashboard.Models;
 using PerformanceMonitorDashboard.Services;
 
@@ -51,11 +52,18 @@ public AddServerDialog(ServerConnection existingServer)
             };
             TrustServerCertificateCheckBox.IsChecked = existingServer.TrustServerCertificate;
 
-            if (existingServer.UseWindowsAuth)
+            if (existingServer.AuthenticationType == AuthenticationTypes.EntraMFA)
             {
-                WindowsAuthRadio.IsChecked = true;
+                EntraMfaAuthRadio.IsChecked = true;
+
+                var credentialService = new CredentialService();
+                var cred = credentialService.GetCredential(existingServer.Id);
+                if (cred.HasValue && !string.IsNullOrEmpty(cred.Value.Username))
+                {
+                    EntraMfaUsernameBox.Text = cred.Value.Username;
+                }
             }
-            else
+            else if (existingServer.AuthenticationType == AuthenticationTypes.SqlServer)
             {
                 SqlAuthRadio.IsChecked = true;
 
@@ -67,13 +75,23 @@ public AddServerDialog(ServerConnection existingServer)
                     PasswordBox.Password = cred.Value.Password;
                 }
             }
+            else
+            {
+                WindowsAuthRadio.IsChecked = true;
+            }
         }
 
         private void AuthType_Changed(object sender, RoutedEventArgs e)
         {
-            if (SqlAuthPanel != null)
+            if (SqlAuthPanel != null && EntraMfaPanel != null)
             {
-                SqlAuthPanel.IsEnabled = SqlAuthRadio.IsChecked == true;
+                SqlAuthPanel.Visibility = SqlAuthRadio.IsChecked == true
+                    ? System.Windows.Visibility.Visible
+                    : System.Windows.Visibility.Collapsed;
+
+                EntraMfaPanel.Visibility = EntraMfaAuthRadio.IsChecked == true
+                    ? System.Windows.Visibility.Visible
+                    : System.Windows.Visibility.Collapsed;
             }
         }
 
@@ -106,15 +124,27 @@ private SqlConnectionStringBuilder BuildConnectionBuilder()
                 ApplicationName = "PerformanceMonitorDashboard",
                 ConnectTimeout = 10,
                 TrustServerCertificate = TrustServerCertificateCheckBox.IsChecked == true,
-                Encrypt = ParseEncryptOption(GetSelectedEncryptMode()),
-                IntegratedSecurity = WindowsAuthRadio.IsChecked == true
+                Encrypt = ParseEncryptOption(GetSelectedEncryptMode())
             };
 
-            if (WindowsAuthRadio.IsChecked != true)
+            if (WindowsAuthRadio.IsChecked == true)
+            {
+                builder.IntegratedSecurity = true;
+            }
+            else if (SqlAuthRadio.IsChecked == true)
             {
+                builder.IntegratedSecurity = false;
                 builder.UserID = UsernameTextBox.Text.Trim();
                 builder.Password = PasswordBox.Password;
             }
+            else if (EntraMfaAuthRadio.IsChecked == true)
+            {
+                builder.IntegratedSecurity = false;
+                builder.Authentication = SqlAuthenticationMethod.ActiveDirectoryInteractive;
+                var mfaUsername = EntraMfaUsernameBox.Text.Trim();
+                if (!string.IsNullOrEmpty(mfaUsername))
+                    builder.UserID = mfaUsername;
+            }
 
             return builder;
         }
@@ -146,15 +176,19 @@ private bool ValidateInputs()
             return true;
         }
 
-        private async System.Threading.Tasks.Task<(bool Connected, string? ErrorMessage, string? ServerVersion)> RunConnectionTestAsync(Button triggerButton)
+        private async System.Threading.Tasks.Task<(bool Connected, string? ErrorMessage, bool MfaCancelled, string? ServerVersion)> RunConnectionTestAsync(Button triggerButton)
         {
             triggerButton.IsEnabled = false;
             SaveButton.IsEnabled = false;
-            StatusText.Text = "Testing connection...";
+
+            StatusText.Text = EntraMfaAuthRadio.IsChecked == true
+                ? "Testing connection — please complete authentication in the popup window..."
+                : "Testing connection...";
             StatusText.Visibility = System.Windows.Visibility.Visible;
 
             bool connected = false;
             string? errorMessage = null;
+            bool mfaCancelled = false;
             string? serverVersion = null;
             try
             {
@@ -169,6 +203,8 @@ private bool ValidateInputs()
             {
                 connected = false;
                 errorMessage = ex.Message;
+                if (EntraMfaAuthRadio.IsChecked == true && MfaAuthenticationHelper.IsMfaCancelledException(ex))
+                    mfaCancelled = true;
             }
             finally
             {
@@ -178,14 +214,14 @@ private bool ValidateInputs()
                 StatusText.Visibility = System.Windows.Visibility.Collapsed;
             }
 
-            return (connected, errorMessage, serverVersion);
+            return (connected, errorMessage, mfaCancelled, serverVersion);
         }
 
         private async void TestConnection_Click(object sender, RoutedEventArgs e)
         {
             if (!ValidateInputs()) return;
 
-            var (connected, errorMessage, serverVersion) = await RunConnectionTestAsync(TestConnectionButton);
+            var (connected, errorMessage, mfaCancelled, serverVersion) = await RunConnectionTestAsync(TestConnectionButton);
 
             if (connected)
             {
@@ -199,12 +235,26 @@ private async void TestConnection_Click(object sender, RoutedEventArgs e)
                     MessageBoxImage.Information
                 );
             }
+            else if (mfaCancelled)
+            {
+                MessageBox.Show(
+                    "Authentication was cancelled. Click Test to try again.",
+                    "Authentication Cancelled",
+                    MessageBoxButton.OK,
+                    MessageBoxImage.Warning
+                );
+            }
             else
             {
                 var detail = errorMessage != null ? $"\n\nError: {errorMessage}" : string.Empty;
                 MessageBox.Show(
-                    $"Could not connect to {ServerNameTextBox.Text}.{detail}",
-                    "Connection Failed",
+                    $"Could not connect to {ServerNameTextBox.Text}.{detail}\n\nPlease check:\n" +
+                    "• Server name/address is correct\n" +
+                    "• Server is accessible from this machine\n" +
+                    "• Firewall allows SQL Server connections\n" +
+                    "• SQL Server service is running\n" +
+                    "• You have the 'PerformanceMonitor' database and access to it",
+                    "Connection Test Failed",
                     MessageBoxButton.OK,
                     MessageBoxImage.Error
                 );
@@ -215,10 +265,21 @@ private async void Save_Click(object sender, RoutedEventArgs e)
         {
             if (!ValidateInputs()) return;
 
-            var (connected, errorMessage, _) = await RunConnectionTestAsync(SaveButton);
+            var (connected, errorMessage, mfaCancelled, _) = await RunConnectionTestAsync(SaveButton);
 
             if (!connected)
             {
+                if (mfaCancelled)
+                {
+                    MessageBox.Show(
+                        "Authentication was cancelled. Click Save to try again, or Cancel to abort.",
+                        "Authentication Cancelled",
+                        MessageBoxButton.OK,
+                        MessageBoxImage.Warning
+                    );
+                    return;
+                }
+
                 var detail = errorMessage != null ? $"\n\nError: {errorMessage}" : string.Empty;
                 var result = MessageBox.Show(
                     $"Could not connect to {ServerNameTextBox.Text}.{detail}\n\n" +
@@ -232,6 +293,27 @@ private async void Save_Click(object sender, RoutedEventArgs e)
                     return;
             }
 
+            // Determine authentication type and credentials
+            string authenticationType;
+            if (WindowsAuthRadio.IsChecked == true)
+            {
+                authenticationType = AuthenticationTypes.Windows;
+                Username = null;
+                Password = null;
+            }
+            else if (EntraMfaAuthRadio.IsChecked == true)
+            {
+                authenticationType = AuthenticationTypes.EntraMFA;
+                Username = EntraMfaUsernameBox.Text.Trim();
+                Password = null;
+            }
+            else
+            {
+                authenticationType = AuthenticationTypes.SqlServer;
+                Username = UsernameTextBox.Text.Trim();
+                Password = PasswordBox.Password;
+            }
+
             // Use server name as display name if not provided
             var displayName = string.IsNullOrWhiteSpace(DisplayNameTextBox.Text)
                 ? ServerNameTextBox.Text.Trim()
@@ -241,7 +323,7 @@ private async void Save_Click(object sender, RoutedEventArgs e)
             {
                 ServerConnection.DisplayName = displayName;
                 ServerConnection.ServerName = ServerNameTextBox.Text.Trim();
-                ServerConnection.UseWindowsAuth = WindowsAuthRadio.IsChecked == true;
+                ServerConnection.AuthenticationType = authenticationType;
                 ServerConnection.Description = DescriptionTextBox.Text.Trim();
                 ServerConnection.IsFavorite = IsFavoriteCheckBox.IsChecked == true;
                 ServerConnection.EncryptMode = GetSelectedEncryptMode();
@@ -253,7 +335,7 @@ private async void Save_Click(object sender, RoutedEventArgs e)
                 {
                     DisplayName = displayName,
                     ServerName = ServerNameTextBox.Text.Trim(),
-                    UseWindowsAuth = WindowsAuthRadio.IsChecked == true,
+                    AuthenticationType = authenticationType,
                     Description = DescriptionTextBox.Text.Trim(),
                     IsFavorite = IsFavoriteCheckBox.IsChecked == true,
                     CreatedDate = DateTime.Now,
@@ -263,12 +345,6 @@ private async void Save_Click(object sender, RoutedEventArgs e)
                 };
             }
 
-            if (SqlAuthRadio.IsChecked == true)
-            {
-                Username = UsernameTextBox.Text.Trim();
-                Password = PasswordBox.Password;
-            }
-
             DialogResult = true;
             Close();
         }

Dashboard/Helpers/MfaAuthenticationHelper.cs

@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2026 Erik Darling, Darling Data LLC
+ *
+ * This file is part of the SQL Server Performance Monitor.
+ *
+ * Licensed under the MIT License. See LICENSE file in the project root for full license information.
+ */
+
+using System;
+
+namespace PerformanceMonitorDashboard.Helpers
+{
+    /// <summary>
+    /// Helper utilities for Microsoft Entra MFA authentication.
+    /// </summary>
+    public static class MfaAuthenticationHelper
+    {
+        /// <summary>
+        /// Checks if an exception indicates that the user cancelled MFA authentication.
+        /// </summary>
+        /// <param name="ex">The exception to check.</param>
+        /// <returns>True if the exception represents user cancellation, false otherwise.</returns>
+        public static bool IsMfaCancelledException(Exception ex)
+        {
+            var message = ex.Message?.ToLowerInvariant() ?? string.Empty;
+
+            // Only treat explicit user cancellation messages as cancellation
+            // Do NOT treat authentication errors (wrong password, account selection, etc.) as cancellation
+            return message.Contains("user canceled") ||
+                   message.Contains("user cancelled") ||
+                   message.Contains("authentication was cancelled") ||
+                   message.Contains("authentication was canceled");
+        }
+    }
+}

Dashboard/Interfaces/IServerManager.cs

@@ -55,7 +55,7 @@ public interface IServerManager
         /// <summary>
         /// Tests connectivity to a single server and updates its status.
         /// </summary>
-        Task<ServerConnectionStatus> CheckConnectionAsync(string serverId);
+        Task<ServerConnectionStatus> CheckConnectionAsync(string serverId, bool allowInteractiveAuth = false);
 
         /// <summary>
         /// Tests connectivity to all servers and updates their statuses.

Dashboard/MainWindow.xaml.cs

@@ -711,7 +711,7 @@ private void AddServer_Click(object sender, RoutedEventArgs e)
 
                     MessageBox.Show(
                         $"Server '{server.DisplayName}' added successfully!\n\n" +
-                        (server.UseWindowsAuth ? "Using Windows Authentication" : "Credentials saved securely to Windows Credential Manager"),
+                        (server.AuthenticationType == Models.AuthenticationTypes.Windows ? "Using Windows Authentication" : $"Using {server.AuthenticationDisplay} — credentials saved securely to Windows Credential Manager"),
                         "Server Added",
                         MessageBoxButton.OK,
                         MessageBoxImage.Information
@@ -757,7 +757,7 @@ private void EditServer_Click(object sender, RoutedEventArgs e)
 
                         MessageBox.Show(
                             $"Server '{updatedServer.DisplayName}' updated successfully!\n\n" +
-                            (updatedServer.UseWindowsAuth ? "Using Windows Authentication" : "Credentials updated securely in Windows Credential Manager"),
+                            (updatedServer.AuthenticationType == Models.AuthenticationTypes.Windows ? "Using Windows Authentication" : $"Using {updatedServer.AuthenticationDisplay} — credentials updated securely in Windows Credential Manager"),
                             "Server Updated",
                             MessageBoxButton.OK,
                             MessageBoxImage.Information

Dashboard/Models/AuthenticationTypes.cs

@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2026 Erik Darling, Darling Data LLC
+ *
+ * This file is part of the SQL Server Performance Monitor.
+ *
+ * Licensed under the MIT License. See LICENSE file in the project root for full license information.
+ */
+
+namespace PerformanceMonitorDashboard.Models
+{
+    /// <summary>
+    /// Constants for server authentication types.
+    /// </summary>
+    public static class AuthenticationTypes
+    {
+        /// <summary>
+        /// Windows integrated authentication.
+        /// </summary>
+        public const string Windows = "Windows";
+
+        /// <summary>
+        /// SQL Server username/password authentication.
+        /// </summary>
+        public const string SqlServer = "SqlServer";
+
+        /// <summary>
+        /// Microsoft Entra MFA (Azure AD) interactive authentication.
+        /// </summary>
+        public const string EntraMFA = "EntraMFA";
+    }
+}