Fix the Twitch provider to use the correct user information endpoint and add new claims

Author: zAfLu

src/AspNet.Security.OAuth.Twitch/TwitchAuthenticationConstants.cs

@@ -0,0 +1,24 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
+ * See https://github.com/aspnet-contrib/AspNet.Security.OAuth.Providers
+ * for more information concerning the license and the contributors participating to this project.
+ */
+
+namespace AspNet.Security.OAuth.Twitch
+{
+    /// <summary>
+    /// Contains constants specific to the <see cref="TwitchAuthenticationHandler"/>.
+    /// </summary>
+    public static class TwitchAuthenticationConstants
+    {
+        public static class Claims
+        {
+            public const string BroadcasterType = "urn:twitch:broadcastertype";
+            public const string Description = "urn:twitch:description";
+            public const string DisplayName = "urn:twitch:displayname";
+            public const string OfflineImageUrl = "urn:twitch:offlineimageurl";
+            public const string ProfileImageUrl = "urn:twitch:profileimageurl";
+            public const string Type = "urn:twitch:type";
+        }
+    }
+}

src/AspNet.Security.OAuth.Twitch/TwitchAuthenticationDefaults.cs

@@ -47,6 +47,6 @@ public static class TwitchAuthenticationDefaults
         /// <summary>
         /// Default value for <see cref="OAuthOptions.UserInformationEndpoint"/>.
         /// </summary>
-        public const string UserInformationEndpoint = "https://api.twitch.tv/helix/user/";
+        public const string UserInformationEndpoint = "https://api.twitch.tv/helix/users/";
     }
 }

src/AspNet.Security.OAuth.Twitch/TwitchAuthenticationOptions.cs

@@ -8,6 +8,7 @@
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Authentication.OAuth;
 using Microsoft.AspNetCore.Http;
+using static AspNet.Security.OAuth.Twitch.TwitchAuthenticationConstants;
 
 namespace AspNet.Security.OAuth.Twitch
 {
@@ -25,10 +26,52 @@ public TwitchAuthenticationOptions()
             TokenEndpoint = TwitchAuthenticationDefaults.TokenEndpoint;
             UserInformationEndpoint = TwitchAuthenticationDefaults.UserInformationEndpoint;
 
-            Scope.Add("user_read");
+            Scope.Add("user:read:email");
 
-            ClaimActions.MapJsonKey(ClaimTypes.NameIdentifier, "_id");
-            ClaimActions.MapJsonKey(ClaimTypes.Name, "name");
+            ClaimActions.MapCustomJson(ClaimTypes.NameIdentifier, user =>
+            {
+                return user["data"]?[0]?.Value<string>("id");
+            });
+
+            ClaimActions.MapCustomJson(ClaimTypes.Name, user =>
+            {
+                return user["data"]?[0]?.Value<string>("login");
+            });
+
+            ClaimActions.MapCustomJson(Claims.DisplayName, user =>
+            {
+                return user["data"]?[0]?.Value<string>("display_name");
+            });
+
+            ClaimActions.MapCustomJson(ClaimTypes.Email, user =>
+            {
+                return user["data"]?[0]?.Value<string>("email");
+            });
+
+            ClaimActions.MapCustomJson(Claims.Type, user =>
+            {
+                return user["data"]?[0]?.Value<string>("type");
+            });
+
+            ClaimActions.MapCustomJson(Claims.BroadcasterType, user =>
+            {
+                return user["data"]?[0]?.Value<string>("broadcaster_type");
+            });
+
+            ClaimActions.MapCustomJson(Claims.Description, user =>
+            {
+                return user["data"]?[0]?.Value<string>("description");
+            });
+
+            ClaimActions.MapCustomJson(Claims.ProfileImageUrl, user =>
+            {
+                return user["data"]?[0]?.Value<string>("profile_image_url");
+            });
+
+            ClaimActions.MapCustomJson(Claims.OfflineImageUrl, user =>
+            {
+                return user["data"]?[0]?.Value<string>("offline_image_url");
+            });
         }
     }
 }