Merge branch 'master' into patch-3

Author: jmprieur

2. Web API now calls Microsoft Graph/README.md

@@ -5,9 +5,9 @@ author: jmprieur
 level: 400
 client: .NET Desktop (WPF)
 service: ASP.NET Core Web API, Microsoft Graph
-endpoint: AAD v2.0
+endpoint: Microsoft identity platform
 ---
-# ASP.NET Core Web API calling Microsoft Graph, itself called from a WPF application using Azure AD V2
+# ASP.NET Core Web API calling Microsoft Graph, itself called from a WPF application using Microsoft identity platform
 
 [![Build status](https://identitydivision.visualstudio.com/IDDP/_apis/build/status/AAD%20Samples/.NET%20client%20samples/active-directory-dotnet-native-aspnetcore-v2)](https://identitydivision.visualstudio.com/IDDP/_build/latest?definitionId=516)
 
@@ -115,7 +115,7 @@ If you want to use this automation:
    > Other ways of running the scripts are described in [App Creation Scripts](./AppCreationScripts/AppCreationScripts.md)
 
 1. In the list of pages for the application registration of the `TodoListService-v2` application, select **Manifest**
-      - in the manifest, search for **"accessTokenAcceptedVersion"**, and replace **null** by **2**. This property lets Azure AD know that the Web API accepts v2.0 tokens
+      - in the manifest, search for **"accessTokenAcceptedVersion"**, and replace **null** by **2**. This property lets Azure AD know that the Web API accepts Microsoft identity platform (v2.0) tokens
       - Select **Save**
 
 
@@ -174,7 +174,7 @@ If you want to register your apps manually, as a first step you'll need to:
    - in the manifest, search for **"accessTokenAcceptedVersion"**, and see that its value is **2**. This property lets Azure AD know that the Web API accepts v2.0 tokens
    - Select **Save**
 
-> Important: it's up to the Web API to decide which version of token (v1.0 or v2.0) it accepts. Then when clients request a token for your Web API using the v2.0 endpoint, they'll get a token which version is accepted by the Web API. The code validating the tokens in this sample was written to accept both versions.
+> Important: it's up to the Web API to decide which version of token (v1.0 or v2.0) it accepts. Then when clients request a token for your Web API using the Microsoft identity platform endpoint, they'll get a token which version is accepted by the Web API. The code validating the tokens in this sample was written to accept both versions.
 
 #### Register the client app (TodoListClient)
 
@@ -309,7 +309,7 @@ Update `Startup.cs` file:
 
   `AddProtectWebApiWithMicrosoftIdentityPlatformV2` does the following:
   - add the **Jwt**BearerAuthenticationScheme (Note the replacement of BearerAuthenticationScheme by **Jwt**BearerAuthenticationScheme)
-  - set the authority to be the Microsoft identity platform v2.0 identity
+  - set the authority to be the Microsoft identity platform identity
   - sets the audiences to validate
   - register an issuer validator that accepts issuers to be in the Microsoft identity platform clouds.
   - 
@@ -325,7 +325,7 @@ Update `Startup.cs` file:
   // Added
   services.Configure<JwtBearerOptions>(AzureADDefaults.JwtBearerAuthenticationScheme, options =>
   {
-    // This is an Azure AD v2.0 Web API
+    // This is an Microsoft identity platform Web API
     options.Authority += "/v2.0";
 
     // The valid audiences are both the Client ID (options.Audience) and api://{ClientID}

3.-Web-api-call-Microsoft-graph-for-personal-accounts/README.md

@@ -5,9 +5,9 @@ author: jmprieur
 level: 400
 client: .NET Desktop (WPF)
 service: ASP.NET Core Web API, Microsoft Graph
-endpoint: AAD v2.0
+endpoint: Microsoft identity platform
 ---
-# ASP.NET Core Web API calling Microsoft Graph including personal accounts, itself called from a WPF application using the Microsoft identity platform (formerly named Azure AD v2.0)
+# ASP.NET Core Web API calling Microsoft Graph including personal accounts, itself called from a WPF application using the Microsoft identity platform
 
 [![Build status](https://identitydivision.visualstudio.com/IDDP/_apis/build/status/AAD%20Samples/.NET%20client%20samples/active-directory-dotnet-native-aspnetcore-v2)](https://identitydivision.visualstudio.com/IDDP/_build/latest?definitionId=516)
 
@@ -372,8 +372,8 @@ For more information, visit the following links:
   - [Acquiring tokens with authorization codes on web apps](https://github.com/AzureAD/microsoft-authentication-library-for-dotnet/wiki/Acquiring-tokens-with-authorization-codes-on-web-apps)
   - [Customizing Token cache serialization](https://github.com/AzureAD/microsoft-authentication-library-for-dotnet/wiki/token-cache-serialization)
 
-- Articles about the Azure AD V2 endpoint [http://aka.ms/aaddevv2](http://aka.ms/aaddevv2), with a focus on:
-  - [Azure Active Directory v2.0 and OAuth 2.0 On-Behalf-Of flow](https://docs.microsoft.com/en-us/azure/active-directory/develop/active-directory-v2-protocols-oauth-on-behalf-of)
+- Articles about the Microsoft identity platform endpoint [http://aka.ms/aaddevv2](http://aka.ms/aaddevv2), with a focus on:
+  - [Microsoft identity platform and OAuth 2.0 On-Behalf-Of flow](https://docs.microsoft.com/en-us/azure/active-directory/develop/active-directory-v2-protocols-oauth-on-behalf-of)
 
 - [Introduction to Identity on ASP.NET Core](https://docs.microsoft.com/en-us/aspnet/core/security/authentication/identity?view=aspnetcore-2.1&tabs=visual-studio%2Caspnetcore2x)
   - [AuthenticationBuilder](https://docs.microsoft.com/en-us/dotnet/api/microsoft.aspnetcore.authentication.authenticationbuilder?view=aspnetcore-2.0)

Microsoft.Identity.Web/StartupHelpers.cs

@@ -38,7 +38,7 @@ namespace Microsoft.Identity.Web
     public static class StartupHelpers
     {
         /// <summary>
-        /// Add authentication with Microsoft identity platform v2.0 (AAD v2.0).
+        /// Add authentication with Microsoft identity platform (v2.0).
         /// This expects the configuration files will have a section named "AzureAD"
         /// </summary>
         /// <param name="services">Service collection to which to add this authentication scheme</param>
@@ -70,7 +70,7 @@ public static IServiceCollection AddAzureAdV2Authentication(this IServiceCollect
 
                 // Set the nameClaimType to be preferred_username.
                 // This change is needed because certain token claims from Azure AD V1 endpoint
-                // (on which the original .NET core template is based) are different than Azure AD V2 endpoint.
+                // (on which the original .NET core template is based) are different than V2 endpoint.
                 // For more details see [ID Tokens](https://docs.microsoft.com/en-us/azure/active-directory/develop/id-tokens)
                 // and [Access Tokens](https://docs.microsoft.com/en-us/azure/active-directory/develop/access-tokens)
                 options.TokenValidationParameters.NameClaimType = "preferred_username";
@@ -161,4 +161,4 @@ public static IServiceCollection AddMsal(this IServiceCollection services, IEnum
             return services;
         }
     }
-}
+}

Microsoft.Identity.Web/WebApiStartupHelpers.cs

@@ -43,7 +43,7 @@ namespace Microsoft.Identity.Web
     public static class WebApiStartupHelpers
     {
         /// <summary>
-        /// Protects the Web API with Microsoft Identity Platform v2.0 (AAD v2.0)
+        /// Protects the Web API with Microsoft identity platform (v2.0)
         /// This expects the configuration files will have a section named "AzureAD"
         /// </summary>
         /// <param name="services">Service collection to which to add this authentication scheme</param>
@@ -57,13 +57,13 @@ public static IServiceCollection AddProtectWebApiWithMicrosoftIdentityPlatformV2
             // Add session if you are planning to use session based token cache , .AddSessionTokenCaches()
             services.AddSession();
 
-            // Change the authentication configuration  to accommodate the Azure AD v2.0 endpoint.
+            // Change the authentication configuration  to accommodate the identity platform endpoint.
             services.Configure<JwtBearerOptions>(AzureADDefaults.JwtBearerAuthenticationScheme, options =>
             {
                 // Reinitialize the options as this has changed to JwtBearerOptions to pick configuration values for attributes unique to JwtBearerOptions
                 configuration.Bind("AzureAd", options);
 
-                // This is an Azure AD v2.0 Web API
+                // This is an identity platform Web API
                 options.Authority += "/v2.0";
 
                 // The valid audiences are both the Client ID (options.Audience) and api://{ClientID}
@@ -105,7 +105,7 @@ public static IServiceCollection AddProtectWebApiWithMicrosoftIdentityPlatformV2
         }
 
         /// <summary>
-        /// Protects the Web API with Microsoft Identity Platform v2.0 (AAD v2.0)
+        /// Protects the Web API with Microsoft identity platform (v2.0)
         /// This supposes that the configuration files have a section named "AzureAD"
         /// </summary>
         /// <param name="services">Service collection to which to add authentication</param>
@@ -149,4 +149,4 @@ public static IServiceCollection AddProtectedApiCallsWebApis(this IServiceCollec
             return services;
         }
     }
-}
+}

README.md

@@ -101,6 +101,6 @@ This project has adopted the [Microsoft Open Source Code of Conduct](https://ope
 
 ## Other samples and documentation
 
-- Other samples for Azure AD v2.0 are available from [https://aka.ms/aaddevsamplesv2](https://aka.ms/aaddevsamplesv2)
+- Other samples for Microsoft identity platform are available from [https://aka.ms/aaddevsamplesv2](https://aka.ms/aaddevsamplesv2)
 - The conceptual documentation for MSAL.NET is available from [https://aka.ms/msalnet](https://aka.ms/msalnet)
-- the documentation for Azure AD v2.0 is available from [https://aka.ms/aadv2](https://aka.ms/aadv2)
+- the documentation for identity platform is available from [https://aka.ms/aadv2](https://aka.ms/aadv2)