Google+ Patch

dotnet/aspnetcore#6486
MichaelPetrinolis · Jan 9, 2019 · 5e3386e · 5e3386e
1 parent 146ff3e
commit 5e3386e
Showing 1 changed file with 13 additions and 0 deletions.
diff --git a/src/OrchardCore.Modules/OrchardCore.Google/Configuration/GoogleOptionsConfiguration.cs b/src/OrchardCore.Modules/OrchardCore.Google/Configuration/GoogleOptionsConfiguration.cs
@@ -2,6 +2,7 @@
 using System.ComponentModel.DataAnnotations;
 using System.Diagnostics;
 using System.Linq;
+using System.Security.Claims;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Authentication.Google;
@@ -75,6 +76,18 @@ public void Configure(string name, GoogleOptions options)
             {
                 options.CallbackPath = settings.CallbackPath;
             }
+
+            // https://github.com/aspnet/AspNetCore/issues/6486
+            // should be removed after February 2.2 patches
+            options.UserInformationEndpoint = "https://www.googleapis.com/oauth2/v2/userinfo";
+            options.ClaimActions.Clear();
+            options.ClaimActions.MapJsonKey(ClaimTypes.NameIdentifier, "id");
+            options.ClaimActions.MapJsonKey(ClaimTypes.Name, "name");
+            options.ClaimActions.MapJsonKey(ClaimTypes.GivenName, "given_name");
+            options.ClaimActions.MapJsonKey(ClaimTypes.Surname, "family_name");
+            options.ClaimActions.MapJsonKey("urn:google:profile", "link");
+            options.ClaimActions.MapJsonKey(ClaimTypes.Email, "email");
+
         }
 
         public void Configure(GoogleOptions options) => Debug.Fail("This infrastructure method shouldn't be called.");