WAM POC

src/Microsoft.Data.SqlClient/netcore/ref/Microsoft.Data.SqlClient.csproj

@@ -28,5 +28,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Azure.Identity" Version="$(AzureIdentityVersion)" />
+    <PackageReference Include="Microsoft.Identity.Client.Broker" Version="4.64.0" />
   </ItemGroup>
 </Project>

src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj

@@ -962,7 +962,8 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Data.SqlClient.SNI.runtime" Version="$(MicrosoftDataSqlClientSNIRuntimeVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="$(MicrosoftExtensionsCachingMemoryVersion)"  />
+    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="$(MicrosoftExtensionsCachingMemoryVersion)" />
+    <PackageReference Include="Microsoft.Identity.Client.Broker" Version="4.64.0" />
     <!-- Enable the project reference for debugging purposes. -->
     <!-- <ProjectReference Include="$(SqlServerSourceCode)\Microsoft.SqlServer.Server.csproj" /> -->
     <PackageReference Include="Microsoft.SqlServer.Server" Version="$(MicrosoftSqlServerServerVersion)" />

src/Microsoft.Data.SqlClient/netfx/ref/Microsoft.Data.SqlClient.csproj

@@ -26,5 +26,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Azure.Identity" Version="$(AzureIdentityVersion)" />
+    <PackageReference Include="Microsoft.Identity.Client.Broker" Version="4.64.0" />
   </ItemGroup>
 </Project>

src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj

@@ -766,7 +766,9 @@
     </COMReference>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="$(MicrosoftExtensionsCachingMemoryVersion)"  />
+    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="$(MicrosoftExtensionsCachingMemoryVersion)" />
+    <PackageReference Include="Microsoft.Identity.Client.Broker" Version="4.64.0" />
+    <PackageReference Include="System.Memory" Version="4.5.5" />
     <PackageReference Include="System.Text.Encodings.Web">
       <Version>$(SystemTextEncodingsWebVersion)</Version>
     </PackageReference>

src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ActiveDirectoryAuthenticationProvider.cs

@@ -4,14 +4,18 @@
 
 using System;
 using System.Collections.Concurrent;
+using System.Diagnostics;
+using System.Runtime.InteropServices;
 using System.Security.Cryptography;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using Azure.Core;
 using Azure.Identity;
+using Microsoft.Data.Common;
 using Microsoft.Extensions.Caching.Memory;
 using Microsoft.Identity.Client;
+using Microsoft.Identity.Client.Broker;
 using Microsoft.Identity.Client.Extensibility;
 
 namespace Microsoft.Data.SqlClient
@@ -107,12 +111,32 @@ public override void BeforeUnload(SqlAuthenticationMethod authentication)
         }
 
 #if NETFRAMEWORK
