damienbod · damienbod · Dec 7, 2023 · Dec 7, 2023 · Dec 7, 2023 · Dec 7, 2023
diff --git 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-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
 

diff --git 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 `<PATH>` 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
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
 	<metadata>
 		<id>Blazor.BFF.AzureAD.Template</id>
-		<version>2.2.0</version>
+		<version>3.0.0</version>
 		<title>Blazor.BFF.AzureAD.Template</title>
 		<license type="file">LICENSE</license>
 		<description>Blazor backend for frontend (BFF) template for WASM ASP.NET Core hosted</description>
@@ -15,7 +15,7 @@
 		<requireLicenseAcceptance>false</requireLicenseAcceptance>
 		<copyright>2023 damienbod</copyright>
 		<summary>This template provides a simple Blazor template with BFF server authentication WASM hosted</summary>
-		<releaseNotes>Updated nuget packages, fixed security XSS block header</releaseNotes>
+		<releaseNotes>Updated .NET 8 packages, Microsoft Entra ID</releaseNotes>
 		<repository type="git" url="https://github.com/damienbod/Blazor.BFF.AzureAD.Template" />
 		<packageTypes>
 			<packageType name="Template" />

diff --git 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": {

diff --git a/content/BlazorBffAzureAD/Client/BlazorBffAzureAD.Client.csproj b/content/BlazorBffAzureAD/Client/BlazorBffAzureAD.Client.csproj
@@ -1,17 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <NoDefaultLaunchSettingsFile>true</NoDefaultLaunchSettingsFile>
     <Nullable>enable</Nullable>
 	<ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.13" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.13" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.Extensions.Http" Version="7.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="7.0.13" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.0" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="8.0.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/content/BlazorBffAzureAD/Client/Pages/Index.razor b/content/BlazorBffAzureAD/Client/Pages/Index.razor
@@ -1,3 +1,3 @@
 @page "/"
 
-<h1>Azure AD using cookies</h1>
+<h1>Microsoft Entra ID using cookies</h1>
diff --git a/content/BlazorBffAzureAD/Client/Shared/NavMenu.razor b/content/BlazorBffAzureAD/Client/Shared/NavMenu.razor
@@ -1,5 +1,5 @@
 <div class="top-row pl-4 navbar navbar-dark">
-    <a class="navbar-brand" href="">Blazor AAD BFF Cookies</a>
+    <a class="navbar-brand" href="">Blazor ME ID BFF Cookies</a>
     <button class="navbar-toggler" @onclick="ToggleNavMenu">
         <span class="navbar-toggler-icon"></span>
     </button>

diff --git a/content/BlazorBffAzureAD/Server/BlazorBffAzureAD.Server.csproj b/content/BlazorBffAzureAD/Server/BlazorBffAzureAD.Server.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
 	<PropertyGroup>
-		<TargetFramework>net7.0</TargetFramework>
+		<TargetFramework>net8.0</TargetFramework>
 		<Nullable>enable</Nullable>
 		<ImplicitUsings>enable</ImplicitUsings>
 	</PropertyGroup>
@@ -12,11 +12,11 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="7.0.13" NoWarn="NU1605" />
-		<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="7.0.13" />
-		<PackageReference Include="Microsoft.Identity.Web.GraphServiceClient" Version="2.15.3" />
-		<PackageReference Include="Microsoft.Identity.Web" Version="2.15.3" />
-		<PackageReference Include="Microsoft.Identity.Web.UI" Version="2.15.3" />
+		<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="8.0.0" NoWarn="NU1605" />
+		<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.0" />
+		<PackageReference Include="Microsoft.Identity.Web.GraphServiceClient" Version="2.16.0" />
+		<PackageReference Include="Microsoft.Identity.Web" Version="2.16.0" />
+		<PackageReference Include="Microsoft.Identity.Web.UI" Version="2.16.0" />
 		<PackageReference Include="NetEscapades.AspNetCore.SecurityHeaders" Version="0.21.0" />
 	</ItemGroup>
 

diff --git a/content/BlazorBffAzureAD/Server/Pages/_Host.cshtml b/content/BlazorBffAzureAD/Server/Pages/_Host.cshtml
@@ -11,7 +11,7 @@
 <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
-    <title>Blazor AAD Cookie</title>
+    <title>Blazor ME ID Cookie</title>
     <base href="~/" />
     <link rel="stylesheet" href="css/bootstrap/bootstrap.min.css" />
     <link href="css/app.css" rel="stylesheet" />

diff --git a/content/BlazorBffAzureAD/Server/Services/MsGraphService.cs b/content/BlazorBffAzureAD/Server/Services/MsGraphService.cs
@@ -3,45 +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;
+
+    public MsGraphService(GraphServiceClient graphServiceClient)
     {
-        private readonly GraphServiceClient _graphServiceClient;
+        _graphServiceClient = graphServiceClient;
+    }
 
-        public MsGraphService(GraphServiceClient graphServiceClient)
-        {
-            _graphServiceClient = graphServiceClient;
-        }
+    public async Task<User?> GetGraphApiUser()
+    {
+        return await _graphServiceClient.Me
+            .GetAsync(b => b.Options.WithScopes("User.ReadBasic.All", "user.read"));
+    }
 
-        public async Task<User?> GetGraphApiUser()
+    public async Task<string> GetGraphApiProfilePhoto()
+    {
+        try
         {
-            return await _graphServiceClient.Me
-                .GetAsync(b => b.Options.WithScopes("User.ReadBasic.All", "user.read"));
-        }
+            var photo = string.Empty;
+            byte[] photoByte;
+            var streamPhoto = new MemoryStream();
 
-        public async Task<string> GetGraphApiProfilePhoto()
-        {
-            try
-            {
-                var photo = string.Empty;
-                // Get user photo
-                using (var photoStream = await _graphServiceClient
-                    .Me
-                    .Photo
-                    .Content
-                    .GetAsync(b => b.Options.WithScopes("User.ReadBasic.All", "user.read")))
-                {
-                    byte[] photoByte = ((MemoryStream)photoStream!).ToArray();
-                    photo = Base64UrlEncoder.Encode(photoByte);
-                }
-
-                return photo;
-            }
-            catch
+            // 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;
         }
     }
 }

diff --git a/content/BlazorBffAzureAD/Shared/BlazorBffAzureAD.Shared.csproj b/content/BlazorBffAzureAD/Shared/BlazorBffAzureAD.Shared.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
   </PropertyGroup>