Fix for test issue for EnsureDefaultCacheKeyBehaviorWhenCertSerialNumberIsNotUsedTestAsync (#5158)

Fix for test issue

Co-authored-by: trwalke <[email protected]>

Author: trwalke

tests/Microsoft.Identity.Test.Unit/PublicApiTests/ClientCredentialWithCertTest.cs

@@ -30,10 +30,13 @@ namespace Microsoft.Identity.Test.Unit
     [DeploymentItem(@"Resources\RSATestCertDotNet.pfx")]
     public class ConfidentialClientWithCertTests : TestBase
     {
+        private byte[] _serializedCache;
+
         [TestInitialize]
         public override void TestInitialize()
         {
             base.TestInitialize();
+            _serializedCache = null;
         }
 
         private static MockHttpMessageHandler CreateTokenResponseHttpHandler(bool clientCredentialFlow)
@@ -717,11 +720,11 @@ public async Task EnsureCertificateSerialNumberIsAddedToCacheKeyTestAsync()
                                               .WithCertificate(certificate, true, true)
                                               .WithHttpManager(httpManager)
                                               .WithExperimentalFeatures()
-                                              .WithCacheOptions(options: new CacheOptions() { UseSharedCache = true })
                                               .BuildConcrete();
 
-                //Clear static caches
-                app.AppTokenCacheInternal.Accessor.Clear();
+                app.AppTokenCache.SetBeforeAccess(BeforeCacheAccess);
+                app.AppTokenCache.SetAfterAccess(AfterCacheAccess);
+
                 var appCacheAccess = app.AppTokenCache.RecordAccess();
 
                 httpManager.AddInstanceDiscoveryMockHandler();
@@ -758,10 +761,12 @@ public async Task EnsureCertificateSerialNumberIsAddedToCacheKeyTestAsync()
                               .WithRedirectUri(TestConstants.RedirectUri)
                               .WithCertificate(certificate, true, true)
                               .WithHttpManager(httpManager)
-                              .WithCacheOptions(options: new CacheOptions() { UseSharedCache = true })
                               .WithExperimentalFeatures()
                               .BuildConcrete();
 
+                app2.AppTokenCache.SetBeforeAccess(BeforeCacheAccess);
+                app2.AppTokenCache.SetAfterAccess(AfterCacheAccess);
+
                 appCacheAccess = app2.AppTokenCache.RecordAccess();
 
                 //Ensure serial number matches
@@ -785,10 +790,12 @@ public async Task EnsureCertificateSerialNumberIsAddedToCacheKeyTestAsync()
                             .WithRedirectUri(TestConstants.RedirectUri)
                             .WithCertificate(certificate2, true, true)
                             .WithHttpManager(httpManager)
-                            .WithCacheOptions(options: new CacheOptions() { UseSharedCache = true })
                             .WithExperimentalFeatures()
                             .BuildConcrete();
 
+                app3.AppTokenCache.SetBeforeAccess(BeforeCacheAccess);
+                app3.AppTokenCache.SetAfterAccess(AfterCacheAccess);
+
                 //Ensure serial number does not match
                 result = await app3.AcquireTokenForClient(TestConstants.s_scope.ToArray())
                                         .ExecuteAsync(CancellationToken.None)
@@ -814,11 +821,10 @@ public async Task EnsureDefaultCacheKeyBehaviorWhenCertSerialNumberIsNotUsedTest
                                               .WithCertificate(certificate, true, false)
                                               .WithHttpManager(httpManager)
                                               .WithExperimentalFeatures()
-                                              .WithCacheOptions(options: new CacheOptions() { UseSharedCache = true })
                                               .BuildConcrete();
 
-                //Clear static caches
-                app.AppTokenCacheInternal.Accessor.Clear();
+                app.AppTokenCache.SetBeforeAccess(BeforeCacheAccess);
+                app.AppTokenCache.SetAfterAccess(AfterCacheAccess);
 
                 var appCacheAccess = app.AppTokenCache.RecordAccess();
 
@@ -850,10 +856,12 @@ public async Task EnsureDefaultCacheKeyBehaviorWhenCertSerialNumberIsNotUsedTest
                               .WithRedirectUri(TestConstants.RedirectUri)
                               .WithCertificate(certificate, true, true)
                               .WithHttpManager(httpManager)
-                              .WithCacheOptions(options: new CacheOptions() { UseSharedCache = true })
                               .WithExperimentalFeatures()
                               .BuildConcrete();
 
+                app2.AppTokenCache.SetBeforeAccess(BeforeCacheAccess);
+                app2.AppTokenCache.SetAfterAccess(AfterCacheAccess);
+
                 app2.AppTokenCache.RecordAccess();
 
                 result = await app2.AcquireTokenForClient(TestConstants.s_scope.ToArray())
@@ -864,8 +872,8 @@ public async Task EnsureDefaultCacheKeyBehaviorWhenCertSerialNumberIsNotUsedTest
                 Assert.AreEqual(TokenSource.IdentityProvider, result.AuthenticationResultMetadata.TokenSource);
                 Assert.AreEqual("header.payload.signature", result.AccessToken);
 
-                var serialNumber = app.AppTokenCacheInternal.Accessor.GetAllAccessTokens().First().AdditionalCacheKeyComponents.FirstOrDefault().Value;
-                Assert.AreEqual(certificate.SerialNumber, serialNumber);
+                var token = app2.AppTokenCacheInternal.Accessor.GetAllAccessTokens().Where(x => x.AdditionalCacheKeyComponents.Any()).FirstOrDefault();
+                Assert.AreEqual(certificate.SerialNumber, token.AdditionalCacheKeyComponents.FirstOrDefault().Value);
             }
         }
 
@@ -891,6 +899,16 @@ public void EnsureNullCertDoesNotSetSerialNumberTestAsync()
             }
         }
 
+        private void BeforeCacheAccess(TokenCacheNotificationArgs args)
+        {
+            args.TokenCache.DeserializeMsalV3(_serializedCache);
+        }
+
+        private void AfterCacheAccess(TokenCacheNotificationArgs args)
+        {
+            _serializedCache = args.TokenCache.SerializeMsalV3();
+        }
+
         private static string ComputeCertThumbprint(X509Certificate2 certificate, bool useSha2)
         {
             string thumbprint = null;