-        private Func<System.Windows.Forms.IWin32Window> _iWin32WindowFunc = null;
+
 
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/ActiveDirectoryAuthenticationProvider.xml' path='docs/members[@name="ActiveDirectoryAuthenticationProvider"]/SetIWin32WindowFunc/*'/>
-        public void SetIWin32WindowFunc(Func<System.Windows.Forms.IWin32Window> iWin32WindowFunc) => this._iWin32WindowFunc = iWin32WindowFunc;
+        public void SetIWin32WindowFunc(Func<System.Windows.Forms.IWin32Window> iWin32WindowFunc) => SetParentActivityOrWindow(iWin32WindowFunc);
 #endif
 
+        private Func<object> _parentActivityOrWindowFunc = null;
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="parentActivityOrWindowFunc"></param>
+        public void SetParentActivityOrWindow(Func<object> parentActivityOrWindowFunc) => this._parentActivityOrWindowFunc = parentActivityOrWindowFunc;
+
+        private delegate Task<AuthenticationResult> InvokeDelegate(IPublicClientApplication app, string[] scopes, Guid connectionId, string userId,
+    SqlAuthenticationMethod authenticationMethod, CancellationTokenSource cts, ICustomWebUi customWebUI, Func<DeviceCodeResult, Task> deviceCodeFlowCallback);
+
+        private SynchronizationContext _synchronizationContext = null;
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="synchronizationContext"></param>
+        public void SetSynchronizationContext(SynchronizationContext synchronizationContext) => this._synchronizationContext = synchronizationContext;
+
+
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/ActiveDirectoryAuthenticationProvider.xml' path='docs/members[@name="ActiveDirectoryAuthenticationProvider"]/AcquireTokenAsync/*'/>
 
         public override async Task<SqlAuthenticationToken> AcquireTokenAsync(SqlAuthenticationParameters parameters)
@@ -205,11 +229,7 @@ public override async Task<SqlAuthenticationToken> AcquireTokenAsync(SqlAuthenti
                 redirectUri = "http://localhost";
             }
 #endif
-            PublicClientAppKey pcaKey = new(parameters.Authority, redirectUri, _applicationClientId
-#if NETFRAMEWORK
-            , _iWin32WindowFunc
-#endif
-                );
+            PublicClientAppKey pcaKey = new(parameters.Authority, redirectUri, _applicationClientId, _parentActivityOrWindowFunc);
 
             AuthenticationResult result = null;
             IPublicClientApplication app = await GetPublicClientAppInstanceAsync(pcaKey, cts.Token).ConfigureAwait(false);
@@ -284,14 +304,45 @@ previousPw is byte[] previousPwBytes &&
                     // An 'MsalUiRequiredException' is thrown in the case where an interaction is required with the end user of the application,
                     // for instance, if no refresh token was in the cache, or the user needs to consent, or re-sign-in (for instance if the password expired),
                     // or the user needs to perform two factor authentication.
-                    result = await AcquireTokenInteractiveDeviceFlowAsync(app, scopes, parameters.ConnectionId, parameters.UserId, parameters.AuthenticationMethod, cts, _customWebUI, _deviceCodeFlowCallback).ConfigureAwait(false);
+
+                    InteractiveAuthStateObject state = new InteractiveAuthStateObject()
+                    {
+                        app = app,
+                        scopes = scopes,
+                        connectionId = parameters.ConnectionId,
+                        userId = parameters.UserId,
+                        authenticationMethod = parameters.AuthenticationMethod,
+                        cts = cts,
+                        customWebUI = _customWebUI,
+                        deviceCodeFlowCallback = _deviceCodeFlowCallback,
+                        _taskCompletionSource = new TaskCompletionSource<AuthenticationResult>()
+                    };
+
+                    _synchronizationContext.Post(AcquireTokenInteractiveDeviceFlowAsync, state);
+                    result = await state._taskCompletionSource.Task;
+
                     SqlClientEventSource.Log.TryTraceEvent("AcquireTokenAsync | Acquired access token (interactive) for {0} auth mode. Expiry Time: {1}", parameters.AuthenticationMethod, result?.ExpiresOn);
                 }
 
                 if (result == null)
                 {
                     // If no existing 'account' is found, we request user to sign in interactively.
-                    result = await AcquireTokenInteractiveDeviceFlowAsync(app, scopes, parameters.ConnectionId, parameters.UserId, parameters.AuthenticationMethod, cts, _customWebUI, _deviceCodeFlowCallback).ConfigureAwait(false);
+                    InteractiveAuthStateObject state = new InteractiveAuthStateObject()
+                    {
+                        app = app,
+                        scopes = scopes,
+                        connectionId = parameters.ConnectionId,
+                        userId = parameters.UserId,
+                        authenticationMethod = parameters.AuthenticationMethod,
+                        cts = cts,
+                        customWebUI = _customWebUI,
+                        deviceCodeFlowCallback = _deviceCodeFlowCallback,
+                        _taskCompletionSource = new TaskCompletionSource<AuthenticationResult>()
+                    };
+
+                    _synchronizationContext.Post(AcquireTokenInteractiveDeviceFlowAsync, state);
+                    result = await state._taskCompletionSource.Task;
+
                     SqlClientEventSource.Log.TryTraceEvent("AcquireTokenAsync | Acquired access token (interactive) for {0} auth mode. Expiry Time: {1}", parameters.AuthenticationMethod, result?.ExpiresOn);
                 }
             }
@@ -345,12 +396,27 @@ private static async Task<AuthenticationResult> TryAcquireTokenSilent(IPublicCli
             return result;
         }
 
-        private static async Task<AuthenticationResult> AcquireTokenInteractiveDeviceFlowAsync(IPublicClientApplication app, string[] scopes, Guid connectionId, string userId,
-            SqlAuthenticationMethod authenticationMethod, CancellationTokenSource cts, ICustomWebUi customWebUI, Func<DeviceCodeResult, Task> deviceCodeFlowCallback)
+        private class InteractiveAuthStateObject
         {
+            internal IPublicClientApplication app;
+            internal string[] scopes;
+            internal Guid connectionId;
+            internal string userId;
+            internal SqlAuthenticationMethod authenticationMethod;
+            internal CancellationTokenSource cts;
+            internal ICustomWebUi customWebUI;
+            internal Func<DeviceCodeResult, Task> deviceCodeFlowCallback;
+            internal TaskCompletionSource<AuthenticationResult> _taskCompletionSource;
+        }
+
+
+        private static async void AcquireTokenInteractiveDeviceFlowAsync(object state)
+        {
+            InteractiveAuthStateObject interactiveAuthStateObject = (InteractiveAuthStateObject)state;
+
             try
             {
-                if (authenticationMethod == SqlAuthenticationMethod.ActiveDirectoryInteractive)
+                if (interactiveAuthStateObject.authenticationMethod == SqlAuthenticationMethod.ActiveDirectoryInteractive)
                 {
                     CancellationTokenSource ctsInteractive = new();
 #if NET6_0_OR_GREATER
@@ -365,14 +431,17 @@ private static async Task<AuthenticationResult> AcquireTokenInteractiveDeviceFlo
                      */
                     ctsInteractive.CancelAfter(180000);
 #endif
