remove factory

twsouthwick · twsouthwick · commit 189a86a8053c · 2025-05-01T13:21:01.000-07:00
diff --git a/doc/snippets/Microsoft.Data.SqlClient/SqlConnection.xml b/doc/snippets/Microsoft.Data.SqlClient/SqlConnection.xml
@@ -2086,11 +2086,11 @@ The following sample tries to open a connection to an invalid database to simula
         Returns 0 if the connection is inactive on the client side.
       </remarks>
     </ServerProcessId>
-    <SspiContextProviderFactory>
+    <SspiContextProvider>
       <summary>
-        Gets or sets the factory used to create an <see cref="SspiContextProvider"/> instance for customizing the SSPI context. If not set, the default for the platform will be used.
+        Gets or sets the <see cref="SspiContextProvider"/> instance for customizing the SSPI context. If not set, the default for the platform will be used.
       </summary>
-    </SspiContextProviderFactory>
+    </SspiContextProvider>
     <State>
       <summary>
         Indicates the state of the <see cref="T:Microsoft.Data.SqlClient.SqlConnection" /> during the most recent network operation performed on the connection.
diff --git a/doc/snippets/Microsoft.Data.SqlClient/SspiContextProvider.xml b/doc/snippets/Microsoft.Data.SqlClient/SspiContextProvider.xml
@@ -4,6 +4,9 @@
     <SspiContextProvider>
       <summary>Provides the ability to customize SSPI context generation.</summary>
     </SspiContextProvider>
+    <ctor>
+      <summary>Creates an instance of the SSPIContextProvider.</summary>
+    </ctor>
     <GenerateSspiClientContext>
       <summary>Generates an SSPI outgoing blob given the incoming blob.</summary>
       <param name="incomingBlob">Incoming blob</param>
diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlConnection.cs b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlConnection.cs
@@ -90,7 +90,7 @@ private static readonly Dictionary<string, SqlColumnEncryptionKeyStoreProvider>
         private IReadOnlyDictionary<string, SqlColumnEncryptionKeyStoreProvider> _customColumnEncryptionKeyStoreProviders;
 
         private Func<SqlAuthenticationParameters, CancellationToken, Task<SqlAuthenticationToken>> _accessTokenCallback;
-        private Func<SspiContextProvider> _sspiContextProviderFactory;
+        private SspiContextProvider _sspiContextProvider;
 
         internal bool HasColumnEncryptionKeyStoreProvidersRegistered =>
             _customColumnEncryptionKeyStoreProviders is not null && _customColumnEncryptionKeyStoreProviders.Count > 0;
@@ -648,7 +648,7 @@ public override string ConnectionString
                         CheckAndThrowOnInvalidCombinationOfConnectionOptionAndAccessTokenCallback(connectionOptions);
                     }
                 }
-                ConnectionString_Set(new SqlConnectionPoolKey(value, _credential, _accessToken, _accessTokenCallback, _sspiContextProviderFactory));
+                ConnectionString_Set(new SqlConnectionPoolKey(value, _credential, _accessToken, _accessTokenCallback, _sspiContextProvider));
                 _connectionString = value;  // Change _connectionString value only after value is validated
                 CacheConnectionStringProperties();
             }
@@ -708,7 +708,7 @@ public string AccessToken
                 }
 
                 // Need to call ConnectionString_Set to do proper pool group check
-                ConnectionString_Set(new SqlConnectionPoolKey(_connectionString, credential: _credential, accessToken: value, accessTokenCallback: null, sspiContextProviderFactory: _sspiContextProviderFactory));
+                ConnectionString_Set(new SqlConnectionPoolKey(_connectionString, credential: _credential, accessToken: value, accessTokenCallback: null, sspiContextProvider: _sspiContextProvider));
                 _accessToken = value;
             }
         }
@@ -731,19 +731,19 @@ public Func<SqlAuthenticationParameters, CancellationToken, Task<SqlAuthenticati
                     CheckAndThrowOnInvalidCombinationOfConnectionOptionAndAccessTokenCallback((SqlConnectionString)ConnectionOptions);
                 }
 
-                ConnectionString_Set(new SqlConnectionPoolKey(_connectionString, credential: _credential, accessToken: null, accessTokenCallback: value, sspiContextProviderFactory: _sspiContextProviderFactory));
+                ConnectionString_Set(new SqlConnectionPoolKey(_connectionString, credential: _credential, accessToken: null, accessTokenCallback: value, sspiContextProvider: _sspiContextProvider));
                 _accessTokenCallback = value;
             }
         }
 
