Skip to content

Commit 181010b

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into include
2 parents cfe69ce + 3ce4630 commit 181010b

30 files changed

+319
-245
lines changed

articles/active-directory-domain-services/troubleshoot-alerts.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ms.service: active-directory
1010
ms.subservice: domain-services
1111
ms.workload: identity
1212
ms.topic: troubleshooting
13-
ms.date: 08/17/2022
13+
ms.date: 09/20/2022
1414
ms.author: justinha
1515

1616
---
@@ -193,7 +193,9 @@ The managed domain's health automatically updates itself within two hours and re
193193

194194
### Resolution
195195

196-
This error is unrecoverable. To resolve the alert, [delete your existing managed domain](delete-aadds.md) and recreate it. If you have trouble deleting the managed domain, [open an Azure support request][azure-support] for additional troubleshooting assistance.
196+
Azure AD DS creates additional resources to function properly, such as public IP addresses, virtual network interfaces, and a load balancer. If any of these resources are modified, the managed domain is in an unsupported state and can't be managed. For more information about these resources, see [Network resources used by Azure AD DS](network-considerations.md#network-resources-used-by-azure-ad-ds).
197+
198+
This alert is generated when one of these required resources is modified and can't automatically be recovered by Azure AD DS. To resolve the alert, [open an Azure support request][azure-support] to fix the instance.
197199

198200
## AADDS114: Subnet invalid
199201

articles/active-directory/develop/v2-app-types.md

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@ ms.service: active-directory
99
ms.subservice: develop
1010
ms.workload: identity
1111
ms.topic: conceptual
12-
ms.date: 11/13/2020
12+
ms.date: 09/09/2022
1313
ms.author: ryanwi
1414
ms.reviewer: saeeda, jmprieur
1515
ms.custom: aaddev, fasttrack-edit, contperf-fy21q2
1616
---
1717

1818
# Application types for the Microsoft identity platform
1919

