Merge pull request #9 from damienbod/dev

Update packages, improve endpoints

Author: damienbod

Changelog.md

@@ -2,6 +2,10 @@
 
 [Readme](https://github.com/damienbod/Blazor.BFF.OpenIDConnect.Template/blob/main/README.md) 
 
+**2022-05-20** 1.2.0
+- Updated nuget packages
+- Improved endpoints
+
 **2022-03-20** 1.1.0
 - Updated nuget packages
 - Using nullable

README.md

@@ -69,7 +69,7 @@ nuget pack content/Blazor.BFF.OpenIDConnect.Template.nuspec
 Locally built nupkg:
 
 ```
-dotnet new -i Blazor.BFF.OpenIDConnect.Template.1.1.0.nupkg
+dotnet new -i Blazor.BFF.OpenIDConnect.Template.1.2.0.nupkg
 ```
 
 Local folder:

content/Blazor.BFF.OpenIDConnect.Template.nuspec

@@ -2,10 +2,10 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
 	<metadata>
 		<id>Blazor.BFF.OpenIDConnect.Template</id>
-		<version>1.1.0</version>
+		<version>1.2.0</version>
 		<title>Blazor.BFF.OpenIDConnect.Template</title>
 		<license type="file">LICENSE</license>
-		<description>Blazor BFF template for WASM ASP.NET Core hosted</description>
+		<description>Blazor backend for frontend (BFF) template for WASM ASP.NET Core hosted</description>
 			<projectUrl>https://github.com/damienbod/Blazor.BFF.OpenIDConnect.Template</projectUrl>
 		<authors>damienbod</authors>
 		<owners>damienbod</owners>
@@ -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, using nullable</releaseNotes>
+		<releaseNotes>Updated nuget packages, improved endpoints</releaseNotes>
 		<repository type="git" url="https://github.com/damienbod/Blazor.BFF.OpenIDConnect.Template" />
 		<packageTypes>
 			<packageType name="Template" />

content/BlazorBffOpenIDConnect/Client/BlazorBffOpenIDConnect.Client.csproj

@@ -7,10 +7,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <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.AspNetCore.Components.WebAssembly" Version="6.0.5" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.5" PrivateAssets="all" />
     <PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="6.0.3" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="6.0.5" />
   </ItemGroup>
 
   <ItemGroup>

content/BlazorBffOpenIDConnect/Server/BlazorBffOpenIDConnect.Server.csproj

@@ -6,7 +6,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="6.0.3" />
+		<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="6.0.5" />
 	</ItemGroup>
 
 	<ItemGroup>
@@ -15,8 +15,8 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="6.0.3" NoWarn="NU1605" />
-		<PackageReference Include="IdentityModel.AspNetCore" Version="4.1.3" />
+		<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="6.0.5" NoWarn="NU1605" />
+		<PackageReference Include="IdentityModel.AspNetCore" Version="4.2.0" />
 		<PackageReference Include="NetEscapades.AspNetCore.SecurityHeaders" Version="0.16.1" />
 	</ItemGroup>
 

content/BlazorBffOpenIDConnect/Server/Services/ApplicationBuilderExtensions.cs

@@ -0,0 +1,23 @@
+using System.Linq;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.Net.Http.Headers;
+
+namespace BlazorBffOpenIDConnect.Server.Services;
+
+public static class ApplicationBuilderExtensions
+{
+    public static IApplicationBuilder UseNoUnauthorizedRedirect(this IApplicationBuilder applicationBuilder, params string[] segments)
+    {
+        applicationBuilder.Use(async (httpContext, func) =>
+        {
+            if (segments.Any(s => httpContext.Request.Path.StartsWithSegments(s)))
+            {
+                httpContext.Request.Headers[HeaderNames.XRequestedWith] = "XMLHttpRequest";
+            }
+
+            await func();
+        });
+
+        return applicationBuilder;
+    }
+}

content/BlazorBffOpenIDConnect/Server/Services/EndpointRouteBuilderExtensions.cs

@@ -0,0 +1,20 @@
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Routing;
+
+namespace BlazorBffOpenIDConnect.Server.Services;
+
+public static class EndpointRouteBuilderExtensions
+{
+    public static IEndpointRouteBuilder MapNotFound(this IEndpointRouteBuilder endpointRouteBuilder, string pattern)
+    {
+        endpointRouteBuilder.Map(pattern, context =>
+        {
+            context.Response.StatusCode = StatusCodes.Status404NotFound;
+            return Task.CompletedTask;
+        });
+
+        return endpointRouteBuilder;
+    }
+}

content/BlazorBffOpenIDConnect/Server/Startup.cs

@@ -1,3 +1,4 @@
+using BlazorBffOpenIDConnect.Server.Services;
 using Microsoft.AspNetCore.Authentication.Cookies;
 using Microsoft.AspNetCore.Authentication.OpenIdConnect;
 using Microsoft.AspNetCore.Builder;
@@ -88,13 +89,17 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
         app.UseStaticFiles();
 
         app.UseRouting();
+
+        app.UseNoUnauthorizedRedirect("/api");
+
         app.UseAuthentication();
         app.UseAuthorization();
 
         app.UseEndpoints(endpoints =>
         {
             endpoints.MapRazorPages();
             endpoints.MapControllers();
+            endpoints.MapNotFound("/api/{**segment}");
             endpoints.MapFallbackToPage("/_Host");
         });
     }