-        /// <include file='../../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlConnection.xml' path='docs/members[@name="SqlConnection"]/SspiContextProviderFactory/*' />
-        public Func<SspiContextProvider> SspiContextProviderFactory
+        /// <include file='../../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlConnection.xml' path='docs/members[@name="SqlConnection"]/SspiContextProvider/*' />
+        public SspiContextProvider SspiContextProvider
         {
-            get { return _sspiContextProviderFactory; }
+            get { return _sspiContextProvider; }
             set
             {
-                ConnectionString_Set(new SqlConnectionPoolKey(_connectionString, credential: _credential, accessToken: null, accessTokenCallback: _accessTokenCallback, sspiContextProviderFactory: value));
-                _sspiContextProviderFactory = value;
+                ConnectionString_Set(new SqlConnectionPoolKey(_connectionString, credential: _credential, accessToken: null, accessTokenCallback: _accessTokenCallback, sspiContextProvider: value));
+                _sspiContextProvider = value;
             }
         }
 
@@ -1044,7 +1044,7 @@ public SqlCredential Credential
                 _credential = value;
 
                 // Need to call ConnectionString_Set to do proper pool group check
-                ConnectionString_Set(new SqlConnectionPoolKey(_connectionString, _credential, accessToken: _accessToken, accessTokenCallback: _accessTokenCallback, _sspiContextProviderFactory));
+                ConnectionString_Set(new SqlConnectionPoolKey(_connectionString, _credential, accessToken: _accessToken, accessTokenCallback: _accessTokenCallback, _sspiContextProvider));
             }
         }
 
@@ -2274,7 +2274,7 @@ public static void ChangePassword(string connectionString, string newPassword)
                     throw ADP.InvalidArgumentLength(nameof(newPassword), TdsEnums.MAXLEN_NEWPASSWORD);
                 }
 
-                SqlConnectionPoolKey key = new SqlConnectionPoolKey(connectionString, credential: null, accessToken: null, accessTokenCallback: null, sspiContextProviderFactory: null);
+                SqlConnectionPoolKey key = new SqlConnectionPoolKey(connectionString, credential: null, accessToken: null, accessTokenCallback: null, sspiContextProvider: null);
 
                 SqlConnectionString connectionOptions = SqlConnectionFactory.FindSqlConnectionOptions(key);
                 if (connectionOptions.IntegratedSecurity)
@@ -2323,7 +2323,7 @@ public static void ChangePassword(string connectionString, SqlCredential credent
                     throw ADP.InvalidArgumentLength(nameof(newSecurePassword), TdsEnums.MAXLEN_NEWPASSWORD);
                 }
 
-                SqlConnectionPoolKey key = new SqlConnectionPoolKey(connectionString, credential, accessToken: null, accessTokenCallback: null, sspiContextProviderFactory: null);
+                SqlConnectionPoolKey key = new SqlConnectionPoolKey(connectionString, credential, accessToken: null, accessTokenCallback: null, sspiContextProvider: null);
 
                 SqlConnectionString connectionOptions = SqlConnectionFactory.FindSqlConnectionOptions(key);
 
@@ -2361,7 +2361,7 @@ private static void ChangePassword(string connectionString, SqlConnectionString
             {
                 con?.Dispose();
             }
-            SqlConnectionPoolKey key = new SqlConnectionPoolKey(connectionString, credential, accessToken: null, accessTokenCallback: null, sspiContextProviderFactory: null);
+            SqlConnectionPoolKey key = new SqlConnectionPoolKey(connectionString, credential, accessToken: null, accessTokenCallback: null, sspiContextProvider: null);
 
             SqlConnectionFactory.SingletonInstance.ClearPool(key);
         }
diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlConnectionFactory.cs b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlConnectionFactory.cs
@@ -96,7 +96,7 @@ override protected DbConnectionInternal CreateConnection(DbConnectionOptions opt
                         //       This first connection is established to SqlExpress to get the instance name
                         //       of the UserInstance.
                         SqlConnectionString sseopt = new SqlConnectionString(opt, opt.DataSource, userInstance: true, setEnlistValue: false);
-                        sseConnection = new SqlInternalConnectionTds(identity, sseopt, key.Credential, null, "", null, false, applyTransientFaultHandling: applyTransientFaultHandling, sspiContextProviderFactory: key.SspiContextProviderFactory);
+                        sseConnection = new SqlInternalConnectionTds(identity, sseopt, key.Credential, null, "", null, false, applyTransientFaultHandling: applyTransientFaultHandling, sspiContextProvider: key.SspiContextProvider);
                         // NOTE: Retrieve <UserInstanceName> here. This user instance name will be used below to connect to the Sql Express User Instance.
                         instanceName = sseConnection.InstanceName;
 
@@ -136,7 +136,7 @@ override protected DbConnectionInternal CreateConnection(DbConnectionOptions opt
                 opt = new SqlConnectionString(opt, instanceName, userInstance: false, setEnlistValue: null);
                 poolGroupProviderInfo = null; // null so we do not pass to constructor below...
             }
-            return new SqlInternalConnectionTds(identity, opt, key.Credential, poolGroupProviderInfo, "", null, redirectedUserInstance, userOpt, recoverySessionData, applyTransientFaultHandling: applyTransientFaultHandling, key.AccessToken, pool, key.AccessTokenCallback, key.SspiContextProviderFactory);
+            return new SqlInternalConnectionTds(identity, opt, key.Credential, poolGroupProviderInfo, "", null, redirectedUserInstance, userOpt, recoverySessionData, applyTransientFaultHandling: applyTransientFaultHandling, key.AccessToken, pool, key.AccessTokenCallback, key.SspiContextProvider);
         }
 
         protected override DbConnectionOptions CreateConnectionOptions(string connectionString, DbConnectionOptions previous)
diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlInternalConnectionTds.cs b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlInternalConnectionTds.cs
@@ -136,7 +136,7 @@ internal sealed class SqlInternalConnectionTds : SqlInternalConnection, IDisposa
         SqlFedAuthToken _fedAuthToken = null;
         internal byte[] _accessTokenInBytes;
         internal readonly Func<SqlAuthenticationParameters, CancellationToken, Task<SqlAuthenticationToken>> _accessTokenCallback;
-        internal readonly Func<SspiContextProvider> _sspiContextProviderFactory;
+        internal readonly SspiContextProvider _sspiContextProvider;
 
         private readonly ActiveDirectoryAuthenticationTimeoutRetryHelper _activeDirectoryAuthTimeoutRetryHelper;
 
@@ -456,7 +456,7 @@ internal SqlInternalConnectionTds(
             string accessToken = null,
             DbConnectionPool pool = null,
             Func<SqlAuthenticationParameters, CancellationToken, Task<SqlAuthenticationToken>> accessTokenCallback = null,
-            Func<SspiContextProvider> sspiContextProviderFactory = null) : base(connectionOptions)
+            SspiContextProvider sspiContextProvider = null) : base(connectionOptions)
 
         {
 #if DEBUG
@@ -490,7 +490,7 @@ internal SqlInternalConnectionTds(
             }
 
             _accessTokenCallback = accessTokenCallback;
-            _sspiContextProviderFactory = sspiContextProviderFactory;
+            _sspiContextProvider = sspiContextProvider;
 
             _activeDirectoryAuthTimeoutRetryHelper = new ActiveDirectoryAuthenticationTimeoutRetryHelper();
 
diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/TdsParser.cs b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/TdsParser.cs
@@ -413,7 +413,7 @@ internal void Connect(ServerInfo serverInfo,
             // AD Integrated behaves like Windows integrated when connecting to a non-fedAuth server
             if (integratedSecurity || authType == SqlAuthenticationMethod.ActiveDirectoryIntegrated)
             {
-                _authenticationProvider = Connection._sspiContextProviderFactory?.Invoke() ?? _physicalStateObj.CreateSspiContextProvider();
+                _authenticationProvider = Connection._sspiContextProvider ?? _physicalStateObj.CreateSspiContextProvider();
                 SqlClientEventSource.Log.TryTraceEvent("TdsParser.Connect | SEC | SSPI or Active Directory Authentication Library loaded for SQL Server based integrated authentication");
             }
 
diff --git a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlConnection.cs b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlConnection.cs
@@ -88,7 +88,7 @@ private static readonly Dictionary<string, SqlColumnEncryptionKeyStoreProvider>
 
         private Func<SqlAuthenticationParameters, CancellationToken, Task<SqlAuthenticationToken>> _accessTokenCallback;
 
-        private Func<SspiContextProvider> _sspiContextProviderFactory;
+        private SspiContextProvider _sspiContextProvider;
 
         internal bool HasColumnEncryptionKeyStoreProvidersRegistered =>
             _customColumnEncryptionKeyStoreProviders is not null && _customColumnEncryptionKeyStoreProviders.Count > 0;
@@ -605,14 +605,14 @@ internal int ConnectRetryInterval
             get => ((SqlConnectionString)ConnectionOptions).ConnectRetryInterval;
         }
 
-        /// <include file='../../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlConnection.xml' path='docs/members[@name="SqlConnection"]/SspiContextProviderFactory/*' />
-        public Func<SspiContextProvider> SspiContextProviderFactory
+        /// <include file='../../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlConnection.xml' path='docs/members[@name="SqlConnection"]/SspiContextProvider/*' />
+        public SspiContextProvider SspiContextProvider
         {
-            get { return _sspiContextProviderFactory; }
+            get { return _sspiContextProvider; }
             set
             {
                 ConnectionString_Set(new SqlConnectionPoolKey(_connectionString, _credential, null,  _accessTokenCallback, value));
-                _sspiContextProviderFactory = value;
+                _sspiContextProvider = value;
             }
         }
 
@@ -684,7 +684,7 @@ public override string ConnectionString
                         CheckAndThrowOnInvalidCombinationOfConnectionOptionAndAccessTokenCallback(connectionOptions);
                     }
                 }