-                    if (customWebUI != null)
+
+                    if (interactiveAuthStateObject.customWebUI != null)
                     {
-                        return await app.AcquireTokenInteractive(scopes)
-                            .WithCorrelationId(connectionId)
-                            .WithCustomWebUi(customWebUI)
-                            .WithLoginHint(userId)
+                        var result = await interactiveAuthStateObject.app.AcquireTokenInteractive(interactiveAuthStateObject.scopes)
+                            .WithCorrelationId(interactiveAuthStateObject.connectionId)
+                            .WithCustomWebUi(interactiveAuthStateObject.customWebUI)
+                            .WithLoginHint(interactiveAuthStateObject.userId)
                             .ExecuteAsync(ctsInteractive.Token)
                             .ConfigureAwait(false);
+                        interactiveAuthStateObject._taskCompletionSource.SetResult(result);
+                        return;
                     }
                     else
                     {
@@ -393,29 +462,40 @@ private static async Task<AuthenticationResult> AcquireTokenInteractiveDeviceFlo
                          *
                          * https://github.com/AzureAD/microsoft-authentication-library-for-dotnet/wiki/MSAL.NET-uses-web-browser#at-a-glance
                          */
-                        return await app.AcquireTokenInteractive(scopes)
-                            .WithCorrelationId(connectionId)
-                            .WithLoginHint(userId)
+                        var result = await interactiveAuthStateObject.app.AcquireTokenInteractive(interactiveAuthStateObject.scopes)
+                            .WithCorrelationId(interactiveAuthStateObject.connectionId)
+                            .WithLoginHint(interactiveAuthStateObject.userId)
                             .ExecuteAsync(ctsInteractive.Token)
                             .ConfigureAwait(false);
+                        interactiveAuthStateObject._taskCompletionSource.SetResult(result);
+                        return;
                     }
                 }
                 else
                 {
-                    AuthenticationResult result = await app.AcquireTokenWithDeviceCode(scopes,
-                        deviceCodeResult => deviceCodeFlowCallback(deviceCodeResult))
-                        .WithCorrelationId(connectionId)
-                        .ExecuteAsync(cancellationToken: cts.Token)
+                    AuthenticationResult result = await interactiveAuthStateObject.app.AcquireTokenWithDeviceCode(interactiveAuthStateObject.scopes,
+                        deviceCodeResult => interactiveAuthStateObject.deviceCodeFlowCallback(deviceCodeResult))
+                        .WithCorrelationId(interactiveAuthStateObject.connectionId)
+                        .ExecuteAsync(cancellationToken: interactiveAuthStateObject.cts.Token)
                         .ConfigureAwait(false);
-                    return result;
+                    interactiveAuthStateObject._taskCompletionSource.SetResult(result);
+                    return;
                 }
             }
             catch (OperationCanceledException)
             {
                 SqlClientEventSource.Log.TryTraceEvent("AcquireTokenInteractiveDeviceFlowAsync | Operation timed out while acquiring access token.");
-                throw (authenticationMethod == SqlAuthenticationMethod.ActiveDirectoryInteractive) ?
+
+                var error = (interactiveAuthStateObject.authenticationMethod == SqlAuthenticationMethod.ActiveDirectoryInteractive) ?
                     SQL.ActiveDirectoryInteractiveTimeout() :
                     SQL.ActiveDirectoryDeviceFlowTimeout();
+
+                interactiveAuthStateObject._taskCompletionSource.SetException(error);
+            }
+            catch (Exception e)
+            {
+                SqlClientEventSource.Log.TryTraceEvent("AcquireTokenInteractiveDeviceFlowAsync | Operation failed while acquiring access token.");
+                interactiveAuthStateObject._taskCompletionSource.SetException(e);
             }
         }
 
