more API updates w/latest build

jennyf19 · jennyf19 · commit d35646ef0af9 · 2020-07-08T11:58:19.000-07:00
diff --git a/1-WebApp-OIDC/1-2-AnyOrg/README.md b/1-WebApp-OIDC/1-2-AnyOrg/README.md
@@ -221,14 +221,14 @@ These steps are encapsulated in the [Microsoft.Identity.Web](..\..\Microsoft.Ide
 
 In order to restrict users from specific organizations from signing-in to your web app, you'll need to customize your code a bit more to restrict issuers. In Azure AD, the token issuers are the Azure AD tenants which issue tokens to applications.
 
-In the `Startup.cs` file, in the `ConfigureServices` method, after `services.AddMicrosoftIdentityPlatformAuthentication(Configuration)` add some code to filter  issuers by overriding the `TokenValidationParameters.IssuerValidator` delegate.
+In the `Startup.cs` file, in the `ConfigureServices` method, after `services.AddMicrosoftWebAppAuthentication(Configuration)` add some code to filter  issuers by overriding the `TokenValidationParameters.IssuerValidator` delegate.
 
 ```CSharp
     public void ConfigureServices(IServiceCollection services)
     {
     ...
     // Sign-in users with the Microsoft identity platform
-    services.AddMicrosoftWebApp(Configuration);
+    services.AddMicrosoftWebAppAuthentication(Configuration);
 
     // Restrict users to specific belonging to specific tenants
     services.Configure<OpenIdConnectOptions>(OpenIdConnectDefaults.AuthenticationScheme, options =>
diff --git a/1-WebApp-OIDC/1-5-B2C/README.md b/1-WebApp-OIDC/1-5-B2C/README.md
@@ -130,7 +130,7 @@ Here is the middleware example:
 
 Important things to notice:
 
-- The method `AddMicrosoftWebAppAuthenticatio` will configure the authentication based on the `MicrosoftIdentityOptions.cs` options. Feel free to bind more properties on `AzureAdB2C` section on `appsettings.json` if you need to set more options.
+- The method `AddMicrosoftWebAppAuthentication` will configure the authentication based on the `MicrosoftIdentityOptions.cs` options. Feel free to bind more properties on `AzureAdB2C` section on `appsettings.json` if you need to set more options.
 - The urls you set for `CallbackPath` and `SignedOutCallbackPath` should be registered on the **Reply Urls** of your application, in [Azure Portal](https://portal.azure.com).
 
 ## Next steps
diff --git a/2-WebApp-graph-user/2-1-Call-MSGraph/README.md b/2-WebApp-graph-user/2-1-Call-MSGraph/README.md
@@ -100,13 +100,9 @@ After the following lines in the ConfigureServices(IServiceCollection services)
  public void ConfigureServices(IServiceCollection services)
 {
     . . .
-     services.AddAuthentication(OpenIdConnectDefaults.AuthenticationScheme)
-             .AddMicrosoftWebApp(Configuration)
-
-             // Token acquisition service based on MSAL.NET
-             // and chosen token cache implementation
-             .AddMicrosoftWebAppCallsWebApi(Configuration, new string[] { Constants.ScopeUserRead });
-     services.AddInMemoryTokenCaches();
+     services.AddMicrosoftWebAppAuthentication(Configuration)
+             .AddMicrosoftWebAppCallsWebApi(Configuration, new string[] { Constants.ScopeUserRead })
+             .AddInMemoryTokenCaches();
 ```
 
 The two new lines of code:
diff --git a/2-WebApp-graph-user/2-1-Call-MSGraph/Startup.cs b/2-WebApp-graph-user/2-1-Call-MSGraph/Startup.cs
@@ -40,17 +40,12 @@ public void ConfigureServices(IServiceCollection services)
 
             services.AddOptions();
 
-            services.AddAuthentication(OpenIdConnectDefaults.AuthenticationScheme)
-                    .AddMicrosoftWebApp(Configuration)
-
-            // Token acquisition service based on MSAL.NET
-            // and chosen token cache implementation
-                    .AddMicrosoftWebAppCallsWebApi(Configuration, new string[] { Constants.ScopeUserRead });
-             services.AddInMemoryTokenCaches();
-
+            services.AddMicrosoftWebAppAuthentication(Configuration)
+                    .AddMicrosoftWebAppCallsWebApi(Configuration, new string[] { Constants.ScopeUserRead })
+                    .AddInMemoryTokenCaches();
             /*
                // or use a distributed Token Cache by adding 
-                           .AddDistributedTokenCaches();
+                    .AddDistributedTokenCaches();
 
                // and then choose your implementation. 
                // See https://docs.microsoft.com/en-us/aspnet/core/performance/caching/distributed?view=aspnetcore-2.2#distributed-memory-cache
@@ -112,11 +107,11 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
 
             app.UseEndpoints(endpoints =>
             {
-            endpoints.MapControllerRoute(
-                name: "default",
-                pattern: "{controller=Home}/{action=Index}/{id?}");
-            endpoints.MapRazorPages();
-        });
+                endpoints.MapControllerRoute(
+                    name: "default",
+                    pattern: "{controller=Home}/{action=Index}/{id?}");
+                endpoints.MapRazorPages();
+            });
         }
     }
 }
diff --git a/2-WebApp-graph-user/2-2-TokenCache/README.md b/2-WebApp-graph-user/2-2-TokenCache/README.md
@@ -187,10 +187,8 @@ public void ConfigureServices(IServiceCollection services)
     . . .
     services.AddAuthentication(OpenIdConnectDefaults.AuthenticationScheme)
             .AddMicrosoftWebApp(Configuration)
-            // Token acquisition service based on MSAL.NET
-            // and chosen token cache implementation
-            .AddMicrosoftWebAppCallsWebApi(Configuration, new string[] { Constants.ScopeUserRead });
-    services.AddDistributedTokenCaches();
+            .AddMicrosoftWebAppCallsWebApi(Configuration, new string[] { Constants.ScopeUserRead })
+            .AddDistributedTokenCaches();
 
     services.AddDistributedSqlServerCache(options =>
     {
diff --git a/2-WebApp-graph-user/2-2-TokenCache/Startup.cs b/2-WebApp-graph-user/2-2-TokenCache/Startup.cs
@@ -53,11 +53,8 @@ dotnet tool install --global dotnet-sql-cache
 
             services.AddAuthentication(OpenIdConnectDefaults.AuthenticationScheme)
                     .AddMicrosoftWebApp(Configuration)
-
-            // Token acquisition service based on MSAL.NET
-            // and chosen token cache implementation
-                    .AddMicrosoftWebAppCallsWebApi(Configuration, new string[] { Constants.ScopeUserRead });
-            services.AddDistributedTokenCaches();
+                    .AddMicrosoftWebAppCallsWebApi(Configuration, new string[] { Constants.ScopeUserRead })
+                    .AddDistributedTokenCaches();
 
             services.AddDistributedSqlServerCache(options =>
             {
diff --git a/2-WebApp-graph-user/2-3-Multi-Tenant/README-National-Cloud.md b/2-WebApp-graph-user/2-3-Multi-Tenant/README-National-Cloud.md
@@ -273,7 +273,7 @@ The `https://graph.microsoft.com/.default` is a static scope that allows the ten
 
 ### Custom token validation allowing only registered tenants
 
-On the `Startup.cs` we are calling `AddMicrosoftWebApp` to configure the authentication, and within that method, we validates that the token issuer is from AAD.
+On the `Startup.cs` we are calling `AddMicrosoftWebAppAuthentication` to configure the authentication, and within that method, we validates that the token issuer is from AAD.
 
 ```csharp
 options.TokenValidationParameters.IssuerValidator = AadIssuerValidator.GetIssuerValidator(options.Authority).Validate;
diff --git a/2-WebApp-graph-user/2-3-Multi-Tenant/README.md b/2-WebApp-graph-user/2-3-Multi-Tenant/README.md
@@ -249,7 +249,7 @@ The `https://graph.microsoft.com/.default` is a static scope that allows the ten
 
 ### Custom token validation allowing only registered tenants
 
-On the `Startup.cs` we are calling `AddMicrosoftWebApp` to configure the authentication, and within that method, we validates that the token issuer is from AAD.
+On the `Startup.cs` we are calling `AddMicrosoftWebAppAuthentication` to configure the authentication, and within that method, we validates that the token issuer is from AAD.
 
 ```csharp
 options.TokenValidationParameters.IssuerValidator = AadIssuerValidator.GetIssuerValidator(options.Authority).Validate;
diff --git a/2-WebApp-graph-user/2-3-Multi-Tenant/Startup.cs b/2-WebApp-graph-user/2-3-Multi-Tenant/Startup.cs
@@ -85,14 +85,10 @@ public void ConfigureServices(IServiceCollection services)
                         return Task.FromResult(0);
                     };
                 }, options =>
-                {
-                    Configuration.Bind("AzureAD", options);
-                }, options =>
                 {
                 })
-
-            .AddMicrosoftWebAppCallsWebApi(Configuration, new string[] { GraphScope.UserReadAll });
-             services.AddInMemoryTokenCaches();
+                    .AddMicrosoftWebAppCallsWebApi(Configuration, new string[] { GraphScope.UserReadAll })
+                    .AddInMemoryTokenCaches();
 
             services.AddControllersWithViews(options =>
             {
diff --git a/3-WebApp-multi-APIs/README.md b/3-WebApp-multi-APIs/README.md
@@ -76,19 +76,15 @@ Starting from the [previous phase of the tutorial](../../2-WebApp-graph-user/2-1
 
 ### Update the `Startup.cs` file to enable TokenAcquisition by a MSAL.NET based service
 
-After the following lines in the ConfigureServices(IServiceCollection services) method, after `services.AddMicrosoftWebApp(Configuration);`, add `services.AddHttpClient<IArmOperations, ArmApiOperationService>();`:
+After the following lines in the ConfigureServices(IServiceCollection services) method, after `services.AddMicrosoftWebAppAuthentication(Configuration);`, add `services.AddHttpClient<IArmOperations, ArmApiOperationService>();`:
 
 ```CSharp
  public void ConfigureServices(IServiceCollection services)
 {
     . . .
-     services.AddAuthentication(OpenIdConnectDefaults.AuthenticationScheme)
-             .AddMicrosoftWebApp(Configuration)
-
-            // Token acquisition service based on MSAL.NET
-            // and chosen token cache implementation
-            .AddMicrosoftWebAppCallsWebApi(Configuration, new string[] { Constants.ScopeUserRead });
-    services.AddInMemoryTokenCaches();
+     services.AddMicrosoftWebAppAuthentication(Configuration)
+                    .AddMicrosoftWebAppCallsWebApi(Configuration, new string[] { Constants.ScopeUserRead })
+                    .AddInMemoryTokenCaches();
     services.AddHttpClient<IArmOperations, ArmApiOperationService>();
 ```
 
diff --git a/3-WebApp-multi-APIs/Startup.cs b/3-WebApp-multi-APIs/Startup.cs
@@ -42,13 +42,9 @@ public void ConfigureServices(IServiceCollection services)
 
             services.AddOptions();
 
-            services.AddAuthentication(OpenIdConnectDefaults.AuthenticationScheme)
-                    .AddMicrosoftWebApp(Configuration)
-
-            // Token acquisition service based on MSAL.NET
-            // and chosen token cache implementation
-                    .AddMicrosoftWebAppCallsWebApi(Configuration, new string[] { Constants.ScopeUserRead });
-            services.AddInMemoryTokenCaches();
+            services.AddMicrosoftWebAppAuthentication(Configuration)
+                    .AddMicrosoftWebAppCallsWebApi(Configuration, new string[] { Constants.ScopeUserRead })
+                    .AddInMemoryTokenCaches();
 
             // Add APIs
             services.AddGraphService(Configuration);
diff --git a/4-WebApp-your-API/4-1-MyOrg/Client/Startup.cs b/4-WebApp-your-API/4-1-MyOrg/Client/Startup.cs
@@ -43,19 +43,9 @@ public void ConfigureServices(IServiceCollection services)
 
             services.AddOptions();
 
-            services.AddAuthentication(OpenIdConnectDefaults.AuthenticationScheme)
-                     .AddMicrosoftWebApp(Configuration)
-
-            // 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;
-
-            // Token acquisition service based on MSAL.NET
-            // and chosen token cache implementation
-                    .AddMicrosoftWebAppCallsWebApi(Configuration, new string[] { Configuration["TodoList:TodoListScope"] });
-            services.AddInMemoryTokenCaches();
+            services.AddMicrosoftWebAppAuthentication(Configuration)
+                    .AddMicrosoftWebAppCallsWebApi(Configuration, new string[] { Configuration["TodoList:TodoListScope"] })
+                    .AddInMemoryTokenCaches();
 
             // Add APIs
             services.AddTodoListService(Configuration);
diff --git a/4-WebApp-your-API/4-1-MyOrg/README-incremental-instructions.md b/4-WebApp-your-API/4-1-MyOrg/README-incremental-instructions.md
@@ -208,10 +208,9 @@ Add a reference to the `Microsoft.Identity.Web` library if not already present.
 1. Update the `configureServices` method in `startup.cs` to add the MSAL library and a token cache.
 
 ```CSharp
-     services.AddAuthentication(OpenIdConnectDefaults.AuthenticationScheme)
-             .AddMicrosoftWebApp(Configuration)
-             .AddMicrosoftWebAppCallsWebApi(new string[] { Configuration["TodoList:TodoListScope"] })
-     services.AddInMemoryTokenCaches();
+     services.AddMicrosoftWebAppAuthentication(Configuration)
+             .AddMicrosoftWebAppCallsWebApi(Configuration, new string[] { Configuration["TodoList:TodoListScope"] })
+             .AddInMemoryTokenCaches();
  ```
 
 ### Creating the Web API project (TodoListService)
diff --git a/4-WebApp-your-API/4-1-MyOrg/README.md b/4-WebApp-your-API/4-1-MyOrg/README.md
@@ -249,10 +249,9 @@ Explore the sample by signing in into the TodoList client, adding items to the T
      with these lines:
 
      ```CSharp
-     services.AddAuthentication(OpenIdConnectDefaults.AuthenticationScheme)
-             .AddMicrosoftWebApp(Configuration)
-             .AddMicrosoftWebAppCallsWebApi(new string[] { Configuration["TodoList:TodoListScope"] })
-     services.AddInMemoryTokenCaches();
+     services.AddMicrosoftWebAppAuthentication(Configuration)
+             .AddMicrosoftWebAppCallsWebApi(Configuration, new string[] { Configuration["TodoList:TodoListScope"] })
+             .AddInMemoryTokenCaches();
      ```
 
      This enables your application to use the Microsoft identity platform endpoint. This endpoint is capable of signing-in users both with their Work and School and Microsoft Personal accounts.
diff --git a/4-WebApp-your-API/4-2-B2C/Client/Startup.cs b/4-WebApp-your-API/4-2-B2C/Client/Startup.cs
@@ -42,19 +42,9 @@ public void ConfigureServices(IServiceCollection services)
 
             services.AddOptions();
 
-            services.AddAuthentication(OpenIdConnectDefaults.AuthenticationScheme)
-                    .AddMicrosoftWebApp(Configuration, "AzureAdB2C")
-
-            // 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;
-
-            // Token acquisition service based on MSAL.NET
-            // and chosen token cache implementation
-                    .AddMicrosoftWebAppCallsWebApi(Configuration, new string[] { Configuration["TodoList:TodoListScope"] }, configSectionName: "AzureAdB2C");
-            services.AddInMemoryTokenCaches();
+            services.AddMicrosoftWebAppAuthentication(Configuration, "AzureAdB2C")
+                    .AddMicrosoftWebAppCallsWebApi(Configuration, new string[] { Configuration["TodoList:TodoListScope"] }, configSectionName: "AzureAdB2C")
+                    .AddInMemoryTokenCaches();
 
             // Add APIs
             services.AddTodoListService(Configuration);
diff --git a/4-WebApp-your-API/4-2-B2C/README-incremental-instructions.md b/4-WebApp-your-API/4-2-B2C/README-incremental-instructions.md
@@ -205,10 +205,9 @@ Add a reference to the `Microsoft.Identity.Web` library if not already present.
 1. Update the `configureServices` method in `startup.cs` to add the MSAL library and a token cache.
 
 ```CSharp
-    services.AddAuthentication(OpenIdConnectDefaults.AuthenticationScheme)
-            .AddMicrosoftWebApp(Configuration, "AzureAdB2C")
-            .AddMicrosoftWebAppCallsWebApi(Configuration, new string[] { Configuration["TodoList:TodoListScope"] }, configSectionName: "AzureAdB2C");
-    services.AddInMemoryTokenCaches();
+    services.AddMicrosoftWebAppAuthentication(Configuration, "AzureAdB2C")
+            .AddMicrosoftWebAppCallsWebApi(Configuration, new string[] { Configuration["TodoList:TodoListScope"] }, configSectionName: "AzureAdB2C")
+            .AddInMemoryTokenCaches();
  ```
 
 ### Creating the Web API project (TodoListService)
diff --git a/5-WebApp-AuthZ/5-1-Roles/README-incremental-instructions.md b/5-WebApp-AuthZ/5-1-Roles/README-incremental-instructions.md
@@ -212,9 +212,9 @@ The following files have the code that would be of interest to you.
                   .AddAzureAD(options => Configuration.Bind("AzureAd", options));
     
     //This enables your application to use the Microsoft identity platform endpoint. This endpoint is capable of signing-in users both with their Work and School and Microsoft Personal accounts.
-    services.AddMicrosoftWebApp(Configuration)
-                .AddMicrosoftWebAppCallsWebApi(Configuration, new string[] { "User.Read", "Directory.Read.All" }) // Adds support for the MSAL library with the permissions necessary to retrieve the signed-in user's group info in case of a token overage
-                .AddInMemoryTokenCaches(); // Adds aspnetcore MemoryCache as Token cache provider for MSAL.
+    services.AddMicrosoftWebAppAuthentication(Configuration)
+            .AddMicrosoftWebAppCallsWebApi(Configuration, new string[] { Constants.ScopeUserRead })
+            .AddInMemoryTokenCaches(); // Adds aspnetcore MemoryCache as Token cache provider for MSAL.
     
     services.AddMSGraphService(Configuration);    // Adds the IMSGraphService as an available service for this app.
     
diff --git a/5-WebApp-AuthZ/5-1-Roles/README.md b/5-WebApp-AuthZ/5-1-Roles/README.md
@@ -295,8 +295,8 @@ This project was created using the following command.
      // by these lines:
 
      //This enables your application to use the Microsoft identity platform endpoint. This endpoint is capable of signing-in users both with their Work and School and Microsoft Personal accounts.
-            services.AddMicrosoftIdentityPlatformAuthentication(Configuration)
-                    .AddMsal(Configuration, new string[] { "User.Read" })
+            services.AddMicrosoftWebAppAuthentication(Configuration)
+                    .AddMicrosoftWebAppCallsWebApi(Configuration, new string[] { Constants.ScopeUserRead })
                     .AddInMemoryTokenCaches(); // Adds aspnetcore MemoryCache as Token cache provider for MSAL.
 
         services.AddGraphService(Configuration);    // Adds the IMSGraphService as an available service for this app.
diff --git a/5-WebApp-AuthZ/5-1-Roles/Startup.cs b/5-WebApp-AuthZ/5-1-Roles/Startup.cs
@@ -48,12 +48,9 @@ public void ConfigureServices(IServiceCollection services)
 
 
             // Sign-in users with the Microsoft identity platform
-            services.AddMicrosoftWebApp(Configuration);
-
-            // Token acquisition service based on MSAL.NET
-            // and chosen token cache implementation
-            services.AddMicrosoftWebAppCallsWebApi(Configuration, new string[] { Constants.ScopeUserRead })
-                .AddInMemoryTokenCaches();
+            services.AddMicrosoftWebAppAuthentication(Configuration)
+                    .AddMicrosoftWebAppCallsWebApi(Configuration, new string[] { Constants.ScopeUserRead })
+                    .AddInMemoryTokenCaches();
 
             // Add Graph
             services.AddGraphService(Configuration);
diff --git a/5-WebApp-AuthZ/5-2-Groups/README-incremental-instructions.md b/5-WebApp-AuthZ/5-2-Groups/README-incremental-instructions.md
@@ -242,10 +242,9 @@ The following files have the code that would be of interest to you:
     - by these lines:
 
       ```CSharp
-      services.AddMicrosoftWebApp(Configuration);
-
-      services.AddMicrosoftWebAppCallsWebApi(Configuration, new string[] { "User.Read", "Directory.Read.All" })
-          .AddInMemoryTokenCaches();
+      services.AddMicrosoftWebAppAuthentication(Configuration)
+              .AddMicrosoftWebAppCallsWebApi(Configuration, new string[] { "User.Read", "Directory.Read.All" })
+              .AddInMemoryTokenCaches();
 
       services.AddMSGraphService(Configuration);    // Adds the IMSGraphService as an available service for this app.
       ```
diff --git a/5-WebApp-AuthZ/5-2-Groups/README.md b/5-WebApp-AuthZ/5-2-Groups/README.md
@@ -352,10 +352,9 @@ The following files have the code that would be of interest to you:
     - by these lines:
 
       ```CSharp
-      services.AddMicrosoftWebApp(Configuration);
-
-      services.AddMicrosoftWebAppCallsWebApi(Configuration, new string[] { "User.Read", "Directory.Read.All" })
-          .AddInMemoryTokenCaches();
+      services.AddMicrosoftWebAppAuthentication(Configuration)
+              .AddMicrosoftWebAppCallsWebApi(Configuration, new string[] { "User.Read", "Directory.Read.All" })
+              .AddInMemoryTokenCaches();
 
       services.AddMSGraphService(Configuration);    // Adds the IMSGraphService as an available service for this app.
       ```
diff --git a/5-WebApp-AuthZ/5-2-Groups/Startup.cs b/5-WebApp-AuthZ/5-2-Groups/Startup.cs
