Apply suggestions from code review

Author: BenjaminMichaelis

EssentialCSharp.Web/Areas/Identity/Pages/Account/Manage/Referrals.cshtml

@@ -7,13 +7,12 @@
 
 <h3>@ViewData["Title"]</h3>
 
-<div class="row">
-    <div class="col-md-6">
-        <p>
-            You have <strong>@Model.ReferralCount</strong> referrals.
-        </p>
-    </div>
+<div>
+    <p>
+        You have <strong>@Model.ReferralCount</strong> referrals.
+    </p>
+</div>
 
-    @section Scripts {
-        <partial name="_ValidationScriptsPartial" />
-    }
+@section Scripts {
+    <partial name="_ValidationScriptsPartial" />
+}

EssentialCSharp.Web/Areas/Identity/Pages/Account/Manage/Referrals.cshtml.cs

@@ -10,7 +10,7 @@ public class ReferralsDataModel : PageModel
     private readonly UserManager<EssentialCSharpWebUser> _UserManager;
     private readonly ILogger<ReferralsDataModel> _Logger;
 
-    public int ReferralCount { get; set; }
+    public int ReferralCount { get; private set; }
 
     public ReferralsDataModel(
         UserManager<EssentialCSharpWebUser> userManager,

EssentialCSharp.Web/Extensions/ClaimsExtensions.cs

@@ -1,18 +1,17 @@
 using System.Security.Claims;
 
-namespace EssentialCSharp.Web.Extensions
+namespace EssentialCSharp.Web.Extensions;
+
+public static class ClaimsExtensions
 {
-    public static class ClaimsExtensions
+    public static string? GetReferrerId(this ClaimsPrincipal claimsPrincipal)
     {
-        public static string? GetReferrerId(this ClaimsPrincipal claimsPrincipal)
-        {
-            return claimsPrincipal.FindFirstValue(ReferrerIdClaimType);
-        }
+        return claimsPrincipal.FindFirstValue(ReferrerIdClaimType);
+    }
 
-        public static string? GetReferrerId(this IList<Claim> claims)
-        {
-            return claims.FirstOrDefault(claim => claim.Type == ReferrerIdClaimType)?.Value;
-        }
-        public const string ReferrerIdClaimType = "ReferrerId";
+    public static string? GetReferrerId(this IList<Claim> claims)
+    {
+        return claims.FirstOrDefault(claim => claim.Type == ReferrerIdClaimType)?.Value;
     }
+    public const string ReferrerIdClaimType = "ReferrerId";
 }

EssentialCSharp.Web/Middleware/ReferralTrackingMiddleware.cs

@@ -20,23 +20,18 @@ public async Task InvokeAsync(HttpContext context, IReferralService referralServ
         // Retrieve current referral Id for processing
         System.Collections.Specialized.NameValueCollection query = HttpUtility.ParseQueryString(context.Request.QueryString.Value!);
         string? referralId = query["rid"];
-        if (context.User is { Identity.IsAuthenticated: true } claimsUser)
+        if (string.IsNullOrWhiteSpace(referralId))
         {
-            TrackReferralAsync(referralService, referralId, claimsUser);
+            await _Next(context);
+            return;
         }
-        else
+        if (context.User is { Identity.IsAuthenticated: true } claimsUser)
         {
-            TrackReferralAsync(referralService, referralId, null);
+            referralService.TrackReferralAsync(referralId, claimsUser);
         }
-
-        await _Next(context);
-
-        static void TrackReferralAsync(IReferralService referralService, string? referralId, ClaimsPrincipal? claimsUser)
+        else
         {
-            if (!string.IsNullOrWhiteSpace(referralId))
-            {
-                referralService.TrackReferralAsync(referralId, claimsUser);
-            }
+            referralService.TrackReferralAsync(referralId, null);
         }
     }
 }

EssentialCSharp.Web/Services/Referrals/ReferralService.cs

@@ -73,7 +73,7 @@ public void TrackReferralAsync(string referralId, ClaimsPrincipal? user)
         TrackReferral(dbContext, referralId);
     }
 
-    static void TrackReferral(EssentialCSharpWebContext dbContext, string referralId)
+    private static void TrackReferral(EssentialCSharpWebContext dbContext, string referralId)
     {
         var userClaim = dbContext.UserClaims.FirstOrDefault(claim => claim.ClaimType == ClaimsExtensions.ReferrerIdClaimType && claim.ClaimValue == referralId);
         if (userClaim is null)