Skip to content

Commit 41abc9d

Browse files
authored
Merge branch 'master' into patch-4
2 parents 04b4c6b + 3048cfb commit 41abc9d

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ author: jmprieur
55
level: 400
66
client: .NET Desktop (WPF)
77
service: ASP.NET Core Web API, Microsoft Graph
8-
endpoint: AAD v2.0
8+
endpoint: Microsoft identity platform
99
---
10-
# ASP.NET Core Web API calling Microsoft Graph, itself called from a WPF application using Azure AD V2
10+
# ASP.NET Core Web API calling Microsoft Graph, itself called from a WPF application using Microsoft identity platform
1111

1212
[![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)
1313

@@ -115,7 +115,7 @@ If you want to use this automation:
115115
> Other ways of running the scripts are described in [App Creation Scripts](./AppCreationScripts/AppCreationScripts.md)
116116
117117
1. In the list of pages for the application registration of the `TodoListService-v2` application, select **Manifest**
118-
- 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
118+
- 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
119119
- Select **Save**
120120

121121

@@ -174,7 +174,7 @@ If you want to register your apps manually, as a first step you'll need to:
174174
- 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
175175
- Select **Save**
176176

177-
> 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.
177+
> 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.
178178
179179
#### Register the client app (TodoListClient)
180180

@@ -309,7 +309,7 @@ Update `Startup.cs` file:
309309

310310
`AddProtectWebApiWithMicrosoftIdentityPlatformV2` does the following:
311311
- add the **Jwt**BearerAuthenticationScheme (Note the replacement of BearerAuthenticationScheme by **Jwt**BearerAuthenticationScheme)
312-
- set the authority to be the Microsoft identity platform v2.0 identity
312+
- set the authority to be the Microsoft identity platform identity
313313
- sets the audiences to validate
314314
- register an issuer validator that accepts issuers to be in the Microsoft identity platform clouds.
315315
-
@@ -325,7 +325,7 @@ Update `Startup.cs` file:
325325
// Added
326326
services.Configure<JwtBearerOptions>(AzureADDefaults.JwtBearerAuthenticationScheme, options =>
327327
{
328-
// This is an Azure AD v2.0 Web API
328+
// This is an Microsoft identity platform Web API
329329
options.Authority += "/v2.0";
330330

331331
// The valid audiences are both the Client ID (options.Audience) and api://{ClientID}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ author: jmprieur
55
level: 400
66
client: .NET Desktop (WPF)
77
service: ASP.NET Core Web API, Microsoft Graph
8-
endpoint: AAD v2.0
8+
endpoint: Microsoft identity platform
99
---
10-
# 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)
10+
# ASP.NET Core Web API calling Microsoft Graph including personal accounts, itself called from a WPF application using the Microsoft identity platform
1111

1212
[![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)
1313

@@ -372,8 +372,8 @@ For more information, visit the following links:
372372
- [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)
373373
- [Customizing Token cache serialization](https://github.com/AzureAD/microsoft-authentication-library-for-dotnet/wiki/token-cache-serialization)
374374

375-
- Articles about the Azure AD V2 endpoint [http://aka.ms/aaddevv2](http://aka.ms/aaddevv2), with a focus on:
376-
- [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)
375+
- Articles about the Microsoft identity platform endpoint [http://aka.ms/aaddevv2](http://aka.ms/aaddevv2), with a focus on:
376+
- [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)
377377

378378
- [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)
379379
- [AuthenticationBuilder](https://docs.microsoft.com/en-us/dotnet/api/microsoft.aspnetcore.authentication.authenticationbuilder?view=aspnetcore-2.0)

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,6 @@ This project has adopted the [Microsoft Open Source Code of Conduct](https://ope
101101

102102
## Other samples and documentation
103103

104-
- Other samples for Azure AD v2.0 are available from [https://aka.ms/aaddevsamplesv2](https://aka.ms/aaddevsamplesv2)
104+
- Other samples for Microsoft identity platform are available from [https://aka.ms/aaddevsamplesv2](https://aka.ms/aaddevsamplesv2)
105105
- The conceptual documentation for MSAL.NET is available from [https://aka.ms/msalnet](https://aka.ms/msalnet)
106-
- the documentation for Azure AD v2.0 is available from [https://aka.ms/aadv2](https://aka.ms/aadv2)
106+
- the documentation for identity platform is available from [https://aka.ms/aadv2](https://aka.ms/aadv2)

0 commit comments

Comments
 (0)