Merge pull request #32 from damienbod/dev7

damienbod · web-flow · commit 6f7f1ad198cf · 2022-12-03T16:05:42.000+01:00
.NET 7
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -16,7 +16,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: '6.0'
+        dotnet-version: '7.0'
         include-prerelease: True
     - name: Restore dependencies
       run: dotnet restore ./content/BlazorBffAzureB2C/Server
diff --git a/Changelog.md b/Changelog.md
@@ -2,6 +2,9 @@
 
 [Readme](https://github.com/damienbod/Blazor.BFF.AzureB2C.Template/blob/main/README.md) 
 
+**2022-12-03** 2.0.0
+- Updated packages to .NET 7
+
 **2022-09-23** 1.2.4
 - Updated packages
 
diff --git a/README-NUGET.md b/README-NUGET.md
@@ -6,7 +6,7 @@ This template can be used to create a Blazor WASM application hosted in an ASP.N
 
 ## Features
 
-- WASM hosted in ASP.NET Core 6
+- WASM hosted in ASP.NET Core 7
 - BFF with Azure B2C using Microsoft.Identity.Web
 - OAuth2 and OpenID Connect OIDC
 - No tokens in the browser
@@ -217,7 +217,7 @@ Further details may be found here [Configure ASP.NET Core to work with proxy ser
  
 Please note, adding the 'XForwardedFor' enum as shown in the Microsoft document above did not work and needed to be removed so only the XForwardedProto remains. 
 
-## Credits, Used NuGet packages + ASP.NET Core 6.0 standard packages
+## Credits, Used NuGet packages + ASP.NET Core 7.0 standard packages
 
 - NetEscapades.AspNetCore.SecurityHeaders
 
diff --git a/README.md b/README.md
@@ -8,7 +8,7 @@ This template can be used to create a Blazor WASM application hosted in an ASP.N
 
 ## Features
 
-- WASM hosted in ASP.NET Core 6
+- WASM hosted in ASP.NET Core 7
 - BFF with Azure B2C using Microsoft.Identity.Web
 - OAuth2 and OpenID Connect OIDC
 - No tokens in the browser
@@ -198,7 +198,7 @@ nuget pack content/Blazor.BFF.AzureB2C.Template.nuspec
 Locally built nupkg:
 
 ```
-dotnet new -i Blazor.BFF.AzureB2C.Template.1.2.4.nupkg
+dotnet new -i Blazor.BFF.AzureB2C.Template.2.0.0.nupkg
 ```
 
 Local folder:
@@ -215,7 +215,7 @@ https://docs.microsoft.com/en-us/azure/active-directory-b2c/tutorial-register-ap
 
 https://docs.microsoft.com/en-us/azure/active-directory-b2c/tutorial-register-applications?tabs=app-reg-ga
 
-## Credits, Used NuGet packages + ASP.NET Core 6.0 standard packages
+## Credits, Used NuGet packages + ASP.NET Core 7.0 standard packages
 
 - NetEscapades.AspNetCore.SecurityHeaders
 
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.2.4</version>
+		<version>2.0.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>Updated nuget packages</releaseNotes>
+		<releaseNotes>Updated to .NET 7</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
@@ -1,17 +1,17 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <NoDefaultLaunchSettingsFile>true</NoDefaultLaunchSettingsFile>
     <Nullable>enable</Nullable>
 	<ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.9" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.9" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="6.0.9" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.0" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="7.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="7.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/content/BlazorBffAzureB2C/Client/Shared/MainLayout.razor b/content/BlazorBffAzureB2C/Client/Shared/MainLayout.razor
@@ -9,7 +9,7 @@
         <div class="top-row px-4 auth">
             <AuthorizeView>
                 <Authorized>
-                    <strong>Hello, @context?.User?.Identity?.Name!</strong>
+                    <strong>Hi @context?.User?.Identity?.Name</strong>
                     <form method="post" action="api/Account/Logout">
                         <AntiForgeryTokenInput/>
                         <button class="btn btn-link" type="submit">Sign out</button>
diff --git a/content/BlazorBffAzureB2C/Server/BlazorBffAzureB2C.Server.csproj b/content/BlazorBffAzureB2C/Server/BlazorBffAzureB2C.Server.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <Nullable>enable</Nullable>
 	<ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
@@ -12,8 +12,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="6.0.9" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="6.0.9" NoWarn="NU1605" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="7.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="7.0.0" NoWarn="NU1605" />
 	  <PackageReference Include="Microsoft.Identity.Web" Version="1.25.1" />
 	  <PackageReference Include="Microsoft.Identity.Web.UI" Version="1.25.1" />
 	  <PackageReference Include="Microsoft.Identity.Web.MicrosoftGraph" Version="1.25.1" />
diff --git a/content/BlazorBffAzureB2C/Server/Cae/CaeClaimsChallengeService.cs b/content/BlazorBffAzureB2C/Server/Cae/CaeClaimsChallengeService.cs
@@ -12,13 +12,6 @@
 /// </summary>
 public class CaeClaimsChallengeService
 {
-    private readonly IConfiguration _configuration;
-
-    public CaeClaimsChallengeService(IConfiguration configuration)
-    {
-        _configuration = configuration;
-    }
-
     public string? CheckForRequiredAuthContextIdToken(string authContextId, HttpContext context)
     {
         if (!string.IsNullOrEmpty(authContextId))
@@ -34,7 +27,6 @@ public CaeClaimsChallengeService(IConfiguration configuration)
 
             if (acrsClaim?.Value != authContextId)
             {
-                string clientId = _configuration.GetSection("AzureAd").GetSection("ClientId").Value;
                 var cae = "{\"id_token\":{\"acrs\":{\"essential\":true,\"value\":\"" + authContextId + "\"}}}";
 
                 return cae;
@@ -43,5 +35,4 @@ public CaeClaimsChallengeService(IConfiguration configuration)
 
         return null;
     }
-
 }
diff --git a/content/BlazorBffAzureB2C/Server/Program.cs b/content/BlazorBffAzureB2C/Server/Program.cs
@@ -92,12 +92,9 @@
 app.UseAuthentication();
 app.UseAuthorization();
 
-app.UseEndpoints(endpoints =>
-{
-    endpoints.MapRazorPages();
-    endpoints.MapControllers();
-    endpoints.MapNotFound("/api/{**segment}");
-    endpoints.MapFallbackToPage("/_Host");
-});
+app.MapRazorPages();
+app.MapControllers();
+app.MapNotFound("/api/{**segment}");
+app.MapFallbackToPage("/_Host");
 
 app.Run();
diff --git a/content/BlazorBffAzureB2C/Server/SecurityHeadersDefinitions.cs b/content/BlazorBffAzureB2C/Server/SecurityHeadersDefinitions.cs
@@ -4,8 +4,13 @@ namespace BlazorBffAzureB2C.Server;
 
 public static class SecurityHeadersDefinitions
 {
-    public static HeaderPolicyCollection GetHeaderPolicyCollection(bool isDev, string idpHost)
+    public static HeaderPolicyCollection GetHeaderPolicyCollection(bool isDev, string? idpHost)
     {
+        if (idpHost == null)
+        {
+            throw new ArgumentNullException(nameof(idpHost));
+        }
+
         var policy = new HeaderPolicyCollection()
             .AddFrameOptionsDeny()
             .AddXssProtectionBlock()
diff --git a/content/BlazorBffAzureB2C/Shared/BlazorBffAzureB2C.Shared.csproj b/content/BlazorBffAzureB2C/Shared/BlazorBffAzureB2C.Shared.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 

Original file line number	Diff line number	Diff line change
`@@ -12,13 +12,6 @@`
`12`	`12`	`/// </summary>`
`13`	`13`	`public class CaeClaimsChallengeService`
`14`	`14`	`{`
`15`		`- private readonly IConfiguration _configuration;`
`16`		`-`
`17`		`- public CaeClaimsChallengeService(IConfiguration configuration)`
`18`		`- {`
`19`		`- _configuration = configuration;`
`20`		`- }`
`21`		`-`
`22`	`15`	`public string? CheckForRequiredAuthContextIdToken(string authContextId, HttpContext context)`
`23`	`16`	`{`
`24`	`17`	`if (!string.IsNullOrEmpty(authContextId))`
`@@ -34,7 +27,6 @@ public CaeClaimsChallengeService(IConfiguration configuration)`
`34`	`27`
`35`	`28`	`if (acrsClaim?.Value != authContextId)`
`36`	`29`	`{`
`37`		`- string clientId = _configuration.GetSection("AzureAd").GetSection("ClientId").Value;`
`38`	`30`	`var cae = "{\"id_token\":{\"acrs\":{\"essential\":true,\"value\":\"" + authContextId + "\"}}}";`
`39`	`31`
`40`	`32`	`return cae;`
`@@ -43,5 +35,4 @@ public CaeClaimsChallengeService(IConfiguration configuration)`
`43`	`35`
`44`	`36`	`return null;`
`45`	`37`	`}`
`46`		`-`
`47`	`38`	`}`