Fixes #2521 (#2522)

AzureAD · Oct 16, 2023 · d6250f6 · d6250f6
1 parent d98c896
commit d6250f6
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 86 deletions.
diff --git a/tests/IntegrationTests/SimulateOidc/Contollers/MetadataController.cs b/tests/IntegrationTests/SimulateOidc/Contollers/MetadataController.cs
@@ -1,6 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
+using System.Text;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 
@@ -33,10 +34,13 @@ public IActionResult  OpenIdConnectConfiguration()
         }
 
         [HttpGet("/v2.0/.well-known/keys.json")]
-        public IActionResult Keys()
+        public async Task<IActionResult> Keys()
         {
-            byte[] keysDocument = Properties.Resource.keys;
-            return new FileContentResult(keysDocument, "application/json");
+            HttpClient client = new HttpClient();
+            string keysDocument = await client.GetStringAsync("https://login.microsoftonline.com/common/discovery/v2.0/keys").ConfigureAwait(false);
+            keysDocument = keysDocument.Replace("https://login.microsoftonline.com/{tenantid}/v2.0", "invalidIssuer", StringComparison.OrdinalIgnoreCase);
+            // byte[] keysDocument = Properties.Resource.keys;
+            return new FileContentResult(Encoding.ASCII.GetBytes(keysDocument), "application/json");
         }
     }
 }
diff --git a/tests/IntegrationTests/SimulateOidc/Properties/Resource.Designer.cs b/tests/IntegrationTests/SimulateOidc/Properties/Resource.Designer.cs
diff --git a/tests/IntegrationTests/SimulateOidc/Properties/Resource.resx b/tests/IntegrationTests/SimulateOidc/Properties/Resource.resx
@@ -118,9 +118,6 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="keys" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>keys.json;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
   <data name="openid_configuration" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>openid-configuration;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>

diff --git a/tests/IntegrationTests/SimulateOidc/Properties/keys.json b/tests/IntegrationTests/SimulateOidc/Properties/keys.json
diff --git a/tests/IntegrationTests/SimulateOidc/SimulateOidc.csproj b/tests/IntegrationTests/SimulateOidc/SimulateOidc.csproj
@@ -24,12 +24,6 @@
     </Compile>
   </ItemGroup>
 
-  <ItemGroup>
-    <Content Update="Properties\keys.json">
-      <CopyToOutputDirectory>Never</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
-
   <ItemGroup>
     <EmbeddedResource Update="Properties\Resource.resx">
       <LastGenOutput>Resource.Designer.cs</LastGenOutput>