Merge pull request #23 from damienbod/dev

damienbod · web-flow · commit 7b4f8af66181 · 2022-03-20T20:28:51.000+01:00
Update packages, using nullable
diff --git a/Changelog.md b/Changelog.md
@@ -2,6 +2,10 @@
 
 [Readme](https://github.com/damienbod/Blazor.BFF.AzureB2C.Template/blob/main/README.md) 
 
+**2022-03-20** 1.1.0
+- Updated nuget packages
+- Using nullable enabled
+
 **2022-03-05** 1.0.11
 - bugfix downstream APIs support
 
diff --git a/README.md b/README.md
@@ -91,7 +91,7 @@ nuget pack content/Blazor.BFF.AzureB2C.Template.nuspec
 Locally built nupkg:
 
 ```
-dotnet new -i Blazor.BFF.AzureB2C.Template.1.0.11.nupkg
+dotnet new -i Blazor.BFF.AzureB2C.Template.1.1.0.nupkg
 ```
 
 Local folder:
diff --git a/content/Blazor.BFF.AzureB2C.Template.nuspec b/content/Blazor.BFF.AzureB2C.Template.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
 	<metadata>
 		<id>Blazor.BFF.AzureB2C.Template</id>
-		<version>1.0.11</version>
+		<version>1.1.0</version>
 		<title>Blazor.BFF.AzureB2C.Template</title>
 		<license type="file">LICENSE</license>
 		<description>Blazor BFF template for WASM ASP.NET Core hosted</description>
@@ -15,7 +15,7 @@
 		<requireLicenseAcceptance>false</requireLicenseAcceptance>
 		<copyright>2022 damienbod</copyright>
 		<summary>This template provides a simple Blazor template with BFF server authentication WASM hosted</summary>
-		<releaseNotes>bugfix downstream APIs support</releaseNotes>
+		<releaseNotes>Updated nuget packages, using nullable enabled</releaseNotes>
 		<repository type="git" url="https://github.com/damienbod/Blazor.BFF.AzureB2C.Template" />
 		<packageTypes>
 			<packageType name="Template" />
diff --git a/content/BlazorBffAzureB2C/Client/BlazorBffAzureB2C.Client.csproj b/content/BlazorBffAzureB2C/Client/BlazorBffAzureB2C.Client.csproj
@@ -3,13 +3,14 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <NoDefaultLaunchSettingsFile>true</NoDefaultLaunchSettingsFile>
+    <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.2" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.2" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.3" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.3" PrivateAssets="all" />
     <PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
-	<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="6.0.2" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="6.0.3" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/content/BlazorBffAzureB2C/Client/Services/AuthorizedHandler.cs b/content/BlazorBffAzureB2C/Client/Services/AuthorizedHandler.cs
@@ -21,7 +21,7 @@ protected override async Task<HttpResponseMessage> SendAsync(
     {
         var authState = await _authenticationStateProvider.GetAuthenticationStateAsync();
         HttpResponseMessage responseMessage;
-        if (!authState.User.Identity.IsAuthenticated)
+        if (authState.User.Identity != null && !authState.User.Identity.IsAuthenticated)
         {
             // if user is not authenticated, immediately set response status to 401 Unauthorized
             responseMessage = new HttpResponseMessage(HttpStatusCode.Unauthorized);
diff --git a/content/BlazorBffAzureB2C/Client/Services/HostAuthenticationStateProvider.cs b/content/BlazorBffAzureB2C/Client/Services/HostAuthenticationStateProvider.cs
@@ -23,7 +23,7 @@ public class HostAuthenticationStateProvider : AuthenticationStateProvider
     private readonly ILogger<HostAuthenticationStateProvider> _logger;
 
     private DateTimeOffset _userLastCheck = DateTimeOffset.FromUnixTimeSeconds(0);
-    private ClaimsPrincipal _cachedUser = new ClaimsPrincipal(new ClaimsIdentity());
+    private ClaimsPrincipal _cachedUser = new(new ClaimsIdentity());
 
     public HostAuthenticationStateProvider(NavigationManager navigation, HttpClient client, ILogger<HostAuthenticationStateProvider> logger)
     {
@@ -37,7 +37,7 @@ public override async Task<AuthenticationState> GetAuthenticationStateAsync()
         return new AuthenticationState(await GetUser(useCache: true));
     }
 
-    public void SignIn(string customReturnUrl = null)
+    public void SignIn(string? customReturnUrl = null)
     {
         var returnUrl = customReturnUrl != null ? _navigation.ToAbsoluteUri(customReturnUrl).ToString() : null;
         var encodedReturnUrl = Uri.EscapeDataString(returnUrl ?? _navigation.Uri);
@@ -63,11 +63,11 @@ private async ValueTask<ClaimsPrincipal> GetUser(bool useCache = false)
 
     private async Task<ClaimsPrincipal> FetchUser()
     {
-        UserInfo user = null;
+        UserInfo? user = null;
 
         try
         {
-            _logger.LogInformation(_client.BaseAddress.ToString());
+            _logger.LogInformation("{clientBaseAddress}", _client.BaseAddress?.ToString());
             user = await _client.GetFromJsonAsync<UserInfo>("api/User");
         }
         catch (Exception exc)
diff --git a/content/BlazorBffAzureB2C/Server/BlazorBffAzureB2C.Server.csproj b/content/BlazorBffAzureB2C/Server/BlazorBffAzureB2C.Server.csproj
@@ -2,10 +2,11 @@
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
+    <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="6.0.2" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="6.0.3" />
   </ItemGroup>
 
   <ItemGroup>
@@ -14,10 +15,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="6.0.2" NoWarn="NU1605" />
-	<PackageReference Include="Microsoft.Graph" Version="4.19.0" />
-    <PackageReference Include="Microsoft.Identity.Web" Version="1.23.0" />
-    <PackageReference Include="Microsoft.Identity.Web.UI" Version="1.23.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="6.0.3" NoWarn="NU1605" />
+    <PackageReference Include="Microsoft.Graph" Version="4.21.0" />
+    <PackageReference Include="Microsoft.Identity.Web" Version="1.23.1" />
+    <PackageReference Include="Microsoft.Identity.Web.UI" Version="1.23.1" />
     <PackageReference Include="IdentityModel.AspNetCore" Version="4.1.3" />
     <PackageReference Include="NetEscapades.AspNetCore.SecurityHeaders" Version="0.16.1" />
   </ItemGroup>
diff --git a/content/BlazorBffAzureB2C/Server/Controllers/GraphApiCallsController.cs b/content/BlazorBffAzureB2C/Server/Controllers/GraphApiCallsController.cs
@@ -1,4 +1,5 @@
-﻿using System.Collections.Generic;
+﻿using System;
+using System.Collections.Generic;
 using System.Threading.Tasks;
 using BlazorBffAzureB2C.Server.Services;
 using Microsoft.AspNetCore.Authentication.Cookies;
@@ -25,8 +26,15 @@ public GraphApiCallsController(MsGraphService msGraphtService)
     [HttpGet]
     public async Task<IEnumerable<string>> Get()
     {
-        var userData = await _msGraphtService.GetGraphApiUser(User.GetNameIdentifierId());
-        return new List<string> { $"DisplayName: {userData.DisplayName}",
+        var userId = User.GetNameIdentifierId();
+        if (userId != null)
+        {
+            var userData = await _msGraphtService.GetGraphApiUser(userId);
+            return new List<string> { $"DisplayName: {userData.DisplayName}",
             $"GivenName: {userData.GivenName}", $"AboutMe: {userData.AboutMe}" };
+        }
+
+        return Array.Empty<string>();
+       
     }
 }
diff --git a/content/BlazorBffAzureB2C/Server/Controllers/UserController.cs b/content/BlazorBffAzureB2C/Server/Controllers/UserController.cs
@@ -17,12 +17,13 @@ public class UserController : ControllerBase
     [AllowAnonymous]
     public IActionResult GetCurrentUser()
     {
-        return Ok(User.Identity.IsAuthenticated ? CreateUserInfo(User) : UserInfo.Anonymous);
+        var userAuthenticated = User.Identity != null && User.Identity.IsAuthenticated;
+        return Ok(userAuthenticated ? CreateUserInfo(User) : UserInfo.Anonymous);
     }
 
-    private UserInfo CreateUserInfo(ClaimsPrincipal claimsPrincipal)
+    private static UserInfo CreateUserInfo(ClaimsPrincipal claimsPrincipal)
     {
-        if (!claimsPrincipal.Identity.IsAuthenticated)
+        if (claimsPrincipal.Identity != null && !claimsPrincipal.Identity.IsAuthenticated)
         {
             return UserInfo.Anonymous;
         }
diff --git a/content/BlazorBffAzureB2C/Server/MsGraphClaimsTransformation.cs b/content/BlazorBffAzureB2C/Server/MsGraphClaimsTransformation.cs
@@ -23,11 +23,14 @@ public async Task<ClaimsPrincipal> TransformAsync(ClaimsPrincipal principal)
             var objectidentifierClaimType = "http://schemas.microsoft.com/identity/claims/objectidentifier";
             var objectIdentifier = principal.Claims.FirstOrDefault(t => t.Type == objectidentifierClaimType);
 
-            var groupIds = await _msGraphService.GetGraphApiUserMemberGroups(objectIdentifier.Value);
-
-            foreach (var groupId in groupIds.ToList())
+            if(objectIdentifier != null)
             {
-                claimsIdentity.AddClaim(new Claim(groupClaimType, groupId));
+                var groupIds = await _msGraphService.GetGraphApiUserMemberGroups(objectIdentifier.Value);
+
+                foreach (var groupId in groupIds.ToList())
+                {
+                    claimsIdentity.AddClaim(new Claim(groupClaimType, groupId));
+                }
             }
         }
 
diff --git a/content/BlazorBffAzureB2C/Server/Pages/Error.cshtml.cs b/content/BlazorBffAzureB2C/Server/Pages/Error.cshtml.cs
@@ -8,7 +8,7 @@ namespace BlazorBffAzureB2C.Server.Pages;
 [IgnoreAntiforgeryToken]
 public class ErrorModel : PageModel
 {
-    public string RequestId { get; set; }
+    public string? RequestId { get; set; }
 
     public bool ShowRequestId => !string.IsNullOrEmpty(RequestId);
 
diff --git a/content/BlazorBffAzureB2C/Server/Services/MsGraphService.cs b/content/BlazorBffAzureB2C/Server/Services/MsGraphService.cs
@@ -11,7 +11,7 @@ public class MsGraphService
 
     public MsGraphService(IConfiguration configuration)
     {
-        string[] scopes = configuration.GetValue<string>("GraphApi:Scopes")?.Split(' ');
+        string[]? scopes = configuration.GetValue<string>("GraphApi:Scopes")?.Split(' ');
         var tenantId = configuration.GetValue<string>("GraphApi:TenantId");
 
         // Values from app registration
diff --git a/content/BlazorBffAzureB2C/Server/Startup.cs b/content/BlazorBffAzureB2C/Server/Startup.cs
@@ -21,7 +21,7 @@ public Startup(IConfiguration configuration)
     }
 
     public IConfiguration Configuration { get; }
-    protected IServiceProvider ApplicationServices { get; set; }
+    protected IServiceProvider? ApplicationServices { get; set; }
 
     public void ConfigureServices(IServiceCollection services)
     {
@@ -39,21 +39,24 @@ public void ConfigureServices(IServiceCollection services)
         services.AddHttpClient();
         services.AddOptions();
 
-        var scopes = string.Empty; // Configuration.GetValue<string>("DownstreamApi:Scopes");
-        string[] initialScopes = scopes?.Split(' ');
+        //var scopes = Configuration.GetValue<string>("DownstreamApi:Scopes");
+        //string[] initialScopes = scopes.Split(' ');
 
         services.AddMicrosoftIdentityWebAppAuthentication(Configuration, "AzureB2C")
-            .EnableTokenAcquisitionToCallDownstreamApi(initialScopes)
+            .EnableTokenAcquisitionToCallDownstreamApi(Array.Empty<string>())
             .AddInMemoryTokenCaches();
 
         services.Configure<MicrosoftIdentityOptions>(OpenIdConnectDefaults.AuthenticationScheme, options =>
         {
             options.Events.OnTokenValidated = async context =>
             {
-                using var scope = ApplicationServices.CreateScope();
-                context.Principal = await scope.ServiceProvider
-                    .GetRequiredService<MsGraphClaimsTransformation>()
-                    .TransformAsync(context.Principal);
+                if (ApplicationServices != null && context.Principal != null)
+                {
+                    using var scope = ApplicationServices.CreateScope();
+                    context.Principal = await scope.ServiceProvider
+                        .GetRequiredService<MsGraphClaimsTransformation>()
+                        .TransformAsync(context.Principal);
+                }
             };
         });
 
diff --git a/content/BlazorBffAzureB2C/Shared/Authorization/ClaimValue.cs b/content/BlazorBffAzureB2C/Shared/Authorization/ClaimValue.cs
@@ -12,7 +12,7 @@ public ClaimValue(string type, string value)
         Value = value;
     }
 
-    public string Type { get; set; }
+    public string Type { get; set; } = string.Empty;
 
-    public string Value { get; set; }
+    public string Value { get; set; } = string.Empty;
 }
diff --git a/content/BlazorBffAzureB2C/Shared/Authorization/UserInfo.cs b/content/BlazorBffAzureB2C/Shared/Authorization/UserInfo.cs
@@ -8,9 +8,9 @@ public class UserInfo
 
     public bool IsAuthenticated { get; set; }
 
-    public string NameClaimType { get; set; }
+    public string NameClaimType { get; set; } = string.Empty;
 
-    public string RoleClaimType { get; set; }
+    public string RoleClaimType { get; set; } = string.Empty;
 
-    public ICollection<ClaimValue> Claims { get; set; }
+    public ICollection<ClaimValue> Claims { get; set; } = new List<ClaimValue>();
 }
diff --git a/content/BlazorBffAzureB2C/Shared/BlazorBffAzureB2C.Shared.csproj b/content/BlazorBffAzureB2C/Shared/BlazorBffAzureB2C.Shared.csproj
@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
+    <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ protected override async Task<HttpResponseMessage> SendAsync(`
`21`	`21`	`{`
`22`	`22`	`var authState = await _authenticationStateProvider.GetAuthenticationStateAsync();`
`23`	`23`	`HttpResponseMessage responseMessage;`
`24`		`- if (!authState.User.Identity.IsAuthenticated)`
	`24`	`+ if (authState.User.Identity != null && !authState.User.Identity.IsAuthenticated)`
`25`	`25`	`{`
`26`	`26`	`// if user is not authenticated, immediately set response status to 401 Unauthorized`
`27`	`27`	`responseMessage = new HttpResponseMessage(HttpStatusCode.Unauthorized);`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ public class HostAuthenticationStateProvider : AuthenticationStateProvider`
`23`	`23`	`private readonly ILogger<HostAuthenticationStateProvider> _logger;`
`24`	`24`
`25`	`25`	`private DateTimeOffset _userLastCheck = DateTimeOffset.FromUnixTimeSeconds(0);`
`26`		`- private ClaimsPrincipal _cachedUser = new ClaimsPrincipal(new ClaimsIdentity());`
	`26`	`+ private ClaimsPrincipal _cachedUser = new(new ClaimsIdentity());`
`27`	`27`
`28`	`28`	`public HostAuthenticationStateProvider(NavigationManager navigation, HttpClient client, ILogger<HostAuthenticationStateProvider> logger)`
`29`	`29`	`{`
`@@ -37,7 +37,7 @@ public override async Task<AuthenticationState> GetAuthenticationStateAsync()`
`37`	`37`	`return new AuthenticationState(await GetUser(useCache: true));`
`38`	`38`	`}`
`39`	`39`
`40`		`- public void SignIn(string customReturnUrl = null)`
	`40`	`+ public void SignIn(string? customReturnUrl = null)`
`41`	`41`	`{`
`42`	`42`	`var returnUrl = customReturnUrl != null ? _navigation.ToAbsoluteUri(customReturnUrl).ToString() : null;`
`43`	`43`	`var encodedReturnUrl = Uri.EscapeDataString(returnUrl ?? _navigation.Uri);`
`@@ -63,11 +63,11 @@ private async ValueTask<ClaimsPrincipal> GetUser(bool useCache = false)`
`63`	`63`
`64`	`64`	`private async Task<ClaimsPrincipal> FetchUser()`
`65`	`65`	`{`
`66`		`- UserInfo user = null;`
	`66`	`+ UserInfo? user = null;`
`67`	`67`
`68`	`68`	`try`
`69`	`69`	`{`
`70`		`- _logger.LogInformation(_client.BaseAddress.ToString());`
	`70`	`+ _logger.LogInformation("{clientBaseAddress}", _client.BaseAddress?.ToString());`
`71`	`71`	`user = await _client.GetFromJsonAsync<UserInfo>("api/User");`
`72`	`72`	`}`
`73`	`73`	`catch (Exception exc)`
Original file line number	Diff line number	Diff line change
`@@ -17,12 +17,13 @@ public class UserController : ControllerBase`
`17`	`17`	`[AllowAnonymous]`
`18`	`18`	`public IActionResult GetCurrentUser()`
`19`	`19`	`{`
`20`		`- return Ok(User.Identity.IsAuthenticated ? CreateUserInfo(User) : UserInfo.Anonymous);`
	`20`	`+ var userAuthenticated = User.Identity != null && User.Identity.IsAuthenticated;`
	`21`	`+ return Ok(userAuthenticated ? CreateUserInfo(User) : UserInfo.Anonymous);`
`21`	`22`	`}`
`22`	`23`
`23`		`- private UserInfo CreateUserInfo(ClaimsPrincipal claimsPrincipal)`
	`24`	`+ private static UserInfo CreateUserInfo(ClaimsPrincipal claimsPrincipal)`
`24`	`25`	`{`
`25`		`- if (!claimsPrincipal.Identity.IsAuthenticated)`
	`26`	`+ if (claimsPrincipal.Identity != null && !claimsPrincipal.Identity.IsAuthenticated)`
`26`	`27`	`{`
`27`	`28`	`return UserInfo.Anonymous;`
`28`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,11 +23,14 @@ public async Task<ClaimsPrincipal> TransformAsync(ClaimsPrincipal principal)`
`23`	`23`	`var objectidentifierClaimType = "http://schemas.microsoft.com/identity/claims/objectidentifier";`
`24`	`24`	`var objectIdentifier = principal.Claims.FirstOrDefault(t => t.Type == objectidentifierClaimType);`
`25`	`25`
`26`		`- var groupIds = await _msGraphService.GetGraphApiUserMemberGroups(objectIdentifier.Value);`
`27`		`-`
`28`		`- foreach (var groupId in groupIds.ToList())`
	`26`	`+ if(objectIdentifier != null)`
`29`	`27`	`{`
`30`		`- claimsIdentity.AddClaim(new Claim(groupClaimType, groupId));`
	`28`	`+ var groupIds = await _msGraphService.GetGraphApiUserMemberGroups(objectIdentifier.Value);`
	`29`	`+`
	`30`	`+ foreach (var groupId in groupIds.ToList())`
	`31`	`+ {`
	`32`	`+ claimsIdentity.AddClaim(new Claim(groupClaimType, groupId));`
	`33`	`+ }`
`31`	`34`	`}`
`32`	`35`	`}`
`33`	`36`