-                ConnectionString_Set(new SqlConnectionPoolKey(value, _credential, _accessToken, _accessTokenCallback, _sspiContextProviderFactory));
+                ConnectionString_Set(new SqlConnectionPoolKey(value, _credential, _accessToken, _accessTokenCallback, _sspiContextProvider));
                 _connectionString = value;  // Change _connectionString value only after value is validated
                 CacheConnectionStringProperties();
             }
@@ -744,7 +744,7 @@ public string AccessToken
 
                 _accessToken = value;
                 // Need to call ConnectionString_Set to do proper pool group check
-                ConnectionString_Set(new SqlConnectionPoolKey(_connectionString, _credential, _accessToken, null, _sspiContextProviderFactory));
+                ConnectionString_Set(new SqlConnectionPoolKey(_connectionString, _credential, _accessToken, null, _sspiContextProvider));
             }
         }
 
@@ -766,7 +766,7 @@ public Func<SqlAuthenticationParameters, CancellationToken, Task<SqlAuthenticati
                     CheckAndThrowOnInvalidCombinationOfConnectionOptionAndAccessTokenCallback((SqlConnectionString)ConnectionOptions);
                 }
 
-                ConnectionString_Set(new SqlConnectionPoolKey(_connectionString, _credential, null, value, _sspiContextProviderFactory));
+                ConnectionString_Set(new SqlConnectionPoolKey(_connectionString, _credential, null, value, _sspiContextProvider));
                 _accessTokenCallback = value;
             }
         }
@@ -1079,7 +1079,7 @@ public SqlCredential Credential
                 _credential = value;
 
                 // Need to call ConnectionString_Set to do proper pool group check
-                ConnectionString_Set(new SqlConnectionPoolKey(_connectionString, _credential, _accessToken, _accessTokenCallback, _sspiContextProviderFactory));
+                ConnectionString_Set(new SqlConnectionPoolKey(_connectionString, _credential, _accessToken, _accessTokenCallback, _sspiContextProvider));
             }
         }
 
@@ -2276,7 +2276,7 @@ public static void ChangePassword(string connectionString, string newPassword)
                     throw ADP.InvalidArgumentLength(nameof(newPassword), TdsEnums.MAXLEN_NEWPASSWORD);
                 }
 
-                SqlConnectionPoolKey key = new SqlConnectionPoolKey(connectionString, credential: null, accessToken: null, accessTokenCallback: null, sspiContextProviderFactory: null);
+                SqlConnectionPoolKey key = new SqlConnectionPoolKey(connectionString, credential: null, accessToken: null, accessTokenCallback: null, sspiContextProvider: null);
 
                 SqlConnectionString connectionOptions = SqlConnectionFactory.FindSqlConnectionOptions(key);
                 if (connectionOptions.IntegratedSecurity || connectionOptions.Authentication == SqlAuthenticationMethod.ActiveDirectoryIntegrated)
@@ -2332,7 +2332,7 @@ public static void ChangePassword(string connectionString, SqlCredential credent
                     throw ADP.InvalidArgumentLength(nameof(newSecurePassword), TdsEnums.MAXLEN_NEWPASSWORD);
                 }
 
