Merge branch 'master' into bogavril/3000

AzureAD · Sep 19, 2024 · 7f5d651 · 7f5d651
2 parents 908827f + 96e9735
commit 7f5d651
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 83 deletions.
diff --git a/.gitignore b/.gitignore
@@ -353,4 +353,5 @@ MigrationBackup/
 
 # Playwright e2e testing trace files
 /tests/E2E Tests/PlaywrightTraces
-/tests/IntegrationTests/PlaywrightTraces
+/tests/IntegrationTests/PlaywrightTraces
+/.SharedData
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -78,7 +78,7 @@
 
   <PropertyGroup Label="Common dependency versions">
     <MicrosoftIdentityModelVersion Condition="'$(MicrosoftIdentityModelVersion)' == ''">8.0.2</MicrosoftIdentityModelVersion>
-    <MicrosoftIdentityClientVersion Condition="'$(MicrosoftIdentityClientVersion)' == ''">4.61.3</MicrosoftIdentityClientVersion>
+    <MicrosoftIdentityClientVersion Condition="'$(MicrosoftIdentityClientVersion)' == ''">4.64.1</MicrosoftIdentityClientVersion>
     <FxCopAnalyzersVersion>3.3.0</FxCopAnalyzersVersion>
     <SystemTextEncodingsWebVersion>4.7.2</SystemTextEncodingsWebVersion>
     <AzureSecurityKeyVaultSecretsVersion>4.6.0</AzureSecurityKeyVaultSecretsVersion>

diff --git a/tests/DevApps/ciam/myWebApp/myWebApp.csproj b/tests/DevApps/ciam/myWebApp/myWebApp.csproj
@@ -9,8 +9,8 @@
   </PropertyGroup>
 
   <ItemGroup Condition="'$(UseWIP)' == 'false' ">
-    <PackageReference Include="Microsoft.Identity.Web" Version="2.17.1" />
-    <PackageReference Include="Microsoft.Identity.Web.UI" Version="2.17.1" />
+    <PackageReference Include="Microsoft.Identity.Web" Version="3.1.0" />
+    <PackageReference Include="Microsoft.Identity.Web.UI" Version="3.1.0" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(UseWIP)' == 'true' ">

diff --git a/tests/DevApps/daemon-app/daemon-console-calling-msgraph/DaemonConsoleCallingMsGraph.csproj b/tests/DevApps/daemon-app/daemon-console-calling-msgraph/DaemonConsoleCallingMsGraph.csproj
@@ -8,7 +8,7 @@
 	</PropertyGroup>
 
 	<ItemGroup Condition="'$(UseWip)' != 'true'">
-		<PackageReference Include="Microsoft.Identity.Web.MicrosoftGraph" Version="2.15.3" />
+		<PackageReference Include="Microsoft.Identity.Web.MicrosoftGraph" Version="3.1.0" />
 	</ItemGroup>
 
   <ItemGroup Condition="'$(UseWip)' == 'true'">

