Skip to content

Commit 9b92efa

Browse files
authored
Merge pull request #83294 from MicrosoftDocs/repo_sync_working_branch
Resolve syncing conflicts from repo_sync_working_branch to master
2 parents 154f10d + 9f43907 commit 9b92efa

File tree

550 files changed

+6289
-2917
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

550 files changed

+6289
-2917
lines changed

.openpublishing.redirection.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26176,6 +26176,11 @@
2617626176
"redirect_url": "/azure/sentinel/data-connectors-reference#salesforce-service-cloud-preview",
2617726177
"redirect_document_id": false
2617826178
},
26179+
{
26180+
"source_path_from_root": "/articles/sentinel/connect-security-events.md",
26181+
"redirect_url": "/azure/sentinel/data-connectors-reference#security-events-windows",
26182+
"redirect_document_id": false
26183+
},
2617926184
{
2618026185
"source_path_from_root": "/articles/sentinel/connect-sophos-cloud-optix.md",
2618126186
"redirect_url": "/azure/sentinel/data-connectors-reference#sophos-cloud-optix-preview",
@@ -26241,6 +26246,11 @@
2624126246
"redirect_url": "/azure/sentinel/data-connectors-reference#windows-firewall",
2624226247
"redirect_document_id": false
2624326248
},
26249+
{
26250+
"source_path_from_root": "/articles/sentinel/connect-windows-security-events.md",
26251+
"redirect_url": "/azure/sentinel/data-connectors-reference#windows-security-events-preview",
26252+
"redirect_document_id": false
26253+
},
2624426254
{
2624526255
"source_path_from_root": "/articles/sentinel/connect-wirex-systems.md",
2624626256
"redirect_url": "/azure/sentinel/data-connectors-reference#wirex-network-forensics-platform-preview",

CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ articles/service-health @rboucher
4646
/articles/synapse-analytics/synapse-link/ @Rodrigossz @SnehaGunda @jovanpop-msft
4747

4848
# Cognitive Services
49-
/articles/cognitive-services/ @aahill @patrickfarley @nitinme @mrbullwinkle @laujan
49+
/articles/cognitive-services/ @aahill @patrickfarley @nitinme @mrbullwinkle @laujan @eric-urban
5050

5151
# DevOps
5252
/articles/ansible/ @TomArcherMsft

articles/active-directory-b2c/TOC.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
href: overview.md
88
- name: Technical and feature overview
99
href: technical-overview.md
10+
displayName: Azure AD B2C architecture, SLA, Azure AD B2C high availability, Azure AD B2C SLA, HA
1011
- name: Supported Azure AD features
1112
href: supported-azure-ad-features.md
1213
- name: What's new in docs?
@@ -81,7 +82,7 @@
8182
href: custom-policy-overview.md
8283
- name: API Connectors
8384
href: api-connectors-overview.md
84-
displayName: REST API, web API, API connectors
85+
displayName: REST API, web API, API connectors, Dynamic data retrieval, external data sources, external identity data source, outbound webhooks, third-party integration
8586
- name: User accounts
8687
href: user-overview.md
8788
- name: User profile attributes
@@ -396,12 +397,13 @@
396397
items:
397398
- name: Modify sign-up experiences
398399
href: add-api-connector.md
399-
displayName: rest claims validation, validate
400+
displayName: rest claims validation, validate, third-party integration, outbound webhook, third-party integration
400401
- name: Enrich tokens with external claims
401402
href: add-api-connector-token-enrichment.md
402-
displayName: rest claims exchange
403+
displayName: rest claims exchange, API connectors, Dynamic data retrieval, external data sources, external identity data source, outbound webhooks, third-party integration
403404
- name: Secure an API connector
404405
href: secure-rest-api.md
406+
displayName: API connectors, Dynamic data retrieval, external data sources, external identity data source, outbound webhooks, third-party integration
405407
- name: Troubleshooting
406408
items:
407409
- name: Collect logs using Application Insights
@@ -607,6 +609,7 @@
607609
displayName: Page version
608610
- name: Region availability & data residency
609611
href: data-residency.md
612+
displayName: SLA, Azure AD B2C high availability, Azure AD B2C SLA, high availability, HA
610613
- name: Build for resilience
611614
items:
612615
- name: Azure AD B2C introduction to resilience

articles/active-directory-b2c/add-api-connector-token-enrichment.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: Token enrichment - Azure Active Directory B2C
3-
description: Enrich tokens with claims from external sources using APIs.
3+
description: Enrich tokens with claims from external identity data sources using APIs or outbound webhooks.
44
services: active-directory-b2c
55
author: kengaderdus
66
manager: CelesteDG
@@ -18,7 +18,7 @@ zone_pivot_groups: b2c-policy-type
1818

1919
[!INCLUDE [active-directory-b2c-choose-user-flow-or-custom-policy](../../includes/active-directory-b2c-choose-user-flow-or-custom-policy.md)]
2020

21-
Azure Active Directory B2C (Azure AD B2C) enables identity developers to integrate an interaction with a RESTful API into their user flow using [API connectors](api-connectors-overview.md). At the end of this walkthrough, you'll be able to create an Azure AD B2C user flow that interacts with APIs to enrich tokens with information from external sources.
21+
Azure Active Directory B2C (Azure AD B2C) enables identity developers to integrate an interaction with a RESTful API into their user flow using [API connectors](api-connectors-overview.md). It enables developers to dynamically retrieve data from external identity sources. At the end of this walkthrough, you'll be able to create an Azure AD B2C user flow that interacts with APIs to enrich tokens with information from external sources.
2222

2323
::: zone pivot="b2c-user-flow"
2424

articles/active-directory-b2c/api-connectors-overview.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
---
22
title: About API connectors in Azure AD B2C
3-
description: Use Azure Active Directory (Azure AD) API connectors to customize and extend your user flows by using REST APIs.
3+
description: Use Azure Active Directory (Azure AD) API connectors to customize and extend your user flows by using REST APIs or outbound webhooks to external identity data sources.
44
services: active-directory-b2c
55
ms.service: active-directory
66
ms.subservice: B2C
77
ms.topic: how-to
8-
ms.date: 07/05/2021
8+
ms.date: 11/02/2021
99

1010
ms.author: kengaderdus
1111
author: kengaderdus
@@ -14,7 +14,7 @@ ms.custom: "it-pro"
1414
zone_pivot_groups: b2c-policy-type
1515
---
1616

17-
# Use API connectors to customize and extend sign-up user flows
17+
# Use API connectors to customize and extend sign-up user flows with external identity data sources
1818

1919
[!INCLUDE [active-directory-b2c-choose-user-flow-or-custom-policy](../../includes/active-directory-b2c-choose-user-flow-or-custom-policy.md)]
2020

@@ -25,7 +25,7 @@ zone_pivot_groups: b2c-policy-type
2525
As a developer or IT administrator, you can use API connectors to integrate your sign-up user flows with REST APIs to customize the sign-up experience and integrate with external systems. For example, with API connectors, you can:
2626

2727
- **Validate user input data**. Validate against malformed or invalid user data. For example, you can validate user-provided data against existing data in an external data store or list of permitted values. If invalid, you can ask a user to provide valid data or block the user from continuing the sign-up flow.
28-
- **Verify user identity**. Use an identity verification service to add an extra level of security to account creation decisions.
28+
- **Verify user identity**. Use an identity verification service or external identity data sources to add an extra level of security to account creation decisions.
2929
- **Integrate with a custom approval workflow**. Connect to a custom approval system for managing and limiting account creation.
3030
- **Augment tokens with attributes from external sources**. Enrich tokens with attributes about the user from sources external to Azure AD B2C such as cloud systems, custom user stores, custom permission systems, legacy identity services, and more.
3131
- **Overwrite user attributes**. Reformat or assign a value to an attribute collected from the user. For example, if a user enters the first name in all lowercase or all uppercase letters, you can format the name with only the first letter capitalized.
@@ -74,9 +74,9 @@ The Identity Experience Framework, which underlies Azure Active Directory B2C (A
7474

7575
Using Azure AD B2C, you can add your own business logic to a user journey by calling your own RESTful service. The Identity Experience Framework can send and receive data from your RESTful service to exchange claims. For example, you can:
7676

77-
- **Validate user input data**. For example, you can verify that the email address provided by the user exists in your customer's database, and if not, present an error.
78-
- **Process claims**. If a user enters their first name in all lowercase or all uppercase letters, your REST API can format the name with only the first letter capitalized and return it to Azure AD B2C.
79-
- **Enrich user data by further integrating with corporate line-of-business applications**. Your RESTful service can receive the user's email address, query the customer's database, and return the user's loyalty number to Azure AD B2C. Then return claims can be stored in the user's Azure AD account, evaluated in the next orchestration steps, or included in the access token.
77+
- **Use external identity data source to validate user input data**. For example, you can verify that the email address provided by the user exists in your customer's database, and if not, present an error. You can as well think of API connectors as a way of supporting outbound webhooks because the call is made when an event occurs e.g. a sign up.
78+
- **Process claims**. If a user enters their first name in all lowercase or all uppercase letters, your REST API can format the name with only the first letter capitalized and return it to Azure AD B2C. However, when using a custom policy, [ClaimsTransformations](claimstransformations.md) is preferred over calling a RESTful API.
79+
- **Dynamically enrich user data by further integrating with corporate line-of-business applications**. Your RESTful service can receive the user's email address, query the customer's database, and return the user's loyalty number to Azure AD B2C. Then return claims can be stored in the user's Azure AD account, evaluated in the next orchestration steps, or included in the access token.
8080
- **Run custom business logic**. You can send push notifications, update corporate databases, run a user migration process, manage permissions, audit databases, and perform any other workflows.
8181

8282
![Diagram of a RESTful service claims exchange](media/api-connectors-overview/restful-service-claims-exchange.png)

articles/active-directory-b2c/azure-sentinel.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,7 @@ In the following example, you receive a notification if someone tries to force a
104104

105105
6. Select **Next: Incident settings (Preview)**. You'll configure and add the automated response later.
106106

107-
7. Go to the **Review and create** tab to review all the
108-
settings for your new alert rule. When the **Validation passed** message appears, select **Create** to initialize your alert rule.
107+
7. Go to the **Review and create** tab to review all the settings for your new alert rule. When the **Validation passed** message appears, select **Create** to initialize your alert rule.
109108

110109
![Screenshot that shows the tab for reviewing and creating an rule.](./media/azure-sentinel/review-create.png)
111110

articles/active-directory-b2c/data-residency.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: Region availability and data residency
33
titleSuffix: Azure AD B2C
4-
description: Region availability, data residency, and information about Azure Active Directory B2C preview tenants.
4+
description: Region availability, data residency, high availability, SLA, and information about Azure Active Directory B2C preview tenants.
55
services: active-directory-b2c
66
author: kengaderdus
77
manager: CelesteDG
@@ -29,8 +29,7 @@ Azure AD B2C is **generally available worldwide** with the option for **data res
2929

3030
## Region availability
3131

32-
Azure AD B2C is available worldwide via the Azure public cloud. You can see examples of this feature in both Azure's [Products Available By Region](https://azure.microsoft.com/regions/services/) page and the [Active Directory B2C pricing calculator](https://azure.microsoft.com/pricing/details/active-directory-b2c/).
33-
32+
Azure AD B2C is available worldwide via the Azure public cloud. You can see availability of this service in both Azure's [Products Available By Region](https://azure.microsoft.com/regions/services/) page and the [Active Directory B2C pricing calculator](https://azure.microsoft.com/pricing/details/active-directory-b2c/). Also, Azure AD B2C service is highly available. Learn more about [Service Level Agreement (SLA) for Azure Active Directory B2C](https://azure.microsoft.com/support/legal/sla/active-directory-b2c/v1_1).
3433
## Data residency
3534

3635
Azure AD B2C stores user data in the United States, Europe, the Asia Pacific region, or Australia.

articles/active-directory-b2c/extensions-app.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,17 @@ manager: CelesteDG
88
ms.service: active-directory
99
ms.workload: identity
1010
ms.topic: reference
11-
ms.date: 09/06/2017
11+
ms.date: 11/02/2021
1212
ms.author: kengaderdus
1313
ms.subservice: B2C
1414
---
1515

16-
# Azure AD B2C: Extensions app
16+
# Azure AD B2C: Extensions app
1717

18-
When an Azure AD B2C directory is created, an app called `b2c-extensions-app. Do not modify. Used by AADB2C for storing user data.` is automatically created inside the new directory. This app, referred to as the **b2c-extensions-app**, is visible in *App registrations*. It is used by the Azure AD B2C service to store information about users and custom attributes. If the app is deleted, Azure AD B2C will not function correctly and your production environment will be affected.
18+
When an Azure AD B2C directory is created, an app called **b2c-extensions-app** is automatically created inside the new directory. This app is visible in *App registrations*. It is used by the Azure AD B2C service to store information about users and custom attributes. If the app is deleted, Azure AD B2C will not function correctly and your production environment will be affected.
1919

2020
> [!IMPORTANT]
21-
> Do not delete the b2c-extensions-app unless you are planning to immediately delete your tenant. If the app remains deleted for more than 30 days, user information will be permanently lost.
21+
> Do not delete the **b2c-extensions-app** unless you are planning to immediately delete your tenant. If the app remains deleted for more than 30 days, user information will be permanently lost.
2222
2323
## Verifying that the extensions app is present
2424

articles/active-directory-b2c/technical-overview.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: Technical and feature overview - Azure Active Directory B2C
3-
description: An in-depth introduction to the features and technologies in Azure Active Directory B2C.
3+
description: An in-depth introduction to the features and technologies in Azure Active Directory B2C. Azure Active Directory B2C has high availability globally.
44
services: active-directory-b2c
55
author: kengaderdus
66
manager: CelesteDG
@@ -157,9 +157,9 @@ You can customize the email to users that sign up to use your applications. By u
157157
* [Custom email verification with Mailjet](custom-email-mailjet.md)
158158
* [Custom email verification with SendGrid](custom-email-sendgrid.md)
159159

160-
## Add your own business logic
160+
## Add your own business logic and call RESTful API
161161

162-
If you choose to use custom policies, you can integrate with a RESTful API in a user journey to add your own business logic to the journey. For example, Azure AD B2C can exchange data with a RESTful service to:
162+
You can integrate with a RESTful API in both user flows and custom policies. The difference is, in user flows, you make calls at specified places, whereas in custom policies, you add your own business logic to the journey. This feature allows you to retrieve and use data from external identity sources. Azure AD B2C can exchange data with a RESTful service to:
163163

164164
* Display custom user-friendly error messages.
165165
* Validate user input to prevent malformed data from persisting in your user directory. For example, you can modify the data entered by the user, such as capitalizing their first name if they entered it in all lowercase.
@@ -297,9 +297,9 @@ By integrating Azure Application Insights into Azure AD B2C custom policies, you
297297
For more information, see [Track user behavior in Azure Active Directory B2C using Application Insights](analytics-with-application-insights.md).
298298

299299
## Region availability and data residency
300-
Azure AD B2C service is generally available worldwide, for availability, with the option for data residency in regions as specified in [Products available by region](https://azure.microsoft.com/regions/services/). Data residency is determined by the country/region you select when you [create your tenant](tutorial-create-tenant.md).
300+
Azure AD B2C service is generally available worldwide with the option for data residency in regions as specified in [Products available by region](https://azure.microsoft.com/regions/services/). Data residency is determined by the country/region you select when you [create your tenant](tutorial-create-tenant.md).
301301

302-
Learn more about [Azure Active Directory B2C service Region availability & data residency](data-residency.md).
302+
Learn more about [Azure Active Directory B2C service Region availability & data residency](data-residency.md) and [Service Level Agreement (SLA) for Azure Active Directory B2C](https://azure.microsoft.com/support/legal/sla/active-directory-b2c/v1_1).
303303

304304
## Automation using Microsoft Graph API
305305

articles/active-directory/authentication/howto-authentication-passwordless-security-key-on-premises.md

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@ The following scenarios aren't supported:
7070
- *Run as* by using a security key.
7171
- Log in to a server by using a security key.
7272

73-
7473
## Install the Azure AD Kerberos PowerShell module
7574

7675
The [Azure AD Kerberos PowerShell module](https://www.powershellgallery.com/packages/AzureADHybridAuthenticationManagement) provides FIDO2 management features for administrators.
@@ -93,18 +92,17 @@ The [Azure AD Kerberos PowerShell module](https://www.powershellgallery.com/pack
9392
9493
## Create a Kerberos Server object
9594

96-
Administrators use PowerShell tools from their Azure AD Connect server to create an Azure AD Kerberos Server object in their on-premises directory. Run the following steps in each domain and forest in your organization that contains Azure AD users:
95+
Administrators use the Azure AD Kerberos PowerShell module to create an Azure AD Kerberos Server object in their on-premises directory.
96+
97+
Run the following steps in each domain and forest in your organization that contain Azure AD users:
9798

98-
1. Upgrade to the latest version of Azure AD Connect. The instructions assume that you've already configured Azure AD Connect to support your hybrid environment.
99-
1. On the Azure AD Connect server, open an elevated PowerShell prompt, and then go to *C:\Program Files\Microsoft Azure Active Directory Connect\AzureADKerberos\\*.
100-
1. Run the following PowerShell commands to create a new Azure AD Kerberos Server object in both your on-premises Active Directory domain and Azure AD tenant.
99+
1. Open a PowerShell prompt using the Run as administrator option.
100+
1. Run the following PowerShell commands to create a new Azure AD Kerberos Server object both in your on-premises Active Directory domain and in your Azure Active Directory tenant.
101101

102102
> [!NOTE]
103103
> Replace `contoso.corp.com` in the following example with your on-premises Active Directory domain name.
104104
105-
```powerShell
106-
Import-Module ".\AzureAdKerberos.psd1"
107-
105+
```powershell
108106
# Specify the on-premises Active Directory domain. A new Azure AD
109107
# Kerberos Server object will be created in this Active Directory domain.
110108
$domain = "contoso.corp.com"
@@ -139,12 +137,10 @@ Administrators use PowerShell tools from their Azure AD Connect server to create
139137

140138
> [!NOTE]
141139
> If your organization protects password-based sign-in and enforces modern authentication methods such as multifactor authentication, FIDO2, or smart card technology, you must use the `-UserPrincipalName` parameter with the User Principal Name (UPN) of a global administrator.
142-
> - Replace `contoso.corp.com` in the following example with your on-premises Active Directory domain name.
143-
> - Replace `[email protected]` in the following example with the UPN of a global administrator.
144-
145-
```powerShell
146-
Import-Module ".\AzureAdKerberos.psd1"
140+
> - Replace `contoso.corp.com` in the following example with your on-premises Active Directory domain name.
141+
> - Replace `[email protected]` in the following example with the UPN of a global administrator.
147142
143+
```powershell
148144
# Specify the on-premises Active Directory domain. A new Azure AD
149145
# Kerberos Server object will be created in this Active Directory domain.
150146
$domain = "contoso.corp.com"

0 commit comments

Comments
 (0)