-                SqlConnectionPoolKey key = new SqlConnectionPoolKey(connectionString, credential, accessToken: null, accessTokenCallback: null, sspiContextProviderFactory: null);
+                SqlConnectionPoolKey key = new SqlConnectionPoolKey(connectionString, credential, accessToken: null, accessTokenCallback: null, sspiContextProvider: null);
 
                 SqlConnectionString connectionOptions = SqlConnectionFactory.FindSqlConnectionOptions(key);
 
@@ -2378,7 +2378,7 @@ private static void ChangePassword(string connectionString, SqlConnectionString
             {
                 con?.Dispose();
             }
-            SqlConnectionPoolKey key = new SqlConnectionPoolKey(connectionString, credential, accessToken: null, accessTokenCallback: null, sspiContextProviderFactory: null);
+            SqlConnectionPoolKey key = new SqlConnectionPoolKey(connectionString, credential, accessToken: null, accessTokenCallback: null, sspiContextProvider: null);
 
             SqlConnectionFactory.SingletonInstance.ClearPool(key);
         }
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/SqlConnectionPoolKey.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/SqlConnectionPoolKey.cs
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SSPI/SspiContextProvider.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SSPI/SspiContextProvider.cs

Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ private static readonly Dictionary<string, SqlColumnEncryptionKeyStoreProvider>`
`90`	`90`	`private IReadOnlyDictionary<string, SqlColumnEncryptionKeyStoreProvider> _customColumnEncryptionKeyStoreProviders;`
`91`	`91`
`92`	`92`	`private Func<SqlAuthenticationParameters, CancellationToken, Task<SqlAuthenticationToken>> _accessTokenCallback;`
`93`		`- private Func<SspiContextProvider> _sspiContextProviderFactory;`
	`93`	`+ private SspiContextProvider _sspiContextProvider;`
`94`	`94`
`95`	`95`	`internal bool HasColumnEncryptionKeyStoreProvidersRegistered =>`
`96`	`96`	`_customColumnEncryptionKeyStoreProviders is not null && _customColumnEncryptionKeyStoreProviders.Count > 0;`
`@@ -648,7 +648,7 @@ public override string ConnectionString`
`648`	`648`	`CheckAndThrowOnInvalidCombinationOfConnectionOptionAndAccessTokenCallback(connectionOptions);`
`649`	`649`	`}`
`650`	`650`	`}`
`651`		`- ConnectionString_Set(new SqlConnectionPoolKey(value, _credential, _accessToken, _accessTokenCallback, _sspiContextProviderFactory));`
	`651`	`+ ConnectionString_Set(new SqlConnectionPoolKey(value, _credential, _accessToken, _accessTokenCallback, _sspiContextProvider));`
`652`	`652`	`_connectionString = value; // Change _connectionString value only after value is validated`
`653`	`653`	`CacheConnectionStringProperties();`
`654`	`654`	`}`
`@@ -708,7 +708,7 @@ public string AccessToken`
`708`	`708`	`}`
`709`	`709`
`710`	`710`	`// Need to call ConnectionString_Set to do proper pool group check`
`711`		`- ConnectionString_Set(new SqlConnectionPoolKey(_connectionString, credential: _credential, accessToken: value, accessTokenCallback: null, sspiContextProviderFactory: _sspiContextProviderFactory));`
	`711`	`+ ConnectionString_Set(new SqlConnectionPoolKey(_connectionString, credential: _credential, accessToken: value, accessTokenCallback: null, sspiContextProvider: _sspiContextProvider));`
`712`	`712`	`_accessToken = value;`
`713`	`713`	`}`
`714`	`714`	`}`
`@@ -731,19 +731,19 @@ public Func<SqlAuthenticationParameters, CancellationToken, Task<SqlAuthenticati`
`731`	`731`	`CheckAndThrowOnInvalidCombinationOfConnectionOptionAndAccessTokenCallback((SqlConnectionString)ConnectionOptions);`
`732`	`732`	`}`
`733`	`733`
`734`		`- ConnectionString_Set(new SqlConnectionPoolKey(_connectionString, credential: _credential, accessToken: null, accessTokenCallback: value, sspiContextProviderFactory: _sspiContextProviderFactory));`
	`734`	`+ ConnectionString_Set(new SqlConnectionPoolKey(_connectionString, credential: _credential, accessToken: null, accessTokenCallback: value, sspiContextProvider: _sspiContextProvider));`
