code clean up

damienbod · Apr 26, 2024 · 57277ce · 57277ce
1 parent d0a15fa
commit 57277ce
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 17 deletions.
diff --git a/server/BffMicrosoftEntraID.Server.csproj b/server/BffMicrosoftEntraID.Server.csproj
@@ -10,9 +10,9 @@
 	<ItemGroup>
 		<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="8.0.4" NoWarn="NU1605" />
 		<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.4" />
-		<PackageReference Include="Microsoft.Identity.Web.GraphServiceClient" Version="2.17.4" />
-		<PackageReference Include="Microsoft.Identity.Web" Version="2.17.4" />
-		<PackageReference Include="Microsoft.Identity.Web.UI" Version="2.17.4" />
+		<PackageReference Include="Microsoft.Identity.Web.GraphServiceClient" Version="2.18.1" />
+		<PackageReference Include="Microsoft.Identity.Web" Version="2.18.1" />
+		<PackageReference Include="Microsoft.Identity.Web.UI" Version="2.18.1" />
 		<PackageReference Include="NetEscapades.AspNetCore.SecurityHeaders" Version="0.21.0" />
 		<PackageReference Include="NetEscapades.AspNetCore.SecurityHeaders.TagHelpers" Version="0.21.0" />
 		<PackageReference Include="Yarp.ReverseProxy" Version="2.1.0" />

diff --git a/server/Controllers/AccountController.cs b/server/Controllers/AccountController.cs
@@ -14,8 +14,7 @@ public ActionResult Login(string? returnUrl, string? claimsChallenge)
 
         if (claimsChallenge != null)
         {
-            string jsonString = claimsChallenge.Replace("\\", "")
-                .Trim(['"']);
+            string jsonString = claimsChallenge.Replace("\\", "").Trim('"');
 
             properties.Items["claims"] = jsonString;
         }

diff --git a/server/Controllers/UserController.cs b/server/Controllers/UserController.cs
@@ -9,8 +9,9 @@ public class UserController : ControllerBase
     public IActionResult GetCurrentUser() => Ok(CreateUserInfo(User));
 
     private static UserInfo CreateUserInfo(ClaimsPrincipal claimsPrincipal)
-    {
-        if (!claimsPrincipal?.Identity?.IsAuthenticated ?? true)
+    {
+        if (claimsPrincipal == null || claimsPrincipal.Identity == null 
+            || !claimsPrincipal.Identity.IsAuthenticated)
         {
             return UserInfo.Anonymous;
         }
@@ -20,7 +21,7 @@ private static UserInfo CreateUserInfo(ClaimsPrincipal claimsPrincipal)
             IsAuthenticated = true
         };
 
-        if (claimsPrincipal?.Identity is ClaimsIdentity claimsIdentity)
+        if (claimsPrincipal.Identity is ClaimsIdentity claimsIdentity)
         {
             userInfo.NameClaimType = claimsIdentity.NameClaimType;
             userInfo.RoleClaimType = claimsIdentity.RoleClaimType;
@@ -31,7 +32,7 @@ private static UserInfo CreateUserInfo(ClaimsPrincipal claimsPrincipal)
             userInfo.RoleClaimType = ClaimTypes.Role;
         }
 
-        if (claimsPrincipal?.Claims?.Any() ?? false)
+        if (claimsPrincipal.Claims?.Any() ?? false)
         {
             // Add just the name claim
             var claims = claimsPrincipal.FindAll(userInfo.NameClaimType)

diff --git a/server/Pages/Error.cshtml b/server/Pages/Error.cshtml
@@ -2,7 +2,7 @@
 @model BffMicrosoftEntraID.Server.Pages.ErrorModel
 
 <!DOCTYPE html>
-<html>
+<html lang="en">
 
 <head>
     <meta charset="utf-8" />

diff --git a/server/Pages/Error.cshtml.cs b/server/Pages/Error.cshtml.cs
@@ -1,7 +1,6 @@
 namespace BffMicrosoftEntraID.Server.Pages;
 
 [ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)]
-[IgnoreAntiforgeryToken]
 public class ErrorModel : PageModel
 {
     public string? RequestId { get; set; }

diff --git a/server/Program.cs b/server/Program.cs
@@ -28,7 +28,7 @@
 
 services.AddMicrosoftIdentityWebAppAuthentication(configuration, "MicrosoftEntraID")
     .EnableTokenAcquisitionToCallDownstreamApi(initialScopes)
-    .AddMicrosoftGraph("https://graph.microsoft.com/v1.0", initialScopes)
+    .AddMicrosoftGraph(defaultScopes: initialScopes)
     .AddInMemoryTokenCaches();
 
 // If using downstream APIs and in memory cache, you need to reset the cookie session if the cache is missing

diff --git a/server/RejectSessionCookieWhenAccountNotInCacheEvents.cs b/server/RejectSessionCookieWhenAccountNotInCacheEvents.cs
@@ -16,7 +16,7 @@ public async override Task ValidatePrincipal(CookieValidatePrincipalContext cont
             var tokenAcquisition = context.HttpContext.RequestServices
                 .GetRequiredService<ITokenAcquisition>();
 
-            string token = await tokenAcquisition.GetAccessTokenForUserAsync(scopes: _downstreamScopes, 
+            await tokenAcquisition.GetAccessTokenForUserAsync(scopes: _downstreamScopes, 
                 user: context.Principal);
         }
         catch (MicrosoftIdentityWebChallengeUserException ex) when (AccountDoesNotExitInTokenCache(ex))

diff --git a/server/SecurityHeadersDefinitions.cs b/server/SecurityHeadersDefinitions.cs
@@ -4,10 +4,7 @@ public static class SecurityHeadersDefinitions
 {
     public static HeaderPolicyCollection GetHeaderPolicyCollection(bool isDev, string? idpHost)
     {
-        if(idpHost == null)
-        {
-            throw new ArgumentNullException(nameof(idpHost));
-        }
+        ArgumentNullException.ThrowIfNull(idpHost);
 
         var policy = new HeaderPolicyCollection()
             .AddFrameOptionsDeny()