@@ -544,19 +624,18 @@ private IPublicClientApplication CreateClientAppInstance(PublicClientAppKey publ
         {
             IPublicClientApplication publicClientApplication;
 
-#if NETFRAMEWORK
-            if (_iWin32WindowFunc != null)
+            if (_parentActivityOrWindowFunc != null)
             {
                 publicClientApplication = PublicClientApplicationBuilder.Create(publicClientAppKey._applicationClientId)
                 .WithAuthority(publicClientAppKey._authority)
                 .WithClientName(Common.DbConnectionStringDefaults.ApplicationName)
                 .WithClientVersion(Common.ADP.GetAssemblyVersion().ToString())
                 .WithRedirectUri(publicClientAppKey._redirectUri)
-                .WithParentActivityOrWindow(_iWin32WindowFunc)
+                .WithParentActivityOrWindow(_parentActivityOrWindowFunc)
+                .WithBroker(new BrokerOptions(BrokerOptions.OperatingSystems.Windows))
                 .Build();
             }
             else
-#endif
             {
                 publicClientApplication = PublicClientApplicationBuilder.Create(publicClientAppKey._applicationClientId)
                 .WithAuthority(publicClientAppKey._authority)
@@ -569,6 +648,46 @@ private IPublicClientApplication CreateClientAppInstance(PublicClientAppKey publ
             return publicClientApplication;
         }
 
+
+        // This is your window handle!
+        static IntPtr GetParent()
+        {
+            Process currentProcess = Process.GetCurrentProcess();
+            return currentProcess.MainWindowHandle;
+        }
+
+        enum GetAncestorFlags
+        {
+            GetParent = 1,
+            GetRoot = 2,
+            /// <summary>
+            /// Retrieves the owned root window by walking the chain of parent and owner windows returned by GetParent.
+            /// </summary>
+            GetRootOwner = 3
+        }
+
+        /// <summary>
+        /// Retrieves the handle to the ancestor of the specified window.
+        /// </summary>
+        /// <param name="hwnd">A handle to the window whose ancestor is to be retrieved.
+        /// If this parameter is the desktop window, the function returns NULL. </param>
+        /// <param name="flags">The ancestor to be retrieved.</param>
+        /// <returns>The return value is the handle to the ancestor window.</returns>
+        [DllImport("user32.dll", ExactSpelling = true)]
+        static extern IntPtr GetAncestor(IntPtr hwnd, GetAncestorFlags flags);
+
+        [DllImport("kernel32.dll")]
+        static extern IntPtr GetConsoleWindow();
+
+        // This is your window handle!
+        IntPtr GetConsoleOrTerminalWindow()
+        {
+            IntPtr consoleHandle = GetConsoleWindow();
+            IntPtr handle = GetAncestor(consoleHandle, GetAncestorFlags.GetRootOwner);
+
+            return handle;
+        }
+
         private static TokenCredentialData CreateTokenCredentialInstance(TokenCredentialKey tokenCredentialKey, string secret)
         {
             if (tokenCredentialKey._tokenCredentialType == typeof(DefaultAzureCredential))
@@ -625,22 +744,16 @@ internal class PublicClientAppKey
             public readonly string _authority;
             public readonly string _redirectUri;
             public readonly string _applicationClientId;
-#if NETFRAMEWORK
-            public readonly Func<System.Windows.Forms.IWin32Window> _iWin32WindowFunc;
-#endif
+            public readonly Func<object> _parentActivityOrWindowFunc;
 
             public PublicClientAppKey(string authority, string redirectUri, string applicationClientId
-#if NETFRAMEWORK
-            , Func<System.Windows.Forms.IWin32Window> iWin32WindowFunc
-#endif
+            , Func<object> parentActivityOrWindowFunc
                 )
             {
                 _authority = authority;
                 _redirectUri = redirectUri;
                 _applicationClientId = applicationClientId;
-#if NETFRAMEWORK
-                _iWin32WindowFunc = iWin32WindowFunc;
-#endif
+                _parentActivityOrWindowFunc = parentActivityOrWindowFunc;
             }
 
             public override bool Equals(object obj)
@@ -650,18 +763,14 @@ public override bool Equals(object obj)
                     return (string.CompareOrdinal(_authority, pcaKey._authority) == 0
                         && string.CompareOrdinal(_redirectUri, pcaKey._redirectUri) == 0
                         && string.CompareOrdinal(_applicationClientId, pcaKey._applicationClientId) == 0
-#if NETFRAMEWORK
-                        && pcaKey._iWin32WindowFunc == _iWin32WindowFunc
-#endif
+                        && pcaKey._parentActivityOrWindowFunc == _parentActivityOrWindowFunc
                     );
                 }
                 return false;
             }
 
             public override int GetHashCode() => Tuple.Create(_authority, _redirectUri, _applicationClientId
-#if NETFRAMEWORK
-                , _iWin32WindowFunc
-#endif
+                , _parentActivityOrWindowFunc
                 ).GetHashCode();
         }
 
@@ -710,6 +819,5 @@ public override bool Equals(object obj)
 
             public override int GetHashCode() => Tuple.Create(_tokenCredentialType, _authority, _scope, _audience, _clientId).GetHashCode();
         }
-
     }
 }