Merge pull request #32 from damienbod/net9

Update .NET 9

.github/workflows/dotnet.yml

@@ -12,11 +12,11 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Setup .NET
-      uses: actions/setup-dotnet@v1
+      uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: '8.0'
+        dotnet-version: '9.0'
         include-prerelease: True
     - name: Build AngularMicrosoftEntraIDMultipleApis
       run: dotnet build ./AngularMicrosoftEntraIDMultipleApis/ApiWithMutlipleApis.sln

.gitignore

@@ -8,15 +8,7 @@
 **/node_modules/
 **/dist/
 **/*.csproj.user
-/AngularAzureADMultipleApis/LogsServiceApi.txt
-/BlazorWithApis/LogsServiceApi.txt
-/ConfidentialClientCredentialsCertificate/LogsServiceApi.txt
-/ConfidentialClientCredentialsCertificate/LogsMyServerRenderedPortal.txt
-/DecryptionCertificates/LogsApiDecryptionCertificates.txt
-/DecryptionCertificates/LogsPortalDecryptionCertificates.txt
 /AngularAzureADMultipleApis/AngularAzureAD/debug.log
-/ClientCredentialsFlows/LogsServiceApi.txt
-/AngularAzureADMultipleApis/_logs-ApiWithMutlipleApis.txt
-/AngularAzureADMultipleApis/_logs-ServiceApi.txt
-/ConfidentialClientCredentialsCertificate/_logs-MyServerRenderedPortal.txt
-/ConfidentialClientCredentialsCertificate/_logs-ServiceApi.txt
+**/_logs*
+**/Logs*
+**/*.user

AngularMicrosoftEntraIDMultipleApis/AngularCliMicrosoftEntraID/certs/dev_localhost.key

@@ -1,13 +1,13 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIICXQIBAAKBgQCs7HI0KWqXEjH1fxXdkgVHg+1UgbtBhwkeZ3WhBsTGcwlqGUmzqlhKiR2hTd9G
-dMhQm1tFeU9qAMpmglxR+XgoZoEv9uoXw/TeegdKvn1V3exTxeULIDGJOXK6wQ1M+4FLMr7zBWlM
-hWmqcbYTHHVwwYd+ycDRHU3NAIxDfMUSQQIDAQABAoGAIB8z/7iJ0lJQ8XeQCj6ruGMrXP1UWZHK
-AdnaIfVt7CdGYm0cIcHM8NuTo3khtqbO5xpU1Az60YggEPa6S4f558kGBIg4PQVxgE/Kv77ptGAk
-rZG9FaCyIibGMh5aJLtxG0Fh1FGnuK1Xk1BKXtaGRUkZpKGg4rMJ9w3qp/T5vLkCQQDe+FiMqY2s
-pxHEz+h3NJ0H2T81FCx2upf1fjTVtlQnJ7Gds6eZT0zwa3z1bSw+VkxICERY8C43bzPUJUgPIyLX
-AkEAxooyVkJHmxlcIvZfrZPvQs+2GOXpWVnyjNUWf8t9G2MsmkdGIkp7oJhi5obpdNR+3jQe0xyr
-Dvy1hbHuGp5opwJBALO6Zc5EogGozgbiPBVSoL2B3ZRQhaLSt8jYCYi3JtBFC8P927wVkwQ88IX4
-kXBSKbzqhQVX3Tkr9xArWRFylhMCQFmigt9WxSVM6cAPI1smctrjE/9hrVxds5fJjILdx/nZaIWu
-sAdDQVVb9yrEthm85hpDxbbiNohppzpY/nqeEfkCQQDInS/pP5dYTUxFV+/YweK+6smN2v+dYZAi
-5KShWRl5fwpl+mdJT3aziRb/kfYkhGPQMO06OnGzjNKt7Rg0Z8mD
+MIICXQIBAAKBgQDjQCAk+Otv72o+HPmieLtLIX0NzWDNc5vocj5p3hU+FNXS74SVWn/XiSAWsF/j
++VhQ8RU7AZWPslMYI/KHDr1PbE54ydQkOjoU6mwKWedQspYSWz9sAwMghV5KxR4bsGCvNYnmAupe
+/lYUhx3DUOWGJulymcerntDEhhseABUDrQIDAQABAoGALVg9UcNNj09RfsVfVnkKvkoXXuqtNzGr
+WW16YLuMt4+GvwlGBltBiSt2eLCG4cF+SuBgIR8Gzd6CUB3UJfjd8xvCGsnJ+7blaTxXPFpYKSdL
+mAxgd2dZcltt9tUTDeMG2VroAiwHZR6ABJDbwmIaStW1JBjtu2u/LML1gjk+JM0CQQD97fRY4v/R
+GCwFxZG9NkSUCRkCM4SpxeryChGwMymVoF/ugRhvw4VmR8qCFP8Set+KieXVZpeTGca/dmOtoBov
+AkEA5Rp7ZiPp1zAyqWcqzeWAkfVPK9Cmfugs4tKBQkxHtdcb0OdObPd964HT1vH0lJ4eR/XhafWY
+5q8rnwQAmyf04wJBAMNCpmFvdJ15w+hQS0g/Ia7f7A4oRXwzR/4ExiNCxFhdcUc6l+rhY4QJ8mvi
+711rhNfIQCa/9BBWguEZjX6mnVsCQCaZuaTR9Do/cqm8KigavPjangZB12uWbsmgsgqbk5F9tsAR
+2NLfOCYP78NNbOoFYhC5ysrxiFuFtBHMuNVrfAUCQQDqhqY1m1hyWXpOneFJbt4wHTun4QhLhJ6N
+yijNL2phxhaM6SgT3lsF+lwjD44UkiT2JOnXwaNYEadK7G2aI0bK
 -----END RSA PRIVATE KEY-----

AngularMicrosoftEntraIDMultipleApis/AngularCliMicrosoftEntraID/certs/dev_localhost.pem

@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIICQDCCAamgAwIBAgIJAIKGapdMCt4NMA0GCSqGSIb3DQEBCwUAMBQxEjAQBgNVBAMTCWxvY2Fs
-aG9zdDAeFw0yMDAyMjAyMjU3MjFaFw0zMDAyMjEyMjU3MjFaMBQxEjAQBgNVBAMTCWxvY2FsaG9z
-dDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEArOxyNClqlxIx9X8V3ZIFR4PtVIG7QYcJHmd1
-oQbExnMJahlJs6pYSokdoU3fRnTIUJtbRXlPagDKZoJcUfl4KGaBL/bqF8P03noHSr59Vd3sU8Xl
-CyAxiTlyusENTPuBSzK+8wVpTIVpqnG2Exx1cMGHfsnA0R1NzQCMQ3zFEkECAwEAAaOBmTCBljAS
-BgNVHRMBAf8ECDAGAQH/AgEDMA4GA1UdDwEB/wQEAwIB/jAUBgNVHREEDTALgglsb2NhbGhvc3Qw
-OwYDVR0lBDQwMgYIKwYBBQUHAwEGCCsGAQUFBwMCBggrBgEFBQcDAwYIKwYBBQUHAwQGCCsGAQUF
-BwMIMB0GA1UdDgQWBBQaVighscgq5k8BjEzeSsZp+6RxITANBgkqhkiG9w0BAQsFAAOBgQBXH/Sq
-jekwz+O0eG0zA2MA2LSwt7OELi54vATFYkXO45IO5frRagUTWDkx85/Vfm9OcdfoaHD1UzPkGBU0
-BPsnN3SGCB3Pk5jSRaXIBBiqByDFiP+G6EYmUYhLxB3FpJp6S5KlnQtdtLkl3KuT8KBtc9haro+e
-lDlUx5s/FM3SJw==
+MIICPzCCAaigAwIBAgIIApLJQ1yKNwgwDQYJKoZIhvcNAQELBQAwFDESMBAGA1UEAxMJbG9jYWxo
+b3N0MB4XDTI1MDEwMTA5Mjc1N1oXDTM1MDEwMjA5Mjc1N1owFDESMBAGA1UEAxMJbG9jYWxob3N0
+MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDjQCAk+Otv72o+HPmieLtLIX0NzWDNc5vocj5p
+3hU+FNXS74SVWn/XiSAWsF/j+VhQ8RU7AZWPslMYI/KHDr1PbE54ydQkOjoU6mwKWedQspYSWz9s
+AwMghV5KxR4bsGCvNYnmAupe/lYUhx3DUOWGJulymcerntDEhhseABUDrQIDAQABo4GZMIGWMBIG
+A1UdEwEB/wQIMAYBAf8CAQMwDgYDVR0PAQH/BAQDAgH+MBQGA1UdEQQNMAuCCWxvY2FsaG9zdDA7
+BgNVHSUENDAyBggrBgEFBQcDAQYIKwYBBQUHAwIGCCsGAQUFBwMDBggrBgEFBQcDBAYIKwYBBQUH
+AwgwHQYDVR0OBBYEFInWKVCkc0wgw1x5XUBvFbFcbDPpMA0GCSqGSIb3DQEBCwUAA4GBADhiql/N
+FTLa5oQCWt1Ot6xdvTXHEMf9f6okZkpcZ310IJO8OuptMKW+l+NvJNrpB20ef0XatzAxUVUtTdvz
+UfbMQTu541Rf8/bdloiPS2ld8TZNQk4xe5kGbX9EegQ1QVseEhba5lQvQvBhefk4zDnK0Ve7TmY7
+5geNTUjDEcgC
 -----END CERTIFICATE-----

AngularMicrosoftEntraIDMultipleApis/ApiWithMutlipleApis/ApiWithMutlipleApis.csproj

@@ -1,32 +1,31 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <UserSecretsId>3e9ac996-8e75-4dd9-9a5b-27a6e01a3f3d</UserSecretsId>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Identity.Web" Version="2.16.0" />
-    <PackageReference Include="Microsoft.Identity.Web.GraphServiceClient" Version="2.16.0" />
-    <PackageReference Include="Magick.NET-Q16-AnyCPU" Version="13.4.0" />
+    <PackageReference Include="Microsoft.Identity.Web" Version="3.5.0" />
+    <PackageReference Include="Microsoft.Identity.Web.GraphServiceClient" Version="3.5.0" />
+    <PackageReference Include="Magick.NET-Q16-AnyCPU" Version="14.3.0" />
 
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.0" NoWarn="NU1605" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="8.0.0" NoWarn="NU1605" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="9.0.0" NoWarn="NU1605" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="9.0.0" NoWarn="NU1605" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="7.2.0" />
 
-    <PackageReference Include="Azure.Extensions.AspNetCore.Configuration.Secrets" Version="1.3.0" />
-    <PackageReference Include="Azure.Identity" Version="1.10.4" />
-    <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.21.0" />
-    <PackageReference Include="Serilog" Version="3.1.1" />
-    <PackageReference Include="Serilog.AspNetCore" Version="8.0.0" />
-    <PackageReference Include="Serilog.Enrichers.Environment" Version="2.3.0" />
-    <PackageReference Include="Serilog.Enrichers.Thread" Version="3.1.0" />
-    <PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
+    <PackageReference Include="Azure.Extensions.AspNetCore.Configuration.Secrets" Version="1.3.2" />
+    <PackageReference Include="Azure.Identity" Version="1.13.1" />
+
+    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.0" />
+    <PackageReference Include="Serilog.AspNetCore" Version="9.0.0" />
+    <PackageReference Include="Serilog.Enrichers.Environment" Version="3.0.1" />
+    <PackageReference Include="Serilog.Enrichers.Thread" Version="4.0.0" />
+    <PackageReference Include="Serilog.Sinks.Async" Version="2.1.0" />
     <PackageReference Include="Serilog.Sinks.ApplicationInsights" Version="4.0.0" />
-    <PackageReference Include="Serilog.Sinks.AzureApp" Version="3.1.0" />
-    <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
+
   </ItemGroup>
 
 </Project>

AngularMicrosoftEntraIDMultipleApis/ApiWithMutlipleApis/Controllers/DelegatedUserApiCallsController.cs

@@ -7,12 +7,12 @@
 namespace ApiWithMutlipleApis.Controllers;
 
 [Authorize(Policy = "ValidateAccessTokenPolicy", AuthenticationSchemes = JwtBearerDefaults.AuthenticationScheme)]
-[AuthorizeForScopes(Scopes = new string[] { "api://2b50a014-f353-4c10-aace-024f19a55569/access_as_user" })]
+[AuthorizeForScopes(Scopes = ["api://2b50a014-f353-4c10-aace-024f19a55569/access_as_user"])]
 [ApiController]
 [Route("[controller]")]
 public class DelegatedUserApiCallsController : ControllerBase
 {
-    private UserApiClientService _userApiClientService;
+    private readonly UserApiClientService _userApiClientService;
 
     public DelegatedUserApiCallsController(UserApiClientService userApiClientService)
     {

AngularMicrosoftEntraIDMultipleApis/ApiWithMutlipleApis/Controllers/DirectApiController.cs

@@ -5,16 +5,15 @@
 
 namespace ApiWithMutlipleApis.Controllers;
 
-[Authorize(Policy = "ValidateAccessTokenPolicy",
-    AuthenticationSchemes = JwtBearerDefaults.AuthenticationScheme)]
-[AuthorizeForScopes(Scopes = new string[] { "api://2b50a014-f353-4c10-aace-024f19a55569/access_as_user" })]
+[Authorize(Policy = "ValidateAccessTokenPolicy", AuthenticationSchemes = JwtBearerDefaults.AuthenticationScheme)]
+[AuthorizeForScopes(Scopes = ["api://2b50a014-f353-4c10-aace-024f19a55569/access_as_user"])]
 [ApiController]
 [Route("[controller]")]
 public class DirectApiController : ControllerBase
 {
     [HttpGet]
     public IEnumerable<string> Get()
     {
-        return new List<string> { "some data", "more data", "loads of data" };
+        return ["some data", "more data", "loads of data"];
     }
 }

AngularMicrosoftEntraIDMultipleApis/ApiWithMutlipleApis/Controllers/GraphApiCallsController.cs

@@ -7,12 +7,12 @@
 namespace ApiWithMutlipleApis.Controllers;
 
 [Authorize(Policy = "ValidateAccessTokenPolicy", AuthenticationSchemes = JwtBearerDefaults.AuthenticationScheme)]
-[AuthorizeForScopes(Scopes = new string[] { "User.ReadBasic.All", "user.read" })]
+[AuthorizeForScopes(Scopes = ["User.ReadBasic.All", "user.read"])]
 [ApiController]
 [Route("[controller]")]
 public class GraphApiCallsController : ControllerBase
 {
-    private GraphApiClientService _graphApiClientService;
+    private readonly GraphApiClientService _graphApiClientService;
 
     public GraphApiCallsController(GraphApiClientService graphApiClientService)
     {
@@ -24,7 +24,7 @@ public async Task<IEnumerable<string>> Get()
     {
         var userData = await _graphApiClientService.GetGraphApiUser();
 
-        return new List<string> { $"DisplayName: {userData.DisplayName}",
-            $"GivenName: {userData.GivenName}", $"AboutMe: {userData.AboutMe}" };
+        return [ $"DisplayName: {userData!.DisplayName}",
+            $"GivenName: {userData!.GivenName}", $"AboutMe: {userData!.AboutMe}" ];
     }
 }

AngularMicrosoftEntraIDMultipleApis/ApiWithMutlipleApis/Controllers/ServiceApiCallsController.cs

@@ -7,12 +7,12 @@
 namespace ApiWithMutlipleApis.Controllers;
 
 [Authorize(Policy = "ValidateAccessTokenPolicy", AuthenticationSchemes = JwtBearerDefaults.AuthenticationScheme)]
-[AuthorizeForScopes(Scopes = new string[] { "api://2b50a014-f353-4c10-aace-024f19a55569/access_as_user" })]
+[AuthorizeForScopes(Scopes = ["api://2b50a014-f353-4c10-aace-024f19a55569/access_as_user"])]
 [ApiController]
 [Route("[controller]")]
 public class ServiceApiCallsController : ControllerBase
 {
-    private ServiceApiClientService _serviceApiClientService;
+    private readonly ServiceApiClientService _serviceApiClientService;
 
     public ServiceApiCallsController(ServiceApiClientService serviceApiClientService)
     {

AngularMicrosoftEntraIDMultipleApis/ApiWithMutlipleApis/Program.cs

@@ -3,32 +3,30 @@
 
 Log.Logger = new LoggerConfiguration()
     .WriteTo.Console()
-    .WriteTo.AzureApp()
     .CreateBootstrapLogger();
 
+Log.Information("Starting ApiWithMutlipleApis application");
+
 try
 {
-    Log.Information("Starting ApiWithMutlipleApis");
-
-var builder = WebApplication.CreateBuilder(args);
+    var builder = WebApplication.CreateBuilder(args);
 
+    builder.Host.UseSerilog((context, loggerConfiguration) => loggerConfiguration
+        .WriteTo.Console(outputTemplate: "[{Timestamp:HH:mm:ss} {Level}] {SourceContext}{NewLine}{Message:lj}{NewLine}{Exception}{NewLine}")
+        .ReadFrom.Configuration(context.Configuration));
 
-builder.Host.UseSerilog((context, loggerConfiguration) => loggerConfiguration
-    .ReadFrom.Configuration(context.Configuration));
+    var app = builder
+        .ConfigureServices()
+        .ConfigurePipeline();
 
-var app = builder
-    .ConfigureServices()
-    .ConfigurePipeline();
-
-app.Run();
+    app.Run();
 }
-catch (Exception ex) when(ex.GetType().Name is not "StopTheHostException"
-    && ex.GetType().Name is not "HostAbortedException")
+catch (Exception ex) when (ex.GetType().Name is not "StopTheHostException" && ex.GetType().Name is not "HostAbortedException")
 {
     Log.Fatal(ex, "Unhandled exception");
 }
 finally
 {
     Log.Information("Shut down complete");
     Log.CloseAndFlush();
-}
+}

AngularMicrosoftEntraIDMultipleApis/ApiWithMutlipleApis/Services/ServiceApiClientService.cs

@@ -9,8 +9,7 @@ public class ServiceApiClientService
     private readonly IHttpClientFactory _clientFactory;
     private readonly ITokenAcquisition _tokenAcquisition;
 
-    public ServiceApiClientService(
-        ITokenAcquisition tokenAcquisition,
+    public ServiceApiClientService(ITokenAcquisition tokenAcquisition,
         IHttpClientFactory clientFactory)
     {
         _clientFactory = clientFactory;
@@ -19,12 +18,10 @@ public ServiceApiClientService(
 
     public async Task<IEnumerable<string>> GetApiDataAsync()
     {
-
         var client = _clientFactory.CreateClient();
 
         var scope = "api://b178f3a5-7588-492a-924f-72d7887b7e48/.default"; // CC flow access_as_application";
-        var accessToken = await _tokenAcquisition.GetAccessTokenForAppAsync(scope)
-            .ConfigureAwait(false);
+        var accessToken = await _tokenAcquisition.GetAccessTokenForAppAsync(scope);
 
         client.BaseAddress = new Uri("https://localhost:44324");
         client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", accessToken);
@@ -36,7 +33,7 @@ public async Task<IEnumerable<string>> GetApiDataAsync()
             var data = await JsonSerializer.DeserializeAsync<List<string>>(
                 await response.Content.ReadAsStreamAsync());
 
-            if(data != null)
+            if (data != null)
                 return data;
 
             return Array.Empty<string>();

AngularMicrosoftEntraIDMultipleApis/ApiWithMutlipleApis/Services/UserApiClientService.cs

@@ -9,17 +9,14 @@ public class UserApiClientService
     private readonly IHttpClientFactory _clientFactory;
     private readonly ITokenAcquisition _tokenAcquisition;
 
-    public UserApiClientService(
-        ITokenAcquisition tokenAcquisition,
-        IHttpClientFactory clientFactory)
+    public UserApiClientService(ITokenAcquisition tokenAcquisition, IHttpClientFactory clientFactory)
     {
         _clientFactory = clientFactory;
         _tokenAcquisition = tokenAcquisition;
     }
 
     public async Task<IEnumerable<string>> GetApiDataAsync()
     {
-
         var client = _clientFactory.CreateClient();
 
         var scopes = new List<string> { "api://b2a09168-54e2-4bc4-af92-a710a64ef1fa/access_as_user" };
@@ -37,10 +34,9 @@ public async Task<IEnumerable<string>> GetApiDataAsync()
 
             var data = await JsonSerializer.DeserializeAsync<List<string>>(stream);
 
-            if (data != null)
-                return data;
+            if (data != null) return data;
 
-            return Array.Empty<string>();
+            return [];
         }
 
         throw new ApplicationException("oh no...");

AngularMicrosoftEntraIDMultipleApis/ApiWithMutlipleApis/HostingExtensions.cs → AngularMicrosoftEntraIDMultipleApis/ApiWithMutlipleApis/StartupExtensions.cs

@@ -9,7 +9,7 @@
 
 namespace ApiWithMutlipleApis;
 
-internal static class HostingExtensions
+internal static class StartupExtensions
 {
     public static WebApplication ConfigureServices(this WebApplicationBuilder builder)
     {
@@ -81,15 +81,15 @@ public static WebApplication ConfigureServices(this WebApplicationBuilder builde
             c.AddSecurityDefinition(securityScheme.Reference.Id, securityScheme);
             c.AddSecurityRequirement(new OpenApiSecurityRequirement
             {
-                {securityScheme, new string[] { }}
+                {securityScheme, Array.Empty<string>()}
             });
 
             c.SwaggerDoc("v1", new OpenApiInfo { Title = "ApiWithMutlipleApis", Version = "v1" });
         });
 
         return builder.Build();
     }
-    
+
     public static WebApplication ConfigurePipeline(this WebApplication app)
     {
         IdentityModelEventSource.ShowPII = true;
@@ -105,12 +105,9 @@ public static WebApplication ConfigurePipeline(this WebApplication app)
         app.UseCors("AllowAllOrigins");
 
         app.UseHttpsRedirection();
-
         app.UseRouting();
-
         app.UseAuthentication();
         app.UseAuthorization();
-
         app.MapControllers();
 
         return app;