`735`	`735`	`_accessTokenCallback = value;`
`736`	`736`	`}`
`737`	`737`	`}`
`738`	`738`
`739`		`- /// <include file='../../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlConnection.xml' path='docs/members[@name="SqlConnection"]/SspiContextProviderFactory/*' />`
`740`		`- public Func<SspiContextProvider> SspiContextProviderFactory`
	`739`	`+ /// <include file='../../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlConnection.xml' path='docs/members[@name="SqlConnection"]/SspiContextProvider/*' />`
	`740`	`+ public SspiContextProvider SspiContextProvider`
`741`	`741`	`{`
`742`		`- get { return _sspiContextProviderFactory; }`
	`742`	`+ get { return _sspiContextProvider; }`
`743`	`743`	`set`
`744`	`744`	`{`
`745`		`- ConnectionString_Set(new SqlConnectionPoolKey(_connectionString, credential: _credential, accessToken: null, accessTokenCallback: _accessTokenCallback, sspiContextProviderFactory: value));`
`746`		`- _sspiContextProviderFactory = value;`
	`745`	`+ ConnectionString_Set(new SqlConnectionPoolKey(_connectionString, credential: _credential, accessToken: null, accessTokenCallback: _accessTokenCallback, sspiContextProvider: value));`
	`746`	`+ _sspiContextProvider = value;`
`747`	`747`	`}`
`748`	`748`	`}`
`749`	`749`
`@@ -1044,7 +1044,7 @@ public SqlCredential Credential`
`1044`	`1044`	`_credential = value;`
`1045`	`1045`
`1046`	`1046`	`// Need to call ConnectionString_Set to do proper pool group check`
`1047`		`- ConnectionString_Set(new SqlConnectionPoolKey(_connectionString, _credential, accessToken: _accessToken, accessTokenCallback: _accessTokenCallback, _sspiContextProviderFactory));`
	`1047`	`+ ConnectionString_Set(new SqlConnectionPoolKey(_connectionString, _credential, accessToken: _accessToken, accessTokenCallback: _accessTokenCallback, _sspiContextProvider));`
`1048`	`1048`	`}`
`1049`	`1049`	`}`
`1050`	`1050`
`@@ -2274,7 +2274,7 @@ public static void ChangePassword(string connectionString, string newPassword)`
`2274`	`2274`	`throw ADP.InvalidArgumentLength(nameof(newPassword), TdsEnums.MAXLEN_NEWPASSWORD);`
`2275`	`2275`	`}`
`2276`	`2276`
`2277`		`- SqlConnectionPoolKey key = new SqlConnectionPoolKey(connectionString, credential: null, accessToken: null, accessTokenCallback: null, sspiContextProviderFactory: null);`
	`2277`	`+ SqlConnectionPoolKey key = new SqlConnectionPoolKey(connectionString, credential: null, accessToken: null, accessTokenCallback: null, sspiContextProvider: null);`
`2278`	`2278`
`2279`	`2279`	`SqlConnectionString connectionOptions = SqlConnectionFactory.FindSqlConnectionOptions(key);`
`2280`	`2280`	`if (connectionOptions.IntegratedSecurity)`
`@@ -2323,7 +2323,7 @@ public static void ChangePassword(string connectionString, SqlCredential credent`
`2323`	`2323`	`throw ADP.InvalidArgumentLength(nameof(newSecurePassword), TdsEnums.MAXLEN_NEWPASSWORD);`
`2324`	`2324`	`}`
`2325`	`2325`
`2326`		`- SqlConnectionPoolKey key = new SqlConnectionPoolKey(connectionString, credential, accessToken: null, accessTokenCallback: null, sspiContextProviderFactory: null);`
	`2326`	`+ SqlConnectionPoolKey key = new SqlConnectionPoolKey(connectionString, credential, accessToken: null, accessTokenCallback: null, sspiContextProvider: null);`
`2327`	`2327`
`2328`	`2328`	`SqlConnectionString connectionOptions = SqlConnectionFactory.FindSqlConnectionOptions(key);`
`2329`	`2329`
`@@ -2361,7 +2361,7 @@ private static void ChangePassword(string connectionString, SqlConnectionString`
`2361`	`2361`	`{`
`2362`	`2362`	`con?.Dispose();`
`2363`	`2363`	`}`
`2364`		`- SqlConnectionPoolKey key = new SqlConnectionPoolKey(connectionString, credential, accessToken: null, accessTokenCallback: null, sspiContextProviderFactory: null);`
	`2364`	`+ SqlConnectionPoolKey key = new SqlConnectionPoolKey(connectionString, credential, accessToken: null, accessTokenCallback: null, sspiContextProvider: null);`