diff --git a/tests/Microsoft.Identity.Web.Test/CacheExtensionsTests.cs b/tests/Microsoft.Identity.Web.Test/CacheExtensionsTests.cs
@@ -33,42 +33,40 @@ public void InMemoryCacheExtensionsTests()
         public async Task CacheExtensions_CcaAlreadyExists_TestsAsync()
         {
             AuthenticationResult result;
-            TestTelemetryClient testTelemetryClient = new TestTelemetryClient(TestConstants.ClientId);
             // new InMemory serializer and new cca
-            result = await CreateAppAndGetTokenAsync(CacheType.InMemory, testTelemetryClient).ConfigureAwait(false);
+            result = await CreateAppAndGetTokenAsync(CacheType.InMemory).ConfigureAwait(false);
             Assert.Equal(TokenSource.IdentityProvider, result.AuthenticationResultMetadata.TokenSource);
-            AssertCacheTelemetry(testTelemetryClient, CacheLevel.None);
+            AssertCacheTelemetry(result, CacheLevel.None);
 
-            result = await CreateAppAndGetTokenAsync(CacheType.InMemory, testTelemetryClient, addTokenMock: false).ConfigureAwait(false);
+            result = await CreateAppAndGetTokenAsync(CacheType.InMemory, addTokenMock: false).ConfigureAwait(false);
             Assert.Equal(TokenSource.Cache, result.AuthenticationResultMetadata.TokenSource);
-            AssertCacheTelemetry(testTelemetryClient, CacheLevel.L1Cache);
+            AssertCacheTelemetry(result, CacheLevel.L1Cache);
 
             //Resetting token caches due to potential collision with other tests
             TokenCacheExtensions.s_serviceProviderFromAction.Clear();
 
             // new DistributedInMemory and same cca
-            result = await CreateAppAndGetTokenAsync(CacheType.DistributedInMemory, testTelemetryClient).ConfigureAwait(false);
+            result = await CreateAppAndGetTokenAsync(CacheType.DistributedInMemory).ConfigureAwait(false);
             Assert.Equal(TokenSource.IdentityProvider, result.AuthenticationResultMetadata.TokenSource);
-            AssertCacheTelemetry(testTelemetryClient, CacheLevel.None);
+            AssertCacheTelemetry(result, CacheLevel.None);
 
-            result = await CreateAppAndGetTokenAsync(CacheType.DistributedInMemory, testTelemetryClient, addTokenMock: false).ConfigureAwait(false);
+            result = await CreateAppAndGetTokenAsync(CacheType.DistributedInMemory, addTokenMock: false).ConfigureAwait(false);
             Assert.Equal(TokenSource.Cache, result.AuthenticationResultMetadata.TokenSource);
-            AssertCacheTelemetry(testTelemetryClient, CacheLevel.L1Cache);
+            AssertCacheTelemetry(result, CacheLevel.L1Cache);
         }
 
         [Fact]
         public async Task CacheExtensions_CcaAlreadyExistsL2_TestsAsync()
         {
             AuthenticationResult result;
-            TestTelemetryClient testTelemetryClient = new TestTelemetryClient(TestConstants.ClientId);
             // new DistributedInMemory serializer with L1 cache disabled
-            result = await CreateAppAndGetTokenAsync(CacheType.DistributedInMemory, testTelemetryClient, disableL1Cache: true).ConfigureAwait(false);
+            result = await CreateAppAndGetTokenAsync(CacheType.DistributedInMemory, disableL1Cache: true).ConfigureAwait(false);
             Assert.Equal(TokenSource.IdentityProvider, result.AuthenticationResultMetadata.TokenSource);
-            AssertCacheTelemetry(testTelemetryClient, CacheLevel.None);
+            AssertCacheTelemetry(result, CacheLevel.None);
 
-            result = await CreateAppAndGetTokenAsync(CacheType.DistributedInMemory, testTelemetryClient, addTokenMock: false, disableL1Cache: true).ConfigureAwait(false);
+            result = await CreateAppAndGetTokenAsync(CacheType.DistributedInMemory, addTokenMock: false, disableL1Cache: true).ConfigureAwait(false);
             Assert.Equal(TokenSource.Cache, result.AuthenticationResultMetadata.TokenSource);
-            AssertCacheTelemetry(testTelemetryClient, CacheLevel.L2Cache);
+            AssertCacheTelemetry(result, CacheLevel.L2Cache);
         }
 
         [Fact]
@@ -200,7 +198,6 @@ private enum CacheType
 
         private static async Task<AuthenticationResult> CreateAppAndGetTokenAsync(
             CacheType cacheType,
-            ITelemetryClient telemetryClient,
             bool addTokenMock = true,
             bool disableL1Cache = false)
         {
@@ -221,7 +218,6 @@ private static async Task<AuthenticationResult> CreateAppAndGetTokenAsync(
                            .WithAuthority(TestConstants.AuthorityCommonTenant)
                            .WithHttpClientFactory(mockHttp)
                            .WithClientSecret(TestConstants.ClientSecret)
-                           .WithTelemetryClient(telemetryClient)
                            .Build();
 
             switch (cacheType)
@@ -255,10 +251,9 @@ private static async Task<AuthenticationResult> CreateAppAndGetTokenAsync(
             return result;
         }
 
-        private void AssertCacheTelemetry(TestTelemetryClient testTelemetryClient, CacheLevel cacheLevel)
+        private void AssertCacheTelemetry(AuthenticationResult result, CacheLevel expectedCacheLevel)
         {
-            TelemetryEventDetails eventDetails = testTelemetryClient.TestTelemetryEventDetails;
-            Assert.Equal(Convert.ToInt64(cacheLevel, new CultureInfo("en-US")), eventDetails.Properties["CacheLevel"]);
+            Assert.Equal(result.AuthenticationResultMetadata.CacheLevel, expectedCacheLevel);
         }
 
         private IConfidentialClientApplication CreateCca() =>

diff --git a/tests/Microsoft.Identity.Web.Test/Microsoft.Identity.Web.Test.csproj b/tests/Microsoft.Identity.Web.Test/Microsoft.Identity.Web.Test.csproj
@@ -45,7 +45,6 @@
     <Compile Include="Certificates\DefaultCertificateLoaderTests.cs" />
     <Compile Include="CacheExtensionsTests.cs" />
     <Compile Include="CacheEncryptionTests.cs" />
-    <Compile Include="TestTelemetryClient.cs" />
     <Compile Include="TestDistributedCache.cs" />
   </ItemGroup>
 

diff --git a/tests/Microsoft.Identity.Web.Test/TestTelemetryClient.cs b/tests/Microsoft.Identity.Web.Test/TestTelemetryClient.cs