Skip to content

Commit bc35085

Browse files
committed
resolved conflict
2 parents 27b70f5 + b2a365f commit bc35085

20 files changed

+250
-169
lines changed

articles/active-directory/develop/authentication-national-cloud.md

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -24,19 +24,19 @@ ms.collection: M365-identity-device-management
2424

2525
National clouds are physically isolated instances of Azure. These regions of Azure are designed to make sure that data residency, sovereignty, and compliance requirements are honored within geographical boundaries.
2626

27-
Including global cloud​, Azure Active Directory is deployed in the following National clouds:  
27+
Including the global cloud​, Azure Active Directory (Azure AD) is deployed in the following national clouds:  
2828

29-
- Azure US Government
29+
- Azure Government
3030
- Azure Germany
3131
- Azure China 21Vianet
3232

33-
National clouds are unique and different environment than Azure global. Therefore, it is important to be aware of some key differences while developing your application for these environments such as registering applications, acquiring tokens, and configuring endpoints.
33+
National clouds are unique and a separate environment from Azure global. It's important to be aware of key differences while developing your application for these environments. Differences include registering applications, acquiring tokens, and configuring endpoints.
3434

3535
## App registration endpoints
3636

37-
There's a separate Azure portal for each one of the national clouds. To integrate applications with the Microsoft Identity Platform in a national cloud, you are required to register your application separately in each of the Azure portal specific to the environment.
37+
There's a separate Azure portal for each one of the national clouds. To integrate applications with the Microsoft identity platform in a national cloud, you're required to register your application separately in each Azure portal that's specific to the environment.
3838

39-
The following table lists the base URLs for the Azure Active Directory (Azure AD) endpoints used to register an application for each national cloud.
39+
The following table lists the base URLs for the Azure AD endpoints used to register an application for each national cloud.
4040

4141
| National cloud | Azure AD portal endpoint |
4242
|----------------|--------------------------|
@@ -49,33 +49,33 @@ The following table lists the base URLs for the Azure Active Directory (Azure AD
4949

5050
All the national clouds authenticate users separately in each environment and have separate authentication endpoints.
5151

52-
The following table lists the base URLs for the Azure Active Directory (Azure AD) endpoints used to acquire tokens for each national cloud.
52+
The following table lists the base URLs for the Azure AD endpoints used to acquire tokens for each national cloud.
5353

54-
| National cloud | Azure AD auth endpoint |
54+
| National cloud | Azure AD authentication endpoint |
5555
|----------------|-------------------------|
5656
| Azure AD for US Government | `https://login.microsoftonline.us` |
5757
| Azure AD Germany| `https://login.microsoftonline.de` |
5858
| Azure AD China operated by 21Vianet | `https://login.chinacloudapi.cn` |
5959
| Azure AD (global service)| `https://login.microsoftonline.com` |
6060

61-
- Requests to the Azure AD authorization or token endpoints can be formed using the appropriate region-specific base URL. For example, for Azure Germany:
61+
You can form requests to the Azure AD authorization or token endpoints by using the appropriate region-specific base URL. For example, for Azure Germany:
6262

6363
- Authorization common endpoint is `https://login.microsoftonline.de/common/oauth2/authorize`.
6464
- Token common endpoint is `https://login.microsoftonline.de/common/oauth2/token`.
6565

66-
- For single-tenant applications, replace common in the previous URLs with your tenant ID or name, for example, `https://login.microsoftonline.de/contoso.com`.
66+
For single-tenant applications, replace "common" in the previous URLs with your tenant ID or name. An example is `https://login.microsoftonline.de/contoso.com`.
6767

6868
> [!NOTE]
69-
> The [Azure AD v2.0 authorization]( https://docs.microsoft.com/azure/active-directory/develop/active-directory-appmodel-v2-overview) and token endpoints are only available for the global service. It is not yet supported for national cloud deployments.
69+
> The [Azure AD v2.0 authorization]( https://docs.microsoft.com/azure/active-directory/develop/active-directory-appmodel-v2-overview) and token endpoints are available only for the global service. They're not supported for national cloud deployments.
7070
7171
## Microsoft Graph API
7272

73-
To learn how to call the Microsoft Graph APIs in National Cloud environment go to [Microsoft Graph in national cloud](https://developer.microsoft.com/graph/docs/concepts/deployments).
73+
To learn how to call the Microsoft Graph APIs in a national cloud environment, go to [Microsoft Graph in national cloud deployments](https://developer.microsoft.com/graph/docs/concepts/deployments).
7474

7575
> [!IMPORTANT]
76-
> Certain services and features that are in specific regions of the global service might not be available in all of the National clouds. To find out what services are available go to [products available by region](https://azure.microsoft.com/global-infrastructure/services/?products=all&regions=usgov-non-regional,us-dod-central,us-dod-east,usgov-arizona,usgov-iowa,usgov-texas,usgov-virginia,china-non-regional,china-east,china-east-2,china-north,china-north-2,germany-non-regional,germany-central,germany-northeast).
76+
> Certain services and features that are in specific regions of the global service might not be available in all of the national clouds. To find out what services are available, go to [Products available by region](https://azure.microsoft.com/global-infrastructure/services/?products=all&regions=usgov-non-regional,us-dod-central,us-dod-east,usgov-arizona,usgov-iowa,usgov-texas,usgov-virginia,china-non-regional,china-east,china-east-2,china-north,china-north-2,germany-non-regional,germany-central,germany-northeast).
7777
78-
Follow this [Microsoft Authentication Library (MSAL) tutorial](msal-national-cloud.md) to learn how to build an application using Microsoft identity platform. Specifically, this app will sign in a user, get an access token to call the Microsoft Graph API.
78+
To learn how to build an application by using the Microsoft identity platform, follow the [Microsoft Authentication Library (MSAL) tutorial](msal-national-cloud.md). Specifically, this app will sign in a user and get an access token to call the Microsoft Graph API.
7979

8080
## Next steps
8181

0 commit comments

Comments
 (0)