revert

Author: twsouthwick

src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlInternalConnectionTds.cs

@@ -2435,10 +2435,13 @@ internal SqlFedAuthToken GetFedAuthToken(SqlFedAuthInfo fedAuthInfo)
                 try
                 {
                     var authParamsBuilder = new SqlAuthenticationParameters.Builder(
-                        connection: this,
-                        resource: fedAuthInfo.spn,
-                        authority: fedAuthInfo.stsurl);
-
+                            authenticationMethod: ConnectionOptions.Authentication,
+                            resource: fedAuthInfo.spn,
+                            authority: fedAuthInfo.stsurl,
+                            serverName: ConnectionOptions.DataSource,
+                            databaseName: ConnectionOptions.InitialCatalog)
+                        .WithConnectionId(_clientConnectionId)
+                        .WithConnectionTimeout(ConnectionOptions.ConnectTimeout);
                     switch (ConnectionOptions.Authentication)
                     {
                         case SqlAuthenticationMethod.ActiveDirectoryIntegrated:

src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlInternalConnectionTds.cs

@@ -4,6 +4,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Data;
 using System.Data.Common;
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
@@ -14,11 +15,11 @@
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
-using System.Transactions;
 using Microsoft.Data.Common;
 using Microsoft.Data.ProviderBase;
 using Microsoft.Data.SqlClient.ConnectionPool;
 using Microsoft.Identity.Client;
+using System.Transactions;
 
 
 namespace Microsoft.Data.SqlClient
@@ -136,7 +137,7 @@ sealed internal class SqlInternalConnectionTds : SqlInternalConnection, IDisposa
         // The Federated Authentication returned by TryGetFedAuthTokenLocked or GetFedAuthToken.
         SqlFedAuthToken _fedAuthToken = null;
         internal byte[] _accessTokenInBytes;
-        internal readonly Func<SqlAuthenticationParameters, CancellationToken, Task<SqlAuthenticationToken>> _accessTokenCallback;
+        internal readonly Func<SqlAuthenticationParameters, CancellationToken,Task<SqlAuthenticationToken>> _accessTokenCallback;
 
         private readonly ActiveDirectoryAuthenticationTimeoutRetryHelper _activeDirectoryAuthTimeoutRetryHelper;
 
@@ -1516,12 +1517,12 @@ private void OpenLoginEnlist(TimeoutTimer timeout, SqlConnectionString connectio
                 else
                 {
                     _timeoutErrorInternal.SetFailoverScenario(false); // not a failover scenario
-                    LoginNoFailover(dataSource,
-                            newPassword,
-                            newSecurePassword,
+                    LoginNoFailover(dataSource, 
+                            newPassword, 
+                            newSecurePassword, 
                             redirectedUserInstance,
-                            connectionOptions,
-                            credential,
+                            connectionOptions, 
+                            credential, 
                             timeout);
                 }
 
@@ -2490,7 +2491,7 @@ internal void OnFedAuthInfo(SqlFedAuthInfo fedAuthInfo)
 
                     if (_newDbConnectionPoolAuthenticationContext != null)
                     {
-                        _dbConnectionPool.AuthenticationContexts.TryAdd(_dbConnectionPoolAuthenticationContextKey, _newDbConnectionPoolAuthenticationContext);
+                         _dbConnectionPool.AuthenticationContexts.TryAdd(_dbConnectionPoolAuthenticationContextKey, _newDbConnectionPoolAuthenticationContext);
                     }
                 }
             }
@@ -2604,10 +2605,13 @@ internal SqlFedAuthToken GetFedAuthToken(SqlFedAuthInfo fedAuthInfo)
                 try
                 {
                     var authParamsBuilder = new SqlAuthenticationParameters.Builder(
-                        connection: this,
+                        authenticationMethod: ConnectionOptions.Authentication,
                         resource: fedAuthInfo.spn,
-                        authority: fedAuthInfo.stsurl);
-
+                        authority: fedAuthInfo.stsurl,
+                        serverName: ConnectionOptions.DataSource,
+                        databaseName: ConnectionOptions.InitialCatalog)
+                        .WithConnectionId(_clientConnectionId)
+                        .WithConnectionTimeout(ConnectionOptions.ConnectTimeout);
                     switch (ConnectionOptions.Authentication)
                     {
                         case SqlAuthenticationMethod.ActiveDirectoryIntegrated:

src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlAuthenticationParameters.cs

@@ -49,7 +49,7 @@ protected SqlAuthenticationParameters(
             string authority,
             string userId,
             string password,
-            Guid connectionId,
+            Guid connectionId, 
             int connectionTimeout)
         {
             AuthenticationMethod = authenticationMethod;
@@ -149,13 +149,11 @@ public Builder WithConnectionTimeout(int timeout)
                 return this;
             }
 
-            internal Builder(SqlInternalConnectionTds connection, string resource, string authority)
+            internal Builder(SqlAuthenticationMethod authenticationMethod, string resource, string authority, string serverName, string databaseName)
             {
-                _authenticationMethod = connection.ConnectionOptions.Authentication;
-                _serverName = connection.ConnectionOptions.DataSource;
-                _databaseName = connection.ConnectionOptions.InitialCatalog;
-                _connectionTimeout = connection.ConnectionOptions.ConnectTimeout;
-                _connectionId = connection.ClientConnectionId;
+                _authenticationMethod = authenticationMethod;
+                _serverName = serverName;
+                _databaseName = databaseName;
                 _resource = resource;
                 _authority = authority;
             }