Merge branch 'master' into pmaytak/miw-0.2.0

Author: jennyf19

1-Call-MSGraph/daemon-console/daemon-console.csproj

@@ -14,7 +14,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="3.1.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="3.1.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.0" />
-    <PackageReference Include="Microsoft.Identity.Client" Version="4.16.0" />
+    <PackageReference Include="Microsoft.Identity.Client" Version="4.16.1" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
   </ItemGroup>
 

2-Call-OwnApi/TodoList-WebApi/Controllers/TodoListController.cs

@@ -5,6 +5,7 @@
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.Identity.Web.Resource;
 using Newtonsoft.Json;
 using TodoList_WebApi.Models;
 
@@ -31,9 +32,9 @@ public TodoListController()
 
         // GET: api/todolist
         [HttpGet]
-        [Authorize(Policy = "DaemonAppRole")]
         public IActionResult Get()
         {
+            HttpContext.ValidateAppRole("DaemonAppRole");
             return Ok(TodoStore.Values);
         }
     }

2-Call-OwnApi/TodoList-WebApi/Startup.cs

@@ -21,26 +21,8 @@ public Startup(IConfiguration configuration)
         // This method gets called by the runtime. Use this method to add services to the container.
         public void ConfigureServices(IServiceCollection services)
         {
-            // This is required to be instantiated before the OpenIdConnectOptions starts getting configured.
-            // By default, the claims mapping will map claim names in the old format to accommodate older SAML applications.
-            // 'http://schemas.microsoft.com/ws/2008/06/identity/claims/role' instead of 'roles'
-            // This flag ensures that the ClaimsIdentity claims collection will be built from the claims in the token
-            JwtSecurityTokenHandler.DefaultMapInboundClaims = false;
-
-            services.AddProtectedWebApi(Configuration);
-
-            // Additional configuration
-            services.Configure<JwtBearerOptions>(JwtBearerDefaults.AuthenticationScheme, options =>
-            {
-                options.TokenValidationParameters.RoleClaimType = "roles";
-            });
-
-            // Creating policies that wraps the authorization requirements.
-            services.AddAuthorization(options =>
-            {
-                // The application should only allow tokens which roles claim contains "DaemonAppRole")
-                options.AddPolicy("DaemonAppRole", policy => policy.RequireRole("DaemonAppRole"));
-            });
+            services.AddAuthentication(JwtBearerDefaults.AuthenticationScheme)
+                    .AddMicrosoftWebApi(Configuration);
 
             services.AddControllers();
         }

2-Call-OwnApi/daemon-console/Daemon-Console.csproj

@@ -14,7 +14,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="3.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="3.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.0.0" />
-    <PackageReference Include="Microsoft.Identity.Client" Version="4.16.0" />
+    <PackageReference Include="Microsoft.Identity.Client" Version="4.16.1" />
     <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
   </ItemGroup>