`2365`	`2365`
`2366`	`2366`	`SqlConnectionFactory.SingletonInstance.ClearPool(key);`
`2367`	`2367`	`}`
Original file line number	Diff line number	Diff line change
`@@ -413,7 +413,7 @@ internal void Connect(ServerInfo serverInfo,`
`413`	`413`	`// AD Integrated behaves like Windows integrated when connecting to a non-fedAuth server`
`414`	`414`	`if (integratedSecurity \|\| authType == SqlAuthenticationMethod.ActiveDirectoryIntegrated)`
`415`	`415`	`{`
`416`		`- _authenticationProvider = Connection._sspiContextProviderFactory?.Invoke() ?? _physicalStateObj.CreateSspiContextProvider();`
	`416`	`+ _authenticationProvider = Connection._sspiContextProvider ?? _physicalStateObj.CreateSspiContextProvider();`
`417`	`417`	`SqlClientEventSource.Log.TryTraceEvent("TdsParser.Connect \| SEC \| SSPI or Active Directory Authentication Library loaded for SQL Server based integrated authentication");`
`418`	`418`	`}`
`419`	`419`
Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ private static readonly Dictionary<string, SqlColumnEncryptionKeyStoreProvider>`
`88`	`88`
`89`	`89`	`private Func<SqlAuthenticationParameters, CancellationToken, Task<SqlAuthenticationToken>> _accessTokenCallback;`
`90`	`90`
`91`		`- private Func<SspiContextProvider> _sspiContextProviderFactory;`
	`91`	`+ private SspiContextProvider _sspiContextProvider;`
`92`	`92`
`93`	`93`	`internal bool HasColumnEncryptionKeyStoreProvidersRegistered =>`
`94`	`94`	`_customColumnEncryptionKeyStoreProviders is not null && _customColumnEncryptionKeyStoreProviders.Count > 0;`
`@@ -605,14 +605,14 @@ internal int ConnectRetryInterval`
`605`	`605`	`get => ((SqlConnectionString)ConnectionOptions).ConnectRetryInterval;`
`606`	`606`	`}`
`607`	`607`
`608`		`- /// <include file='../../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlConnection.xml' path='docs/members[@name="SqlConnection"]/SspiContextProviderFactory/*' />`
`609`		`- public Func<SspiContextProvider> SspiContextProviderFactory`
	`608`	`+ /// <include file='../../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlConnection.xml' path='docs/members[@name="SqlConnection"]/SspiContextProvider/*' />`
	`609`	`+ public SspiContextProvider SspiContextProvider`
`610`	`610`	`{`
`611`		`- get { return _sspiContextProviderFactory; }`
	`611`	`+ get { return _sspiContextProvider; }`
`612`	`612`	`set`
`613`	`613`	`{`
`614`	`614`	`ConnectionString_Set(new SqlConnectionPoolKey(_connectionString, _credential, null, _accessTokenCallback, value));`
`615`		`- _sspiContextProviderFactory = value;`
	`615`	`+ _sspiContextProvider = value;`
`616`	`616`	`}`
`617`	`617`	`}`
`618`	`618`
`@@ -684,7 +684,7 @@ public override string ConnectionString`
`684`	`684`	`CheckAndThrowOnInvalidCombinationOfConnectionOptionAndAccessTokenCallback(connectionOptions);`
`685`	`685`	`}`
`686`	`686`	`}`
`687`		`- ConnectionString_Set(new SqlConnectionPoolKey(value, _credential, _accessToken, _accessTokenCallback, _sspiContextProviderFactory));`
	`687`	`+ ConnectionString_Set(new SqlConnectionPoolKey(value, _credential, _accessToken, _accessTokenCallback, _sspiContextProvider));`
`688`	`688`	`_connectionString = value; // Change _connectionString value only after value is validated`
`689`	`689`	`CacheConnectionStringProperties();`
`690`	`690`	`}`
`@@ -744,7 +744,7 @@ public string AccessToken`
`744`	`744`
`745`	`745`	`_accessToken = value;`
`746`	`746`	`// Need to call ConnectionString_Set to do proper pool group check`
`747`		`- ConnectionString_Set(new SqlConnectionPoolKey(_connectionString, _credential, _accessToken, null, _sspiContextProviderFactory));`
	`747`	`+ ConnectionString_Set(new SqlConnectionPoolKey(_connectionString, _credential, _accessToken, null, _sspiContextProvider));`
