From cb9dc6d8a8f66fb36ed6a57ed666fda89883b814 Mon Sep 17 00:00:00 2001 From: damienbod Date: Thu, 7 Dec 2023 08:58:19 +0100 Subject: [PATCH 1/7] .NET 8 --- .../Client/BlazorBffAzureAD.Client.csproj | 10 +++++----- .../Server/BlazorBffAzureAD.Server.csproj | 12 ++++++------ .../Shared/BlazorBffAzureAD.Shared.csproj | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/content/BlazorBffAzureAD/Client/BlazorBffAzureAD.Client.csproj b/content/BlazorBffAzureAD/Client/BlazorBffAzureAD.Client.csproj index d8b1e6e..2f6d209 100644 --- a/content/BlazorBffAzureAD/Client/BlazorBffAzureAD.Client.csproj +++ b/content/BlazorBffAzureAD/Client/BlazorBffAzureAD.Client.csproj @@ -1,17 +1,17 @@  - net7.0 + net8.0 true enable enable - - - - + + + + diff --git a/content/BlazorBffAzureAD/Server/BlazorBffAzureAD.Server.csproj b/content/BlazorBffAzureAD/Server/BlazorBffAzureAD.Server.csproj index aa804d0..c372595 100644 --- a/content/BlazorBffAzureAD/Server/BlazorBffAzureAD.Server.csproj +++ b/content/BlazorBffAzureAD/Server/BlazorBffAzureAD.Server.csproj @@ -1,7 +1,7 @@  - net7.0 + net8.0 enable enable @@ -12,11 +12,11 @@ - - - - - + + + + + diff --git a/content/BlazorBffAzureAD/Shared/BlazorBffAzureAD.Shared.csproj b/content/BlazorBffAzureAD/Shared/BlazorBffAzureAD.Shared.csproj index b7c572e..4fe5d59 100644 --- a/content/BlazorBffAzureAD/Shared/BlazorBffAzureAD.Shared.csproj +++ b/content/BlazorBffAzureAD/Shared/BlazorBffAzureAD.Shared.csproj @@ -1,7 +1,7 @@  - net7.0 + net8.0 enable From 6dc8dfb6ed67254d7bb1d3aca370bd7a5b5241af Mon Sep 17 00:00:00 2001 From: damienbod Date: Thu, 7 Dec 2023 09:01:49 +0100 Subject: [PATCH 2/7] fix Graph photo streaming --- .../BlazorBffAzureAD/Server/Services/MsGraphService.cs | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/content/BlazorBffAzureAD/Server/Services/MsGraphService.cs b/content/BlazorBffAzureAD/Server/Services/MsGraphService.cs index 65a5fe6..d6372b4 100644 --- a/content/BlazorBffAzureAD/Server/Services/MsGraphService.cs +++ b/content/BlazorBffAzureAD/Server/Services/MsGraphService.cs @@ -25,6 +25,9 @@ public async Task GetGraphApiProfilePhoto() try { var photo = string.Empty; + byte[] photoByte; + var streamPhoto = new MemoryStream(); + // Get user photo using (var photoStream = await _graphServiceClient .Me @@ -32,10 +35,12 @@ public async Task GetGraphApiProfilePhoto() .Content .GetAsync(b => b.Options.WithScopes("User.ReadBasic.All", "user.read"))) { - byte[] photoByte = ((MemoryStream)photoStream!).ToArray(); - photo = Base64UrlEncoder.Encode(photoByte); + photoStream!.CopyTo(streamPhoto); + photoByte = streamPhoto!.ToArray(); } + photo = Base64UrlEncoder.Encode(photoByte); + return photo; } catch From 793a802701612923949227ee93e746d73b8ada08 Mon Sep 17 00:00:00 2001 From: damienbod Date: Thu, 7 Dec 2023 09:12:29 +0100 Subject: [PATCH 3/7] update namespaces --- .../Server/Services/MsGraphService.cs | 73 +++++++++---------- 1 file changed, 36 insertions(+), 37 deletions(-) diff --git a/content/BlazorBffAzureAD/Server/Services/MsGraphService.cs b/content/BlazorBffAzureAD/Server/Services/MsGraphService.cs index d6372b4..cd2d28c 100644 --- a/content/BlazorBffAzureAD/Server/Services/MsGraphService.cs +++ b/content/BlazorBffAzureAD/Server/Services/MsGraphService.cs @@ -3,50 +3,49 @@ using Microsoft.Identity.Web; using Microsoft.IdentityModel.Tokens; -namespace BlazorBffAzureAD.Server.Services +namespace BlazorBffAzureAD.Server.Services; + +public class MsGraphService { - public class MsGraphService - { - private readonly GraphServiceClient _graphServiceClient; + private readonly GraphServiceClient _graphServiceClient; - public MsGraphService(GraphServiceClient graphServiceClient) - { - _graphServiceClient = graphServiceClient; - } + public MsGraphService(GraphServiceClient graphServiceClient) + { + _graphServiceClient = graphServiceClient; + } - public async Task GetGraphApiUser() - { - return await _graphServiceClient.Me - .GetAsync(b => b.Options.WithScopes("User.ReadBasic.All", "user.read")); - } + public async Task GetGraphApiUser() + { + return await _graphServiceClient.Me + .GetAsync(b => b.Options.WithScopes("User.ReadBasic.All", "user.read")); + } - public async Task GetGraphApiProfilePhoto() + public async Task GetGraphApiProfilePhoto() + { + try { - try - { - var photo = string.Empty; - byte[] photoByte; - var streamPhoto = new MemoryStream(); - - // Get user photo - using (var photoStream = await _graphServiceClient - .Me - .Photo - .Content - .GetAsync(b => b.Options.WithScopes("User.ReadBasic.All", "user.read"))) - { - photoStream!.CopyTo(streamPhoto); - photoByte = streamPhoto!.ToArray(); - } - - photo = Base64UrlEncoder.Encode(photoByte); - - return photo; - } - catch + var photo = string.Empty; + byte[] photoByte; + var streamPhoto = new MemoryStream(); + + // Get user photo + using (var photoStream = await _graphServiceClient + .Me + .Photo + .Content + .GetAsync(b => b.Options.WithScopes("User.ReadBasic.All", "user.read"))) { - return string.Empty; + photoStream!.CopyTo(streamPhoto); + photoByte = streamPhoto!.ToArray(); } + + photo = Base64UrlEncoder.Encode(photoByte); + + return photo; + } + catch + { + return string.Empty; } } } From 1338e7a60b62a24c5f1b5f44a006ea22f13803ab Mon Sep 17 00:00:00 2001 From: damienbod Date: Thu, 7 Dec 2023 09:13:20 +0100 Subject: [PATCH 4/7] Microsoft Entra ID --- content/BlazorBffAzureAD/Client/Pages/Index.razor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/BlazorBffAzureAD/Client/Pages/Index.razor b/content/BlazorBffAzureAD/Client/Pages/Index.razor index 77b37b0..bbb3a09 100644 --- a/content/BlazorBffAzureAD/Client/Pages/Index.razor +++ b/content/BlazorBffAzureAD/Client/Pages/Index.razor @@ -1,3 +1,3 @@ @page "/" -

Azure AD using cookies

+

Microsoft Entra ID using cookies

From c8eae4a356984ea5947e27389c40c62a62137a17 Mon Sep 17 00:00:00 2001 From: damienbod Date: Thu, 7 Dec 2023 09:15:15 +0100 Subject: [PATCH 5/7] Microsoft Entra ID --- content/BlazorBffAzureAD/Client/Shared/NavMenu.razor | 2 +- content/BlazorBffAzureAD/Server/Pages/_Host.cshtml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/content/BlazorBffAzureAD/Client/Shared/NavMenu.razor b/content/BlazorBffAzureAD/Client/Shared/NavMenu.razor index 806c120..5392274 100644 --- a/content/BlazorBffAzureAD/Client/Shared/NavMenu.razor +++ b/content/BlazorBffAzureAD/Client/Shared/NavMenu.razor @@ -1,5 +1,5 @@ 
- Blazor AAD BFF Cookies + Blazor ME ID BFF Cookies diff --git a/content/BlazorBffAzureAD/Server/Pages/_Host.cshtml b/content/BlazorBffAzureAD/Server/Pages/_Host.cshtml index 9ff63f6..cee0a61 100644 --- a/content/BlazorBffAzureAD/Server/Pages/_Host.cshtml +++ b/content/BlazorBffAzureAD/Server/Pages/_Host.cshtml @@ -11,7 +11,7 @@ - Blazor AAD Cookie + Blazor ME ID Cookie From 44148c568bc28ff7dd2c668e68c430eab2e250e9 Mon Sep 17 00:00:00 2001 From: damienbod Date: Thu, 7 Dec 2023 09:21:51 +0100 Subject: [PATCH 6/7] release 3.0.0 --- Changelog.md | 5 +++++ README.md | 16 ++++++++-------- content/Blazor.BFF.AzureAD.Template.nuspec | 4 ++-- .../.template.config/template.json | 3 ++- 4 files changed, 17 insertions(+), 11 deletions(-) diff --git a/Changelog.md b/Changelog.md index 0c17c01..746123e 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,11 @@ [Readme](https://github.com/damienbod/Blazor.BFF.AzureAD.Template/blob/main/README.md) +**2023-12-07** 3.0.0 +- Updated .NET 8 +- Fixed Graph SDK photo streaming +- Rebranding Microsoft Entra ID + **2023-11-03** 2.2.0 - Updated packages - fixed XSS security header diff --git a/README.md b/README.md index 4f4037c..86f78af 100644 --- a/README.md +++ b/README.md @@ -2,17 +2,17 @@ [![.NET](https://github.com/damienbod/Blazor.BFF.AzureAD.Template/actions/workflows/dotnet.yml/badge.svg)](https://github.com/damienbod/Blazor.BFF.AzureAD.Template/actions/workflows/dotnet.yml) [![NuGet Status](http://img.shields.io/nuget/v/Blazor.BFF.AzureAD.Template.svg?style=flat-square)](https://www.nuget.org/packages/Blazor.BFF.AzureAD.Template/) [Change log](https://github.com/damienbod/Blazor.BFF.AzureAD.Template/blob/main/Changelog.md) -This template can be used to create a Blazor WASM application hosted in an ASP.NET Core Web app using Azure AD and Microsoft.Identity.Web to authenticate using the BFF security architecture. (server authentication) This removes the tokens from the browser and uses cookies with each HTTP request, response. The template also adds the required security headers as best it can for a Blazor application. +This template can be used to create a Blazor WASM application hosted in an ASP.NET Core Web app using Microsoft Entra ID and Microsoft.Identity.Web to authenticate using the BFF security architecture. (server authentication) This removes the tokens from the browser and uses cookies with each HTTP request, response. The template also adds the required security headers as best it can for a Blazor application. -![Blazor BFF Azure AD](https://github.com/damienbod/Blazor.BFF.AzureAD.Template/blob/main/images/blazorBFFAzureAD.png) +![Blazor BFF Microsoft Entra ID](https://github.com/damienbod/Blazor.BFF.AzureAD.Template/blob/main/images/blazorBFFAzureAD.png) ## Features -- WASM hosted in ASP.NET Core 7 -- BFF with Azure AD using Microsoft.Identity.Web +- WASM hosted in ASP.NET Core 8 +- BFF with Microsoft Entra ID using Microsoft.Identity.Web - OAuth2 and OpenID Connect OIDC - No tokens in the browser -- Azure AD Continuous Access Evaluation CAE support +- Microsoft Entra ID Continuous Access Evaluation CAE support ## Other templates @@ -38,7 +38,7 @@ Use the `-n` or `--name` parameter to change the name of the output created. Thi ## Setup after installation -Add the Azure AD App registration settings +Add the Microsoft Entra ID App registration settings ``` { @@ -191,7 +191,7 @@ nuget pack content/Blazor.BFF.AzureAD.Template.nuspec Locally built nupkg: ``` -dotnet new install Blazor.BFF.AzureAD.Template.2.2.0.nupkg +dotnet new install Blazor.BFF.AzureAD.Template.3.0.0.nupkg ``` Local folder: @@ -206,7 +206,7 @@ Where `` is the path to the folder containing .template.config. https://docs.microsoft.com/en-us/azure/active-directory/develop/quickstart-register-app -## Credits, Used NuGet packages + ASP.NET Core 7.0 standard packages +## Credits, Used NuGet packages + ASP.NET Core 8.0 standard packages - NetEscapades.AspNetCore.SecurityHeaders diff --git a/content/Blazor.BFF.AzureAD.Template.nuspec b/content/Blazor.BFF.AzureAD.Template.nuspec index fc8c071..546d608 100644 --- a/content/Blazor.BFF.AzureAD.Template.nuspec +++ b/content/Blazor.BFF.AzureAD.Template.nuspec @@ -2,7 +2,7 @@ Blazor.BFF.AzureAD.Template - 2.2.0 + 3.0.0 Blazor.BFF.AzureAD.Template LICENSE Blazor backend for frontend (BFF) template for WASM ASP.NET Core hosted @@ -15,7 +15,7 @@ false 2023 damienbod This template provides a simple Blazor template with BFF server authentication WASM hosted - Updated nuget packages, fixed security XSS block header + Updated .NET 8 packages, Microsoft Entra ID diff --git a/content/BlazorBffAzureAD/.template.config/template.json b/content/BlazorBffAzureAD/.template.config/template.json index c719eda..a9ca5ac 100644 --- a/content/BlazorBffAzureAD/.template.config/template.json +++ b/content/BlazorBffAzureAD/.template.config/template.json @@ -3,6 +3,7 @@ "classifications": [ "AspNetCore", "WASM", + "MicrosoftEntraID" "AzureAD", "OAuth2", "Web", @@ -11,7 +12,7 @@ "Solution", "Blazor" ], - "name": "ASP.NET Core Blazor BFF hosted WASM Azure AD", + "name": "ASP.NET Core Blazor BFF hosted WASM Microsoft Entra ID", "identity": "Blazor.BFF.AzureAD.Template", "shortName": "blazorbffaad", "tags": { From 6dd32e06cdf41fa6d286079bde919645a9fb14ce Mon Sep 17 00:00:00 2001 From: damienbod Date: Thu, 7 Dec 2023 09:23:51 +0100 Subject: [PATCH 7/7] Microsoft Entra ID --- README-NUGET.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/README-NUGET.md b/README-NUGET.md index f0ee7b2..bf941e7 100644 --- a/README-NUGET.md +++ b/README-NUGET.md @@ -2,15 +2,15 @@ [![.NET](https://github.com/damienbod/Blazor.BFF.AzureAD.Template/actions/workflows/dotnet.yml/badge.svg)](https://github.com/damienbod/Blazor.BFF.AzureAD.Template/actions/workflows/dotnet.yml) [![NuGet Status](http://img.shields.io/nuget/v/Blazor.BFF.AzureAD.Template.svg?style=flat-square)](https://www.nuget.org/packages/Blazor.BFF.AzureAD.Template/) [Change log](https://github.com/damienbod/Blazor.BFF.AzureAD.Template/blob/main/Changelog.md) -This template can be used to create a Blazor WASM application hosted in an ASP.NET Core Web app using Azure AD and Microsoft.Identity.Web to authenticate using the BFF security architecture. (server authentication) This removes the tokens from the browser and uses cookies with each HTTP request, response. The template also adds the required security headers as best it can for a Blazor application. +This template can be used to create a Blazor WASM application hosted in an ASP.NET Core Web app using Microsoft Entra ID and Microsoft.Identity.Web to authenticate using the BFF security architecture. (server authentication) This removes the tokens from the browser and uses cookies with each HTTP request, response. The template also adds the required security headers as best it can for a Blazor application. ## Features -- WASM hosted in ASP.NET Core 7 -- BFF with Azure AD using Microsoft.Identity.Web +- WASM hosted in ASP.NET Core 8 +- BFF with Microsoft Entra ID using Microsoft.Identity.Web - OAuth2 and OpenID Connect OIDC - No tokens in the browser -- Azure AD Continuous Access Evaluation CAE support +- Microsoft Entra ID Continuous Access Evaluation CAE support ## Using the template @@ -30,7 +30,7 @@ Use the `-n` or `--name` parameter to change the name of the output created. Thi ## Setup after installation -Add the Azure AD App registration settings +Add the Microsoft Entra ID App registration settings ``` { @@ -171,7 +171,7 @@ public IActionResult Get() dotnet new uninstall Blazor.BFF.AzureAD.Template ``` -## Credits, Used NuGet packages + ASP.NET Core 7.0 standard packages +## Credits, Used NuGet packages + ASP.NET Core 8.0 standard packages - NetEscapades.AspNetCore.SecurityHeaders