From b178ba5d324cfc77a4ff68cf7c250895f766dbeb Mon Sep 17 00:00:00 2001
From: David Engel <v-davidengel@microsoft.com>
Date: Thu, 23 May 2024 12:10:21 -0700
Subject: [PATCH] Fix | Clone of SqlConnection should include
 AccessTokenCallback (#2525)

---
 .../src/Microsoft/Data/SqlClient/SqlConnection.cs      |  1 +
 .../src/Microsoft/Data/SqlClient/SqlConnection.cs      |  1 +
 .../tests/FunctionalTests/CloneTests.cs                | 10 ++++++++++
 3 files changed, 12 insertions(+)

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
index 4b4e7ccc43..1d044633ec 100644
--- a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlConnection.cs
+++ b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlConnection.cs
@@ -227,6 +227,7 @@ private SqlConnection(SqlConnection connection)
             }
 
             _accessToken = connection._accessToken;
+            _accessTokenCallback = connection._accessTokenCallback;
             CacheConnectionStringProperties();
         }
 
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
index b6104b9075..b9d2e32daa 100644
--- a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlConnection.cs
+++ b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlConnection.cs
@@ -429,6 +429,7 @@ private SqlConnection(SqlConnection connection)
                 _credential = new SqlCredential(connection._credential.UserId, password);
             }
             _accessToken = connection._accessToken;
+            _accessTokenCallback = connection._accessTokenCallback;
             _serverCertificateValidationCallback = connection._serverCertificateValidationCallback;
             _clientCertificateRetrievalCallback = connection._clientCertificateRetrievalCallback;
             _originalNetworkAddressInfo = connection._originalNetworkAddressInfo;
diff --git a/src/Microsoft.Data.SqlClient/tests/FunctionalTests/CloneTests.cs b/src/Microsoft.Data.SqlClient/tests/FunctionalTests/CloneTests.cs
index f5deb6c62c..1c8efc4456 100644
--- a/src/Microsoft.Data.SqlClient/tests/FunctionalTests/CloneTests.cs
+++ b/src/Microsoft.Data.SqlClient/tests/FunctionalTests/CloneTests.cs
@@ -4,6 +4,7 @@
 
 using System;
 using System.Data;
+using System.Threading.Tasks;
 using Xunit;
 
 namespace Microsoft.Data.SqlClient.Tests
@@ -18,10 +19,19 @@ public void CloneSqlConnection()
             builder.ConnectTimeout = 1;
             builder.InitialCatalog = "northwinddb";
             SqlConnection connection = new SqlConnection(builder.ConnectionString);
+            connection.AccessToken = Guid.NewGuid().ToString();
 
             SqlConnection clonedConnection = (connection as ICloneable).Clone() as SqlConnection;
             Assert.Equal(connection.ConnectionString, clonedConnection.ConnectionString);
             Assert.Equal(connection.ConnectionTimeout, clonedConnection.ConnectionTimeout);
+            Assert.Equal(connection.AccessToken, clonedConnection.AccessToken);
+            Assert.NotEqual(connection, clonedConnection);
+
+            connection = new SqlConnection(builder.ConnectionString);
+            connection.AccessTokenCallback = (ctx, token) =>
+                        Task.FromResult(new SqlAuthenticationToken(Guid.NewGuid().ToString(), DateTimeOffset.MaxValue));
+            clonedConnection = (connection as ICloneable).Clone() as SqlConnection;
+            Assert.Equal(connection.AccessTokenCallback, clonedConnection.AccessTokenCallback);
             Assert.NotEqual(connection, clonedConnection);
         }