20-
The Microsoft identity platform supports authentication for a variety of modern app architectures, all of them based on industry-standard protocols [OAuth 2.0 or OpenID Connect](active-directory-v2-protocols.md). This article describes the types of apps that you can build by using Microsoft identity platform, regardless of your preferred language or platform. The information is designed to help you understand high-level scenarios before you start working with the code in the [application scenarios](authentication-flows-app-scenarios.md#application-scenarios).
20+
The Microsoft identity platform supports authentication for various modern app architectures, all of them based on industry-standard protocols [OAuth 2.0 or OpenID Connect](active-directory-v2-protocols.md). This article describes the types of apps that you can build by using Microsoft identity platform, regardless of your preferred language or platform. The information is designed to help you understand high-level scenarios before you start working with the code in the [application scenarios](authentication-flows-app-scenarios.md#application-scenarios).
2121

2222
## The basics
2323

@@ -38,7 +38,7 @@ https://login.microsoftonline.com/common/oauth2/v2.0/token
3838

3939
## Single-page apps (JavaScript)
4040

41-
Many modern apps have a single-page app front end written primarily in JavaScript, often with a framework like Angular, React, or Vue. The Microsoft identity platform supports these apps by using the [OpenID Connect](v2-protocols-oidc.md) protocol for authentication and either [OAuth 2.0 implicit grant flow](v2-oauth2-implicit-grant-flow.md) or the more recent [OAuth 2.0 authorization code + PKCE flow](v2-oauth2-auth-code-flow.md) for authorization (see below).
41+
Many modern apps have a single-page app front end written primarily in JavaScript, often with a framework like Angular, React, or Vue. The Microsoft identity platform supports these apps by using the [OpenID Connect](v2-protocols-oidc.md) protocol for authentication and one of two types of authorization grants defined by OAuth 2.0. The supported grant types are either the [OAuth 2.0 implicit grant flow](v2-oauth2-implicit-grant-flow.md) or the more recent [OAuth 2.0 authorization code + PKCE flow](v2-oauth2-auth-code-flow.md) (see below).
4242

4343
The flow diagram below demonstrates the OAuth 2.0 authorization code grant (with details around PKCE omitted), where the app receives a code from the Microsoft identity platform `authorize` endpoint, and redeems it for an access token and a refresh token using cross-site web requests. The access token expires every 24 hours, and the app must request another code using the refresh token. In addition to the access token, an `id_token` that represents the signed-in user to the client application is typically also requested through the same flow and/or a separate OpenID Connect request (not shown here).
4444

@@ -48,9 +48,7 @@ To see this scenario in action, check out the [Tutorial: Sign in users and call
4848

4949
### Authorization code flow vs. implicit flow
5050

51-
For most of the history of OAuth 2.0, the [implicit flow](v2-oauth2-implicit-grant-flow.md) was the recommended way to build single-page apps. With the removal of [third-party cookies](reference-third-party-cookies-spas.md) and [greater attention](https://tools.ietf.org/html/draft-ietf-oauth-security-topics-14) paid to security concerns around the implicit flow, we've moved to the authorization code flow for single-page apps.
52-
53-
To ensure compatibility of your app in Safari and other privacy-conscious browsers, we no longer recommend use of the implicit flow and instead recommend the authorization code flow.
51+
For most of the history of OAuth 2.0, the [implicit flow](v2-oauth2-implicit-grant-flow.md) was the recommended way to build single-page apps. With the removal of [third-party cookies](reference-third-party-cookies-spas.md) and [greater attention](https://tools.ietf.org/html/draft-ietf-oauth-security-topics-14) paid to security concerns around the implicit flow, the authorization code flow for single-page apps should now be implemented to ensure compatibility of your app in Safari and other privacy-conscious browsers. The continued use of the implicit flow is not recommended.
5452

5553
## Web apps
5654

@@ -69,17 +67,17 @@ eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiIsIng1dCI6ImtyaU1QZG1Cd...
6967
}
7068
```
7169

72-
Further details of different types of tokens used in the Microsoft identity platform are available in the [access token](access-tokens.md) reference and [id_token reference](id-tokens.md)
70+
Further details of different types of tokens used in the Microsoft identity platform are available in the [access token](access-tokens.md) reference and [id_token](id-tokens.md) reference.
7371

7472
In web server apps, the sign-in authentication flow takes these high-level steps:
7573

7674
![Shows the web app authentication flow](./media/v2-app-types/convergence-scenarios-webapp.svg)
7775

7876
You can ensure the user's identity by validating the ID token with a public signing key that is received from the Microsoft identity platform. A session cookie is set, which can be used to identify the user on subsequent page requests.
7977

80-
To see this scenario in action, try the code samples in the [Web app that signs in users scenario](scenario-web-app-sign-user-overview.md).
78+
To see this scenario in action, try the code samples in [Sign in users from a Web app](scenario-web-app-sign-user-overview.md).
8179

82-
In addition to simple sign-in, a web server app might need to access another web service, such as a REST API. In this case, the web server app engages in a combined OpenID Connect and OAuth 2.0 flow, by using the [OAuth 2.0 authorization code flow](v2-oauth2-auth-code-flow.md). For more information about this scenario, read about [getting started with web apps and Web APIs](https://github.com/AzureADQuickStarts/AppModelv2-WebApp-WebAPI-OpenIDConnect-DotNet).
80+
In addition to simple sign-in, a web server app might need to access another web service, such as a Representational State Transfer ([REST](https://docs.microsoft.com/rest/api/azure/)) API. In this case, the web server app engages in a combined OpenID Connect and OAuth 2.0 flow, by using the [OAuth 2.0 authorization code flow](v2-oauth2-auth-code-flow.md). For more information about this scenario, refer to our code [sample](https://github.com/Azure-Samples/active-directory-aspnetcore-webapp-openidconnect-v2/blob/master/2-WebApp-graph-user/2-1-Call-MSGraph/README.md).
8381

8482
## Web APIs
8583

articles/active-directory/manage-apps/review-admin-consent-requests.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ To review the admin consent requests and take action:
5151

5252
## Review admin consent requests using Microsoft Graph
5353

54-
To review the admin consent requests programmatically, use the [appConsentRequest resource type](/graph/api/resources/userconsentrequest) and [userConsentRequest resource type](/graph/api/resources/userconsentrequest) and their associated methods in Microsoft Graph. You cannot approve or deny consent requests using Microsoft Graph.
54+
To review the admin consent requests programmatically, use the [appConsentRequest resource type](/graph/api/resources/appconsentrequest) and [userConsentRequest resource type](/graph/api/resources/userconsentrequest) and their associated methods in Microsoft Graph. You cannot approve or deny consent requests using Microsoft Graph.
5555

5656
## Next steps
5757
- [Review permissions granted to apps](manage-application-permissions.md)

articles/azure-arc/data/connectivity.md

Lines changed: 41 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ ms.topic: conceptual
1818

1919
There are multiple options for the degree of connectivity from your Azure Arc-enabled data services environment to Azure. As your requirements vary based on business policy, government regulation, or the availability of network connectivity to Azure, you can choose from the following connectivity modes.
2020

21-
Azure Arc-enabled data services provides you the option to connect to Azure in two different *connectivity modes*:
21+
Azure Arc-enabled data services provide you the option to connect to Azure in two different *connectivity modes*:
2222

2323
- Directly connected
2424
- Indirectly connected
@@ -43,7 +43,7 @@ Some Azure-attached services are only available when they can be directly reache
4343
|**Feature**|**Indirectly connected**|**Directly connected**|
4444
|---|---|---|
4545
|**Automatic high availability**|Supported|Supported|
46-
|**Self-service provisioning**|Supported<br/>Creation can be done through Azure Data Studio, the appropriate CLI, or Kubernetes native tools (helm, kubectl, oc, etc.), or using Azure Arc-enabled Kubernetes GitOps provisioning.|Supported<br/>In addition to the indirectly connected mode creation options, you can also create through the Azure portal, Azure Resource Manager APIs, the Azure CLI, or ARM templates.
46+
|**Self-service provisioning**|Supported<br/>Use Azure Data Studio, the appropriate CLI, or Kubernetes native tools like Helm, `kubectl`, or `oc`, or use Azure Arc-enabled Kubernetes GitOps provisioning.|Supported<br/>In addition to the indirectly connected mode creation options, you can also create through the Azure portal, Azure Resource Manager APIs, the Azure CLI, or ARM templates.
4747
|**Elastic scalability**|Supported|Supported<br/>|
4848
|**Billing**|Supported<br/>Billing data is periodically exported out and sent to Azure.|Supported<br/>Billing data is automatically and continuously sent to Azure and reflected in near real time. |
4949
|**Inventory management**|Supported<br/>Inventory data is periodically exported out and sent to Azure.<br/><br/>Use client tools like Azure Data Studio, Azure Data CLI, or `kubectl` to view and manage inventory locally.|Supported<br/>Inventory data is automatically and continuously sent to Azure and reflected in near real time. As such, you can manage inventory directly from the Azure portal.|
@@ -76,8 +76,10 @@ Some Azure-attached services are only available when they can be directly reache
7676
There are three connections required to services available on the Internet. These connections include:
7777

7878
- [Microsoft Container Registry (MCR)](#microsoft-container-registry-mcr)
79+
- [Helm chart (direct connected mode)](#helm-chart-direct-connected-mode)
7980
- [Azure Resource Manager APIs](#azure-resource-manager-apis)
8081
- [Azure monitor APIs](#azure-monitor-apis)
82+
- [Azure Arc data processing service](#azure-arc-data-processing-service)
8183

8284
All HTTPS connections to Azure and the Microsoft Container Registry are encrypted using SSL/TLS using officially signed and verifiable certificates.
8385

@@ -111,9 +113,9 @@ Yes
111113

112114
None
113115

114-
### Helm chart used to create data controller in direct connected mode
116+
### Helm chart (direct connected mode)
115117

116-
The helm chart used to provision the Azure Arc data controller bootstrapper and cluster level objects, such as custom resource definitions, cluster roles, and cluster role bindings, is pulled from an Azure Container Registry.
118+
The Helm chart used to provision the Azure Arc data controller bootstrapper and cluster level objects, such as custom resource definitions, cluster roles, and cluster role bindings, is pulled from an Azure Container Registry.
117119

118120
#### Connection source
119121

@@ -150,18 +152,6 @@ A computer running Azure Data Studio, or Azure CLI that is connecting to Azure.
150152

151153
- `login.microsoftonline.com`
152154
- `management.azure.com`
153-
- `san-af-eastus-prod.azurewebsites.net`
154-
- `san-af-eastus2-prod.azurewebsites.net`
155-
- `san-af-australiaeast-prod.azurewebsites.net`
156-
- `san-af-centralus-prod.azurewebsites.net`
157-
- `san-af-westus2-prod.azurewebsites.net`
158-
- `san-af-westeurope-prod.azurewebsites.net`
159-
- `san-af-southeastasia-prod.azurewebsites.net`
160-
- `san-af-koreacentral-prod.azurewebsites.net`
161-
- `san-af-northeurope-prod.azurewebsites.net`
162-
- `san-af-westeurope-prod.azurewebsites.net`
163-
- `san-af-uksouth-prod.azurewebsites.net`
164-
- `san-af-francecentral-prod.azurewebsites.net`
165155

166156
#### Protocol
167157

@@ -175,6 +165,8 @@ HTTPS
175165

176166
Yes
177167

168+
To use proxy, verify that the agents meet the network requirements. See [Meet network requirements](../kubernetes/quickstart-connect-cluster.md#meet-network-requirements).
169+
178170
#### Authentication
179171

180172
Azure Active Directory
@@ -219,3 +211,36 @@ Azure Active Directory
219211
> For now, all browser HTTPS/443 connections to the data controller for running the command `az arcdata dc export` and Grafana and Kibana dashboards are SSL encrypted using self-signed certificates. A feature will be available in the future that will allow you to provide your own certificates for encryption of these SSL connections.
220212
221213
Connectivity from Azure Data Studio to the Kubernetes API server uses the Kubernetes authentication and encryption that you have established. Each user that is using Azure Data Studio or CLI must have an authenticated connection to the Kubernetes API to perform many of the actions related to Azure Arc-enabled data services.
214+
215+
### Azure Arc data processing service
216+
217+
Points to the data processing service endpoint in connection
218+
219+
#### Connection target
220+
221+
- `san-af-eastus-prod.azurewebsites.net`
222+
- `san-af-eastus2-prod.azurewebsites.net`
223+
- `san-af-australiaeast-prod.azurewebsites.net`
224+
- `san-af-centralus-prod.azurewebsites.net`
225+
- `san-af-westus2-prod.azurewebsites.net`
226+
- `san-af-westeurope-prod.azurewebsites.net`
227+
- `san-af-southeastasia-prod.azurewebsites.net`
228+
- `san-af-koreacentral-prod.azurewebsites.net`
229+
- `san-af-northeurope-prod.azurewebsites.net`
230+
- `san-af-westeurope-prod.azurewebsites.net`
231+
- `san-af-uksouth-prod.azurewebsites.net`
232+
- `san-af-francecentral-prod.azurewebsites.net`
233+
234+
#### Protocol
235+
236+
HTTPS
237+
238+
#### Can use proxy
239+
240+
Yes
241+
242+
To use proxy, verify that the agents meet the network requirements. See [Meet network requirements](../kubernetes/quickstart-connect-cluster.md#meet-network-requirements).
243+
244+
#### Authentication
245+
246+
None

0 commit comments

Comments
 (0)