`748`	`748`	`}`
`749`	`749`	`}`
`750`	`750`
`@@ -766,7 +766,7 @@ public Func<SqlAuthenticationParameters, CancellationToken, Task<SqlAuthenticati`
`766`	`766`	`CheckAndThrowOnInvalidCombinationOfConnectionOptionAndAccessTokenCallback((SqlConnectionString)ConnectionOptions);`
`767`	`767`	`}`
`768`	`768`
`769`		`- ConnectionString_Set(new SqlConnectionPoolKey(_connectionString, _credential, null, value, _sspiContextProviderFactory));`
	`769`	`+ ConnectionString_Set(new SqlConnectionPoolKey(_connectionString, _credential, null, value, _sspiContextProvider));`
`770`	`770`	`_accessTokenCallback = value;`
`771`	`771`	`}`
`772`	`772`	`}`
`@@ -1079,7 +1079,7 @@ public SqlCredential Credential`
`1079`	`1079`	`_credential = value;`
`1080`	`1080`
`1081`	`1081`	`// Need to call ConnectionString_Set to do proper pool group check`
`1082`		`- ConnectionString_Set(new SqlConnectionPoolKey(_connectionString, _credential, _accessToken, _accessTokenCallback, _sspiContextProviderFactory));`
	`1082`	`+ ConnectionString_Set(new SqlConnectionPoolKey(_connectionString, _credential, _accessToken, _accessTokenCallback, _sspiContextProvider));`
`1083`	`1083`	`}`
`1084`	`1084`	`}`
`1085`	`1085`
`@@ -2276,7 +2276,7 @@ public static void ChangePassword(string connectionString, string newPassword)`
`2276`	`2276`	`throw ADP.InvalidArgumentLength(nameof(newPassword), TdsEnums.MAXLEN_NEWPASSWORD);`
`2277`	`2277`	`}`
`2278`	`2278`
`2279`		`- SqlConnectionPoolKey key = new SqlConnectionPoolKey(connectionString, credential: null, accessToken: null, accessTokenCallback: null, sspiContextProviderFactory: null);`
	`2279`	`+ SqlConnectionPoolKey key = new SqlConnectionPoolKey(connectionString, credential: null, accessToken: null, accessTokenCallback: null, sspiContextProvider: null);`
`2280`	`2280`
`2281`	`2281`	`SqlConnectionString connectionOptions = SqlConnectionFactory.FindSqlConnectionOptions(key);`
`2282`	`2282`	`if (connectionOptions.IntegratedSecurity \|\| connectionOptions.Authentication == SqlAuthenticationMethod.ActiveDirectoryIntegrated)`
`@@ -2332,7 +2332,7 @@ public static void ChangePassword(string connectionString, SqlCredential credent`
`2332`	`2332`	`throw ADP.InvalidArgumentLength(nameof(newSecurePassword), TdsEnums.MAXLEN_NEWPASSWORD);`
`2333`	`2333`	`}`
`2334`	`2334`
`2335`		`- SqlConnectionPoolKey key = new SqlConnectionPoolKey(connectionString, credential, accessToken: null, accessTokenCallback: null, sspiContextProviderFactory: null);`
	`2335`	`+ SqlConnectionPoolKey key = new SqlConnectionPoolKey(connectionString, credential, accessToken: null, accessTokenCallback: null, sspiContextProvider: null);`
`2336`	`2336`
`2337`	`2337`	`SqlConnectionString connectionOptions = SqlConnectionFactory.FindSqlConnectionOptions(key);`
`2338`	`2338`
`@@ -2378,7 +2378,7 @@ private static void ChangePassword(string connectionString, SqlConnectionString`
`2378`	`2378`	`{`
`2379`	`2379`	`con?.Dispose();`
`2380`	`2380`	`}`
`2381`		`- SqlConnectionPoolKey key = new SqlConnectionPoolKey(connectionString, credential, accessToken: null, accessTokenCallback: null, sspiContextProviderFactory: null);`
	`2381`	`+ SqlConnectionPoolKey key = new SqlConnectionPoolKey(connectionString, credential, accessToken: null, accessTokenCallback: null, sspiContextProvider: null);`
`2382`	`2382`
`2383`	`2383`	`SqlConnectionFactory.SingletonInstance.ClearPool(key);`
`2384`	`2384`	`}`