From fa37de4c0b4bd566d0697e4c1f0c90678be73354 Mon Sep 17 00:00:00 2001
From: Jennyf19 <jeferrie@microsoft.com>
Date: Fri, 16 Apr 2021 08:36:15 -0700
Subject: [PATCH] revert wilson workaround and use latest 6.10.2

---
 .../MicrosoftIdentityWebApiAuthenticationBuilderExtensions.cs   | 2 --
 .../MicrosoftIdentityWebAppAuthenticationBuilderExtensions.cs   | 2 --
 2 files changed, 4 deletions(-)

diff --git a/src/Microsoft.Identity.Web/WebApiExtensions/MicrosoftIdentityWebApiAuthenticationBuilderExtensions.cs b/src/Microsoft.Identity.Web/WebApiExtensions/MicrosoftIdentityWebApiAuthenticationBuilderExtensions.cs
index ff39626d1..c1cd9d8f7 100644
--- a/src/Microsoft.Identity.Web/WebApiExtensions/MicrosoftIdentityWebApiAuthenticationBuilderExtensions.cs
+++ b/src/Microsoft.Identity.Web/WebApiExtensions/MicrosoftIdentityWebApiAuthenticationBuilderExtensions.cs
@@ -155,8 +155,6 @@ private static void AddMicrosoftIdentityWebApiImplementation(
             string jwtBearerScheme,
             bool subscribeToJwtBearerMiddlewareDiagnosticsEvents)
         {
-            JwtSecurityTokenHandler.DefaultInboundClaimTypeMap.Remove(ClaimConstants.Name);
-
             builder.AddJwtBearer(jwtBearerScheme, configureJwtBearerOptions);
             builder.Services.Configure(jwtBearerScheme, configureMicrosoftIdentityOptions);
 
diff --git a/src/Microsoft.Identity.Web/WebAppExtensions/MicrosoftIdentityWebAppAuthenticationBuilderExtensions.cs b/src/Microsoft.Identity.Web/WebAppExtensions/MicrosoftIdentityWebAppAuthenticationBuilderExtensions.cs
index e877036c5..f9c8699be 100644
--- a/src/Microsoft.Identity.Web/WebAppExtensions/MicrosoftIdentityWebAppAuthenticationBuilderExtensions.cs
+++ b/src/Microsoft.Identity.Web/WebAppExtensions/MicrosoftIdentityWebAppAuthenticationBuilderExtensions.cs
@@ -233,8 +233,6 @@ private static void AddMicrosoftIdentityWebAppInternal(
                 throw new ArgumentNullException(nameof(configureMicrosoftIdentityOptions));
             }
 
-            JwtSecurityTokenHandler.DefaultInboundClaimTypeMap.Remove(ClaimConstants.Name);
-
             builder.Services.Configure(configureMicrosoftIdentityOptions);
             builder.Services.AddHttpClient();