Refactor

Simplify some custom action mappings.
Remove unused using statement.
Adjust whitespace to reduce diff.
Remove TODO.

Author: martincostello

src/AspNet.Security.OAuth.Automatic/AutomaticAuthenticationHandler.cs

@@ -17,7 +17,6 @@
 using Microsoft.AspNetCore.WebUtilities;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
-using Newtonsoft.Json.Linq;
 
 namespace AspNet.Security.OAuth.Automatic
 {

src/AspNet.Security.OAuth.Fitbit/FitbitAuthenticationHandler.cs

@@ -90,6 +90,7 @@ protected override async Task<OAuthTokenResponse> ExchangeCodeAsync([NotNull] st
             }
 
             var payload = JsonDocument.Parse(await response.Content.ReadAsStringAsync());
+
             return OAuthTokenResponse.Success(payload);
         }
     }

src/AspNet.Security.OAuth.GitHub/GitHubAuthenticationHandler.cs

@@ -92,7 +92,6 @@ protected virtual async Task<string> GetEmailAsync([NotNull] OAuthTokenResponse
                 return null;
             }
 
-            // TODO Review if this is correct for parsing a raw array
             using (var payload = JsonDocument.Parse(await response.Content.ReadAsStringAsync()))
             {
                 return (from address in payload.RootElement.EnumerateArray()

src/AspNet.Security.OAuth.Instagram/InstagramAuthenticationHandler.cs

@@ -67,8 +67,8 @@ protected override async Task<AuthenticationTicket> CreateTicketAsync([NotNull]
             using (var payload = JsonDocument.Parse(await response.Content.ReadAsStringAsync()))
             {
                 var principal = new ClaimsPrincipal(identity);
-                var context = new OAuthCreatingTicketContext(principal, properties, Context, Scheme, Options, Backchannel, tokens, payload.RootElement.GetProperty("data"));
-                context.RunClaimActions();
+                var context = new OAuthCreatingTicketContext(principal, properties, Context, Scheme, Options, Backchannel, tokens, payload.RootElement);
+                context.RunClaimActions(payload.RootElement.GetProperty("data"));
 
                 await Options.Events.CreatingTicket(context);
                 return new AuthenticationTicket(context.Principal, context.Properties, Scheme.Name);

src/AspNet.Security.OAuth.LinkedIn/LinkedInAuthenticationOptions.cs

@@ -39,49 +39,16 @@ public LinkedInAuthenticationOptions()
             ClaimActions.MapJsonKey(Claims.Industry, "industry");
             ClaimActions.MapJsonKey(Claims.Summary, "summary");
             ClaimActions.MapJsonKey(Claims.Headline, "headline");
+            ClaimActions.MapCustomJson(Claims.Positions, user => user.GetString("positions"));
             ClaimActions.MapJsonKey(Claims.PhoneticFirstName, "phoneticFirstName");
             ClaimActions.MapJsonKey(Claims.PhoneticLastName, "phoneticLastName");
             ClaimActions.MapJsonKey(Claims.FormattedPhoneticName, "formattedPhoneticName");
+            ClaimActions.MapCustomJson(Claims.Location, user => user.GetString("location"));
             ClaimActions.MapJsonKey(Claims.Specialties, "specialties");
             ClaimActions.MapJsonKey(Claims.NumConnections, "numConnections");
             ClaimActions.MapJsonKey(Claims.NumConnectionsCapped, "numConnectionsCapped");
             ClaimActions.MapJsonKey(Claims.CurrentShare, "currentShare");
-
-            ClaimActions.MapCustomJson(
-                Claims.Positions,
-                user =>
-                {
-                    if (user.TryGetProperty("positions", out var positions))
-                    {
-                        return positions.ToString();
-                    }
-
-                    return null;
-                });
-
-            ClaimActions.MapCustomJson(
-                Claims.Location,
-                user =>
-                {
-                    if (user.TryGetProperty("location", out var positions))
-                    {
-                        return positions.ToString();
-                    }
-
-                    return null;
-                });
-
-            ClaimActions.MapCustomJson(
-                Claims.PictureUrls,
-                user =>
-                {
-                    if (user.TryGetProperty("pictureUrls", out var positions))
-                    {
-                        return positions.ToString();
-                    }
-
-                    return null;
-                });
+            ClaimActions.MapCustomJson(Claims.PictureUrls, user => user.GetString("pictureUrls"));
         }
 
         /// <summary>

src/AspNet.Security.OAuth.Patreon/PatreonAuthenticationOptions.cs

@@ -5,6 +5,7 @@
  */
 
 using System.Security.Claims;
+using System.Text.Json;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Authentication.OAuth;
 using Microsoft.AspNetCore.Http;
@@ -32,42 +33,19 @@ public PatreonAuthenticationOptions()
             Scope.Add("my-campaign");
 
             ClaimActions.MapJsonKey(ClaimTypes.NameIdentifier, "id");
+            ClaimActions.MapCustomJson(ClaimTypes.Name, user => GetUserAttribute(user, "full_name"));
+            ClaimActions.MapCustomJson(ClaimTypes.Webpage, user => GetUserAttribute(user, "url"));
+            ClaimActions.MapCustomJson(Claims.Avatar, user => GetUserAttribute(user, "thumb_url"));
+        }
 
-            ClaimActions.MapCustomJson(
-                ClaimTypes.Name,
-                user =>
-                {
-                    if (user.TryGetProperty("attributes", out var attributes))
-                    {
-                        return attributes.GetString("full_name");
-                    }
-
-                    return null;
-                });
-
-            ClaimActions.MapCustomJson(
-                ClaimTypes.Webpage,
-                user =>
-                {
-                    if (user.TryGetProperty("attributes", out var attributes))
-                    {
-                        return attributes.GetString("url");
-                    }
-
-                    return null;
-                });
-
-            ClaimActions.MapCustomJson(
-                Claims.Avatar,
-                user =>
-                {
-                    if (user.TryGetProperty("attributes", out var attributes))
-                    {
-                        return attributes.GetString("thumb_url");
-                    }
+        private static string GetUserAttribute(JsonElement user, string key)
+        {
+            if (!user.TryGetProperty("attributes", out var attributes))
+            {
+                return null;
+            }
 
-                    return null;
-                });
+            return attributes.GetString(key);
         }
     }
 }